@ibiz-template/runtime 0.7.41-alpha.1 → 0.7.41-alpha.100

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

@@ -52,6 +52,43 @@ export interface TreeFetchOpts {
      * @memberof TreeFetchOpts
      */
     ctrl?: ITreeController;
+    /**
+     * @description 是否加载更多
+     * @type {boolean}
+     * @memberof TreeFetchOpts
+     */
+    isLoadMore?: boolean;
+}
+/**
+ * @description 加载更多信息项
+ * @export
+ * @interface LoadMoreInfoItem
+ */
+export interface LoadMoreInfoItem {
+    /**
+     * @description 节点模型id
+     * @type {string}
+     * @memberof LoadMoreInfoItem
+     */
+    nodeModelId: string;
+    /**
+     * @description 当前页
+     * @type {number}
+     * @memberof LoadMoreInfoItem
+     */
+    curPage: number;
+    /**
+     * @description 总页数
+     * @type {number}
+     * @memberof LoadMoreInfoItem
+     */
+    totalPage: number;
+    /**
+     * @description 节点数据
+     * @type {TreeDataSetNodeData[]}
+     * @memberof LoadMoreInfoItem
+     */
+    items: TreeDataSetNodeData[];
 }
 /**
  * 树部件服务
@@ -62,6 +99,16 @@ export interface TreeFetchOpts {
  * @extends {MDControlService<IDETree>}
  */
 export declare class TreeService<T extends IDETree = IDETree> extends MDControlService<T> {
+    /**
+     * @description 加载更多信息项映射
+     * @type {{
+     *     [parentDataId: string]: LoadMoreInfoItem[];
+     *   }}
+     * @memberof TreeService
+     */
+    loadMoreMap: {
+        [parentDataId: string]: LoadMoreInfoItem[];
+    };
     /**
      * 获取子节点数据
      *
@@ -191,9 +238,10 @@ export declare class TreeService<T extends IDETree = IDETree> extends MDControlS
      * @date 2022-09-07 19:09:48
      * @param {IContext} context 上下文
      * @param {IParams} [params={}] 视图参数
+     * @param {string | undefined} [removeAppDEActionId] 树节点删除实体行为标识
      * @returns {*}
      */
-    removeItem(appDataEntityId: string, context: IContext, params?: IParams): Promise<IHttpResponse>;
+    removeItem(appDataEntityId: string, context: IContext, params?: IParams, removeAppDEActionId?: string | undefined): Promise<IHttpResponse>;
     /**
      * 执行服务方法(带实体id)
      *
@@ -222,5 +270,33 @@ export declare class TreeService<T extends IDETree = IDETree> extends MDControlS
      * @param {IModel} nodeModel 方法名
      */
     calcStaticExpand(nodeModel: IModel): boolean;
+    /**
+     * @description 初始化分页参数
+     * @param {IDETreeDataSetNode} nodeModel
+     * @param {(ITreeNodeData | undefined)} parentNodeData
+     * @param {TreeFetchOpts} opts
+     * @param {IParams} params
+     * @memberof TreeService
+     */
+    initPageParams(nodeModel: IDETreeDataSetNode, parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts, params: IParams): void;
+    /**
+     * @description 更新分页节点数据
+     * @param {IDETreeDataSetNode} nodeModel
+     * @param {(ITreeNodeData | undefined)} parentNodeData
+     * @param {TreeFetchOpts} opts
+     * @param {(string | undefined)} dataSourceType
+     * @param {TreeDataSetNodeData[]} nodeDatas
+     * @memberof TreeService
+     */
+    updatePageItems(nodeModel: IDETreeDataSetNode, parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts, dataSourceType: string | undefined, nodeDatas: TreeDataSetNodeData[]): void;
+    /**
+     * @description 更新分页信息
+     * @param {IDETreeDataSetNode} nodeModel
+     * @param {(ITreeNodeData | undefined)} parentNodeData
+     * @param {TreeFetchOpts} opts
+     * @param {number} totalPage
+     * @memberof TreeService
+     */
+    updatePageInfo(nodeModel: IDETreeDataSetNode, parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts, totalPage: number): void;
 }
 //# sourceMappingURL=tree.service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tree.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tree.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.service.ts"],"names":[],"mappings":"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"}

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

