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

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

@@ -1,17 +1,18 @@
 /* eslint-disable no-param-reassign */
 /* eslint-disable no-lonely-if */
 /* eslint-disable no-else-return */
-import { RuntimeError, RuntimeModelError, recursiveIterate, } from '@ibiz-template/core';
+import { RuntimeError, recursiveIterate, RuntimeModelError, } 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';
 import { TreeService } from './tree.service';
-import { calcDeCodeNameById, getChildNodeRSs, getTreeNode, } from '../../../model';
+import { getTreeNode, getChildNodeRSs, getUIActionById, calcDeCodeNameById, calcUIActionGroup, } from '../../../model';
 import { CounterService, Srfuf } from '../../../service';
 import { convertNavData } from '../../../utils';
 import { OpenAppViewCommand } from '../../../command';
+import { PresetIdentifier } from '../../../constant';
 /**
  * 树部件控制器
  * @author lxm
@@ -66,6 +67,29 @@ export class TreeController extends MDControlController {
         }
         return ibiz.config.common.searchPhSeparator;
     }
+    /**
+     * @description 是否启用点击导航
+     * @readonly
+     * @type {boolean}
+     * @memberof TreeController
+     */
+    get enableClickNav() {
+        if (!ibiz.env.isMob)
+            return true;
+        if (this.controlParams.enableclicknav) {
+            return this.controlParams.enableclicknav === 'true';
+        }
+        return ibiz.config.tree.enableClickNav;
+    }
+    /**
+     * @description 面包屑显示模式
+     * @readonly
+     * @type {('DEFAULT' | 'HEADERSTYLE')}
+     * @memberof TreeController
+     */
+    get crumbShowMode() {
+        return this.controlParams.crumbshowmode || 'DEFAULT';
+    }
     initState() {
         super.initState();
         // 根节点初始化
@@ -75,11 +99,13 @@ export class TreeController extends MDControlController {
         this.state.size = 0;
         this.state.query = '';
         this.state.mobExpandedKey = '';
+        this.state.counterData = {};
     }
     async onCreated() {
         await super.onCreated();
         this.state.expandedKeys = [...this.state.defaultExpandedKeys];
         this.initDropNodeRss();
+        this.initViewScheduler();
         this.initNodeClickTBUIActionItem();
         await this.initQuickSearch();
         await this.initService();
@@ -94,6 +120,52 @@ export class TreeController extends MDControlController {
         // 上下文菜单控制器初始化
         await Promise.all(Object.values(this.contextMenus).map(menu => menu.created()));
     }
+    /**
+     * @description 初始化界面行为组
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof TreeController
+     */
+    async initUIActions() {
+        // 收集所有遍历过程中的异步任务
+        const asyncTasks = [];
+        this.model.detreeNodes.forEach(node => {
+            var _a, _b;
+            if ((_b = (_a = node.decontextMenu) === null || _a === void 0 ? void 0 : _a.detoolbarItems) === null || _b === void 0 ? void 0 : _b.length) {
+                // 初始化工具栏模型
+                recursiveIterate(node.decontextMenu, (item) => {
+                    const groupItem = item;
+                    // 适配行为组展开模式及分组项配置了界面行为组
+                    if (groupItem.groupExtractMode && groupItem.uiactionGroup) {
+                        const calcTask = calcUIActionGroup(groupItem.uiactionGroup, this.context, this.params);
+                        asyncTasks.push(calcTask);
+                    }
+                }, { childrenFields: ['detoolbarItems'] });
+            }
+        });
+        // 所有上下文菜单
+        await Promise.all(asyncTasks);
+    }
+    /**
+     * @description 初始化部件视图逻辑
+     * @protected
+     * @memberof TreeController
+     */
+    initViewScheduler() {
+        const viewLogics = this.model.appViewLogics || [];
+        if (viewLogics.length !== 0) {
+            this.viewScheduler = ibiz.scheduler.createViewScheduler(viewLogics);
+            this.viewScheduler.defaultParamsCb = () => {
+                return this.getEventArgs();
+            };
+            if (this.viewScheduler.hasViewEventTrigger) {
+                // 监听视图事件触发视图事件触发器
+                this.evt.onAll((_eventName, event) => {
+                    this.viewScheduler.triggerViewEvent(event);
+                });
+            }
+        }
+    }
     /**
      * 初始化快速搜索
      *
@@ -137,11 +209,17 @@ export class TreeController extends MDControlController {
             }
         }
     }
+    /**
+     * @description 生命周期-销毁完成
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof TreeController
+     */
     async onDestroyed() {
+        var _a, _b;
         await super.onDestroyed();
-        if (this.counter) {
-            this.counter.destroy();
-        }
+        (_a = this.counter) === null || _a === void 0 ? void 0 : _a.offChange(this.handleCounterChange);
+        (_b = this.counter) === null || _b === void 0 ? void 0 : _b.destroy();
     }
     /**
      * 初始化对应类型的部件服务
@@ -162,11 +240,25 @@ export class TreeController extends MDControlController {
      * @return {*}  {Promise<void>}
      */
     async initCounter() {
+        var _a;
+        this.handleCounterChange = this.handleCounterChange.bind(this);
+        if (this.state.isCounterDisabled)
+            return;
         const { appCounterRefs } = this.model;
         const appCounterRef = appCounterRefs === null || appCounterRefs === void 0 ? void 0 : appCounterRefs[0];
         if (appCounterRef) {
             this.counter = await CounterService.getCounterByRef(appCounterRef, this.context, Object.assign({}, this.params));
         }
+        (_a = this.counter) === null || _a === void 0 ? void 0 : _a.onChange(this.handleCounterChange);
+    }
+    /**
+     * @description 处理计数器值变更
+     * @protected
+     * @param {IData} data
+     * @memberof TreeController
+     */
+    handleCounterChange(data) {
+        this.state.counterData = data;
     }
     /**
      * 初始化节点拖入关系处理
@@ -251,18 +343,7 @@ export class TreeController extends MDControlController {
             }
         }
         const isInitialLoad = args.isInitialLoad === true;
-        if (isInitialLoad) {
-            await this.startLoading();
-        }
-        let nodes;
-        try {
-            nodes = await this.loadNodes();
-        }
-        finally {
-            if (isInitialLoad) {
-                await this.endLoading();
-            }
-        }
+        const nodes = await this.loadNodes();
         await this.afterLoad(args, nodes);
         this.state.isLoaded = true;
         await this._evt.emit('onLoadSuccess', {
@@ -367,6 +448,7 @@ export class TreeController extends MDControlController {
         }, { childrenFields: ['_children'] });
         // 重新计算展开节点标识
         this.state.expandedKeys = this.calcExpandedKeys(nodes);
+        this.calcSelectDataBySelectKey();
     }
     /**
      * 树节点点击事件
@@ -378,9 +460,8 @@ export class TreeController extends MDControlController {
     async onTreeNodeClick(_nodeData, event) {
         var _a, _b;
         const nodeData = this.getNodeData(_nodeData._id);
-        if (!nodeData) {
+        if (!nodeData)
             return;
-        }
         // 设置导航数据
         this.setNavData(nodeData);
         // 节点有配置常用操作的上下文菜单时，触发界面行为，后续逻辑都不走
@@ -395,33 +476,24 @@ export class TreeController extends MDControlController {
         if (this.state.navigational && !(nodeModel === null || nodeModel === void 0 ? void 0 : nodeModel.navAppViewId)) {
             return;
         }
-        // 不是导航树上的树，但是有配置导航视图的时候，直接路由打开导航视图
-        if (!this.state.navigational && (nodeModel === null || nodeModel === void 0 ? void 0 : nodeModel.navAppViewId)) {
+        // 不是导航树上的树，且不是内置导航模式，但是有配置导航视图的时候，直接打开导航视图
+        if (this.enableClickNav &&
+            !this.state.enableNavView &&
+            !this.state.navigational &&
+            (nodeModel === null || nodeModel === void 0 ? void 0 : nodeModel.navAppViewId)) {
             const resultContext = this.context.clone();
             const resultParams = Object.assign({}, this.params);
             const navContexts = [...(nodeModel.navigateContexts || [])];
             const navParams = [...(nodeModel.navigateParams || [])];
-            const { tempContext, tempParams } = this.handleNavParams(navContexts, navParams, _nodeData);
+            const { tempContext, tempParams } = this.handleNavParams(navContexts, navParams, nodeData);
             Object.assign(resultContext, tempContext);
             Object.assign(resultParams, tempParams);
             await ibiz.commands.execute(OpenAppViewCommand.TAG, nodeModel === null || nodeModel === void 0 ? void 0 : nodeModel.navAppViewId, resultContext, resultParams, { ctx: this.view.getCtx(), event });
             return;
         }
         // 单选时，单击才会触发选中逻辑,禁止选择的时候不触发
-        if (this.state.singleSelect && !nodeData._disableSelect) {
-            // 选中相关处理
-            const { selectedData } = this.state;
-            // 选中里没有则添加，有则删除
-            const filterArr = selectedData.filter(item => item._id !== nodeData._id);
-            if (filterArr.length === selectedData.length) {
-                this.setSelection(this.state.singleSelect
-                    ? [nodeData]
-                    : selectedData.concat([nodeData]));
-            }
-            else {
-                this.setSelection(filterArr);
-            }
-        }
+        if (this.state.singleSelect && !nodeData._disableSelect)
+            this.setSelection([nodeData]);
         // 激活事件
         if (this.state.mdctrlActiveMode === 1) {
             await this.setActive(nodeData);
@@ -446,6 +518,7 @@ export class TreeController extends MDControlController {
      * @param {boolean} isExpand true为展开，false为折叠
      */
     onExpandChange(nodeData, isExpand) {
+        nodeData.srfcollapsestate = isExpand ? 1 : 0;
         const hasKey = this.state.expandedKeys.includes(nodeData._id);
         if (isExpand && !hasKey) {
             this.state.expandedKeys.push(nodeData._id);
@@ -466,7 +539,12 @@ export class TreeController extends MDControlController {
      */
     async onDbTreeNodeClick(_nodeData) {
         const nodeData = this.getNodeData(_nodeData._id);
-        if (this.state.mdctrlActiveMode === 2 && nodeData) {
+        if (!nodeData)
+            return;
+        // 多选时，双击节点才选中数据
+        if (!this.state.singleSelect && !nodeData._disableSelect)
+            this.setSelection([nodeData]);
+        if (this.state.mdctrlActiveMode === 2) {
             await this.setActive(nodeData);
         }
     }
@@ -501,9 +579,8 @@ export class TreeController extends MDControlController {
      */
     getNodeData(key) {
         const find = this.state.items.find(item => item._id === key);
-        if (find) {
+        if (find)
             return find;
-        }
         return this.state.items.find(item => item._uuid === key);
     }
     /**
@@ -518,6 +595,7 @@ export class TreeController extends MDControlController {
      * @return {*}  {Promise<void>}
      */
     async doUIAction(uiActionId, nodeData, event, appId) {
+        var _a;
         const eventArgs = this.getEventArgs();
         const nodeParams = this.parseTreeNodeData(nodeData);
         const result = await UIActionUtil.exec(uiActionId, Object.assign(Object.assign(Object.assign({}, eventArgs), nodeParams), { event, noWaitRoute: true }), appId);
@@ -541,6 +619,15 @@ export class TreeController extends MDControlController {
                 default:
             }
         }
+        // 异步行为处理
+        const action = await getUIActionById(uiActionId, appId);
+        if ((action.asyncAction && !result.cancel) ||
+            ((_a = action.uiactionParamJO) === null || _a === void 0 ? void 0 : _a.srfasyncaction)) {
+            if (!event || !event.target) {
+                return;
+            }
+            await ibiz.util.anime.moveAndResize(event.target, `#${PresetIdentifier.MESSAGE}`);
+        }
     }
     /**
      * 解析树节点获取通用数据，和完整的上下文和视图参数。
@@ -817,7 +904,7 @@ export class TreeController extends MDControlController {
             const tempContext = this.context.clone();
             tempContext[deName] = deData.srfkey;
             // 调用接口修改数据
-            const res = await app.deService.exec(model.appDataEntityId, 'update', tempContext, deData);
+            const res = await app.deService.exec(model.appDataEntityId, model.updateAppDEActionId || 'update', tempContext, deData);
             // 更新完之后更新state里的数据。
             if (res.ok) {
                 node._deData = res.data;
@@ -847,10 +934,12 @@ export class TreeController extends MDControlController {
         await this.updateDeNodeData([nodeData]);
     }
     /**
-     * 删除每一项
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2024-02-27 09:47:52
+     * @description 处理项删除
+     * @param {IData} item
+     * @param {IContext} context
+     * @param {IParams} params
+     * @returns {*}  {Promise<boolean>}
+     * @memberof TreeController
      */
     async handleItemRemove(item, context, params) {
         let needRefresh = false;
@@ -865,7 +954,7 @@ export class TreeController extends MDControlController {
                 const tempContext = context.clone();
                 tempContext[deName] = item.srfkey;
                 // 删除后台的数据
-                await this.service.removeItem(nodeAppDataEntityId, tempContext, params);
+                await this.service.removeItem(nodeAppDataEntityId, tempContext, params, treeNode.removeAppDEActionId);
                 needRefresh = true;
             }
         }
@@ -903,9 +992,8 @@ export class TreeController extends MDControlController {
         });
     }
     /**
-     * @description 展开收缩节点
-     * @param {string} tag
-     * @param {boolean} [expand]
+     * @description 切换折叠，tag=指定分组标识(不传则全部)，expand=目标状态(不传则反转)
+     * @param {{ tag?: string; expand?: boolean }} [params={}]
      * @memberof TreeController
      */
     changeCollapse(params = {}) {
@@ -1038,4 +1126,129 @@ export class TreeController extends MDControlController {
         });
         return targetNodes;
     }
+    /**
+     * @description 打开编辑数据视图
+     * @param {ITreeNodeData} node
+     * @param {MouseEvent} [event]
+     * @returns {*}  {Promise<IUIActionResult>}
+     * @memberof TreeController
+     */
+    async openData(item, event) {
+        var _a;
+        const nodeModel = this.getNodeModel(item._nodeId);
+        if (!nodeModel) {
+            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.tree.noFoundTreeNode'));
+        }
+        const { context, params, data } = this.parseTreeNodeData(item);
+        const { appDataEntityId } = nodeModel;
+        if (!appDataEntityId)
+            return { cancel: true };
+        const deName = calcDeCodeNameById(appDataEntityId);
+        context[deName.toLowerCase()] = item.srfkey;
+        context.srfnavctrlid = this.ctrlId;
+        const result = await ((_a = this.viewScheduler) === null || _a === void 0 ? void 0 : _a.triggerCustom(`${nodeModel.id.toLowerCase()}_opendata`, {
+            data,
+            event,
+            params,
+            context,
+            view: this.view,
+            ctrl: this,
+        }));
+        if (result === -1)
+            throw new RuntimeModelError(nodeModel, ibiz.i18n.t('runtime.controller.common.md.logicOpendata', {
+                itemType: nodeModel.id.toLowerCase(),
+            }));
+        return {
+            cancel: result ? !result.ok : true,
+        };
+    }
+    /**
+     * @description 打开新建编辑视图
+     * @param {ITreeNodeData} node
+     * @param {MouseEvent} [event]
+     * @returns {*}  {Promise<IUIActionResult>}
+     * @memberof TreeController
+     */
+    async newData(item, event) {
+        var _a;
+        const nodeModel = this.getNodeModel(item._nodeId);
+        if (!nodeModel) {
+            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.tree.noFoundTreeNode'));
+        }
+        const { context, params, data } = this.parseTreeNodeData(item);
+        context.srfnavctrlid = this.ctrlId;
+        const result = await ((_a = this.viewScheduler) === null || _a === void 0 ? void 0 : _a.triggerCustom(`${item._nodeId.toLowerCase()}_newdata`, {
+            data,
+            event,
+            params,
+            context,
+            view: this.view,
+            ctrl: this,
+        }));
+        if (result === -1)
+            throw new RuntimeModelError(nodeModel, ibiz.i18n.t('runtime.controller.common.md.logicNewdata', {
+                itemType: nodeModel.id.toLowerCase(),
+            }));
+        return {
+            cancel: result ? !result.ok : true,
+        };
+    }
+    /**
+     * @description 跳转第一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof TreeController
+     */
+    async goToFirstPage() {
+        return [];
+    }
+    /**
+     * @description 跳转上一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof TreeController
+     */
+    async goToPreviousPage() {
+        return [];
+    }
+    /**
+     * @description 跳转下一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof TreeController
+     */
+    async goToNextPage() {
+        return [];
+    }
+    /**
+     * @description 跳转最后一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof TreeController
+     */
+    async goToLastPage() {
+        return [];
+    }
+    /**
+     * @description 更新UI
+     * @memberof TreeController
+     */
+    updateUI() {
+        this._evt.emit('onUpdateUI', undefined);
+    }
+    /**
+     * @description 转换各类多语言
+     * @protected
+     * @memberof TreeController
+     */
+    convertMultipleLanguages() {
+        const { detreeNodes = [], emptyTextLanguageRes, emptyText } = this.model;
+        if (emptyTextLanguageRes === null || emptyTextLanguageRes === void 0 ? void 0 : emptyTextLanguageRes.lanResTag) {
+            this.model.emptyText = ibiz.i18n.t(emptyTextLanguageRes.lanResTag, emptyText);
+        }
+        detreeNodes.forEach((item) => {
+            var _a;
+            // 只转化静态节点多语言
+            if (item.treeNodeType === 'STATIC' && ((_a = item.nameLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag)) {
+                item.name = ibiz.i18n.t(item.nameLanguageRes.lanResTag, item.name);
+                item.text = ibiz.i18n.t(item.nameLanguageRes.lanResTag, item.text);
+            }
+        });
+    }
 }

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

@@ -238,9 +238,10 @@ export declare class TreeService<T extends IDETree = IDETree> extends MDControlS
      * @date 2022-09-07 19:09:48
      * @param {IContext} context 上下文
      * @param {IParams} [params={}] 视图参数
+     * @param {string | undefined} [removeAppDEActionId] 树节点删除实体行为标识
      * @returns {*}
      */
-    removeItem(appDataEntityId: string, context: IContext, params?: IParams): Promise<IHttpResponse>;
+    removeItem(appDataEntityId: string, context: IContext, params?: IParams, removeAppDEActionId?: string | undefined): Promise<IHttpResponse>;
     /**
      * 执行服务方法(带实体id)
      *

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":"AAAA,OAAO,EAAE,aAAa,EAAc,MAAM,qBAAqB,CAAC;AAChE,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACX,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,eAAe,EACf,aAAa,EACb,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAQ5B,OAAO,EACL,gBAAgB,EAEhB,mBAAmB,EACnB,oBAAoB,EAErB,MAAM,kBAAkB,CAAC;AAI1B,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,OAAO,EAAE,QAAQ,CAAC;IAClB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAChB;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B;;;;;OAKG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;;;OAKG;IACH,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,KAAK,EAAE,mBAAmB,EAAE,CAAC;CAC9B;AAED;;;;;;;GAOG;AACH,qBAAa,WAAW,CACtB,CAAC,SAAS,OAAO,GAAG,OAAO,CAC3B,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC3B;;;;;;OAMG;IACH,WAAW,EAAE;QACX,CAAC,YAAY,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAC;KAC5C,CAAM;IAEP;;;;;;;OAOG;IACG,eAAe,CACnB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;IA8CvC;;;;;;;;;;OAUG;cACa,oBAAoB,CAClC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,CAAC;IAyF3B;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,CAAC;IAezB;;;;;;;OAOG;IACH,qBAAqB,CACnB,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,EAAE,OAAO,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;KACpB;IA+DD;;;;;;;;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;IA2GjC;;;;;;;;;;OAUG;cACa,sBAAsB,CACpC,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,KAAK,EAAE,CAAC;IAkCnB;;;;;;;;;;OAUG;cACa,sBAAsB,CACpC,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,KAAK,EAAE,CAAC;IAuBnB;;;;;;;;;;OAUG;cACa,uBAAuB,CACrC,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,KAAK,EAAE,CAAC;IA2BnB;;;;;;;;;OASG;cACa,wBAAwB,CACtC,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,KAAK,EAAE,CAAC;IAkBnB;;;;;;;;;OASG;cACa,yBAAyB,CACvC,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,KAAK,EAAE,CAAC;IAwBnB;;;;;;;OAOG;cACa,oBAAoB,CAClC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAgDlC;;;;;;;;OAQG;IACG,UAAU,CACd,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAazB;;;;;;;;;OASG;IACG,gBAAgB,CACpB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC;IAazB;;;;;;;OAOG;IACH,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAKrD;;;;;;OAMG;IACH,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAK5C;;;;;;;OAOG;IACH,cAAc,CACZ,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,OAAO,GACd,IAAI;IA6CP;;;;;;;;OAQG;IACH,eAAe,CACb,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,EACnB,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,SAAS,EAAE,mBAAmB,EAAE,GAC/B,IAAI;IAyBP;;;;;;;OAOG;IACH,cAAc,CACZ,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,MAAM,GAChB,IAAI;CAuBR"}
+{"version":3,"file":"tree.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.service.ts"],"names":[],"mappings":"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"}

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

@@ -1,3 +1,4 @@
+/* eslint-disable no-nested-ternary */
 import { ModelError } from '@ibiz-template/core';
 import { getRootNode, getChildNodeRSs, getTreeNode, calcDeCodeNameById, findDELogic, } from '../../../model';
 import { MDControlService, TreeStaticNodeData, TreeDataSetNodeData, TreeCodeListNodeData, AppDataEntity, } from '../../../service';
@@ -176,6 +177,10 @@ export class TreeService extends MDControlService {
                 deName = calcDeCodeNameById(parentNodeModel.appDataEntityId);
             }
             derValue = parentData._value;
+            // 附加父节点的父节点数据主键
+            if (parentData._parentValue) {
+                Object.assign(data, { srfparentkey: parentData._parentValue });
+            }
         }
         // 导航相关参数处理
         const { resultContext, resultParams } = calcNavParams({
@@ -255,21 +260,27 @@ export class TreeService extends MDControlService {
         }
         if (result.length) {
             const entityModel = await ibiz.hub.getAppDataEntity(appDataEntityId, appId);
-            const nodeDatas = result.map((item, index) => {
+            const nodeDatas = [];
+            for (let index = 0; index < result.length; index++) {
+                const item = result[index];
                 const defaultExpand = this.calcExpand(nodeModel, index);
                 let data = item;
                 // 不是应用数据实体对象的数据项必须转为应用数据实体对象
                 if (!(item instanceof AppDataEntity)) {
                     data = new AppDataEntity(entityModel, item);
                 }
-                return new TreeDataSetNodeData(nodeModel, parentNodeData, {
+                const nodeData = new TreeDataSetNodeData(nodeModel, parentNodeData, {
                     data,
                     leaf: !!opts.leaf,
+                    context: opts.context,
+                    params: opts.params,
                     navContext,
                     navParams,
                     defaultExpand,
                 });
-            });
+                await nodeData.initAsyncData(nodeModel);
+                nodeDatas.push(nodeData);
+            }
             this.updatePageItems(nodeModel, parentNodeData, opts, dataSourceType, nodeDatas);
             return nodeDatas;
         }
@@ -308,15 +319,8 @@ export class TreeService extends MDControlService {
         }
         let result = [];
         if (params) {
-            if (dataName) {
-                const data = params[dataName];
-                if (data) {
-                    result = Array.isArray(data) ? data : [data];
-                }
-            }
-            else {
-                result = [params];
-            }
+            const data = dataName ? params[dataName] : params;
+            result = data ? (Array.isArray(data) ? data : [data]) : [];
         }
         return result;
     }
@@ -456,6 +460,8 @@ export class TreeService extends MDControlService {
                     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,
@@ -480,11 +486,14 @@ export class TreeService extends MDControlService {
      * @date 2022-09-07 19:09:48
      * @param {IContext} context 上下文
      * @param {IParams} [params={}] 视图参数
+     * @param {string | undefined} [removeAppDEActionId] 树节点删除实体行为标识
      * @returns {*}
      */
-    async removeItem(appDataEntityId, context, params = {}) {
+    async removeItem(appDataEntityId, context, params = {}, removeAppDEActionId = undefined) {
         var _a;
-        const removeAction = ((_a = this.model.removeControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'remove';
+        const removeAction = removeAppDEActionId ||
+            ((_a = this.model.removeControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) ||
+            'remove';
         const res = await this.execWithEntityId(appDataEntityId, removeAction, context, undefined, params);
         return res;
     }

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"}