@ibiz-template/runtime 0.1.30 → 0.1.32

package/out/constant/view-call-tag.d.ts

@@ -17,6 +17,10 @@ export declare enum ViewCallTag {
     /**
      * 获取所有数据（多数据专用，获取全部数据）
      */
-    'GET_ALL_DATA' = "GetAllData"
+    'GET_ALL_DATA' = "GetAllData",
+    /**
+     * 校验数据（编辑视图才用）
+     */
+    'VALIDATE' = "Validate"
 }
 //# sourceMappingURL=view-call-tag.d.ts.map

package/out/constant/view-call-tag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-call-tag.d.ts","sourceRoot":"","sources":["../../src/constant/view-call-tag.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AACH,oBAAY,WAAW;IACrB;;OAEG;IACH,MAAM,SAAS;IACf;;OAEG;IACH,UAAU,YAAY;IACtB;;OAEG;IACH,cAAc,eAAe;CAC9B"}
+{"version":3,"file":"view-call-tag.d.ts","sourceRoot":"","sources":["../../src/constant/view-call-tag.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AACH,oBAAY,WAAW;IACrB;;OAEG;IACH,MAAM,SAAS;IACf;;OAEG;IACH,UAAU,YAAY;IACtB;;OAEG;IACH,cAAc,eAAe;IAC7B;;OAEG;IACH,UAAU,aAAa;CACxB"}

package/out/constant/view-call-tag.js

@@ -20,4 +20,8 @@ export var ViewCallTag;
      * 获取所有数据（多数据专用，获取全部数据）
      */
     ViewCallTag["GET_ALL_DATA"] = "GetAllData";
+    /**
+     * 校验数据（编辑视图才用）
+     */
+    ViewCallTag["VALIDATE"] = "Validate";
 })(ViewCallTag || (ViewCallTag = {}));

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAIpE,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AAKpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,kBAAkB,CAAC;IACrF;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAa;IAE/C;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAKrC;;;;;OAKG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAoBzC;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCvE;;;;;;;;OAQG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxE;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC;IAqBnE;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,SAAS;IAiEhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;CAiBzC"}
+{"version":3,"file":"grid-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAIpE,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AAKpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,kBAAkB,CAAC;IACrF;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAa;IAE/C;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAKrC;;;;;OAKG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAoBzC;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCvE;;;;;;;;OAQG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxE;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC;IAqBnE;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,SAAS;IAqEhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;CAiBzC"}

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.js

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { DataTypes, ModelError } from '@ibiz-template/core';
 import dayjs from 'dayjs';
-import { clone } from 'ramda';
+import { clone, isNil } from 'ramda';
 import { OpenAppViewCommand } from '../../../../../command';
 import { parseUserParams } from '../../../../../model';
 import { UIActionUtil } from '../../../../../ui-action';
@@ -171,6 +171,8 @@ export class GridFieldColumnController extends GridColumnController {
             return;
         }
         const fieldName = aggField || this.model.id;
