@lambo-design/workflow-approve 1.0.0-beta.141 → 1.0.0-beta.143

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.141",
+  "version": "1.0.0-beta.143",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/src/components/history.vue

@@ -30,7 +30,7 @@
           <!-- 检查是否有待审批记录 -->
           <template v-if="items.some(item => isPendingAudit(item))">
             <!-- 待审批的记录：使用折叠面板 -->
-            <Collapse v-model="pendingActiveName" simple style="margin: -10px 0 0 20px;border: none">
+            <Collapse :key="'pending-collapse-' + index + '-' + sortBy" v-model="pendingActiveName" simple style="margin: -10px 0 0;border: none">
               <Panel :name="'pending-panel' + index" hide-arrow>
                  <span class="pending-audit-title">
                    <Icon type="md-time" style="color: orange; margin-right: 5px;" />
@@ -526,7 +526,7 @@ export default {
         }
       ],
       sortBy: this.historySortBy,
-      pendingActiveName: [], // 控制待审批折叠面板的展开状态
+      pendingActiveName: '', // 控制待审批折叠面板的展开状态
     }
   },
   computed: {
@@ -993,6 +993,7 @@ export default {
     },
     toggleSortBy(by) {
       this.sortBy = by;
+      this.pendingActiveName = '';
     },
     isPendingAudit(item) {
       // 判断是否为待审批状态
@@ -1056,20 +1057,18 @@ export default {
   align-items: center;
 }
 
-/* 按时间排序的卡片样式 - 更小，不遮挡时间轴圆点 */
 .portrait-card-time {
-  margin-left: 20px !important;
-  margin-right: 10px !important;
-  margin-bottom: 8px !important;
-  background-color: #fafafa !important;
+  width: 100%;
+  max-width: 100%;
+  margin-left: 0 !important;
+  margin-right: 0 !important;
+  margin-bottom: 5px !important;
+  box-sizing: border-box;
+  overflow: hidden;
 }
 
 :deep(.portrait-card-time .ivu-card-body) {
-  padding: 8px 12px !important;
-}
-
-:deep(.portrait-card-time .ivu-list-item) {
-  padding: 6px 0 !important;
+  padding: 5px !important;
 }
 
 :deep(.docx) {

package/src/components/reject-node-table.vue

@@ -71,6 +71,7 @@ export default {
           key: 'selected',
           width: 56,
           align: 'center',
+          renderHeader: h => h('span'),
           render: (h, params) => {
             if (params.row.type === 'group') {
               return h('div', {
@@ -248,14 +249,21 @@ export default {
     formatRejectPathLabel(pathIds, nodeNameMap) {
       return pathIds.map(id => nodeNameMap.get(id) || id).join(' > ')
     },
-    formatGatewayPathLabel(gatewayPath) {
-      if (!Array.isArray(gatewayPath) || gatewayPath.length === 0) {
-        return ''
-      }
-      return gatewayPath
-        .map(item => item.groupName || item.groupId)
-        .filter(Boolean)
-        .join(' > ')
+    formatGatewayPathLabel(gatewayPath) {
+      if (!Array.isArray(gatewayPath) || gatewayPath.length === 0) {
+        return ''
+      }
+      return gatewayPath
+        .map(item => item.groupName || item.groupId)
+        .filter(Boolean)
+        .join(' > ')
+    },
+    getRejectNodePrimaryGatewayPath(node) {
+      const pathEntries = Array.isArray(node?.pathEntries) && node.pathEntries.length > 0
+        ? node.pathEntries
+        : this.normalizeRejectNode(node, 0, new Map()).pathEntries
+      const primaryEntry = pathEntries.find(item => Array.isArray(item?.gatewayPath) && item.gatewayPath.length > 0)
+      return Array.isArray(primaryEntry?.gatewayPath) ? primaryEntry.gatewayPath : []
     },
     getRejectNodeGatewaySortKey(gatewayPath) {
       if (!Array.isArray(gatewayPath) || gatewayPath.length === 0) {
@@ -282,21 +290,8 @@ export default {
       if (leftPathOrder !== rightPathOrder) {
         return leftPathOrder - rightPathOrder
       }
-      return String(left?.pathKey || '').localeCompare(String(right?.pathKey || ''))
-    },
-    getRejectNodeSortKey(node) {
-      const pathEntries = Array.isArray(node?.pathEntries) ? node.pathEntries : []
-      if (pathEntries.length === 0) {
-        const taskName = String(node?.taskName || node?.name || node?.title || node?.taskNode || '')
-        return `z|z|${taskName}`
-      }
-      const firstEntry = pathEntries[0]
-      const depth = Array.isArray(firstEntry?.gatewayPath) ? firstEntry.gatewayPath.length : 0
-      const gatewayKey = this.getRejectNodeGatewaySortKey(firstEntry?.gatewayPath)
-      const pathOrder = typeof firstEntry?.pathOrder === 'number' ? firstEntry.pathOrder : Number.MAX_SAFE_INTEGER
-      const taskName = String(node?.taskName || node?.name || node?.title || node?.taskNode || '')
-      return `${String(depth).padStart(4, '0')}|${gatewayKey}|${String(pathOrder).padStart(4, '0')}|${taskName}`
-    },
+      return String(left?.pathKey || '').localeCompare(String(right?.pathKey || ''))
+    },
     getRejectNodePathKeys(node) {
       if (Array.isArray(node?.pathKeys) && node.pathKeys.length > 0) {
         return node.pathKeys
@@ -537,14 +532,46 @@ export default {
 
       return visibleRows
     },
-    sortRejectNodesForTable(nodes) {
-      const list = Array.isArray(nodes) ? nodes.slice() : []
-      return list.sort((left, right) => {
-        const leftSortKey = this.getRejectNodeSortKey(this.normalizeRejectNode(left, 0, new Map()))
-        const rightSortKey = this.getRejectNodeSortKey(this.normalizeRejectNode(right, 0, new Map()))
-        return leftSortKey.localeCompare(rightSortKey)
-      })
-    },
+    sortRejectNodesForTable(nodes) {
+      const list = Array.isArray(nodes) ? nodes.slice() : []
+      const bucketMap = new Map()
+      const bucketOrder = []
+
+      list.forEach((node, index) => {
+        const normalizedNode = this.normalizeRejectNode(node, index, new Map())
+        const primaryGatewayPath = this.getRejectNodePrimaryGatewayPath(normalizedNode)
+        const gatewayKey = primaryGatewayPath.length > 0
+          ? this.getRejectNodeGatewaySortKey(primaryGatewayPath)
+          : '__reject_node_no_gateway__'
+        let bucket = bucketMap.get(gatewayKey)
+        if (!bucket) {
+          bucket = {
+            gatewayKey,
+            hasGateway: primaryGatewayPath.length > 0,
+            firstIndex: index,
+            nodes: []
+          }
+          bucketMap.set(gatewayKey, bucket)
+          bucketOrder.push(bucket)
+        }
+        bucket.nodes.push(node)
+      })
+
+      bucketOrder.sort((left, right) => {
+        if (left.hasGateway !== right.hasGateway) {
+          return left.hasGateway ? 1 : -1
+        }
+        return left.firstIndex - right.firstIndex
+      })
+
+      const sortedNodes = []
+      bucketOrder.forEach(bucket => {
+        bucket.nodes.forEach(node => {
+          sortedNodes.push(node)
+        })
+      })
+      return sortedNodes
+    },
     mergeRejectNodesByTaskNode(nodes) {
       const groupedMap = new Map()
       const sourceNodes = Array.isArray(nodes) ? nodes : []