@ibiz-template/runtime 0.7.41-alpha.5 → 0.7.41-alpha.52

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 = {};
+    }
     /**
      * 获取子节点数据
      *
@@ -205,6 +217,7 @@ export class TreeService extends MDControlService {
             };
         // 设置查询长度
         params.size = nodeModel.maxSize || 1000;
+        this.initPageParams(nodeModel, parentNodeData, opts, params);
         // 排序属性
         if (nodeModel.sortAppDEFieldId) {
             Object.assign(params, {
@@ -253,11 +266,14 @@ export class TreeService extends MDControlService {
                 return new TreeDataSetNodeData(nodeModel, parentNodeData, {
                     data,
                     leaf: !!opts.leaf,
+                    context: opts.context,
+                    params: opts.params,
                     navContext,
                     navParams,
                     defaultExpand,
                 });
             });
+            this.updatePageItems(nodeModel, parentNodeData, opts, dataSourceType, nodeDatas);
             return nodeDatas;
         }
         return [];
@@ -295,15 +311,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 +408,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 +445,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 +478,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 +527,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-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"}

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

@@ -1,6 +1,7 @@
 import { ButtonContainerState, UIActionButtonState } from '../../../../utils';
 import { TreeGridExColumnController } from '../tree-grid-ex-column/tree-grid-ex-column.controller';
 import { TreeGridExNotifyState } from '../../../../constant';
+import { getAllUIActionItems } from '../../../../../model';
 /**
  * 树表格（增强）操作列控制器
  * @author lxm
@@ -86,7 +87,8 @@ export class TreeGridExUAColumnController extends TreeGridExColumnController {
             return;
         }
         const containerState = new ButtonContainerState();
-        deuiactionGroup.uiactionGroupDetails.forEach(detail => {
+        const actions = getAllUIActionItems(deuiactionGroup.uiactionGroupDetails);
+        actions.forEach(detail => {
             const actionid = detail.uiactionId;
             if (actionid) {
                 const buttonState = new UIActionButtonState(detail.id, this.treeGrid.context.srfappid, actionid, detail);

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

@@ -1,8 +1,8 @@
 import { IDETreeColumn, IDETreeGridEx } from '@ibiz/model-core';
-import { ITreeGridExController, ITreeGridExState, ITreeGridExEvent, ITreeGridExColumnProvider, ITreeGridExRowState, ITreeNodeData, MDCtrlLoadParams, IUIActionResult } from '../../../interface';
+import { ITreeNodeData, ITreeGridExState, ITreeGridExEvent, MDCtrlLoadParams, ITreeGridExRowState, ITreeGridExController, ITreeGridExColumnProvider } from '../../../interface';
 import { TreeGridExService } from './tree-grid-ex.service';
 import { TreeController } from '../tree/tree.controller';
-import { TreeGridExColumnController, TreeGridExFieldColumnController, TreeGridExUAColumnController } from './tree-grid-ex-column';
+import { TreeGridExColumnController, TreeGridExUAColumnController, TreeGridExFieldColumnController } from './tree-grid-ex-column';
 import { TreeGridExRowState } from './tree-grid-ex-row.state';
 import { TreeGridExNotifyState } from '../../constant';
 import { ControllerEvent } from '../../utils';
@@ -240,6 +240,5 @@ export declare class TreeGridExController<T extends IDETreeGridEx = IDETreeGridE
      * @memberof TreeController
      */
     onTreeNodeClick(_nodeData: ITreeNodeData, event: MouseEvent): Promise<void>;
-    openData(item: IData, event: MouseEvent): Promise<IUIActionResult>;
 }
 //# 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":"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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

@@ -1,4 +1,4 @@
-import { RuntimeError, RuntimeModelError, awaitTimeout, recursiveIterate, } from '@ibiz-template/core';
+import { RuntimeError, awaitTimeout, recursiveIterate, RuntimeModelError, } from '@ibiz-template/core';
 import { clone } from 'ramda';
 import { getTreeGridExColumnProvider } from '../../../register';
 import { TreeGridExService } from './tree-grid-ex.service';
