fix:修改virtuallyRole绑定时机

zkqy-ui/src/views/relateTable/index.vue

@@ -269,6 +269,7 @@
               @change="getList()"
               placeholder="请选择表格名称"
               @input="iptChange()"
+              :filterable="true"
             >
               <el-option
                 v-for="item in tableList"
@@ -290,6 +291,7 @@
               v-model="tableItemForm.selectFields"
               placeholder="请选择表格主键"
               @input="iptChange()"
+              :filterable="true"
             >
               <el-option
                 v-for="item in tableFieldList"
@@ -309,6 +311,7 @@
               v-model="tableItemForm.timeFormat"
               placeholder="请选择时间格式"
               @input="iptChange()"
+              :filterable="true"
             >
               <el-option
                 v-for="val in dict.type.sys_time_format"
@@ -323,6 +326,7 @@
               v-model="tableItemForm.orderByColumn"
               placeholder="请选择排序依赖"
               @input="iptChange()"
+              :filterable="true"
             >
               <el-option
                 v-for="val in orderByFieldList"

zkqy-ui/src/views/system/bpmnPro/components/Panel/components/ElementExecuteUser.vue

@@ -82,7 +82,7 @@ import { filterUtil } from "@packages/bo-utils/filterUtil.js";
 export default {
   name: "ElementExecuteUser",
   // props: ["allUserList", "allRoleList"],
-  inject: ["allUserList", "allRoleList"],
+  inject: ["allUserList", "allRoleList", "nodeData"],
   data() {
     return {
       userTypeList: [
@@ -185,8 +185,8 @@ export default {
     updateExeUserType(value) {
       setExecuteUserType(getActive(), value);
       value == 2
-        ? setExecuteUser(getActive(), [], this.$route.query.id ? true : false)
-        : setExecuteUser(getActive(), "", this.$route.query.id ? true : false);
+        ? setExecuteUser(getActive(), [], this.isNewNode())
+        : setExecuteUser(getActive(), "", this.isNewNode());
       this.exeUserValueList = [];
       this.exeUserValue = "";
       if (!value) return;
@@ -249,13 +249,25 @@ export default {
       }
     },
     updateExeUserValue(value) {
-      setExecuteUser(getActive(), value, this.$route.query.id ? true : false);
+      setExecuteUser(getActive(), value, this.isNewNode());
     },
     scrollHandler() {
       if (this.isArriveBoottom) return;
       this.queryParams.pageNum++;
       this.loadListHandler();
     },
+    // 判断是否是新增节点
+    isNewNode() {
+      let element = getActive();
+      let nodeData = this.nodeData();
+      if (nodeData && nodeData.bpmProcessConfigurationList?.length) {
+        let id = element.id;
+        return !nodeData.bpmProcessConfigurationList.some((item) => {
+          return item.nodeKey == id;
+        });
+      }
+      return true;
+    },
     loadListHandler() {
       if (!this.exeUserType) return;
       if (this.exeUserType == 3) {

zkqy-ui/src/views/system/bpmnPro/components/bo-utils/getNodeMsg.js

@@ -49,8 +49,7 @@ export function getNodeMsg(xmlObj) {
       nodeProcessKey: '', //流程别名
       nodeType: '',   //节点类型(判断节点,正常节点..)根据字典维护
       nodeBefore: 'false',
-      nodeAfter: 'false',
-      nodeRolePremission: '', //节点对应的角色权限字符
+      nodeAfter: 'false',//节点对应的角色权限字符
       spare1: '',
       spare2: '',
       spare3: '',
@@ -174,14 +173,13 @@ function getBpmNodeHandleUser(node, nodeObj) {
   if (!node.attributes.length || !node.getAttribute('camunda:executeUser')) return []
   let res = {}, prefix = getProcessEngine();
   let uuid = node.getAttribute(`${prefix}:virtuallyRole`)
-  console.log(uuid);
   if (uuid) {
     res.virtuallyRole = uuid;
-    nodeObj.nodeRolePremission = uuid
+    nodeObj.nodeRolePermission = uuid
   } else {
-    let newUUID = uuidv4()
-    res.virtuallyRole = newUUID;
-    nodeObj.nodeRolePremission = newUUID;
+    // let newUUID = uuidv4()
+    // res.virtuallyRole = newUUID;
+    // nodeObj.nodeRolePermission = newUUID;
   }
   console.log(nodeObj);
 

zkqy-ui/src/views/system/bpmnPro/components/bo-utils/myFieldUtil.js

@@ -121,7 +121,7 @@ export function isEnd(element) {
   return is(element, 'bpmn:EndEvent')
 }
 
-export function setExecuteUser(element, value, isUpdate) {
+export function setExecuteUser(element, value, isNewNode) {
   const prefix = getProcessEngine();
   const modeling = getModeler.getModeling();
   const businessObject = getBusinessObject(element);
@@ -129,7 +129,7 @@ export function setExecuteUser(element, value, isUpdate) {
   modeling.updateModdleProperties(element, businessObject, {
     [`${prefix}:executeUser`]: value
   });
-  if (isUpdate) return
+  if (!isNewNode) return
   modeling.updateModdleProperties(element, businessObject, {
     [`${prefix}:virtuallyRole`]: uuid
   });