adtec-core-package 3.1.2 → 3.1.4

package/package.json

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

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

@@ -123,21 +123,35 @@ watchEffect(() => {
       }
       if ($props.node.type === 'jump') {
         const flowKeys = (_inject.processInst.value.flows ?? []).map((x) => x.taskDefKey)
-        const pathNodes = _inject.getPathNodes?.($props.node.id) ?? []
-        const parentCondition = [...pathNodes].reverse().find((x) => x.type === 'condition')
+        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 (parentCondition) {
-          // jump 在 BPMN 中仅为连线，以所属条件分支的 sequenceFlow 是否执行判断
-          if (flowKeys.includes(parentCondition.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 if ($props.node.pid) {
-          const parentNode = _inject.getNodeById?.($props.node.pid)
-          if (parentNode?.type === 'approval') {
+        } 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) &&
@@ -146,16 +160,6 @@ watchEffect(() => {
               nodeClass.value = 'node-complete'
               headColor.value = '#18AD43'
             }
-          } else if (parentNode?.type === 'exclusive' || parentNode?.type === 'inclusive') {
-            // 网关主干 default jump：默认条件连线已执行时高亮
-            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'
-            }
           }
         }
       }

package/src/utils/routeMetaParams.ts

@@ -0,0 +1,103 @@
+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
+}
+
+function extractParameterArray(value: unknown): IParameter[] | undefined {
+  if (isParameterArray(value)) return value
+  if (isPlainObject(value)) {
+    const vals = Object.values(value)
+    if (vals.length > 0 && vals.every(isParameterItem)) {
+      return vals as IParameter[]
+    }
+  }
+  return undefined
+}
+
+/**
+ * 从 route.meta.params（数组 / 对象 / 历史 spread 损坏）或 route.query 读取单个参数。
+ * 页面侧请用此函数替代 params.find(c => c.code === 'xxx')?.value
+ */
+export function getRouteMetaParam(
+  params: unknown,
+  code: string,
+  query?: Record<string, unknown>,
+): unknown {
+  const paramList = extractParameterArray(params)
+  if (paramList) {
+    const item = paramList.find((c) => c.code === code)
+    if (item && item.value !== undefined && item.value !== null && item.value !== '') {
+      return item.value
+    }
+  }
+  if (isPlainObject(params) && code in params) {
+    const direct = params[code]
+    if (direct !== undefined && direct !== null && direct !== '') return direct
+  }
+  if (query && code in query) {
+    const q = query[code]
+    if (q !== undefined && q !== null && q !== '') return q
+  }
+  return undefined
+}