@@ -540,6 +540,8 @@ export class TreeGridExController extends TreeController {
         if (!nodeData) {
             return;
         }
+        // 设置导航数据
+        this.setNavData(nodeData);
         // 节点有配置常用操作的上下文菜单时，触发界面行为，后续逻辑都不走
         const clickActionItem = (_a = this.contextMenuInfos[nodeData._nodeId]) === null || _a === void 0 ? void 0 : _a.clickTBUIActionItem;
         const onlyOneActionItem = (_b = this.contextMenuInfos[nodeData._nodeId]) === null || _b === void 0 ? void 0 : _b.onlyOneActionItem;
@@ -575,30 +577,4 @@ export class TreeGridExController extends TreeController {
         // 执行opendata逻辑事件
         await this.openData(nodeData, event);
     }
-    async openData(item, event) {
-        var _a, _b, _c;
-        // 添加选中数据的主键
-        const context = this.context.clone();
-        const deName = ((_b = (_a = item.deData) === null || _a === void 0 ? void 0 : _a.srfdecodename) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ||
-            calcDeCodeNameById(this.model.appDataEntityId);
-        context[deName.toLowerCase()] = item._deData.srfkey;
-        const result = await ((_c = this.scheduler) === null || _c === void 0 ? void 0 : _c.triggerCustom(`${item._nodeId}_opendata`, {
-            context,
-            params: this.params,
-            data: [item._deData],
-            event,
-            view: this.view,
-            ctrl: this,
-        }));
-        if (result === -1) {
-            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.control.calendar.missingViewLogic', {
-                itemType: item.itemType.toLowerCase(),
-            }));
-        }
-        else {
-            return {
-                cancel: result ? result.ok : true,
-            };
-        }
-    }
 }

package/out/controller/control/wizard-panel/wizard-panel.controller.d.ts

@@ -175,6 +175,6 @@ export declare class WizardPanelController extends ControlController<IDEWizardPa
      * @param item 数据
      * @memberof WizardPanelController
      */
-    calcButtonState(item?: IData): Promise<void>;
+    calcButtonState(item?: IData, _form?: EditFormController): Promise<void>;
 }
 //# sourceMappingURL=wizard-panel.controller.d.ts.map

package/out/controller/control/wizard-panel/wizard-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wizard-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/wizard-panel/wizard-panel.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,aAAa,EACb,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,gBAAgB,EAChB,SAAS,EAEV,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;;GAQG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CACvB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,OAAO,EAAG,kBAAkB,CAAC;IAE7B;;;;;;;OAOG;IACH,UAAU,EAAE,MAAM,EAAE,CAAM;IAE1B;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;OAKG;IACH,SAAS,EAAE,aAAa,GAAG,SAAS,CAAa;IAEjD;;;;;OAKG;IACH,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAa;IAE7D;;;;;OAKG;IACH,KAAK,EAAE,MAAM,EAAE,CAAM;IAErB;;;;;OAKG;IACH,QAAQ,EAAE,KAAK,CAAM;IAErB;;;;;OAKG;IACH,QAAQ,EAAE,KAAK,CAAM;IAErB;;;OAGG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsD1C;;;;;;;OAOG;IACH,IAAI,gBAAgB,IAAI,aAAa,GAAG,SAAS,CAehD;IAED;;;;;;;OAOG;IACH,IAAI,oBAAoB,IAAI,kBAAkB,CAW7C;IAED;;;;;;OAMG;IACG,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3E;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IASnC;;;;;;OAMG;IACH,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAuB1D;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsCjC;;;;;;;OAOG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IA2ClC;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IA2DlC;;;;;;OAMG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAapC;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAezB;;;;;OAKG;IACG,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CA4BnD"}
+{"version":3,"file":"wizard-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/wizard-panel/wizard-panel.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,aAAa,EACb,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,gBAAgB,EAChB,SAAS,EAEV,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;;GAQG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CACvB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,OAAO,EAAG,kBAAkB,CAAC;IAE7B;;;;;;;OAOG;IACH,UAAU,EAAE,MAAM,EAAE,CAAM;IAE1B;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;OAKG;IACH,SAAS,EAAE,aAAa,GAAG,SAAS,CAAa;IAEjD;;;;;OAKG;IACH,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAa;IAE7D;;;;;OAKG;IACH,KAAK,EAAE,MAAM,EAAE,CAAM;IAErB;;;;;OAKG;IACH,QAAQ,EAAE,KAAK,CAAM;IAErB;;;;;OAKG;IACH,QAAQ,EAAE,KAAK,CAAM;IAErB;;;OAGG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsD1C;;;;;;;OAOG;IACH,IAAI,gBAAgB,IAAI,aAAa,GAAG,SAAS,CAehD;IAED;;;;;;;OAOG;IACH,IAAI,oBAAoB,IAAI,kBAAkB,CAW7C;IAED;;;;;;OAMG;IACG,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3E;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IASnC;;;;;;OAMG;IACH,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAsB1D;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAuCjC;;;;;;;OAOG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IA2ClC;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IA2DlC;;;;;;OAMG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAapC;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAezB;;;;;OAKG;IACG,eAAe,CACnB,IAAI,CAAC,EAAE,KAAK,EACZ,KAAK,CAAC,EAAE,kBAAkB,GACzB,OAAO,CAAC,IAAI,CAAC;CA6BjB"}

