adtec-core-package 3.1.1 → 3.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "private": false,
   "type": "module",
   "exports": {

package/src/components/bpmntree/views/flowDesign/index.vue

@@ -152,6 +152,7 @@ provide('flowDesign', {
   nodesError: nodesError,
   getTaskNodes: getTaskNodes,
   getParentNodes: getParentNodes,
+  getPathNodes: (id: string) => getPathNodes(id, props.process, []),
   addFormItem: addFormItem,
   deleteFormItem: deleteFormItem,
   getNodeById: getNodeById,

package/src/components/bpmntree/views/flowDesign/nodes/Node.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { ErrorInfo, FlowNode, NodeType } from './type'
+import type { BranchNode, ErrorInfo, FlowNode, NodeType } from './type'
 import { ClickOutside as vClickOutside, type InputInstance } from 'element-plus'
 import Add from './Add.vue'
 import { computed, inject, nextTick, ref, type Ref, watchEffect } from 'vue'
@@ -10,6 +10,8 @@ const _inject = inject<{
   readOnly?: Ref<boolean>
   nodesError: Ref<Recordable<ErrorInfo[]>>
   processInst: Ref<IWfProcessInstVo>
+  getNodeById?: (id: string) => FlowNode | undefined
+  getPathNodes?: (id: string) => FlowNode[]
 }>('flowDesign', {
   readOnly: ref(false),
   nodesError: ref({}),
@@ -120,15 +122,45 @@ watchEffect(() => {
         headColor.value = '#9B9EA1'
       }
       if ($props.node.type === 'jump') {
-        //jump节点若pid完成，则其也完成
-        if (
-          $props.node.pid &&
-          ((_inject.processInst.value.hisTasks?.some((x) => x.taskDefKey == $props.node.pid) &&
-            !_inject.processInst.value.activeTasks?.some((x) => x.taskDefKey == $props.node.pid)) ||
-            _inject.processInst.value.flows?.some((x) => x.taskDefKey == $props.node.pid))
-        ) {
-          nodeClass.value = 'node-complete'
-          headColor.value = '#18AD43'
+        const flowKeys = (_inject.processInst.value.flows ?? []).map((x) => x.taskDefKey)
+        const parentNode = $props.node.pid ? _inject.getNodeById?.($props.node.pid) : undefined
+        const isGatewayDefaultTrunkJump =
+          (parentNode?.type === 'exclusive' || parentNode?.type === 'inclusive') &&
+          (parentNode as BranchNode).child?.id === $props.node.id
+
+        if (isGatewayDefaultTrunkJump) {
+          // 网关主干 jump（exclusive.child）：仅以 def 默认条件 sequenceFlow 是否执行判断
+          const defaultCondition = (parentNode as BranchNode).children?.find((c) => c.def)
+          if (defaultCondition && flowKeys.includes(defaultCondition.id)) {
+            nodeClass.value = 'node-complete'
+            headColor.value = '#18AD43'
+          } else {
+            nodeClass.value = 'node-unstart'
+            headColor.value = '#9B9EA1'
+          }
+        } else {
+          const pathNodes = _inject.getPathNodes?.($props.node.id) ?? []
+          const parentCondition = [...pathNodes].reverse().find((x) => x.type === 'condition')
+
+          if (parentCondition) {
+            // jump 在 BPMN 中仅为连线，以所属条件分支的 sequenceFlow 是否执行判断
+            if (flowKeys.includes(parentCondition.id)) {
+              nodeClass.value = 'node-complete'
+              headColor.value = '#18AD43'
+            } else {
+              nodeClass.value = 'node-unstart'
+              headColor.value = '#9B9EA1'
+            }
+          } else if (parentNode?.type === 'approval') {
+            // 线性审批后的 jump：父审批已完成即可
+            if (
+              _inject.processInst.value.hisTasks?.some((x) => x.taskDefKey == $props.node.pid) &&
+              !_inject.processInst.value.activeTasks?.some((x) => x.taskDefKey == $props.node.pid)
+            ) {
+              nodeClass.value = 'node-complete'
+              headColor.value = '#18AD43'
+            }
+          }
         }
       }
     }

package/src/utils/routeMetaParams.ts

@@ -0,0 +1,65 @@
+import type { IParameter } from '../interface/Message'
+
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function isParameterItem(value: unknown): value is IParameter {
+  return !!value && typeof value === 'object' && 'code' in value
+}
+
+function isParameterArray(value: unknown): value is IParameter[] {
+  return Array.isArray(value) && value.every(isParameterItem)
+}
+
+/** RouterChangeBus 等场景会传入空对象，不应覆盖已有 params */
+function isEmptyPlainObject(value: unknown): boolean {
+  return isPlainObject(value) && Object.keys(value).length === 0
+}
+
+function objectToParameterArray(obj: Record<string, unknown>): IParameter[] {
+  return Object.entries(obj).map(([code, value]) => ({ code, value }))
+}
+
+function mergeParameterArrays(base: IParameter[], incoming: IParameter[]): IParameter[] {
+  const map = new Map<string, IParameter>()
+  for (const item of base) {
+    if (item?.code != null) map.set(String(item.code), item)
+  }
+  for (const item of incoming) {
+    if (item?.code != null) map.set(String(item.code), item)
+  }
+  return Array.from(map.values())
+}
+
+/**
+ * 合并 route.meta.params，兼容两种历史格式：
+ * - IParameter[]：工作流 / openMenuByRandom（页面用 .find(c => c.code)）
+ * - Record：embed / 对象 query（页面用 params.id 等）
+ */
+export function mergeRouteMetaParams(existing: unknown, incoming: unknown): unknown {
+  if (incoming === undefined || incoming === null) return existing
+  if (isEmptyPlainObject(incoming)) return existing
+
+  if (Array.isArray(incoming)) {
+    if (isParameterArray(existing)) {
+      return mergeParameterArrays(existing, incoming)
+    }
+    return incoming
+  }
+
+  if (isPlainObject(incoming)) {
+    if (isParameterArray(existing)) {
+      return mergeParameterArrays(existing, objectToParameterArray(incoming))
+    }
+    const base = isPlainObject(existing) ? existing : {}
+    return { ...base, ...incoming }
+  }
+
+  return incoming
+}
+
+/** openMenu 仅对含键的普通对象写入 router.query（数组不走 query） */
+export function shouldPushRouteQueryParams(params: unknown): params is Record<string, unknown> {
+  return isPlainObject(params) && Object.keys(params).length > 0
+}