@ibiz-template/runtime 0.4.17-dev.0 → 0.4.17-dev.1

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

@@ -1,10 +1,10 @@
-import { IDETree, IDETreeColumn } from '@ibiz/model-core';
-import { MDCtrlLoadParams, ITreeNodeData, ITreeGridExController, IGridColumnProvider, ITreeGridExState, ITreeGridExEvent } from '../../../interface';
-import { MDControlController } from '../../common';
-import { GridColumnController, GridFieldColumnController, GridUAColumnController } from '../grid';
+import { IDETreeColumn, IDETreeGridEx } from '@ibiz/model-core';
+import { ITreeGridExController, ITreeGridExState, ITreeGridExEvent, ITreeGridExColumnProvider, ITreeGridExRowState, ITreeNodeData } from '../../../interface';
 import { TreeGridExService } from './tree-grid-ex.service';
+import { TreeController } from '../tree/tree.controller';
+import { TreeGridExColumnController, TreeGridExFieldColumnController, TreeGridExUAColumnController } from './tree-grid-ex-column';
 /**
- * 树表格部件控制器
+ * 树表格（增强）部件控制器
  *
  * @author zk
  * @date 2023-09-21 06:09:46
@@ -13,56 +13,72 @@ import { TreeGridExService } from './tree-grid-ex.service';
  * @extends {MDControlController<IDETree, ITreeGridState, ITreeGridEvent>}
  * @implements {ITreeGridExController}
  */
