@ibiz-template/runtime 0.7.34 → 0.7.38-alpha.12

package/out/controller/control/toolbar/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC"}

package/out/controller/control/toolbar/index.js

@@ -1 +1 @@
-export * from './toolbar.controllerr';
+export * from './toolbar.controller';

package/out/controller/control/toolbar/{toolbar.controllerr.d.ts → toolbar.controller.d.ts}

@@ -78,4 +78,4 @@ export declare class ToolbarController<T extends IDEToolbar = IDEToolbar, S exte
      */
     protected convertMultipleLanguages(): void;
 }
-//# sourceMappingURL=toolbar.controllerr.d.ts.map
+//# sourceMappingURL=toolbar.controller.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"toolbar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EAEd,aAAa,EAGd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEZ,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAIhB,MAAM,aAAa,CAAC;AAGrB;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED;;;;;;OAMG;IACH,eAAe,EAAE,cAAc,EAAE,CAAM;IAEvC;;;;;;OAMG;IACH,aAAa,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAE5D,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;;;;;;OAWG;cACa,UAAU,CACxB,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,KAAK,GAAE,KAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IA4ChB;;;;;;;OAOG;cACa,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;cAWzC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqE1C;;;;;;;;;;OAUG;IACG,WAAW,CACf,IAAI,EAAE,cAAc,GAAG,YAAY,EACnC,KAAK,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC;IAcV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2DpE,eAAe,CACb,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,EACrC,OAAO,EAAE,YAAY,EAAE,GACtB,IAAI;IAOP,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI;IAS/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAelE;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAqB3C"}

package/out/controller/control/toolbar/{toolbar.controllerr.js → toolbar.controller.js}

@@ -4,7 +4,7 @@ import { getUIActionById } from '../../../model';
 import { ControlVO } from '../../../service';
 import { UIActionUtil } from '../../../ui-action';
 import { ControlController } from '../../common';
-import { ButtonContainerState, UIActionButtonState, } from '../../utils';
+import { ButtonContainerState, UIActionButtonState, formatSeparator, } from '../../utils';
 import { getToolbarItemProvider } from '../../../register';
 /**
  * 工具栏控制器
@@ -110,7 +110,7 @@ export class ToolbarController extends ControlController {
             this.allToolbarItems.push(item);
             if (item.itemType) {
                 const uiItem = item;
-                const buttonState = new UIActionButtonState(uiItem.id, this.context.srfappid, uiItem.uiactionId);
+                const buttonState = new UIActionButtonState(uiItem.id, uiItem.appId, uiItem.uiactionId);
                 this.state.buttonsState.addState(uiItem.id, buttonState);
             }
             // 如果有项显示逻辑默认隐藏
@@ -134,7 +134,7 @@ export class ToolbarController extends ControlController {
                 groupItem.uiactionGroup.uiactionGroupDetails.forEach((detail) => {
                     const actionid = detail.uiactionId;
                     if (actionid) {
-                        const buttonState = new UIActionButtonState(detail.id, this.context.srfappid, actionid);
+                        const buttonState = new UIActionButtonState(detail.id, detail.appId, actionid);
                         this.state.buttonsState.addState(detail.id, buttonState);
                     }
                 });
@@ -212,6 +212,7 @@ export class ToolbarController extends ControlController {
                 }
             }, { childrenFields: ['detoolbarItems'] });
         }
+        formatSeparator('TOOLBAR', this.model.detoolbarItems, this.state.buttonsState);
     }
     setExtraButtons(position, buttons) {
         if (!this.state.extraButtons[position]) {

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

@@ -287,5 +287,12 @@ export declare class TreeController<T extends IDETree = IDETree, S extends ITree
      * @return {*}  {void}
      */
     protected onDEDataChange(msg: IPortalMessage): void;
+    /**
+     * @description 展开收缩节点
+     * @param {string} tag
+     * @param {boolean} [expand]
+     * @memberof TreeController
+     */
+    changeCollapse(params?: IData): void;
 }
 //# sourceMappingURL=tree.controller.d.ts.map

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

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

@@ -1,6 +1,9 @@
 /* eslint-disable no-param-reassign */
+/* eslint-disable no-lonely-if */
+/* eslint-disable no-else-return */
 import { RuntimeError, RuntimeModelError, recursiveIterate, } from '@ibiz-template/core';
 import { isNil } from 'ramda';
