@ibiz-template/runtime 0.1.30 → 0.1.31

package/dist/index.esm.js

@@ -27917,10 +27917,12 @@ var TreeController = class extends MDControlController {
   initState() {
     super.initState();
     this.state.defaultExpandedKeys = [];
+    this.state.expandedKeys = [];
     this.state.size = 0;
   }
   async onCreated() {
     await super.onCreated();
+    this.state.expandedKeys = [...this.state.defaultExpandedKeys];
     this.service = new TreeService(this.model);
     await this.service.init(this.context);
     this.model.detreeNodes.forEach((node) => {
@@ -27946,8 +27948,17 @@ var TreeController = class extends MDControlController {
    */
   async load(args = {}) {
     const isInitialLoad = args.isInitialLoad === true;
-    const nodes = await this.loadNodes();
-    this.state.expandedKeys = this.calcExpandedKeys(nodes);
+    if (isInitialLoad) {
+      await this.startLoading();
+    }
+    let nodes;
+    try {
+      nodes = await this.loadNodes();
+    } finally {
+      if (isInitialLoad) {
+        await this.endLoading();
+      }
+    }
     await this.afterLoad(args, nodes);
     this.state.isLoaded = true;
     await this.evt.emit("onLoadSuccess", {
@@ -27965,19 +27976,12 @@ var TreeController = class extends MDControlController {
   async loadNodes(parentNode) {
     const params = await this.getFetchParams();
     const hasQuery = !!params.query;
-    const defaultExpandedKeys = !parentNode ? this.state.defaultExpandedKeys : void 0;
-    await this.startLoading();
-    let nodes;
-    try {
-      nodes = await this.service.fetchChildNodes(parentNode, {
-        context: this.context.clone(),
-        params,
-        hasQuery,
-        defaultExpandedKeys
-      }) || [];
-    } finally {
-      await this.endLoading();
-    }
+    const nodes = await this.service.fetchChildNodes(parentNode, {
+      context: this.context.clone(),
+      params,
+      hasQuery,
+      defaultExpandedKeys: this.state.expandedKeys
+    }) || [];
     if (parentNode) {
       parentNode.children = nodes;
     } else {
@@ -27990,6 +27994,7 @@ var TreeController = class extends MDControlController {
         this.state.items.push(node);
       }
     );
+    this.state.expandedKeys = this.calcExpandedKeys(nodes);
     return nodes;
   }
   /**
@@ -28015,6 +28020,24 @@ var TreeController = class extends MDControlController {
       await this.setActive(nodeData);
     }
   }
+  /**
+   * 树节点数据变更事件处理
+   * @author lxm
+   * @date 2023-09-28 01:48:05
+   * @param {ITreeNodeData} nodeData
+   * @param {boolean} isExpand true为展开，false为折叠
+   */
+  onExpandChange(nodeData, isExpand) {
+    const hasKey = this.state.expandedKeys.includes(nodeData.id);
+    if (isExpand && !hasKey) {
+      this.state.expandedKeys.push(nodeData.id);
+    } else if (!isExpand && hasKey) {
+      const index = this.state.expandedKeys.indexOf(nodeData.id);
+      if (index !== -1) {
+        this.state.expandedKeys.splice(index, 1);
+      }
+    }
+  }
   /**
    * 树节点双击事件
    * @author lxm
@@ -28098,7 +28121,7 @@ var TreeController = class extends MDControlController {
     };
   }
   /**
-   * 计算展开节点集合
+   * 计算展开节点集合(根据加载的子节点计算所有的展开节点标识集合)
    * @author lxm
    * @date 2023-08-09 05:19:36
    * @param {ITreeNodeData[]} nodes
@@ -28106,17 +28129,14 @@ var TreeController = class extends MDControlController {
    * @return {*}  {string[]}
    */
   calcExpandedKeys(nodes) {
-    let expandedKeys = [];
+    let expandedKeys = [...this.state.expandedKeys];
     recursiveIterate6({ children: nodes }, (node) => {
       var _a;
       if ((_a = node.children) == null ? void 0 : _a.length) {
         expandedKeys.push(node.id);
       }
     });
-    if (this.state.defaultExpandedKeys.length) {
-      expandedKeys.push(...this.state.defaultExpandedKeys);
-      expandedKeys = Array.from(new Set(expandedKeys));
-    }
+    expandedKeys = Array.from(new Set(expandedKeys));
     return expandedKeys;
   }
   /**