-export declare class TreeGridExController extends MDControlController<IDETree, ITreeGridExState, ITreeGridExEvent> implements ITreeGridExController {
+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;
     /**
-     * 表格列的适配器
+     * 树表格（增强）列的适配器
      *
      * @author zk
      * @date 2023-09-21 06:09:04
-     * @type {{ [key: string]: IGridColumnProvider }}
+     * @type {{ [key: string]: ITreeGridExColumnProvider }}
      * @memberof TreeGridExController
      */
     providers: {
-        [key: string]: IGridColumnProvider;
+        [key: string]: ITreeGridExColumnProvider;
     };
     /**
-     * 所有表格列控制器集合
+     * 所有树表格（增强）列控制器集合
      *
      * @author zk
      * @date 2023-09-21 06:09:10
-     * @type {{ [key: string]: GridColumnController }}
+     * @type {{ [key: string]: TreeGridExColumnController }}
      * @memberof TreeGridExController
      */
     columns: {
-        [key: string]: GridColumnController;
+        [key: string]: TreeGridExColumnController;
     };
     /**
-     * 所有表格属性列的控制器
+     * 所有树表格（增强）属性列的控制器
      *
      * @author zk
      * @date 2023-09-21 06:09:16
-     * @type {{ [key: string]: GridFieldColumnController }}
+     * @type {{ [key: string]: TreeGridExFieldColumnController }}
      * @memberof TreeGridExController
      */
     fieldColumns: {
-        [key: string]: GridFieldColumnController;
+        [key: string]: TreeGridExFieldColumnController;
     };
     /**
-     * 所有表格操作列的控制器
+     * 所有树表格（增强）操作列的控制器
      *
      * @author zk
      * @date 2023-09-21 06:09:21
-     * @type {{ [key: string]: GridUAColumnController }}
+     * @type {{ [key: string]: TreeGridExUAColumnController }}
      * @memberof TreeGridExController
      */
     uaColumns: {
-        [key: string]: GridUAColumnController;
+        [key: string]: TreeGridExUAColumnController;
     };
+    /**
+     * 是否有配置宽度自适应列
+     *
+     * @type {boolean}
+     * @memberof GridController
+     */
+    get hasAdaptiveColumn(): boolean;
+    /**
+     * 单元格超出呈现模式
+     * @author lxm
+     * @date 2023-11-17 01:56:26
+     * @readonly
+     * @type {('wrap' | 'ellipsis')}
+     */
+    get overflowMode(): 'wrap' | 'ellipsis';
     protected initState(): void;
     protected onCreated(): Promise<void>;
+    protected initService(): Promise<void>;
     /**
-     * 初始化表格属性列，操作列，编辑项控制器
+     * 初始化树表格（增强）属性列，操作列，编辑项控制器
      *
      * @author zk
      * @date 2023-09-21 06:09:28
@@ -72,7 +88,7 @@ export declare class TreeGridExController extends MDControlController<IDETree, I
      */
     protected initGridColumns(): Promise<void>;
     /**
-     * 初始化表格属性列，操作列，编辑项控制器
+     * 初始化树表格（增强）属性列，操作列，编辑项控制器
      *
      * @author zk
      * @date 2023-09-21 06:09:37
@@ -83,7 +99,7 @@ export declare class TreeGridExController extends MDControlController<IDETree, I
      */
     protected initColumnsController(column: IDETreeColumn): Promise<void>;
     /**
-     * 初始化表格列状态
+     * 初始化树表格（增强）列状态
      *
      * @author zk
      * @date 2023-09-21 06:09:43
@@ -101,34 +117,20 @@ export declare class TreeGridExController extends MDControlController<IDETree, I
      */
     protected calcColumnFixed(): void;
     /**
-     * 树部件加载，从根节点开始重新加载
-     *
-     * @author zk
-     * @date 2023-09-21 06:09:56
-     * @param {MDCtrlLoadParams} [args={}]
-     * @return {*}  {Promise<ITreeNodeData[]>}
-     * @memberof TreeGridExController
-     */
-    load(args?: MDCtrlLoadParams): Promise<ITreeNodeData[]>;
-    /**
-     * 加载子节点数据
-     *
-     * @author zk
-     * @date 2023-09-21 06:09:02
-     * @param {ITreeNodeData} [parentNode]
-     * @return {*}  {Promise<ITreeNodeData[]>}
-     * @memberof TreeGridExController
+     * 获取树表格行数据
+     * @author lxm
+     * @date 2023-12-22 02:23:44
+     * @param {string} key 可以是节点id也可以是_uuid
+     * @return {*}  {(ITreeGridExRowState | undefined)}
      */
-    loadNodes(parentNode?: ITreeNodeData): Promise<ITreeNodeData[]>;
+    getRowState(key: string): ITreeGridExRowState | undefined;
+    afterLoadNodes(nodes: ITreeNodeData[]): Promise<void>;
     /**
-     * 计算展开节点集合
+     * 转换各类多语言
      *
-     * @author zk
-     * @date 2023-09-21 06:09:07
-     * @param {ITreeNodeData[]} nodes
-     * @return {*}  {string[]}
-     * @memberof TreeGridExController
+     * @date 2023-05-18 02:57:00
+     * @protected
      */
-    protected calcExpandedKeys(nodes: ITreeNodeData[]): string[];
+    protected convertMultipleLanguages(): void;
 }
 //# sourceMappingURL=tree-grid-ex.controller.d.ts.map

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":"AACA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,qBAAqB,EACrB,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,CACvE,YAAW,qBAAqB;IAExB,OAAO,EAAE,iBAAiB,CAAC;IAEnC;;;;;;;OAOG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;;;OAOG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEtD;;;;;;;OAOG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAAE,CAAM;IAEhE;;;;;;;OAOG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAE1D,SAAS,CAAC,SAAS,IAAI,IAAI;cAQX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;;;;;OAQG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhD;;;;;;;;;OASG;cACa,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAqB3E;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAkBlC;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAcjC;;;;;;;;OAQG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAajE;;;;;;;;OAQG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAyCrE;;;;;;;;OAQG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;CAa7D"}
+{"version":3,"file":"tree-grid-ex.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EAChB,yBAAyB,EACzB,mBAAmB,EACnB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EACL,0BAA0B,EAC1B,+BAA+B,EAC/B,4BAA4B,EAC7B,MAAM,uBAAuB,CAAC;AAG/B;;;;;;;;;GASG;AACH,qBAAa,oBAAoB,CAC7B,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,EAC7C,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAE/C,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,qBAAqB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEjC,OAAO,EAAE,iBAAiB,CAAC;IAEnC;;;;;;;OAOG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAAE,CAAM;IAE7D;;;;;;;OAOG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,0BAA0B,CAAA;KAAE,CAAM;IAE5D;;;;;;;OAOG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,+BAA+B,CAAA;KAAE,CAAM;IAEtE;;;;;;;OAOG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,4BAA4B,CAAA;KAAE,CAAM;IAEhE;;;;;OAKG;IACH,IAAI,iBAAiB,IAAI,OAAO,CAE/B;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,UAAU,CAEtC;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;cAMX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAO1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5C;;;;;;;;OAQG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhD;;;;;;;;;OASG;cACa,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB3E;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAalC;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAcjC;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS;IAOnD,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAS3D;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAgB3C"}

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

@@ -1,9 +1,10 @@
 import { recursiveIterate } from '@ibiz-template/core';