+import { isBoolean } from 'qx-util';
 import { UIActionUtil } from '../../../ui-action';
 import { MDControlController } from '../../common';
 import { ContextMenuController } from '../context-menu';
@@ -538,12 +541,17 @@ export class TreeController extends MDControlController {
     calcAllowDrop(draggingNode, dropNode, type) {
         var _a, _b;
         const draggingNodeModel = this.getNodeModel(draggingNode._nodeId);
+        const dropNodeModel = this.getNodeModel(dropNode._nodeId);
         // * 移入的情况
         if (type === 'inner') {
-            const nodeModel = this.getNodeModel(dropNode._nodeId);
-            return (!!this.findDropNodeRS(dropNode._nodeId, draggingNodeModel.appDataEntityId) && !!(nodeModel === null || nodeModel === void 0 ? void 0 : nodeModel.allowDrop));
+            return !!this.findDropNodeRS(dropNode._nodeId, draggingNodeModel.appDataEntityId);
+        }
+        else {
+            // * 前后的情况，不同实体之间不能排序
+            if (draggingNodeModel.appDataEntityId !== dropNodeModel.appDataEntityId) {
+                return false;
+            }
         }
-        // * 前后的情况
         // 父相同的情况下,就是排序，看当前节点是否能排序
         if (((_a = draggingNode._parent) === null || _a === void 0 ? void 0 : _a._id) === ((_b = dropNode._parent) === null || _b === void 0 ? void 0 : _b._id)) {
             const currentNodeModel = this.getNodeModel(dropNode._nodeId);
@@ -588,46 +596,60 @@ export class TreeController extends MDControlController {
         }
         const draggingNodeModel = this.getNodeModel(draggingNode._nodeId);
         const dropInNode = dropType === 'inner' ? dropNode : dropNode._parent;
-        const isChangedParent = ((_a = dropNode._parent) === null || _a === void 0 ? void 0 : _a._id) !== ((_b = draggingNode._parent) === null || _b === void 0 ? void 0 : _b._id);
+        const isChangedParent = dropType === 'inner' ||
+            ((_a = dropNode._parent) === null || _a === void 0 ? void 0 : _a._id) !== ((_b = draggingNode._parent) === null || _b === void 0 ? void 0 : _b._id);
         let orderNodeModel = this.getNodeModel(dropNode._nodeId);
+        const isEntityChange = draggingNodeModel.appDataEntityId !== orderNodeModel.appDataEntityId;
         // * 处理切换父节点
-        if (dropType === 'inner' || isChangedParent) {
+        if (isChangedParent) {
             const dropNodeRs = this.findDropNodeRS(dropInNode._nodeId, draggingNodeModel.appDataEntityId);
             if (dropNodeRs) {
                 // 修改关系属性的值为父节点的主键和树节点id
                 draggingNode._deData[dropNodeRs.pickupDEFName] = dropInNode._value;
                 orderNodeModel = this.getNodeModel(dropNodeRs.childDETreeNodeId);
             }
-            // 更改父节点
-            draggingNode._parent = dropInNode;
-            // 修改指向的节点模型
-            draggingNode._nodeId = orderNodeModel.id;
             // 维护拖拽的节点和其子孙的展开，维护拖入节点的展开
             this.state.expandedKeys = this.calcExpandedKeys([dropInNode]);
             await this.updateDeNodeData([draggingNode]);
         }
-        // 移动排序
-        const { moveAppDEActionId, appDataEntityId, allowOrder } = orderNodeModel;
-        if (!moveAppDEActionId) {
-            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.common.md.noMoveDataCconfig'));
-        }
-        if (dropType !== 'inner' && allowOrder) {
-            const moveParams = {
-                srftargetkey: dropNode.srfkey,
-                srfmovetype: dropType === 'prev' ? 'MOVEBEFORE' : 'MOVEAFTER',
-            };
-            const app = ibiz.hub.getApp(this.context.srfappid);
-            const deName = calcDeCodeNameById(appDataEntityId);
-            const tempContext = this.context.clone();
-            tempContext[deName] = draggingNode.srfkey;
-            const res = await app.deService.exec(appDataEntityId, moveAppDEActionId, tempContext, moveParams);
-            if (res.ok) {
-                if (isChangedParent) {
-                    await this.refreshNodeChildren(draggingNode, true);
-                    await this.refreshNodeChildren(dropInNode);
+        // 拖入节点或实体不同时刷新父节点
+        if (dropType === 'inner' || isEntityChange) {
+            if (isChangedParent) {
+                await this.refreshNodeChildren(draggingNode, true);
+            }
+            await this.refreshNodeChildren(dropInNode, true);
+        }
+        else {
+            // 移动排序
+            const { moveAppDEActionId, appDataEntityId, allowOrder } = orderNodeModel;
+            if (allowOrder) {
+                if (!moveAppDEActionId) {
+                    throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.common.md.noMoveDataCconfig'));
+                }
+                const moveParams = {
+                    srftargetkey: dropNode.srfkey,
+                    srfmovetype: dropType === 'prev' ? 'MOVEBEFORE' : 'MOVEAFTER',
+                };
+                const app = ibiz.hub.getApp(this.context.srfappid);
+                const deName = calcDeCodeNameById(appDataEntityId);
+                const tempContext = this.context.clone();
+                tempContext[deName] = draggingNode.srfkey;
+                try {
+                    const res = await app.deService.exec(appDataEntityId, moveAppDEActionId, tempContext, moveParams);
+                    if (res.ok) {
+                        this.emitDEDataChange('update', draggingNode._deData);
+                        if (isChangedParent) {
+                            await this.refreshNodeChildren(draggingNode, true);
+                        }
+                        await this.refreshNodeChildren(dropInNode);
+                    }
                 }
-                else {
+                catch (error) {
+                    // 拖动失败重置位置
                     await this.refreshNodeChildren(dropInNode);
+                    this.actionNotification('DROPERROR', {
+                        error: error,
+                    });
                 }
             }
         }
@@ -657,9 +679,11 @@ export class TreeController extends MDControlController {
             // 调用接口修改数据
             const res = await app.deService.exec(model.appDataEntityId, 'update', tempContext, deData);
             // 更新完之后更新state里的数据。
-            if (res.data) {
+            if (res.ok) {
                 node._deData = res.data;
                 node._oldDeData = res.data.clone();
+                // 通知实体数据变更
+                this.emitDEDataChange('update', node._deData);
             }
         }));
     }
@@ -681,8 +705,6 @@ export class TreeController extends MDControlController {
         }
         nodeData._text = text;
         await this.updateDeNodeData([nodeData]);
-        // 通知实体数据变更
-        this.emitDEDataChange('update', nodeData._deData);
     }
     /**
      * 删除每一项
@@ -735,8 +757,38 @@ export class TreeController extends MDControlController {
         if (!findNode) {
             return;
         }
-        this.doNextActive(() => this.refreshNodeChildren(findNode, true), {
+        this.doNextActive(() => !this.ctx.isDestroyed && this.refreshNodeChildren(findNode, true), {
             key: `refresh${findNode._id}`,
         });
     }
+    /**
+     * @description 展开收缩节点
+     * @param {string} tag
+     * @param {boolean} [expand]
+     * @memberof TreeController
+     */
+    changeCollapse(params = {}) {
+        const { tag, expand } = params;
+        if (tag) {
+            const expandedKeysSet = new Set(this.state.expandedKeys);
+            const expanded = isBoolean(expand) ? expand : !expandedKeysSet.has(tag);
+            if (expanded) {
+                expandedKeysSet.add(tag);
+            }
+            else {
+                expandedKeysSet.delete(tag);
+            }
+            this.state.expandedKeys = Array.from(expandedKeysSet);
+        }
+        else if (this.state.rootNodes.length > 0) {
+            // 全部展开只对第一层节点生效
+            if (expand) {
+                const { _children = [] } = this.state.rootNodes[0];
+                this.state.expandedKeys = _children.map(x => x.srfnodeid);
+            }
+            else {
+                this.state.expandedKeys = [];
+            }
+        }
+    }
 }

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

@@ -188,7 +188,7 @@ export class TreeService extends MDControlService {
      * @memberof TreeService
      */
     async getDENodeDatas(nodeModel, nodeRS, parentNodeData, opts) {
-        const { appDEDataSetId, appDataEntityId } = nodeModel;
+        const { appDEDataSetId, appDataEntityId, appId } = nodeModel;
         // 处理查询参数,没有关系的时候不处理参数了
         const { context, params, navContext, navParams } = nodeRS
             ? this.getNodeRSFilterParams(nodeRS, parentNodeData, opts)
@@ -206,6 +206,8 @@ export class TreeService extends MDControlService {
                 sort: `${nodeModel.sortAppDEFieldId.toLowerCase()},${nodeModel.sortDir ? nodeModel.sortDir.toLowerCase() : 'asc'}`,
             });
         }
+        // 更正应用标识(适配多应用树合并)
+        context.srfappid = appId;
         // 请求实体数据
         const response = await this.app.deService.exec(appDataEntityId, appDEDataSetId, context, params);
         if (response.data.length) {
@@ -241,6 +243,8 @@ export class TreeService extends MDControlService {
                 navContext: {},
                 navParams: {},
             };
+        // 更正应用标识(适配多应用树合并)
+        context.srfappid = nodeRS.appId;
         // 请求实体数据
         const items = await this.app.codeList.get(nodeModel.codeListId, context, params);
         if (items.length) {

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

@@ -1,6 +1,7 @@
 import { IDETreeGrid } from '@ibiz/model-core';
-import { ITreeGridController, ITreeGridEvent, ITreeGridState } from '../../../interface';
+import { ITreeGridController, ITreeGridEvent, ITreeGridState, MDCtrlLoadParams } 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> {
     /**
      * 树表格值属性名称
@@ -28,11 +29,32 @@ export declare class TreeGridController<T extends IDETreeGrid = IDETreeGrid, S e
      * @author: zhujiamin
      */
     protected initTreeGridField(): void;
+    afterLoad(args: MDCtrlLoadParams, items: ControlVO[]): Promise<ControlVO[]>;
+    /**
+     * @description 获取树表格数据项
+     * @param {IData} data
+     * @return {*}  {IData}
+     * @memberof TreeGridController
+     */
+    getTreeGridDataItem(data: IData): IData;
+    /**
+     * @description 计算树表格数据
+     * @param {IData[]} items
+     * @memberof TreeGridController
+     */
+    calcTreeGridData(items: IData[]): void;
     /**
      * 切换树表格显示
      * @return {*}
      * @author: zhujiamin
      */
     switchTreeGridShow(): void;
+    /**
+     * 切换行展开
+     * @author: zzq
+     * @date 2024-08-23 17:12:58
+     * @return {*}  {void}
+     */
+    changeCollapse(params?: IData): 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,EACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,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;IAK3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAyBnC;;;;OAIG;IACH,kBAAkB,IAAI,IAAI;CAG3B"}
+{"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"}

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

@@ -17,6 +17,7 @@ export class TreeGridController extends GridController {
     initState() {
         super.initState();
         this.state.showTreeGrid = true;
+        this.state.treeGirdData = [];
     }
     /**
      * 初始化方法
@@ -52,6 +53,46 @@ export class TreeGridController extends GridController {
         this.treeGridValueField = treeGridValue.appDEFieldId.toLowerCase();
         this.treeGridParentField = treeGridParent.appDEFieldId.toLowerCase();
     }
+    async afterLoad(args, items) {
+        await super.afterLoad(args, items);
+        this.calcTreeGridData(this.state.items);
+        return items;
+    }
+    /**
+     * @description 获取树表格数据项
+     * @param {IData} data
+     * @return {*}  {IData}
+     * @memberof TreeGridController
+     */
+    getTreeGridDataItem(data) {
+        const tempData = data.clone();
+        // 判断是否有子 （显示下拉图标）
+        tempData.hasChildren = this.state.items.some(item => data[this.treeGridValueField] === item[this.treeGridParentField]);
+        tempData.children = [];
+        return tempData;
+    }
+    /**
+     * @description 计算树表格数据
+     * @param {IData[]} items
+     * @memberof TreeGridController
+     */
+    calcTreeGridData(items) {
+        const treeGirdItems = items.map(data => this.getTreeGridDataItem(data));
+        const rootNodes = [];
+        const ids = [];
+        treeGirdItems.forEach(item => {
+            const id = item[this.treeGridValueField];
+            if (id) {
+                ids.push(id);
+            }
+        });
+        treeGirdItems.forEach(item => {
+            if (!ids.includes(item[this.treeGridParentField])) {
+                rootNodes.push(item);
+            }
+        });
+        this.state.treeGirdData = rootNodes;
+    }
     /**
      * 切换树表格显示
      * @return {*}
@@ -60,4 +101,27 @@ export class TreeGridController extends GridController {
     switchTreeGridShow() {
         this.state.showTreeGrid = !this.state.showTreeGrid;
     }
+    /**
+     * 切换行展开
+     * @author: zzq
+     * @date 2024-08-23 17:12:58
+     * @return {*}  {void}
+     */
+    changeCollapse(params = {}) {
+        const { tag, expand } = params;
+        // 存在分组id则展开/收缩分组
+        if (tag) {
+            const row = this.state.items.find(x => x.srfkey === tag);
+            if (row) {
+                this._evt.emit('onToggleRowExpansion', { row, expand });
+            }
+        }
+        else {
+            // 不存在分组id时全展开/全收缩
+            const groups = this.state.treeGirdData.filter(item => item.hasChildren);
+            groups.forEach(item => {
+                this._evt.emit('onToggleRowExpansion', { row: item, expand });
+            });
+        }
+    }
 }

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

@@ -19,6 +19,13 @@ import { ControllerEvent } from '../../utils';
 export declare class TreeGridExController<T extends IDETreeGridEx = IDETreeGridEx, S extends ITreeGridExState = ITreeGridExState, E extends ITreeGridExEvent = ITreeGridExEvent> extends TreeController<T, S, E> implements ITreeGridExController<T, S, E> {
     service: TreeGridExService;
     protected get _evt(): ControllerEvent<ITreeGridExEvent>;
+    /**
+     * @description 行编辑模式
+     * @readonly
+     * @type {('cell' | 'row' | 'all')}
+     * @memberof TreeGridExController
+     */
+    get editShowMode(): 'cell' | 'row' | 'all';
     /**
      * 树表格（增强）列的适配器
      *

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

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

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

@@ -62,6 +62,18 @@ export class TreeGridExController extends TreeController {
     get _evt() {
         return this.evt;
     }
+    /**
+     * @description 行编辑模式
+     * @readonly
+     * @type {('cell' | 'row' | 'all')}
+     * @memberof TreeGridExController
+     */
+    get editShowMode() {
+        if (this.controlParams.editshowmode) {
+            return this.controlParams.editshowmode;
+        }
+        return ibiz.config.grid.editShowMode;
+    }
     /**
      * 是否有配置宽度自适应列
      *

package/out/controller/ctx/ctx.d.ts

@@ -43,9 +43,9 @@ export declare class CTX<V extends IViewController = IViewController> {
      *
      * @author chitanda
      * @date 2023-09-11 11:09:57
-     * @protected
+     * @public
      */
-    protected isDestroyed: boolean;
+    isDestroyed: boolean;
     /**
      * CTX事件
      * @author lxm

package/out/controller/ctx/ctx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ctx.d.ts","sourceRoot":"","sources":["../../../src/controller/ctx/ctx.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,KAAK,QAAQ,GAAG;IACd;;;;OAIG;IACH,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC;;;;OAIG;IACH,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC;CACpD,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,GAAG,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IAgDvC,MAAM,CAAC;IA/C1B;;;;;OAKG;IACH,KAAK,EAAE,QAAQ,CAAC;IAEhB;;;;;OAKG;IACH,IAAI,EAAG,CAAC,CAAC;IAET;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,UAAS;IAE9B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,oBAA+B;IAE3C;;;;;OAKG;IACH,SAAS,CAAC,cAAc,kIAAkC;IAE1D;;;;;OAKG;gBACgB,MAAM,CAAC,yKAAK;IAI/B;;;;;;OAMG;IACG,IAAI,CAAC,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAMxC;;;;OAIG;IACH,OAAO,IAAI,IAAI;IAOf;;;;;;OAMG;IACG,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5D;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAIpB;;;;OAIG;IACH,UAAU,IAAI,IAAI;IAOlB;;;;;;OAMG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,GAAG,IAAI;IAKtD;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,WAAW,GAAG,SAAS;IASvE;;;;;;;OAOG;IACH,UAAU,IAAI,eAAe;CAS9B"}
+{"version":3,"file":"ctx.d.ts","sourceRoot":"","sources":["../../../src/controller/ctx/ctx.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,KAAK,QAAQ,GAAG;IACd;;;;OAIG;IACH,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC;;;;OAIG;IACH,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC;CACpD,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,GAAG,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IAgDvC,MAAM,CAAC;IA/C1B;;;;;OAKG;IACH,KAAK,EAAE,QAAQ,CAAC;IAEhB;;;;;OAKG;IACH,IAAI,EAAG,CAAC,CAAC;IAET;;;;;;OAMG;IACI,WAAW,UAAS;IAE3B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,oBAA+B;IAE3C;;;;;OAKG;IACH,SAAS,CAAC,cAAc,kIAAkC;IAE1D;;;;;OAKG;gBACgB,MAAM,CAAC,yKAAK;IAI/B;;;;;;OAMG;IACG,IAAI,CAAC,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAMxC;;;;OAIG;IACH,OAAO,IAAI,IAAI;IAOf;;;;;;OAMG;IACG,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5D;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAOpB;;;;OAIG;IACH,UAAU,IAAI,IAAI;IAOlB;;;;;;OAMG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,GAAG,IAAI;IAKtD;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,WAAW,GAAG,SAAS;IASvE;;;;;;;OAOG;IACH,UAAU,IAAI,eAAe;CAS9B"}

package/out/controller/ctx/ctx.js

@@ -22,7 +22,7 @@ export class CTX {
          *
          * @author chitanda
          * @date 2023-09-11 11:09:57
-         * @protected
+         * @public
          */
         this.isDestroyed = false;
         /**
@@ -80,6 +80,9 @@ export class CTX {
      * @date 2023-03-27 01:59:22
      */
     startLoading() {
+        if (this.isDestroyed) {
+            return;
+        }
         this.view.startLoading();
     }
     /**

package/out/controller/utils/button-state/button-container.state.d.ts

@@ -9,8 +9,11 @@ import { IButtonContainerState, IButtonState } from '../../../interface';
  */
 export declare class ButtonContainerState implements IButtonContainerState {
     visible: boolean;
+    disabled: boolean;
     children: Array<IButtonContainerState | IButtonState>;
     constructor();
+    computeVisable(): boolean;
+    computeDisabled(): boolean;
     addState(name: string, state: IButtonContainerState | IButtonState): void;
     setLoading(name: string): void;
     update(context: IContext, data?: IData, appDeId?: string): Promise<void>;

package/out/controller/utils/button-state/button-container.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"button-container.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/button-container.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEzE;;;;;;;GAOG;AACH,qBAAa,oBAAqB,YAAW,qBAAqB;IACxD,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,KAAK,CAAC,qBAAqB,GAAG,YAAY,CAAC,CAAC;;IAuB9D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,YAAY,GAAG,IAAI;IAWzE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAUxB,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAQV,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ3B,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB"}
+{"version":3,"file":"button-container.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/button-state/button-container.state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEzE;;;;;;;GAOG;AACH,qBAAa,oBAAqB,YAAW,qBAAqB;IACxD,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,OAAO,CAAC;IAElB,QAAQ,EAAE,KAAK,CAAC,qBAAqB,GAAG,YAAY,CAAC,CAAC;;IAoC9D,cAAc,IAAI,OAAO;IAUzB,eAAe,IAAI,OAAO;IAI1B,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,YAAY,GAAG,IAAI;IAWzE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAUxB,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IAUV,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAU3B,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB"}

package/out/controller/utils/button-state/button-container.state.js

@@ -16,16 +16,41 @@ export class ButtonContainerState {
             value: [],
         });
         // 有一个子的visible为true容器的visible就为true,反之false
+        let visible = this.computeVisable();
         Object.defineProperty(this, 'visible', {
             enumerable: true,
             configurable: true,
             get: () => {
-                if (this.children.length === 0) {
-                    return false;
-                }
-                return !!this.children.find(child => child.visible);
+                return visible;
+            },
+            set: (value) => {
+                visible = value;
             },
         });
+        let disabled = this.computeDisabled();
+        Object.defineProperty(this, 'disabled', {
+            enumerable: true,
+            configurable: true,
+            get: () => {
+                return disabled;
+            },
+            set: (value) => {
+                disabled = value;
+            },
+        });
+    }
+    // 计算当前项是否显示
+    computeVisable() {
+        let visible = true;
+        if (this.children.length === 0) {
+            visible = false;
+        }
+        visible = !!this.children.find(child => child.visible);
+        return visible;
+    }
+    // 计算是否显示
+    computeDisabled() {
+        return this.children.every(child => child.disabled);
     }
     addState(name, state) {
         // 设置子状态到本身和数组里
@@ -51,10 +76,14 @@ export class ButtonContainerState {
         await Promise.all(this.children.map(child => {
             return child.update(context, data, appDeId);
         }));
+        this.visible = this.computeVisable();
+        this.disabled = this.computeDisabled();
     }
     async init() {
         await Promise.all(this.children.map(child => {
             return child.init();
         }));
+        this.visible = this.computeVisable();
+        this.disabled = this.computeDisabled();
     }
 }