package/out/controller/control/wizard-panel/wizard-panel.controller.js

@@ -178,11 +178,11 @@ export class WizardPanelController extends ControlController {
         const formController = event.ctrl;
         this.formControllers.set(activeFormTag, formController);
         formController.evt.on('onFormDataChange', evt => {
-            this.calcButtonState(evt.data[0]);
+            this.calcButtonState(evt.data[0], formController);
         });
         // 调用表单的load加载一次数据
         const data = await formController.load();
-        this.calcButtonState(formController.data);
+        this.calcButtonState(formController.data, formController);
         Object.assign(this.formData, data);
     }
     /**
@@ -211,7 +211,6 @@ export class WizardPanelController extends ControlController {
         var _a;
         if (!((_a = this.model.dewizard) === null || _a === void 0 ? void 0 : _a.dewizardForms)) {
             throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.wizardPanel.noConfiguration'));
-            return;
         }
         const wizardForm = this.model.dewizard.dewizardForms.find((form) => {
             return form.formTag === tag;
@@ -261,6 +260,7 @@ export class WizardPanelController extends ControlController {
             this.state.activeFormTag = this.firstForm.formTag;
             this.tagHistory.push(this.firstForm.formTag);
         }
+        this.evt.emit('onInitialized', undefined);
     }
     /**
      * 执行完成操作
@@ -429,7 +429,7 @@ export class WizardPanelController extends ControlController {
      * @param item 数据
      * @memberof WizardPanelController
      */
-    async calcButtonState(item) {
+    async calcButtonState(item, _form) {
         var _a;
         const { activeWizardForm } = this;
         if (activeWizardForm) {
@@ -443,6 +443,7 @@ export class WizardPanelController extends ControlController {
                 if (buttonState && scriptCode) {
                     buttonState.visible = !!ScriptFactory.execScriptFn({
                         view: this.view,
+                        ctrl: _form,
                         context: this.context,
                         params: this.params,
                         data,

package/out/controller/ctx/ctx.js

@@ -132,10 +132,10 @@ export class CTX {
      * @return {*}  {IViewController}
      */
     getTopView() {
-        if (!this.parent) {
+        if (!this.parent || (this.parent && this.parent.isDestroyed)) {
             return this.view;
         }
-        if (this.view.modal.routeDepth === 2) {
+        if (this.view && this.view.modal.routeDepth === 2) {
             return this.view;
         }
         return this.parent.getTopView();