-import { getGridColumnProvider } from '../../../register';
-import { MDControlController } from '../../common';
+import { getTreeGridExColumnProvider } from '../../../register';
 import { TreeGridExService } from './tree-grid-ex.service';
+import { TreeController } from '../tree/tree.controller';
+import { TreeGridExRowState } from './tree-grid-ex-row.state';
 /**
- * 树表格部件控制器
+ * 树表格（增强）部件控制器
  *
  * @author zk
  * @date 2023-09-21 06:09:46
@@ -12,62 +13,81 @@ import { TreeGridExService } from './tree-grid-ex.service';
  * @extends {MDControlController<IDETree, ITreeGridState, ITreeGridEvent>}
  * @implements {ITreeGridExController}
  */
-export class TreeGridExController extends MDControlController {
+export class TreeGridExController extends TreeController {
     constructor() {
         super(...arguments);
         /**
-         * 表格列的适配器
+         * 树表格（增强）列的适配器
          *
          * @author zk
          * @date 2023-09-21 06:09:04
-         * @type {{ [key: string]: IGridColumnProvider }}
+         * @type {{ [key: string]: ITreeGridExColumnProvider }}
          * @memberof TreeGridExController
          */
         this.providers = {};
         /**
-         * 所有表格列控制器集合
+         * 所有树表格（增强）列控制器集合
          *
          * @author zk
          * @date 2023-09-21 06:09:10
-         * @type {{ [key: string]: GridColumnController }}
+         * @type {{ [key: string]: TreeGridExColumnController }}
          * @memberof TreeGridExController
          */
         this.columns = {};
         /**
-         * 所有表格属性列的控制器
+         * 所有树表格（增强）属性列的控制器
          *
          * @author zk
          * @date 2023-09-21 06:09:16
-         * @type {{ [key: string]: GridFieldColumnController }}
+         * @type {{ [key: string]: TreeGridExFieldColumnController }}
          * @memberof TreeGridExController
          */
         this.fieldColumns = {};
         /**
-         * 所有表格操作列的控制器
+         * 所有树表格（增强）操作列的控制器
          *
          * @author zk
          * @date 2023-09-21 06:09:21
-         * @type {{ [key: string]: GridUAColumnController }}
+         * @type {{ [key: string]: TreeGridExUAColumnController }}
          * @memberof TreeGridExController
          */
         this.uaColumns = {};
     }
+    /**
+     * 是否有配置宽度自适应列
+     *
+     * @type {boolean}
+     * @memberof GridController
+     */
+    get hasAdaptiveColumn() {
+        return !!Object.values(this.columns).find(item => item.isAdaptiveColumn);
+    }
+    /**
+     * 单元格超出呈现模式
+     * @author lxm
+     * @date 2023-11-17 01:56:26
+     * @readonly
+     * @type {('wrap' | 'ellipsis')}
+     */
+    get overflowMode() {
+        return ibiz.config.grid.overflowMode;
+    }
     initState() {
         super.initState();
-        // 根节点初始化
-        this.state.size = 0;
         this.state.columnStates = [];
-        this.state.defaultExpandedKeys = [];
+        this.state.rows = {};
     }
     async onCreated() {
         await super.onCreated();
-        this.service = new TreeGridExService(this.model);
-        await this.service.init(this.context);
         this.initColumnStates();
         await this.initGridColumns();
     }
+    async initService() {
+        this.service = new TreeGridExService(this.model);
+        await this.service.init(this.context);
+    }
     /**
-     * 初始化表格属性列，操作列，编辑项控制器
+     * 初始化树表格（增强）属性列，操作列，编辑项控制器
      *
      * @author zk
      * @date 2023-09-21 06:09:28
@@ -81,7 +101,7 @@ export class TreeGridExController extends MDControlController {
         }
     }
     /**
-     * 初始化表格属性列，操作列，编辑项控制器
+     * 初始化树表格（增强）属性列，操作列，编辑项控制器
      *
      * @author zk
      * @date 2023-09-21 06:09:37
@@ -92,26 +112,26 @@ export class TreeGridExController extends MDControlController {
      */
     async initColumnsController(column) {
         // 初始化适配器
-        const provider = await getGridColumnProvider(column);
+        const provider = await getTreeGridExColumnProvider(column);
         if (!provider) {
             return;
         }
         this.providers[column.codeName] = provider;
-        // 初始化表格列控制器
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        // 初始化树表格（增强）列控制器
         const controller = await provider.createController(column, this);
-        this.columns[column.codeName] = controller;
         // 分类存放控制器
+        this.columns[column.codeName] = controller;
         if (column.columnType === 'DEFGRIDCOLUMN') {
             this.fieldColumns[column.codeName] =
                 controller;
         }
         else if (column.columnType === 'UAGRIDCOLUMN') {
-            this.uaColumns[column.codeName] = controller;
+            this.uaColumns[column.codeName] =
+                controller;
         }
     }
     /**
-     * 初始化表格列状态
+     * 初始化树表格（增强）列状态
      *
      * @author zk
      * @date 2023-09-21 06:09:43
@@ -119,16 +139,15 @@ export class TreeGridExController extends MDControlController {
      * @memberof TreeGridExController
      */
     initColumnStates() {
-        recursiveIterate(this.model, (column) => {
-            if (column.columnType !== 'GROUPGRIDCOLUMN') {
-                this.state.columnStates.push({
-                    key: column.codeName,
-                    caption: column.caption,
-                    hidden: !!column.hideDefault,
-                    uaColumn: column.columnType === 'UAGRIDCOLUMN',
-                });
-            }
-        }, { childrenFields: ['detreeColumns'] });
+        var _a;
+        (_a = this.model.detreeColumns) === null || _a === void 0 ? void 0 : _a.forEach(column => {
+            this.state.columnStates.push({
+                key: column.codeName,
+                caption: column.caption,
+                hidden: !!column.hideDefault,
+                uaColumn: column.columnType === 'UAGRIDCOLUMN',
+            });
+        });
         this.calcColumnFixed();
     }
     /**
@@ -140,102 +159,53 @@ export class TreeGridExController extends MDControlController {
      * @memberof TreeGridExController
      */
     calcColumnFixed() {
+        // 过滤出当前显示的列
         const showColumns = this.state.columnStates.filter(column => !column.hidden);
         const allNum = showColumns.length;
         showColumns.forEach((column, index) => {
             if (column.uaColumn) {
+                // 操作列根据在中间列的那一侧，固定在最左侧或最右侧
                 column.fixed = index + 1 <= Math.floor(allNum / 2) ? 'left' : 'right';
             }
-            else {
-                column.fixed = 'right';
-            }
         });
     }
     /**
-     * 树部件加载，从根节点开始重新加载
-     *
-     * @author zk
-     * @date 2023-09-21 06:09:56
-     * @param {MDCtrlLoadParams} [args={}]
-     * @return {*}  {Promise<ITreeNodeData[]>}
-     * @memberof TreeGridExController
-     */
-    async load(args = {}) {
-        const isInitialLoad = args.isInitialLoad === true;
-        const nodes = await this.loadNodes();
-        this.state.expandedKeys = this.calcExpandedKeys(nodes);
-        await this.afterLoad(args, nodes);
-        this.state.isLoaded = true;
-        await this.evt.emit('onLoadSuccess', {
-            isInitialLoad,
-        });
-        return nodes;
-    }
-    /**
-     * 加载子节点数据
-     *
-     * @author zk
-     * @date 2023-09-21 06:09:02
-     * @param {ITreeNodeData} [parentNode]
-     * @return {*}  {Promise<ITreeNodeData[]>}
-     * @memberof TreeGridExController
+     * 获取树表格行数据
+     * @author lxm
+     * @date 2023-12-22 02:23:44
+     * @param {string} key 可以是节点id也可以是_uuid
+     * @return {*}  {(ITreeGridExRowState | undefined)}
      */
-    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();
-        }
-        // 有父节点绑定到父节点数据上，无父节点替换rootNodes
-        if (parentNode) {
-            parentNode.children = nodes;
+    getRowState(key) {
+        const nodeData = this.getNodeData(key);
+        if (nodeData) {
+            return this.state.rows[nodeData._uuid];
         }
-        else {
-            this.state.rootNodes = nodes;
-        }
-        // 更新items
-        this.state.items = [];
-        recursiveIterate({ children: this.state.rootNodes }, (node) => {
-            this.state.items.push(node);
+    }
+    async afterLoadNodes(nodes) {
+        await super.afterLoadNodes(nodes);
+        // 封装更新树表格行数据
+        recursiveIterate({ children: nodes }, (node) => {
+            this.state.rows[node._uuid] = new TreeGridExRowState(node, this);
         });
-        return nodes;
     }
     /**
-     * 计算展开节点集合
+     * 转换各类多语言
      *
-     * @author zk
-     * @date 2023-09-21 06:09:07
-     * @param {ITreeNodeData[]} nodes
-     * @return {*}  {string[]}
-     * @memberof TreeGridExController
+     * @date 2023-05-18 02:57:00
+     * @protected
      */
-    calcExpandedKeys(nodes) {
-        let 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));
+    convertMultipleLanguages() {
+        // *转换列标题的多语言
+        const convertColumnCaption = (columns) => {
+            columns.forEach((column) => {
+                if (column.capLanguageRes && column.capLanguageRes.lanResTag) {
+                    column.caption = ibiz.i18n.t(column.capLanguageRes.lanResTag, column.caption);
+                }
+            });
+        };
+        if (this.model.detreeColumns && this.model.detreeColumns.length > 0) {
+            convertColumnCaption(this.model.detreeColumns);
         }
-        return expandedKeys;
     }
 }

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

@@ -1,65 +1,15 @@
-import { IHttpResponse } from '@ibiz-template/core';
-import { IDETreeDataSetNode, IDETreeNodeRS } from '@ibiz/model-core';
-import { ITreeNodeData } from '../../../interface';
-import { ControlVO, TreeDataSetNodeData, UIMapField } from '../../../service';
-import { TreeFetchOpts, TreeService } from '../tree/tree.service';
+import { IDETreeGridEx } from '@ibiz/model-core';
+import { TreeService } from '../tree/tree.service';
 /**
  * 树表格增强部件服务
  *
- * @author zk
- * @date 2023-09-25 05:09:52
+ * @author lxm
+ * @date 2023-12-21 10:50:35
  * @export
- * @class TreeGridService
- * @extends {TreeService}
+ * @class TreeGridExService
+ * @extends {TreeService<T>}
+ * @template T
  */
-export declare class TreeGridExService extends TreeService {
-    /**
-     * 表格列映射关系
-     *
-     * @author zk
-     * @date 2023-09-25 05:09:11
-     * @type {Map<string, Map<string, UIMapField>>}
-     * @memberof TreeGridService
-     */
-    multipleUiMap: Map<string, Map<string, UIMapField>>;
-    /**
-     * 初始化节点属性映射
-     *
-     * @author lxm
-     * @date 2022-08-31 18:08:37
-     */
-    initUIDataMap(): void;
-    /**
-     * 获取实体数据集数据
-     *
-     * @protected
-     * @param {TreeNodeRSModel} nodeRS
-     * @param {TreeFetchOpts} opts
-     * @returns {*}
-     * @memberof TreeService
-     */
-    protected getDENodeDatas(nodeModel: IDETreeDataSetNode, nodeRS: IDETreeNodeRS | undefined, parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts): Promise<TreeDataSetNodeData[]>;
-    /**
-     * 处理多数据源响应
-     *
-     * @author zk
-     * @date 2023-09-21 04:09:06
-     * @param {IHttpResponse} response
-     * @param {string} tag 多数据源dataUIMap标识
-     * @return {*}  {IHttpResponse}
-     * @memberof TreeGridService
-     */
-    handleResponseForMultiple(response: IHttpResponse, tag: string): IHttpResponse;
-    /**
-     * 实体数据转ui数据
-     *
-     * @author zk
-     * @date 2023-09-21 06:09:06
-     * @param {IData} entityData 实体数据
-     * @param {string} tag 多数据源dataUIMap标识
-     * @return {*}  {ControlVO}
-     * @memberof TreeGridService
-     */
-    toUIDataForMultiple(entityData: IData, tag: string): ControlVO;
+export declare class TreeGridExService<T extends IDETreeGridEx = IDETreeGridEx> extends TreeService<T> {
 }
 //# sourceMappingURL=tree-grid-ex.service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tree-grid-ex.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid-ex/tree-grid-ex.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACL,kBAAkB,EAElB,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAElE;;;;;;;;GAQG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;IAChD;;;;;;;OAOG;IACH,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAa;IAEhE;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAmBrB;;;;;;;;OAQG;cACa,cAAc,CAC5B,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,mBAAmB,EAAE,CAAC;IA6CjC;;;;;;;;;OASG;IACH,yBAAyB,CACvB,QAAQ,EAAE,aAAa,EACvB,GAAG,EAAE,MAAM,GACV,aAAa;IA2BhB;;;;;;;;;OASG;IACH,mBAAmB,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS;CAI/D"}
+{"version":3,"file":"tree-grid-ex.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid-ex/tree-grid-ex.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD;;;;;;;;;GASG;AACH,qBAAa,iBAAiB,CAC5B,CAAC,SAAS,aAAa,GAAG,aAAa,CACvC,SAAQ,WAAW,CAAC,CAAC,CAAC;CAAG"}