vue2-client 1.17.3 → 1.17.5

package/package.json

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

package/src/base-client/components/common/XTable/XTable.vue

@@ -147,10 +147,10 @@
             </a-tooltip>
             <a-popover title="开发者调试信息" placement="bottomRight" v-if="!isDebugUser()">
               <template slot="content">
-                <p>租户：{{ realQueryParams.$globalProp.tenantAlias }}</p>
-                <p>命名空间：{{ realQueryParams.$globalProp.namespaceName }} - {{ realQueryParams.$globalProp.module }}</p>
+                <p>租户：{{ realQueryParams.$globalProp?.tenantAlias }}</p>
+                <p>命名空间：{{ realQueryParams.$globalProp?.namespaceName }} - {{ realQueryParams.$globalProp?.module }}</p>
                 <p>配置名称：{{ queryParamsName }}</p>
-                <p>版本号：{{ realQueryParams.$globalProp.version }}</p>
+                <p>版本号：{{ realQueryParams.$globalProp?.version }}</p>
               </template>
               <a-button>
                 <a-icon :style="iconStyle" type="bug"/>

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

@@ -404,7 +404,21 @@ export default {
     // 判断步骤是否已完成
     isStepCompleted (step) {
       if (!step) return false
-      return step.id < this.currentStepId || this.state
+      return this.isStepGreater(this.currentStepId, step.id) || this.state
+    },
+
+    // 判断第一环节是否再第二个环节之后
+    isStepGreater (firstId, secondId) {
+      const first = this.steps.find(item => item.id === firstId)
+      const second = this.steps.find(item => item.id === secondId)
+      // 优先使用 sequence，没有则用 id
+      const firstValue = first?.sequence ?? first?.id
+      const secondValue = second?.sequence ?? second?.id
+      if (firstValue == null || secondValue == null) {
+        console.warn('步骤不存在或无效:', { firstId, secondId })
+        return false
+      }
+      return firstValue > secondValue
     },
 
     // 判断id是否为流程中最后一个
@@ -430,7 +444,7 @@ export default {
       } else if (!this.changeAble && stepId === this.currentStepId) {
         return this.state ? 'blue' : 'green'
       }
-      if (stepId < this.currentStepId || this.state) {
+      if (this.isStepGreater(this.currentStepId, stepId) || this.state) {
         return 'blue'
       }
       if (stepId === this.currentStepId) {
@@ -491,7 +505,7 @@ export default {
         return
       }
       const curStep = this.steps.find(item => item.id === stepId)
-      if (stepId > this.currentStepId && curStep.status !== 1 && curStep.status !== 2) {
+      if (this.isStepGreater(stepId, this.currentStepId) && curStep.status !== 1 && curStep.status !== 2) {
         return this.$message.warn('请先完成当前步骤')
       }
       this.$emit('activeStep', stepId)