cosey 0.11.4 → 0.11.6

package/components/horizontal-tree/horizontal-tree.js

@@ -173,6 +173,15 @@ var stdin_default = defineComponent({
     function renderMayCustomNode(node) {
       return props.renderNode ? props.renderNode(node, () => renderNode(node)) : renderNode(node);
     }
+    function getMergedLeafNodes(node) {
+      const nodes = [];
+      let current = node;
+      while (current && current.reverseLevel === 1) {
+        nodes.push(current);
+        current = current.nextSibling;
+      }
+      return nodes;
+    }
     return () => {
       let _slot2;
       return createVNode("div", {
@@ -200,7 +209,7 @@ var stdin_default = defineComponent({
             "key": j,
             "colspan": node.reverseLevel === 1 ? maxLevel.value - node.level + 1 : 1,
             "rowspan": node.leafCount
-          }, [node.reverseLevel !== 1 || !props.mergeLast ? renderMayCustomNode(node) : createVNode("div", null, [node.parent.children?.map(renderMayCustomNode)])]);
+          }, [node.reverseLevel !== 1 || !props.mergeLast ? renderMayCustomNode(node) : createVNode("div", null, [getMergedLeafNodes(node).map(renderMayCustomNode)])]);
         })]);
       })])])]);
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosey",
-  "version": "0.11.4",
+  "version": "0.11.6",
   "description": "基于 Vue3 + vite 的后台管理系统框架",
   "type": "module",
   "main": "index.js",

package/utils/tree.js

@@ -96,7 +96,7 @@ function mapTreeExtra(tree, callback, options, _internalLevel = 1) {
       rNode.lastChild = mappedChildren[mappedChildren.length - 1];
       rNode.reverseLevel = Math.max(...mappedChildren.map((item) => item.reverseLevel)) + 1;
     } else {
-      if (mergeLast && index > 0) {
+      if (mergeLast && prevNode?.reverseLevel === 1) {
         rNode.leafCount = 0;
       }
     }
@@ -109,8 +109,12 @@ function mapTreeExtra(tree, callback, options, _internalLevel = 1) {
 }
 function getNextSibling(node, mergeLast) {
   if (node) {
-    if (node.nextSibling && (!mergeLast || node.nextSibling.reverseLevel > 1)) {
-      return node.nextSibling;
+    let nextSibling = node.nextSibling;
+    while (mergeLast && nextSibling && nextSibling.reverseLevel === 1 && nextSibling.prevSibling?.reverseLevel === 1) {
+      nextSibling = nextSibling.nextSibling;
+    }
+    if (nextSibling) {
+      return nextSibling;
     } else {
       return getNextSibling(node.parent, mergeLast);
     }