@ng-nest/ui 15.0.15 → 15.0.16

package/fesm2020/ng-nest-ui-tree.mjs

@@ -771,7 +771,7 @@ class XTreeComponent extends XTreeProperty {
     insertNode(dragNode, hoverNode, dragPosition) {
         let parent = this.nodes.find((x) => x.id === dragNode.pid);
         this.treeService.moveNode(this.treeData, dragNode, hoverNode, dragPosition);
-        this.setDataChange(this.treeData, true, false, parent);
+        this.setDataChange(this.treeData, true, false, true, parent);
     }
     cdkDragMoved(event) {
         if (!this.dragging || !this.hoverTreeNode)
@@ -813,13 +813,13 @@ class XTreeComponent extends XTreeProperty {
             this.setDataChange(x);
         });
     }
-    setDataChange(value, regetChildren = false, init = true, lazyParant) {
+    setDataChange(value, regetChildren = false, init = true, parentOpen = true, lazyParant) {
         if (XIsEmpty(this.checked))
             this.checked = [];
         const getChildren = (node, level) => {
             if (init) {
                 node.level = level;
-                node.open = Boolean(this.expandedAll) || level <= this.expandedLevel || this.expanded.indexOf(node.id) >= 0 || node.open;
+                node.open = Boolean(this.expandedAll) || level <= Number(this.expandedLevel) || this.expanded.indexOf(node.id) >= 0 || node.open;
                 node.checked = this.checked.indexOf(node.id) >= 0;
                 node.childrenLoaded = node.open;
             }
@@ -841,9 +841,11 @@ class XTreeComponent extends XTreeProperty {
         };
         this.treeData = value;
         this.nodes = value.filter((x) => XIsEmpty(x.pid)).map((x) => getChildren(x, 0));
-        for (let item of value) {
-            if (!item.leaf && item.open) {
-                this.setParentOpen(value, item);
+        if (parentOpen) {
+            for (let item of value) {
+                if (!item.leaf && item.open) {
+                    this.setParentOpen(value, item);
+                }
             }
         }
         this.setExpanded();
@@ -1027,7 +1029,7 @@ class XTreeComponent extends XTreeProperty {
             }
         }
     }
-    setActivatedNode(nodes) {
+    setActivatedNode(nodes, parentOpen = true, dataChange = true) {
         if (XIsEmpty(this.activatedId) && this.multiple) {
             this.activatedId = [];
         }
@@ -1038,7 +1040,7 @@ class XTreeComponent extends XTreeProperty {
                 for (let i = 0; i < ids.length; i++) {
                     let node = nodes.find((x) => x.id === ids[i]);
                     if (node) {
-                        this.setParentOpen(nodes, node);
+                        parentOpen && this.setParentOpen(nodes, node);
                         if (i === ids.length - 1) {
                             this.activatedNode = node;
                             this.activatedChange.emit(this.activatedNode);
@@ -1051,15 +1053,15 @@ class XTreeComponent extends XTreeProperty {
             let activatedId = this.activatedId;
             this.activatedNode = nodes.find((x) => x.id == activatedId);
             if (this.activatedNode) {
-                this.setParentOpen(nodes, this.activatedNode);
+                parentOpen && this.setParentOpen(nodes, this.activatedNode);
                 this.activatedChange.emit(this.activatedNode);
             }
         }
         if (before) {
             before.change && before.change();
         }
-        if (!XIsEmpty(nodes)) {
-            this.setDataChange(nodes);
+        if (!XIsEmpty(nodes) && dataChange) {
+            this.setDataChange(nodes, false, true, parentOpen);
         }
     }
     setParentOpen(nodes, node) {
@@ -1070,10 +1072,10 @@ class XTreeComponent extends XTreeProperty {
             if (!XIsEmpty(parent)) {
                 if (!this.expanded.includes(parent.id)) {
                     this.expanded = [...this.expanded, parent.id];
-                    parent.open = true;
-                    parent.change && parent.change();
-                    getParent(parent);
                 }
+                parent.open = true;
+                parent.change && parent.change();
+                getParent(parent);
             }
         };
         getParent(node);
@@ -1086,10 +1088,10 @@ class XTreeComponent extends XTreeProperty {
             if (!XIsEmpty(parent)) {
                 if (!this.expanded.includes(parent.id)) {
                     this.expanded = [...this.expanded, parent.id];
-                    parent.open = true;
-                    parent.change && parent.change();
-                    getParent(parent);
                 }
+                parent.open = true;
+                parent.change && parent.change();
+                getParent(parent);
             }
         };
         getParent(node);
@@ -1131,29 +1133,26 @@ class XTreeComponent extends XTreeProperty {
         let parent = this.treeData.find((x) => x.id === node.pid);
         const _addNode = () => {
             if (parent) {
-                if (!parent.children)
-                    parent.children = [];
-                this.expanded = [...this.expanded, parent.id];
-                this.setActivatedId(node);
-                node.level = Number(parent.level) + 1;
+                node.level = parent.level + 1;
                 node.pid = parent.id;
                 node.leaf = true;
-                this.treeData.push(node);
-                this.setActivatedNode(this.treeData);
-                parent.open = true;
                 parent.leaf = false;
-                parent.children = [...parent.children, node];
-                this.virtualToggle(parent);
-                this.cdr.detectChanges();
-                parent.change && parent.change();
+                parent.open = true;
+                this.treeData = [...this.treeData, node];
+                this.setParentOpen(this.treeData, node);
+                this.setDataChange(this.treeData, true, false, false);
+                this.setActivatedId(node);
+                this.setActivatedNode(this.nodes, true, false);
+                node.change && node.change();
             }
             else if (XIsEmpty(node.pid)) {
-                this.setActivatedId(node);
                 node.level = 0;
+                node.leaf = true;
                 this.treeData = [...this.treeData, node];
                 this.nodes = [...this.nodes, node];
-                this.setActivatedNode(this.treeData);
-                this.cdr.detectChanges();
+                this.setActivatedId(node);
+                this.setActivatedNode(this.nodes, true, false);
+                node.change && node.change();
             }
         };
         if (this.lazy && parent && !parent.childrenLoaded) {
@@ -1181,36 +1180,25 @@ class XTreeComponent extends XTreeProperty {
     }
     removeNode(node) {
         let parent = this.treeData.find((x) => x.id === node.pid);
+        const removeChildren = (nd) => {
+            XRemove(this.treeData, (x) => x.id === nd.id);
+            if (nd.children) {
+                for (let item of nd.children) {
+                    removeChildren(item);
+                }
+            }
+        };
+        removeChildren(node);
         if (parent) {
             if (!parent.children)
                 parent.children = [];
-            parent.children.splice(parent.children.indexOf(node), 1);
-            parent.leaf = parent.children.length === 0;
-            if (parent.leaf) {
-                this.setActivatedId(parent);
-            }
-            let index = this.nodes.indexOf(node);
-            let aindex = index - 1;
-            if (index === 0 && this.nodes.length > 1) {
-                aindex = 1;
+            const childIndex = parent.children.findIndex((x) => x.id === node.id);
+            if (childIndex > -1) {
+                parent.children.splice(childIndex, 1);
             }
-            let activatedNode = this.nodes[aindex];
-            this.setActivatedId(activatedNode);
-            this.setActivatedNode(this.nodes);
-            this.nodes.splice(index, 1);
-            this.nodes = [...this.nodes];
-            if (activatedNode) {
-                activatedNode.change && activatedNode.change();
-            }
-            this.cdr.detectChanges();
-            parent.change && parent.change();
-        }
-        else if (XIsEmpty(node.pid)) {
-            this.treeData.splice(this.treeData.indexOf(node), 1);
-            this.nodes.splice(this.nodes.indexOf(node), 1);
-            this.nodes = [...this.nodes];
-            this.cdr.detectChanges();
+            parent.leaf = parent.children.length === 0;
         }
+        this.setDataChange(this.treeData, true, false, false);
     }
     updateNode(node, nowNode) {
         Object.assign(node, nowNode);