@@ -1,3 +1,4 @@
+/* eslint-disable no-nested-ternary */
 import { ModelError } from '@ibiz-template/core';
 import { getRootNode, getChildNodeRSs, getTreeNode, calcDeCodeNameById, findDELogic, } from '../../../model';
 import { MDControlService, TreeStaticNodeData, TreeDataSetNodeData, TreeCodeListNodeData, AppDataEntity, } from '../../../service';
@@ -12,6 +13,17 @@ import { execDELogicAction } from '../../../de-logic';
  * @extends {MDControlService<IDETree>}
  */
 export class TreeService extends MDControlService {
+    constructor() {
+        super(...arguments);
+        /**
+         * @description 加载更多信息项映射
+         * @type {{
+         *     [parentDataId: string]: LoadMoreInfoItem[];
+         *   }}
+         * @memberof TreeService
+         */
+        this.loadMoreMap = {};
+    }
     /**
      * 获取子节点数据
      *
@@ -165,6 +177,10 @@ export class TreeService extends MDControlService {
                 deName = calcDeCodeNameById(parentNodeModel.appDataEntityId);
             }
             derValue = parentData._value;
+            // 附加父节点的父节点数据主键
+            if (parentData._parentValue) {
+                Object.assign(data, { srfparentkey: parentData._parentValue });
+            }
         }
         // 导航相关参数处理
         const { resultContext, resultParams } = calcNavParams({
@@ -205,6 +221,7 @@ export class TreeService extends MDControlService {
             };
         // 设置查询长度
         params.size = nodeModel.maxSize || 1000;
+        this.initPageParams(nodeModel, parentNodeData, opts, params);
         // 排序属性
         if (nodeModel.sortAppDEFieldId) {
             Object.assign(params, {
@@ -243,21 +260,28 @@ export class TreeService extends MDControlService {
         }
         if (result.length) {
             const entityModel = await ibiz.hub.getAppDataEntity(appDataEntityId, appId);
-            const nodeDatas = result.map((item, index) => {
+            const nodeDatas = [];
+            for (let index = 0; index < result.length; index++) {
+                const item = result[index];
                 const defaultExpand = this.calcExpand(nodeModel, index);
                 let data = item;
                 // 不是应用数据实体对象的数据项必须转为应用数据实体对象
                 if (!(item instanceof AppDataEntity)) {
                     data = new AppDataEntity(entityModel, item);
                 }
-                return new TreeDataSetNodeData(nodeModel, parentNodeData, {
+                const nodeData = new TreeDataSetNodeData(nodeModel, parentNodeData, {
                     data,
                     leaf: !!opts.leaf,
+                    context: opts.context,
+                    params: opts.params,
                     navContext,
                     navParams,
                     defaultExpand,
                 });
-            });
+                await nodeData.initAsyncData(nodeModel);
+                nodeDatas.push(nodeData);
+            }
+            this.updatePageItems(nodeModel, parentNodeData, opts, dataSourceType, nodeDatas);
             return nodeDatas;
         }
         return [];
@@ -295,15 +319,8 @@ export class TreeService extends MDControlService {
         }
         let result = [];
         if (params) {
-            if (dataName) {
-                const data = params[dataName];
-                if (data) {
-                    result = Array.isArray(data) ? data : [data];
-                }
-            }
-            else {
-                result = [params];
-            }
+            const data = dataName ? params[dataName] : params;
+            result = data ? (Array.isArray(data) ? data : [data]) : [];
         }
         return result;
     }
@@ -399,12 +416,14 @@ export class TreeService extends MDControlService {
      * @memberof TreeService
      */
     async getDENodeDatasByDEDataset(nodeModel, parentNodeData, opts) {
+        var _a;
         const { appDEDataSetId, appDataEntityId } = nodeModel;
         const { context, params } = opts;
         let result = [];
         if (appDEDataSetId && appDataEntityId) {
             const response = await this.app.deService.exec(appDataEntityId, appDEDataSetId, context, params);
             if (response.ok && response.data) {
+                this.updatePageInfo(nodeModel, parentNodeData, opts, Number((_a = response.headers) === null || _a === void 0 ? void 0 : _a['x-total-pages']) || 0);
                 result = response.data;
             }
         }
@@ -434,14 +453,27 @@ export class TreeService extends MDControlService {
         const items = await this.app.codeList.get(nodeModel.codeListId, context, params);
         if (items.length) {
             const nodeDatas = items.map((item, index) => {
-                const defaultExpand = this.calcExpand(nodeModel, index);
-                return new TreeCodeListNodeData(nodeModel, parentNodeData, {
-                    data: item,
-                    leaf: !!opts.leaf,
-                    navContext,
-                    navParams,
-                    defaultExpand,
-                });
+                // 处理多层级代码表，递归填充子节点数据
+                const fillChildren = (codeListItem, parent, i) => {
+                    var _a;
+                    const defaultExpand = this.calcExpand(nodeModel, i);
+                    const node = new TreeCodeListNodeData(nodeModel, parent, {
+                        data: codeListItem,
+                        leaf: !!opts.leaf && !((_a = codeListItem.children) === null || _a === void 0 ? void 0 : _a.length),
+                        context: opts.context,
+                        params: opts.params,
+                        navContext,
+                        navParams,
+                        defaultExpand,
+                    });
+                    if (codeListItem.children && codeListItem.children.length) {
+                        node._children = codeListItem.children.map((child, j) => {
+                            return fillChildren(child, node, j);
+                        });
+                    }
+                    return node;
+                };
+                return fillChildren(item, parentNodeData, index);
             });
             return nodeDatas;
         }
@@ -454,11 +486,14 @@ export class TreeService extends MDControlService {
      * @date 2022-09-07 19:09:48
      * @param {IContext} context 上下文
      * @param {IParams} [params={}] 视图参数
+     * @param {string | undefined} [removeAppDEActionId] 树节点删除实体行为标识
      * @returns {*}
      */
-    async removeItem(appDataEntityId, context, params = {}) {
+    async removeItem(appDataEntityId, context, params = {}, removeAppDEActionId = undefined) {
         var _a;
-        const removeAction = ((_a = this.model.removeControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'remove';
+        const removeAction = removeAppDEActionId ||
+            ((_a = this.model.removeControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) ||
+            'remove';
         const res = await this.execWithEntityId(appDataEntityId, removeAction, context, undefined, params);
         return res;
     }
@@ -500,4 +535,115 @@ export class TreeService extends MDControlService {
         const { expandFirstOnly, expanded } = nodeModel;
         return !!expanded || !!expandFirstOnly;
     }
+    /**
+     * @description 初始化分页参数
+     * @param {IDETreeDataSetNode} nodeModel
+     * @param {(ITreeNodeData | undefined)} parentNodeData
+     * @param {TreeFetchOpts} opts
+     * @param {IParams} params
+     * @memberof TreeService
+     */
+    initPageParams(nodeModel, parentNodeData, opts, params) {
+        if (nodeModel.enablePaging && nodeModel.pagingSize) {
+            params.size = nodeModel.pagingSize;
+        }
+        if (parentNodeData) {
+            if (!this.loadMoreMap[parentNodeData._id]) {
+                this.loadMoreMap[parentNodeData._id] = [];
+            }
+            if (opts.isLoadMore) {
+                let info = this.loadMoreMap[parentNodeData._id].find(item => item.nodeModelId === nodeModel.id);
+                if (!info) {
+                    info = {
+                        nodeModelId: nodeModel.id,
+                        curPage: 0,
+                        totalPage: 0,
+                        items: [],
+                    };
+                    this.loadMoreMap[parentNodeData._id].push(info);
+                }
+                params.page = info.curPage + 1;
+            }
+            else {
+                const index = this.loadMoreMap[parentNodeData._id].findIndex(item => item.nodeModelId === nodeModel.id);
+                if (index === -1) {
+                    this.loadMoreMap[parentNodeData._id].push({
+                        nodeModelId: nodeModel.id,
+                        curPage: 0,
+                        totalPage: 0,
+                        items: [],
+                    });
+                }
+                else {
+                    this.loadMoreMap[parentNodeData._id][index] = {
+                        nodeModelId: nodeModel.id,
+                        curPage: 0,
+                        totalPage: 0,
+                        items: [],
+                    };
+                }
+            }
+        }
+    }
+    /**
+     * @description 更新分页节点数据
+     * @param {IDETreeDataSetNode} nodeModel
+     * @param {(ITreeNodeData | undefined)} parentNodeData
+     * @param {TreeFetchOpts} opts
+     * @param {(string | undefined)} dataSourceType
+     * @param {TreeDataSetNodeData[]} nodeDatas
+     * @memberof TreeService
+     */
+    updatePageItems(nodeModel, parentNodeData, opts, dataSourceType, nodeDatas) {
+        if (parentNodeData) {
+            if (!this.loadMoreMap[parentNodeData._id]) {
+                this.loadMoreMap[parentNodeData._id] = [];
+            }
+            let info = this.loadMoreMap[parentNodeData._id].find(item => item.nodeModelId === nodeModel.id);
+            if (!info) {
+                info = {
+                    nodeModelId: nodeModel.id,
+                    curPage: 0,
+                    totalPage: 0,
+                    items: [],
+                };
+                this.loadMoreMap[parentNodeData._id].push(info);
+            }
+            if (dataSourceType === 'DEDATASET' && opts.isLoadMore) {
+                info.items.push(...nodeDatas);
+            }
+            else {
+                info.items = [...nodeDatas];
+            }
+        }
+    }
+    /**
+     * @description 更新分页信息
+     * @param {IDETreeDataSetNode} nodeModel
+     * @param {(ITreeNodeData | undefined)} parentNodeData
+     * @param {TreeFetchOpts} opts
+     * @param {number} totalPage
+     * @memberof TreeService
+     */
+    updatePageInfo(nodeModel, parentNodeData, opts, totalPage) {
+        if (parentNodeData && nodeModel.enablePaging && nodeModel.pagingSize) {
+            if (!this.loadMoreMap[parentNodeData._id]) {
+                this.loadMoreMap[parentNodeData._id] = [];
+            }
+            let info = this.loadMoreMap[parentNodeData._id].find(item => item.nodeModelId === nodeModel.id);
+            if (!info) {
+                info = {
+                    nodeModelId: nodeModel.id,
+                    curPage: 0,
+                    totalPage: 0,
+                    items: [],
+                };
+                this.loadMoreMap[parentNodeData._id].push(info);
+            }
+            if (opts.isLoadMore) {
+                info.curPage += 1;
+            }
+            info.totalPage = totalPage;
+        }
+    }
 }

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

@@ -1,5 +1,5 @@
 import { IDETreeGrid } from '@ibiz/model-core';
-import { ITreeGridController, ITreeGridEvent, ITreeGridState, MDCtrlLoadParams } from '../../../interface';
+import { ITreeGridEvent, ITreeGridState, MDCtrlLoadParams, ITreeGridController } from '../../../interface';
 import { GridController } from '../grid';
 import { ControlVO } from '../../../service';
 export declare class TreeGridController<T extends IDETreeGrid = IDETreeGrid, S extends ITreeGridState = ITreeGridState, E extends ITreeGridEvent = ITreeGridEvent> extends GridController<T, S, E> implements ITreeGridController<T, S, E> {
@@ -29,6 +29,13 @@ export declare class TreeGridController<T extends IDETreeGrid = IDETreeGrid, S e
      * @author: zhujiamin
      */
     protected initTreeGridField(): void;
+    /**
+     * @description  处理刷新模式
+     * @protected
+     * @param {MDCtrlLoadParams} args
+     * @memberof TreeGridController
+     */
+    protected handleRefreshMode(args: MDCtrlLoadParams): void;
     afterLoad(args: MDCtrlLoadParams, items: ControlVO[]): Promise<ControlVO[]>;
     /**
      * @description 获取树表格数据项
@@ -50,11 +57,13 @@ export declare class TreeGridController<T extends IDETreeGrid = IDETreeGrid, S e
      */
     switchTreeGridShow(): void;
     /**
-     * 切换行展开
-     * @author: zzq
-     * @date 2024-08-23 17:12:58
-     * @return {*}  {void}
+     * @description 切换折叠,tag=指定分组标识(不传则全部)，expand=目标状态(不传则反转)
+     * @param {{ tag?: string; expand?: boolean }} [params={}]
+     * @memberof TreeGridController
      */
-    changeCollapse(params?: IData): void;
+    changeCollapse(params?: {
+        tag?: string;
+        expand?: boolean;
+    }): void;
 }
 //# sourceMappingURL=tree-grid.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tree-grid.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid/tree-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEnE,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,cAAc,EACd,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,qBAAa,kBAAkB,CAC3B,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,cAAc,GAAG,cAAc,EACzC,CAAC,SAAS,cAAc,GAAG,cAAc,CAE3C,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEvC;;;OAGG;IACH,kBAAkB,EAAE,MAAM,CAAM;IAEhC;;;OAGG;IACH,mBAAmB,EAAE,MAAM,CAAM;IAEjC,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAyB7B,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;IAOvB;;;;;OAKG;IACH,mBAAmB,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK;IAWvC;;;;OAIG;IACH,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAqBtC;;;;OAIG;IACH,kBAAkB,IAAI,IAAI;IAI1B;;;;;OAKG;IACH,cAAc,CAAC,MAAM,GAAE,KAAU,GAAG,IAAI;CAgBzC"}
+{"version":3,"file":"tree-grid.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid/tree-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGnE,OAAO,EACL,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,qBAAa,kBAAkB,CAC3B,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,cAAc,GAAG,cAAc,EACzC,CAAC,SAAS,cAAc,GAAG,cAAc,CAE3C,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEvC;;;OAGG;IACH,kBAAkB,EAAE,MAAM,CAAM;IAEhC;;;OAGG;IACH,mBAAmB,EAAE,MAAM,CAAM;IAEjC,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1C;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAuBnC;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAWnD,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;IAMvB;;;;;OAKG;IACH,mBAAmB,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK;IAWvC;;;;OAIG;IACH,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAiBtC;;;;OAIG;IACH,kBAAkB,IAAI,IAAI;IAI1B;;;;OAIG;IACH,cAAc,CAAC,MAAM,GAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,IAAI;CAgBtE"}

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

@@ -1,4 +1,5 @@
 import { RuntimeModelError } from '@ibiz-template/core';
+import { createUUID } from 'qx-util';
 import { GridController } from '../grid';
 export class TreeGridController extends GridController {
     constructor() {
@@ -18,6 +19,7 @@ export class TreeGridController extends GridController {
         super.initState();
         this.state.showTreeGrid = true;
         this.state.treeGirdData = [];
+        this.state.tableKey = '';
     }
     /**
      * 初始化方法
@@ -41,21 +43,33 @@ export class TreeGridController extends GridController {
         const treeGridParent = (_a = this.model.degridColumns) === null || _a === void 0 ? void 0 : _a.find((item) => {
             return item.treeColumnMode === 4 || item.treeColumnMode === 12;
         });
+        if (!treeGridParent)
+            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.control.treeGrid.columnMode'));
         const treeGridValue = (_b = this.model.degridColumns) === null || _b === void 0 ? void 0 : _b.find((item) => {
             return item.treeColumnMode === 2 || item.treeColumnMode === 3;
         });
-        if (!treeGridParent) {
+        if (!treeGridValue)
             throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.control.treeGrid.columnsSchema'));
-        }
-        if (!treeGridValue) {
-            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.control.treeGrid.columnMode'));
-        }
         this.treeGridValueField = treeGridValue.appDEFieldId.toLowerCase();
         this.treeGridParentField = treeGridParent.appDEFieldId.toLowerCase();
     }
+    /**
+     * @description  处理刷新模式
+     * @protected
+     * @param {MDCtrlLoadParams} args
+     * @memberof TreeGridController
+     */
+    handleRefreshMode(args) {
+        super.handleRefreshMode(args);
+        // 缓存模式时需排除没有的数据
+        if (this.refreshMode === 'cache')
+            this.state.expandRowKeys = this.state.expandRowKeys.filter(key => this.state.items.some(item => item.srfkey === key));
+        // 树表格是懒加载的必须强制更新组件
+        this.state.tableKey = createUUID();
+    }
     async afterLoad(args, items) {
-        await super.afterLoad(args, items);
         this.calcTreeGridData(this.state.items);
+        await super.afterLoad(args, items);
         return items;
     }
     /**
@@ -82,14 +96,12 @@ export class TreeGridController extends GridController {
         const ids = [];
         treeGirdItems.forEach(item => {
             const id = item[this.treeGridValueField];
-            if (id) {
+            if (id)
                 ids.push(id);
-            }
         });
         treeGirdItems.forEach(item => {
-            if (!ids.includes(item[this.treeGridParentField])) {
+            if (!ids.includes(item[this.treeGridParentField]))
                 rootNodes.push(item);
-            }
         });
         this.state.treeGirdData = rootNodes;
     }
@@ -102,10 +114,9 @@ export class TreeGridController extends GridController {
         this.state.showTreeGrid = !this.state.showTreeGrid;
     }
     /**
-     * 切换行展开
-     * @author: zzq
-     * @date 2024-08-23 17:12:58
-     * @return {*}  {void}
+     * @description 切换折叠,tag=指定分组标识(不传则全部)，expand=目标状态(不传则反转)
+     * @param {{ tag?: string; expand?: boolean }} [params={}]
+     * @memberof TreeGridController
      */
     changeCollapse(params = {}) {
         const { tag, expand } = params;

package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-column/tree-grid-ex-column.controller.d.ts

@@ -2,6 +2,7 @@ import { IDETreeColumn } from '@ibiz/model-core';
 import { TreeGridExController } from '../../tree-grid-ex.controller';
 import { TreeGridExNotifyState } from '../../../../constant';
 import { TreeGridExRowState } from '../../tree-grid-ex-row.state';
+import { ITreeGridExColumnController } from '../../../../../interface';
 /**
  * 树表格（增强）列控制器
  * @author lxm
@@ -10,7 +11,7 @@ import { TreeGridExRowState } from '../../tree-grid-ex-row.state';
  * @class TreeGridExColumnController
  * @template T
  */
-export declare class TreeGridExColumnController<T extends IDETreeColumn = IDETreeColumn> {
+export declare class TreeGridExColumnController<T extends IDETreeColumn = IDETreeColumn> implements ITreeGridExColumnController {
     /**
      * 树表格（增强）列模型对象
      *

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

@@ -1 +1 @@
-{"version":3,"file":"tree-grid-ex-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-column/tree-grid-ex-column.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE;;;;;;;GAOG;AACH,qBAAa,0BAA0B,CACrC,CAAC,SAAS,aAAa,GAAG,aAAa;IAEvC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IAExC;;;;;OAKG;IACH,gBAAgB,EAAE,OAAO,CAAS;IAElC;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,OAAO,CAK/B;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,oBAAoB;IAMpD;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,eAAe,CACb,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,qBAAqB,GAC5B,IAAI;IAID,gBAAgB,CACpB,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,IAAI,CAAC;CAGjB"}
+{"version":3,"file":"tree-grid-ex-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-column/tree-grid-ex-column.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAEvE;;;;;;;GAOG;AACH,qBAAa,0BAA0B,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CAC7E,YAAW,2BAA2B;IAEtC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IAExC;;;;;OAKG;IACH,gBAAgB,EAAE,OAAO,CAAS;IAElC;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,OAAO,CAK/B;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,oBAAoB;IAMpD;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,eAAe,CACb,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,qBAAqB,GAC5B,IAAI;IAID,gBAAgB,CACpB,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,IAAI,CAAC;CAGjB"}

package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-node-column.controller.d.ts

@@ -1,5 +1,5 @@
-import { IAppCodeList, IDETreeNode, IDETreeNodeDataItem, IDETreeNodeEditItem, IDETreeNodeFieldColumn, IUIActionGroupDetail } from '@ibiz/model-core';
-import { CodeListItem, IEditorContainerController, IEditorController, IEditorProvider, ITreeGridExRowState } from '../../../../../interface';
+import { IDETreeNode, IAppCodeList, IDETreeNodeDataItem, IDETreeNodeEditItem, IUIActionGroupDetail, IDETreeNodeFieldColumn } from '@ibiz/model-core';
+import { CodeListItem, IEditorProvider, IEditorController, ITreeGridExRowState, IEditorContainerController } from '../../../../../interface';
 import { TreeGridExFieldColumnController } from './tree-grid-ex-field-column.controller';
 import { TreeGridExController } from '../../tree-grid-ex.controller';
 import { TreeGridExNotifyState } from '../../../../constant';

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

@@ -1 +1 @@
-{"version":3,"file":"tree-grid-ex-node-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-node-column.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tree-grid-ex-node-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-node-column.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-node-column.controller.js

@@ -4,7 +4,7 @@ import dayjs from 'dayjs';
 import { getEditorProvider } from '../../../../../register';
 import { convertNavData, getWFContext } from '../../../../../utils';
 import { OpenAppViewCommand } from '../../../../../command';
-import { parseUserParams } from '../../../../../model';
+import { getAllUIActionItems, parseUserParams } from '../../../../../model';
 import { UIActionUtil } from '../../../../../ui-action';
 import { ButtonContainerState, UIActionButtonState, ValueExUtil, } from '../../../../utils';
 import { TreeGridExNotifyState } from '../../../../constant';
@@ -146,19 +146,21 @@ export class TreeGridExNodeColumnController {
      * @param {GridRowState} row
      */
     initActionStates(row) {
+        var _a;
         // 属性列界面行为按钮状态
         const { deuiactionGroup } = this.nodeColumn;
-        if (deuiactionGroup && deuiactionGroup.uiactionGroupDetails) {
-            const containerState = new ButtonContainerState();
-            deuiactionGroup.uiactionGroupDetails.forEach(detail => {
-                const actionid = detail.uiactionId;
-                if (actionid) {
-                    const buttonState = new UIActionButtonState(detail.id, this.context.srfappid, actionid, detail);
-                    containerState.addState(detail.id, buttonState);
-                }
-            });
-            row.columnActionsStates[this.name] = containerState;
-        }
+        if (!((_a = deuiactionGroup === null || deuiactionGroup === void 0 ? void 0 : deuiactionGroup.uiactionGroupDetails) === null || _a === void 0 ? void 0 : _a.length))
+            return;
+        const containerState = new ButtonContainerState();
+        const actions = getAllUIActionItems(deuiactionGroup.uiactionGroupDetails);
+        actions.forEach(detail => {
+            const actionid = detail.uiactionId;
+            if (actionid) {
+                const buttonState = new UIActionButtonState(detail.id, this.context.srfappid, actionid, detail);
+                containerState.addState(detail.id, buttonState);
+            }
+        });
+        row.columnActionsStates[this.name] = containerState;
     }
     /**
      * 文本点击事件

package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.d.ts

@@ -1,4 +1,4 @@
-import { IDETreeNodeUAColumn, IDETreeUAColumn, IUIActionGroup, IUIActionGroupDetail } from '@ibiz/model-core';
+import { IUIActionGroup, IDETreeUAColumn, IDETreeNodeUAColumn, IUIActionGroupDetail } from '@ibiz/model-core';
 import { TreeGridExColumnController } from '../tree-grid-ex-column/tree-grid-ex-column.controller';
 import { ITreeGridExRowState } from '../../../../../interface';
 import { TreeGridExNotifyState } from '../../../../constant';

package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-grid-ex-ua-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,0BAA0B,EAAE,MAAM,uDAAuD,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE;;;;;;;GAOG;AACH,qBAAa,4BAA6B,SAAQ,0BAA0B,CAAC,eAAe,CAAC;IAC3F;;;;;OAKG;IACH,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAa;IAEtD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B;;;;OAIG;IACH,iBAAiB,IAAI,IAAI;IAkBzB;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,GAAG,cAAc,GAAG,SAAS;IAgBtE;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;IAkChD;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,mBAAmB,EACxB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAKhB,eAAe,CAAC,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE,qBAAqB,GAAG,IAAI;CAa7E"}
+{"version":3,"file":"tree-grid-ex-ua-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,0BAA0B,EAAE,MAAM,uDAAuD,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAGlE;;;;;;;GAOG;AACH,qBAAa,4BAA6B,SAAQ,0BAA0B,CAAC,eAAe,CAAC;IAC3F;;;;;OAKG;IACH,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAa;IAEtD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B;;;;OAIG;IACH,iBAAiB,IAAI,IAAI;IAkBzB;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,GAAG,cAAc,GAAG,SAAS;IAgBtE;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;IAmChD;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,mBAAmB,EACxB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAKhB,eAAe,CAAC,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE,qBAAqB,GAAG,IAAI;CAa7E"}