@ibiz-template/runtime 0.1.30 → 0.1.32

package/dist/index.esm.js

@@ -8385,6 +8385,7 @@ var ViewCallTag = /* @__PURE__ */ ((ViewCallTag2) => {
   ViewCallTag2["LOAD"] = "Load";
   ViewCallTag2["GET_DATA"] = "GetData";
   ViewCallTag2["GET_ALL_DATA"] = "GetAllData";
+  ViewCallTag2["VALIDATE"] = "Validate";
   return ViewCallTag2;
 })(ViewCallTag || {});
 
@@ -10471,7 +10472,8 @@ var CodeListService = class {
         value: isValueNumber ? Number(codeItem.value) : codeItem.value,
         color: codeItem.color,
         id: codeItem.codeName,
-        textCls: codeItem.textCls
+        textCls: codeItem.textCls,
+        disableSelect: codeItem.disableSelect
       };
       if ((_a = codeItem.codeItems) == null ? void 0 : _a.length) {
         _codeItem.children = this.formatStaticItems(
@@ -19802,6 +19804,12 @@ var UIActionUtil = class {
     if (!action) {
       throw new RuntimeError36("\u6CA1\u627E\u5230".concat(actionId, "\u7684\u754C\u9762\u884C\u4E3A\u6A21\u578B"));
     }
+    if (action.actionTarget === "SINGLEDATA") {
+      const validateResult = await params.view.call("Validate" /* VALIDATE */);
+      if (validateResult === false) {
+        return { cancel: true };
+      }
+    }
     const provider = await getUIActionProvider(action);
     return provider.exec(action, params);
   }
@@ -25902,7 +25910,7 @@ var GridController = class extends MDControlController {
 // src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
 import { DataTypes as DataTypes3, ModelError as ModelError26 } from "@ibiz-template/core";
 import dayjs4 from "dayjs";
-import { clone as clone18 } from "ramda";
+import { clone as clone18, isNil as isNil19 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
     super(...arguments);
@@ -26072,6 +26080,7 @@ var GridFieldColumnController = class extends GridColumnController {
       return;
     }
     const fieldName = aggField || this.model.id;
+    items = items.filter((item) => !isNil19(item[fieldName]));
     let aggValue;
     if (this.grid.model.aggMode === "PAGE") {
       switch (aggMode) {
@@ -27917,10 +27926,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 +27957,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 +27985,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 +28003,7 @@ var TreeController = class extends MDControlController {
         this.state.items.push(node);
       }
     );
+    this.state.expandedKeys = this.calcExpandedKeys(nodes);
     return nodes;
   }
   /**
@@ -28015,6 +28029,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 +28130,7 @@ var TreeController = class extends MDControlController {
     };
   }
   /**
-   * 计算展开节点集合
+   * 计算展开节点集合(根据加载的子节点计算所有的展开节点标识集合)
    * @author lxm
    * @date 2023-08-09 05:19:36
    * @param {ITreeNodeData[]} nodes
@@ -28106,17 +28138,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;
   }
   /**
@@ -28664,7 +28693,7 @@ var MDCtrlController = class extends MDControlController {
 
 // src/controller/control/kanban/kanban.controller.ts
 import { RuntimeError as RuntimeError47, RuntimeModelError as RuntimeModelError54 } from "@ibiz-template/core";
-import { isNil as isNil19 } from "ramda";
+import { isNil as isNil20 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
 var KanbanService = class extends DataViewControlService {
@@ -28746,7 +28775,7 @@ var KanbanController = class extends DataViewControlController {
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
       const sortValue = item[sortField];
-      if (isNil19(sortValue)) {
+      if (isNil20(sortValue)) {
         item[sortField] = 0;
       } else {
         const toNum = Number(sortValue);