vue2-client 1.15.6 → 1.15.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.15.6",
+  "version": "1.15.7",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -966,19 +966,7 @@ export default {
         submitUser: this.currUser.name,
         submitUserId: this.currUser.id,
         // 新增：分支节点信息
-        branchInfo: this.isWfResultBranch ? {
-          isWfResultBranch: true,
-          branchChargePersons: this.branchChargePersons,
-          branchNodes: this.branchNodes.map(node => ({
-            stepId: node.stepId,
-            stepName: node.stepName,
-            selectedPersonId: this.branchChargePersons[node.stepId],
-            selectedPersonName: this.getBranchPersonName(node.stepId)
-          }))
-        } : {
-          isWfResultBranch: false,
-          calculatedTargetNode: this.calculatedTargetNode
-        }
+        branchChargePersons: this.branchChargePersons
       }
     },
     // 获取当前选择的负责人
@@ -1170,7 +1158,6 @@ export default {
             const result = await this.evaluateExpression(action.expression, formData)
             if (result) {
               this.calculatedTargetNode = action.to
-
               // 设置对应节点的人员选择
               const stepDefine = this.stepsDefine.find(step => step.id === action.to)
               if (stepDefine?.properties?.chargePerson?.needSelectPerson) {
@@ -1273,6 +1260,7 @@ export default {
       for (const action of conditionalActions) {
         const stepDefine = this.stepsDefine.find(step => step.id === action.to)
         if (stepDefine?.properties?.chargePerson?.needSelectPerson) {
+          // 都使用多分支了 肯定是新数据 那么不用做兼容处理
           this.chargePerson = stepDefine?.properties?.chargePerson
           // 获取这个节点的人员选项
           const chargePersonOptions = await this.getChargePersonOptionsForStep(action.to)
@@ -1283,9 +1271,10 @@ export default {
             chargePerson: stepDefine.properties.chargePerson,
             chargePersonOptions: chargePersonOptions
           })
-
           // 初始化选择值
           this.branchChargePersons[action.to] = undefined
+        } else {
+          this.branchChargePersons[action.to] = stepDefine?.properties?.chargePerson
         }
       }
 
@@ -1300,6 +1289,7 @@ export default {
         targetStepId = this.stepNextBtnTo
       }
 
+      this.calculatedTargetNode = targetStepId
       const stepDefine = this.stepsDefine.find(step => step.id === targetStepId)
       const defineProperties = stepDefine.properties
       this.chargePerson = defineProperties?.chargePerson
@@ -1323,6 +1313,7 @@ export default {
         this.needSelectPerson = true
         console.warn('设置人员选择，选项数量:', this.chargePersonOptions.length)
       } else {
+        this.branchChargePersons[targetStepId] = stepDefine?.properties?.chargePerson
         this.needSelectPerson = false
         this.chargePersonOptions = []
         console.warn('无需选择人员')

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowTimeline.vue

@@ -222,7 +222,7 @@ export default {
     // 动态展示时间线节点颜色
     getStepIconColor (index) {
       // 根据index找到stepId
-      const stepId = this.displaySteps[index - 1].id
+      const stepId = this.displaySteps[index - 1]?.id
 
       if (this.changeAble && stepId === this.displayStepId) {
         return 'yellow'

package/src/pages/WorkflowDetail/WorkflowPageDetail/components/WorkflowPersonSelector.vue

@@ -9,12 +9,18 @@
         required
       >
         <a-select
-          v-model="workflowHandleWrap.branchChargePersons[node.stepId]"
+          :value="getBranchPersonValue(node.stepId)"
+          @change="setBranchPersonValue(node.stepId, $event, node.chargePersonOptions)"
           :placeholder="`请选择${node.stepName}的处理人`"
           :options="node.chargePersonOptions"
           :filter-option="filterOption"
           style="width: 300px"
-        />
+          show-search
+        >
+          <a-select-option v-for="option in node.chargePersonOptions" :key="option.value" :value="option.value">
+            {{ option.label }}
+          </a-select-option>
+        </a-select>
       </a-form-item>
     </template>
 
@@ -24,13 +30,14 @@
         v-model="workflowHandleWrap.checkedChargePerson"
         placeholder="请选择或搜索"
         :options="workflowHandleWrap.chargePersonOptions"
+        @change="setBranchPersonValue(workflowHandleWrap.calculatedTargetNode, $event, workflowHandleWrap.chargePersonOptions)"
         :filter-option="filterOption"
         style="width: 300px"
       />
-      <div v-if="workflowHandleWrap.calculatedTargetNode" style="margin-top: 8px; color: #52c41a; font-size: 12px;">
-        <a-icon type="check-circle"/>
-        根据当前表单数据，将进入：{{ workflowHandleWrap.getStepNameByStepId(workflowHandleWrap.calculatedTargetNode) }}
-      </div>
+      <!--      <div v-if="workflowHandleWrap.calculatedTargetNode" style="margin-top: 8px; color: #52c41a; font-size: 12px;">-->
+      <!--        <a-icon type="check-circle"/>-->
+      <!--        根据当前表单数据，将进入：{{ workflowHandleWrap.getStepNameByStepId(workflowHandleWrap.calculatedTargetNode) }}-->
+      <!--      </div>-->
     </a-form-item>
   </div>
 </template>
@@ -40,7 +47,9 @@ export default {
   name: 'WorkflowPersonSelector',
   inject: ['workflowHandleWrap'],
   data () {
-    return { }
+    return {}
+  },
+  mounted () {
   },
   methods: {
     // 选择框过滤
@@ -49,6 +58,33 @@ export default {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
+
+    // 获取分支处理人值
+    getBranchPersonValue (stepId) {
+      if (!this.workflowHandleWrap.branchChargePersons) {
+        // 确保 branchChargePersons 对象存在
+        this.$set(this.workflowHandleWrap, 'branchChargePersons', {})
+      }
+      const value = this.workflowHandleWrap.branchChargePersons[stepId]?.handlerId
+      console.log('获取分支处理人值:', stepId, value)
+      return value
+    },
+
+    // 设置分支处理人值
+    setBranchPersonValue (stepId, value, options) {
+      if (!stepId) return
+      if (!this.workflowHandleWrap.branchChargePersons) {
+        this.$set(this.workflowHandleWrap, 'branchChargePersons', {})
+      }
+      // 使用 $set 确保响应式更新
+      this.$set(this.workflowHandleWrap.branchChargePersons, stepId, Object.assign({ ...this.workflowHandleWrap.branchChargePersons[stepId] }, {
+        handler: options.find(item => item.value === value).label,
+        handlerId: value
+      }))
+      // 强制更新组件
+      this.$forceUpdate()
+    },
+
     // 获取分支选择标签文本
     getBranchSelectionLabel () {
       if (this.workflowHandleWrap.isWfResultBranch) {
@@ -58,8 +94,7 @@ export default {
       } else {
         return '下一环节处理人'
       }
-    },
-
+    }
   }
 }
 </script>