+        // 排除属性无值的数据,不纳入统计
+        items = items.filter(item => !isNil(item[fieldName]));
         let aggValue;
         if (this.grid.model.aggMode === 'PAGE') {
             switch (aggMode) {

package/out/controller/control/tree/tree.controller.d.ts

@@ -48,6 +48,14 @@ export declare class TreeController extends MDControlController<IDETree, ITreeSt
      * @memberof TreeController
      */
     onTreeNodeClick(nodeData: ITreeNodeData): Promise<void>;
+    /**
+     * 树节点数据变更事件处理
+     * @author lxm
+     * @date 2023-09-28 01:48:05
+     * @param {ITreeNodeData} nodeData
+     * @param {boolean} isExpand true为展开，false为折叠
+     */
+    onExpandChange(nodeData: ITreeNodeData, isExpand: boolean): void;
     /**
      * 树节点双击事件
      * @author lxm
@@ -89,7 +97,7 @@ export declare class TreeController extends MDControlController<IDETree, ITreeSt
         params: IParams;
     };
     /**
-     * 计算展开节点集合
+     * 计算展开节点集合(根据加载的子节点计算所有的展开节点标识集合)
      * @author lxm
      * @date 2023-08-09 05:19:36
      * @param {ITreeNodeData[]} nodes

package/out/controller/control/tree/tree.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D,SAAS,CAAC,SAAS,IAAI,IAAI;cAOX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAajE;;;;;;OAMG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAyCrE;;;;;;OAMG;IACG,eAAe,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7D;;;;;;OAMG;IACG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIjD;;;;;;;;OAQG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG;QACpD,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IAQD;;;;;;;OAOG;IACH,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;IAclD;;;;;;;OAOG;IACG,mBAAmB,CACvB,QAAQ,EAAE,aAAa,GAAG,KAAK,EAC/B,aAAa,UAAQ,GACpB,OAAO,CAAC,IAAI,CAAC;CA+BjB"}
+{"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D,SAAS,CAAC,SAAS,IAAI,IAAI;cAQX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAsBjE;;;;;;OAMG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAkCrE;;;;;;OAMG;IACG,eAAe,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7D;;;;;;OAMG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI;IAYhE;;;;;;OAMG;IACG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIjD;;;;;;;;OAQG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG;QACpD,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IAQD;;;;;;;OAOG;IACH,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;IAgBlD;;;;;;;OAOG;IACG,mBAAmB,CACvB,QAAQ,EAAE,aAAa,GAAG,KAAK,EAC/B,aAAa,UAAQ,GACpB,OAAO,CAAC,IAAI,CAAC;CA+BjB"}

package/out/controller/control/tree/tree.controller.js

@@ -28,10 +28,12 @@ export class TreeController extends MDControlController {
         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);
         // 初始化上下文菜单控制器
@@ -52,8 +54,18 @@ export class TreeController 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', {
@@ -71,24 +83,13 @@ export class TreeController extends MDControlController {
     async loadNodes(parentNode) {
         const params = await this.getFetchParams();
         const hasQuery = !!params.query;
-        const defaultExpandedKeys = !parentNode
-            ? this.state.defaultExpandedKeys
-            : undefined;
         // 请求服务获取子节点数据
-        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,
+        })) || [];
         // 有父节点绑定到父节点数据上，无父节点替换rootNodes
         if (parentNode) {
             parentNode.children = nodes;
@@ -101,6 +102,7 @@ export class TreeController extends MDControlController {
         recursiveIterate({ children: this.state.rootNodes }, (node) => {
             this.state.items.push(node);
         });
+        this.state.expandedKeys = this.calcExpandedKeys(nodes);
         return nodes;
     }
     /**
@@ -131,6 +133,25 @@ export class TreeController 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
@@ -214,7 +235,7 @@ export class TreeController extends MDControlController {
         };
     }
     /**
-     * 计算展开节点集合
+     * 计算展开节点集合(根据加载的子节点计算所有的展开节点标识集合)
      * @author lxm
      * @date 2023-08-09 05:19:36
      * @param {ITreeNodeData[]} nodes
@@ -222,17 +243,17 @@ export class TreeController extends MDControlController {
      * @return {*}  {string[]}
      */
     calcExpandedKeys(nodes) {
-        let expandedKeys = [];
+        // 用户操作的添加的要保留
+        let expandedKeys = [...this.state.expandedKeys];
+        // 计算加载回来的里面带的默认展开
         recursiveIterate({ children: nodes }, (node) => {
             var _a;
             if ((_a = node.children) === null || _a === void 0 ? 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;
     }
     /**

package/out/interface/service/code-list-item/code-list-item.d.ts

@@ -37,5 +37,12 @@ export interface CodeListItem {
      * @type {string}
      */
     textCls?: string;
+    /**
+     * 禁止选择
+     * @author lxm
+     * @date 2023-10-08 03:49:40
+     * @type {boolean}
+     */
+    disableSelect?: boolean;
 }
 //# sourceMappingURL=code-list-item.d.ts.map

package/out/interface/service/code-list-item/code-list-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-list-item.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/code-list-item/code-list-item.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAEvB;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAE1B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}
+{"version":3,"file":"code-list-item.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/code-list-item/code-list-item.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAEvB;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAE1B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB"}

package/out/service/service/code-list/code-list.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,eAAe;IAoBd,SAAS,CAAC,QAAQ,EAAE,YAAY;IAnB5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;gBAEU,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIlD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IAwB3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;CAcpC"}
+{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,eAAe;IAoBd,SAAS,CAAC,QAAQ,EAAE,YAAY;IAnB5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;gBAEU,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIlD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IAyB3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;CAcpC"}

package/out/service/service/code-list/code-list.service.js

@@ -99,6 +99,7 @@ export class CodeListService {
                 color: codeItem.color,
                 id: codeItem.codeName,
                 textCls: codeItem.textCls,
+                disableSelect: codeItem.disableSelect,
             };
             if ((_a = codeItem.codeItems) === null || _a === void 0 ? void 0 : _a.length) {
                 _codeItem.children = this.formatStaticItems(codeItem.codeItems, isValueNumber);

package/out/ui-action/uiaction-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uiaction-util.d.ts","sourceRoot":"","sources":["../../src/ui-action/uiaction-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/D;;;;;;;GAOG;AACH,qBAAa,YAAY;IACvB;;;;;;;;;OASG;WACU,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAS3B;;;;;;;OAOG;WACU,eAAe,CAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;CAoBjB"}
+{"version":3,"file":"uiaction-util.d.ts","sourceRoot":"","sources":["../../src/ui-action/uiaction-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/D;;;;;;;GAOG;AACH,qBAAa,YAAY;IACvB;;;;;;;;;OASG;WACU,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAgB3B;;;;;;;OAOG;WACU,eAAe,CAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;CAoBjB"}

package/out/ui-action/uiaction-util.js

@@ -1,5 +1,5 @@
 import { RuntimeError } from '@ibiz-template/core';
-import { SysUIActionTag } from '../constant';
+import { SysUIActionTag, ViewCallTag } from '../constant';
 import { getUIActionById } from '../model';
 import { getUIActionProvider } from '../register';
 /**
@@ -26,6 +26,13 @@ export class UIActionUtil {
         if (!action) {
             throw new RuntimeError(`没找到${actionId}的界面行为模型`);
         }
+        // 单项数据的界面行为执行前校验表单的数据，不通过则拦截
+        if (action.actionTarget === 'SINGLEDATA') {
+            const validateResult = await params.view.call(ViewCallTag.VALIDATE);
+            if (validateResult === false) {
+                return { cancel: true };
+            }
+        }
         const provider = await getUIActionProvider(action);
         return provider.exec(action, params);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.30",
+  "version": "0.1.32",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,11 +29,11 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.24",
+    "@ibiz-template/core": "^0.1.32",
     "@ibiz/model-core": "^0.0.18",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
-    "@types/systemjs": "^6.13.2",
+    "@types/systemjs": "^6.13.3",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.10",
     "echarts": "^5.4.3",
@@ -42,7 +42,7 @@
     "path-browserify": "^1.0.1",
     "qs": "^6.11.2",
     "qx-util": "^0.4.8",
-    "ramda": "^0.29.0"
+    "ramda": "^0.29.1"
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.1.0",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "882d7335b02b0ada912b08bfc81debc91f48ff49"
+  "gitHead": "594d722ab71f8c9e5fa88e685597b221c70e56e0"
 }

package/src/constant/view-call-tag.ts

@@ -19,4 +19,8 @@ export enum ViewCallTag {
    * 获取所有数据（多数据专用，获取全部数据）
    */
   'GET_ALL_DATA' = 'GetAllData',
+  /**
+   * 校验数据（编辑视图才用）
+   */
+  'VALIDATE' = 'Validate',
 }

package/src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts

@@ -2,7 +2,7 @@
 import { DataTypes, ModelError } from '@ibiz-template/core';
 import { IAppCodeList, IDEGridFieldColumn } from '@ibiz/model-core';
 import dayjs from 'dayjs';
-import { clone } from 'ramda';
+import { clone, isNil } from 'ramda';
 import { OpenAppViewCommand } from '../../../../../command';
 import { CodeListItem, IModalData } from '../../../../../interface';
 import { parseUserParams } from '../../../../../model';
@@ -212,6 +212,10 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
       return;
     }
     const fieldName = aggField || this.model.id!;
+
+    // 排除属性无值的数据,不纳入统计
+    items = items.filter(item => !isNil(item[fieldName]));
+
     let aggValue: number;
     if (this.grid.model.aggMode === 'PAGE') {
       switch (aggMode) {

package/src/controller/control/tree/tree.controller.ts

@@ -40,11 +40,15 @@ export class TreeController
     super.initState();
     // 根节点初始化
     this.state.defaultExpandedKeys = [];
+    this.state.expandedKeys = [];
     this.state.size = 0;
   }
 
   protected async onCreated(): Promise<void> {
     await super.onCreated();
+
+    this.state.expandedKeys = [...this.state.defaultExpandedKeys];
+
     this.service = new TreeService(this.model);
     await this.service.init(this.context);
 
@@ -74,8 +78,17 @@ export class TreeController
    */
   async load(args: MDCtrlLoadParams = {}): Promise<ITreeNodeData[]> {
     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', {
@@ -95,24 +108,15 @@ export class TreeController
   async loadNodes(parentNode?: ITreeNodeData): Promise<ITreeNodeData[]> {
     const params = await this.getFetchParams();
     const hasQuery = !!params.query;
-    const defaultExpandedKeys = !parentNode
-      ? this.state.defaultExpandedKeys
-      : undefined;
 
     // 请求服务获取子节点数据
-    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,
+      })) || [];
 
     // 有父节点绑定到父节点数据上，无父节点替换rootNodes
     if (parentNode) {
@@ -130,6 +134,8 @@ export class TreeController
       },
     );
 
+    this.state.expandedKeys = this.calcExpandedKeys(nodes);
+
     return nodes;
   }
 
@@ -164,6 +170,25 @@ export class TreeController
     }
   }
 
+  /**
+   * 树节点数据变更事件处理
+   * @author lxm
+   * @date 2023-09-28 01:48:05
+   * @param {ITreeNodeData} nodeData
+   * @param {boolean} isExpand true为展开，false为折叠
+   */
+  onExpandChange(nodeData: ITreeNodeData, isExpand: boolean): void {
+    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
@@ -266,7 +291,7 @@ export class TreeController
   }
 
   /**
-   * 计算展开节点集合
+   * 计算展开节点集合(根据加载的子节点计算所有的展开节点标识集合)
    * @author lxm
    * @date 2023-08-09 05:19:36
    * @param {ITreeNodeData[]} nodes
@@ -274,16 +299,18 @@ export class TreeController
    * @return {*}  {string[]}
    */
   calcExpandedKeys(nodes: ITreeNodeData[]): string[] {
-    let expandedKeys: string[] = [];
+    // 用户操作的添加的要保留
+    let expandedKeys: string[] = [...this.state.expandedKeys];
+
+    // 计算加载回来的里面带的默认展开
     recursiveIterate({ children: nodes }, (node: ITreeNodeData) => {
       if (node.children?.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;
   }
 

package/src/interface/service/code-list-item/code-list-item.ts

@@ -42,4 +42,12 @@ export interface CodeListItem {
    * @type {string}
    */
   textCls?: string;
+
+  /**
+   * 禁止选择
+   * @author lxm
+   * @date 2023-10-08 03:49:40
+   * @type {boolean}
+   */
+  disableSelect?: boolean;
 }

package/src/service/service/code-list/code-list.service.ts

@@ -109,6 +109,7 @@ export class CodeListService {
         color: codeItem.color,
         id: codeItem.codeName!,
         textCls: codeItem.textCls,
+        disableSelect: codeItem.disableSelect,
       };
       if (codeItem.codeItems?.length) {
         _codeItem.children = this.formatStaticItems(

package/src/ui-action/uiaction-util.ts

@@ -1,5 +1,5 @@
 import { RuntimeError } from '@ibiz-template/core';
-import { SysUIActionTag } from '../constant';
+import { SysUIActionTag, ViewCallTag } from '../constant';
 import { IUILogicParams, IUIActionResult } from '../interface';
 import { getUIActionById } from '../model';
 import { getUIActionProvider } from '../register';
@@ -31,6 +31,13 @@ export class UIActionUtil {
     if (!action) {
       throw new RuntimeError(`没找到${actionId}的界面行为模型`);
     }
+    // 单项数据的界面行为执行前校验表单的数据，不通过则拦截
+    if (action.actionTarget === 'SINGLEDATA') {
+      const validateResult = await params.view.call(ViewCallTag.VALIDATE);
+      if (validateResult === false) {
+        return { cancel: true };
+      }
+    }
     const provider = await getUIActionProvider(action);
     return provider.exec(action, params);
   }