@ibiz-template/runtime 0.4.17-dev.1 → 0.5.0-beta.1

package/out/controller/control/gantt/gantt.controller.js

@@ -1,12 +1,5 @@
-/* eslint-disable no-param-reassign */
-/* eslint-disable no-prototype-builtins */
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import { recursiveIterate } from '@ibiz-template/core';
-import { MDControlController } from '../../common';
 import { GanttService } from './gantt.service';
-import { ContextMenuController } from '../context-menu';
-import { getGridColumnProvider } from '../../../register';
-import { UIActionUtil } from '../../../ui-action';
+import { TreeGridExController } from '../tree-grid-ex';
 /**
  * 甘特图控制器
  *
@@ -17,54 +10,7 @@ import { UIActionUtil } from '../../../ui-action';
  * @extends {MDControlController<IDEGantt, IGanttState, IGanttEvent>}
  * @implements {IGanttController}
  */
-export class GanttController extends MDControlController {
-    constructor() {
-        super(...arguments);
-        /**
-         * 表格列适配器
-         *
-         * @type {{ [key: string]: IGridColumnProvider }}
-         * @memberof GanttController
-         */
-        this.providers = {};
-        /**
-         * 所有表格列控制器集合
-         *
-         * @type {{ [key: string]: GridColumnController }}
-         * @memberof GanttController
-         */
-        this.columns = {};
-        /**
-         * 所有表格属性列的控制器
-         *
-         * @type {{ [key: string]: GridFieldColumnController }}
-         * @memberof GanttController
-         */
-        this.fieldColumns = {};
-        /**
-         * 所有表格操作列的控制器
-         *
-         * @type {{ [key: string]: GridUAColumnController }}
-         * @memberof GanttController
-         */
-        this.uaColumns = {};
-        /**
-         * 上下文菜单控制器
-         *
-         * @author tony001
-         * @date 2023-12-11 16:12:57
-         * @type {{ [p: string]: ContextMenuController }}
-         */
-        this.contextMenus = {};
-        /**
-         * 是否启用快速搜索
-         *
-         * @author tony001
-         * @date 2023-12-11 16:12:13
-         * @type {boolean}
-         */
-        this.enableQuickSearch = false;
-    }
+export class GanttController extends TreeGridExController {
     /**
      * 初始化状态
      *
@@ -74,9 +20,6 @@ export class GanttController extends MDControlController {
      */
     initState() {
         super.initState();
-        this.state.size = 0;
-        this.state.query = '';
-        this.state.columnStates = [];
         this.state.rootNodes = [];
         this.state.ganttStyle = {};
     }
@@ -88,121 +31,16 @@ export class GanttController extends MDControlController {
      * @memberof GanttController
      */
     onDataChange(msg) { }
-    async onCreated() {
-        var _a, _b;
-        await super.onCreated();
-        await this.initGridColumns();
-        this.initColumnStates();
-        // 快速搜索
-        if ((_a = this.model.detreeNodes) === null || _a === void 0 ? void 0 : _a[0].enableQuickSearch) {
-            this.enableQuickSearch = true;
-        }
-        // 计算快速搜索占位符
-        if (this.dataEntity) {
-            const searchFields = (_b = this.dataEntity.appDEFields) === null || _b === void 0 ? void 0 : _b.filter(field => {
-                return field.enableQuickSearch;
-            });
-            const placeHolders = [];
-            searchFields === null || searchFields === void 0 ? void 0 : searchFields.forEach(searchField => {
-                if ((searchField === null || searchField === void 0 ? void 0 : searchField.lnlanguageRes) && searchField.lnlanguageRes.lanResTag) {
-                    placeHolders.push(ibiz.i18n.t(searchField.lnlanguageRes.lanResTag, searchField.logicName));
-                }
-                else if (searchField === null || searchField === void 0 ? void 0 : searchField.logicName) {
-                    placeHolders.push(searchField.logicName);
-                }
-            });
-            if (placeHolders.length > 0) {
-                this.state.placeHolder = placeHolders.join('、');
-            }
-        }
-        this.service = new GanttService(this.model);
-        await this.service.init(this.context);
-        // 初始化上下文菜单控制器
-        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) {
-                this.contextMenus[node.decontextMenu.id] = new ContextMenuController(node.decontextMenu, this.context, this.params, this.ctx);
-            }
-        });
-        // 上下文菜单控制器初始化
-        await Promise.all(Object.values(this.contextMenus).map(menu => menu.created()));
-    }
     /**
-     * 初始化表格列
+     * 初始化对应类型的部件服务
      *
      * @protected
      * @return {*}  {Promise<void>}
      * @memberof GanttController
      */
-    async initGridColumns() {
-        if (this.model.detreeColumns) {
-            await Promise.all(this.model.detreeColumns.map(async (column) => this.initColumnsController(column)));
-        }
-    }
-    /**
-     * 初始化表格属性列，操作列，编辑项控制器
-     *
-     * @protected
-     * @param {IDETreeColumn} column
-     * @return {*}  {Promise<void>}
-     * @memberof GanttController
-     */
-    async initColumnsController(column) {
-        // 初始化适配器
-        const provider = await getGridColumnProvider(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;
-        // 分类存放控制器
-        if (column.columnType === 'DEFGRIDCOLUMN') {
-            this.fieldColumns[column.codeName] =
-                controller;
-        }
-        else if (column.columnType === 'UAGRIDCOLUMN') {
-            this.uaColumns[column.codeName] = controller;
-        }
-    }
-    /**
-     * 初始化表格列状态
-     *
-     * @protected
-     * @memberof GanttController
-     */
-    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'] });
-        this.calcColumnFixed();
-    }
-    /**
-     * 计算列的固定状态
-     *
-     * @protected
-     * @memberof GanttController
-     */
-    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';
-            }
-        });
+    async initService() {
+        this.service = new GanttService(this.model);
+        await this.service.init(this.context);
     }
     /**
      * 设置甘特图样式
@@ -213,218 +51,6 @@ export class GanttController extends MDControlController {
     setGanttStyle(style) {
         this.state.ganttStyle = style;
     }
-    /**
-     * 加载
-     *
-     * @author tony001
-     * @date 2023-12-12 11:12:08
-     * @param {MDCtrlLoadParams} [args={}]
-     * @return {*}  {Promise<IGanttNodeData[]>}
-     */
-    async load(args = {}) {
-        const isInitialLoad = args.isInitialLoad === true;
-        if (isInitialLoad) {
-            await this.startLoading();
-        }
-        let nodes;
-        try {
-            nodes = await this.loadNodes();
-        }
-        finally {
-            if (isInitialLoad) {
-                await this.endLoading();
-            }
-        }
-        await this.afterLoad(args, nodes);
-        this.state.isLoaded = true;
-        await this.evt.emit('onLoadSuccess', {
-            isInitialLoad,
-        });
-        return nodes;
-    }
-    /**
-     * 获取节点模型
-     *
-     * @param {string} id
-     * @return {*}  {(IDETreeNode | undefined)}
-     * @memberof GanttController
-     */
-    getNodeModel(id) {
-        var _a;
-        return (_a = this.model.detreeNodes) === null || _a === void 0 ? void 0 : _a.find(item => item.id === id);
-    }
-    /**
-     * 获取查询参数
-     *
-     * @author tony001
-     * @date 2023-12-12 11:12:22
-     * @param {IParams} [extraParams]
-     * @return {*}  {Promise<IParams>}
-     */
-    async getFetchParams(extraParams) {
-        const params = await super.getFetchParams(extraParams);
-        if (this.state.query) {
-            params.query = this.state.query;
-        }
-        return params;
-    }
-    /**
-     * 加载节点
-     *
-     * @author tony001
-     * @date 2023-12-12 11:12:33
-     * @param {IGanttNodeData} [parentNode]
-     * @return {*}  {Promise<IGanttNodeData[]>}
-     */
-    async loadNodes(parentNode) {
-        const params = await this.getFetchParams();
-        const hasQuery = !!params.query;
-        this.state.isLoading = true;
-        let nodes;
-        try {
-            // 请求服务获取子节点数据
-            nodes =
-                (await this.service.fetchGanttChildNodes(parentNode, {
-                    context: this.context.clone(),
-                    params,
-                    hasQuery,
-                    defaultExpandedKeys: [],
-                })) || [];
-        }
-        finally {
-            this.state.isLoading = false;
-        }
-        // 有父节点绑定到父节点数据上，无父节点替换rootNodes
-        if (parentNode) {
-            parentNode.children = nodes;
-        }
-        else {
-            this.state.rootNodes = nodes;
-        }
-        // 更新items
-        this.state.items = [];
-        recursiveIterate({ children: this.state.rootNodes }, (node) => {
-            this.state.items.push(node);
-        });
-        return nodes;
-    }
-    /**
-     * 甘特节点点击事件
-     *
-     * @param {IGanttNodeData} nodeData
-     * @return {*}  {Promise<void>}
-     * @memberof GanttController
-     */
-    async onGanttNodeClick(nodeData) {
-        // 单选时，单击才会触发选中逻辑
-        if (this.state.singleSelect) {
-            // 选中相关处理
-            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.mdctrlActiveMode === 1) {
-            await this.setActive(nodeData);
-        }
-    }
-    /**
-     * 甘特节点双击事件
-     *
-     * @param {IGanttNodeData} nodeData
-     * @return {*}  {Promise<void>}
-     * @memberof GanttController
-     */
-    async onDbGanttNodeClick(nodeData) {
-        if (this.state.mdctrlActiveMode === 2) {
-            await this.setActive(nodeData);
-        }
-    }
-    /**
-     * 设置激活
-     *
-     * @param {IGanttNodeData} item
-     * @return {*}  {Promise<void>}
-     * @memberof GanttController
-     */
-    setActive(item) {
-        const nodeParams = this.parseGanttNodeData(item);
-        return this.evt.emit('onActive', Object.assign(Object.assign({}, nodeParams), { nodeData: item }));
-    }
-    /**
-     * 设置选中
-     *
-     * @param {IData[]} selection
-     * @memberof GanttController
-     */
-    setSelection(selection) {
-        // 通过id过滤出原始的树节点数据，避免外部使用的时候传入的选中数据有问题。
-        const selectionIds = selection.map(item => item.id);
-        const filterArr = this.state.items.filter(item => selectionIds.includes(item.id));
-        super.setSelection(filterArr);
-    }
-    /**
-     * 执行界面行为
-     *
-     * @param {string} uiActionId
-     * @param {IGanttNodeData} nodeData
-     * @param {MouseEvent} event
-     * @param {string} appId
-     * @return {*}  {Promise<void>}
-     * @memberof GanttController
-     */
-    async doUIAction(uiActionId, nodeData, event, appId) {
-        const eventArgs = this.getEventArgs();
-        const nodeParams = this.parseGanttNodeData(nodeData);
-        const result = await UIActionUtil.exec(uiActionId, Object.assign(Object.assign(Object.assign({}, eventArgs), nodeParams), { event }), appId);
-        if (result.closeView) {
-            this.view.closeView();
-        }
-        else if (result.refresh) {
-            switch (result.refreshMode) {
-                // 刷新当前节点的子
-                case 1:
-                    this.refreshNodeChildren(nodeData);
-                    break;
-                // 刷新当前节点的父节点的子
-                case 2:
-                    this.refreshNodeChildren(nodeData, true);
-                    break;
-                // 刷新所有节点数据
-                case 3:
-                    this.refresh();
-                    break;
-                default:
-            }
-        }
-    }
-    /**
-     * 解析甘特节点获取通用数据，和完整的上下文和视图参数。
-     *
-     * @protected
-     * @param {IGanttNodeData} nodeData
-     * @return {*}  {{
-     *     data: IData[];
-     *     context: IContext;
-     *     params: IParams;
-     *   }}
-     * @memberof GanttController
-     */
-    parseGanttNodeData(nodeData) {
-        return {
-            data: [Object.assign(Object.assign({}, nodeData), (nodeData.deData || {}))],
-            context: Object.assign(this.context.clone(), nodeData.context || {}),
-            params: Object.assign(Object.assign({}, this.params), (nodeData.params || {})),
-        };
-    }
     /**
      * 转化节点数据项
      * vo -> do
@@ -479,36 +105,4 @@ export class GanttController extends MDControlController {
             }
         }
     }
-    /**
-     * 刷新指定树节点的子节点数据
-     *
-     * @param {(IGanttNodeData | IData)} nodeData 指定树节点数据，可以是节点数据，也可以是对应的实体数据
-     * @param {boolean} [refreshParent=false] 是否是刷新给定节点数据的父节点的子节点数据
-     * @return {*}  {Promise<void>}
-     * @memberof GanttController
-     */
-    async refreshNodeChildren(nodeData, refreshParent = false) {
-        const key = nodeData.srfkey ? 'srfkey' : 'id';
-        const currentNode = this.state.items.find(item => item[key] === nodeData[key]);
-        if (!currentNode) {
-            ibiz.log.error('找不到对应的树节点数据', nodeData);
-            return;
-        }
-        // 刷新父，但是没父，刷新根
-        if (refreshParent) {
-            const { parent } = currentNode;
-            // 没有父，或者父是不显示的根节点，那么刷新所有
-            if (!parent ||
-                (!this.model.rootVisible && this.state.rootNodes.includes(parent))) {
-                this.refresh();
-                return;
-            }
-        }
-        const targetNode = refreshParent ? currentNode.parent : currentNode;
-        const nodes = await this.loadNodes(targetNode);
-        this.evt.emit('onAfterRefreshParent', {
-            parentNode: targetNode,
-            children: nodes,
-        });
-    }
 }

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

@@ -33,7 +33,7 @@ export declare class GanttService extends TreeService {
      * @param {TreeFetchOpts} opts
      * @return {*}  {(Promise<IGanttNodeData[] | undefined>)}
      */
-    fetchGanttChildNodes(parentNodeData: IGanttNodeData | undefined, opts: TreeFetchOpts): Promise<IGanttNodeData[] | undefined>;
+    fetchChildNodes(parentNodeData: IGanttNodeData | undefined, opts: TreeFetchOpts): Promise<IGanttNodeData[] | undefined>;
     /**
      * 通过节点类型加载节点数据
      *
@@ -46,7 +46,7 @@ export declare class GanttService extends TreeService {
      * @param {TreeFetchOpts} opts
      * @return {*}  {Promise<IGanttNodeData[]>}
      */
-    protected fetchGanttNodeDatasByType(nodeModel: IDETreeNode, nodeRS: IDETreeNodeRS | undefined, parentNodeData: IGanttNodeData | undefined, opts: TreeFetchOpts): Promise<IGanttNodeData[]>;
+    protected fetchNodeDatasByType(nodeModel: IDETreeNode, nodeRS: IDETreeNodeRS | undefined, parentNodeData: IGanttNodeData | undefined, opts: TreeFetchOpts): Promise<IGanttNodeData[]>;
     /**
      * 获取静态节点数据
      *

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

@@ -1 +1 @@
-{"version":3,"file":"gantt.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/gantt/gantt.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAc,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAOrD;;;;;;;;GAQG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C;;;;;;;;;;OAUG;IACH,aAAa,CACX,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAShC;;;;;;;;OAQG;IACG,oBAAoB,CACxB,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,GAAG,SAAS,CAAC;IA8CxC;;;;;;;;;;;OAWG;cACa,yBAAyB,CACvC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC;IAoE5B;;;;;;;;;;;OAWG;cACa,sBAAsB,CACpC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,CAAC;IAU1B;;;;;;;;;;;OAWG;cACa,mBAAmB,CACjC,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC;IA6C5B;;;;;;;;;;;OAWG;cACa,yBAAyB,CACvC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC;CAmC7B"}
+{"version":3,"file":"gantt.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/gantt/gantt.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAc,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAOrD;;;;;;;;GAQG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C;;;;;;;;;;OAUG;IACH,aAAa,CACX,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAShC;;;;;;;;OAQG;IACG,eAAe,CACnB,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,GAAG,SAAS,CAAC;IA8CxC;;;;;;;;;;;OAWG;cACa,oBAAoB,CAClC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC;IAoE5B;;;;;;;;;;;OAWG;cACa,sBAAsB,CACpC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,CAAC;IAU1B;;;;;;;;;;;OAWG;cACa,mBAAmB,CACjC,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC;IA6C5B;;;;;;;;;;;OAWG;cACa,yBAAyB,CACvC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC;CAmC7B"}

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

@@ -36,13 +36,13 @@ export class GanttService extends TreeService {
      * @param {TreeFetchOpts} opts
      * @return {*}  {(Promise<IGanttNodeData[] | undefined>)}
      */
-    async fetchGanttChildNodes(parentNodeData, opts) {
+    async fetchChildNodes(parentNodeData, opts) {
         const { hasQuery } = opts;
         let childrenNodes = [];
         if (!parentNodeData) {
             // 没有父节点的加载根节点数据
             const rootNode = getRootNode(this.model);
-            childrenNodes = await this.fetchGanttNodeDatasByType(rootNode, undefined, undefined, opts);
+            childrenNodes = await this.fetchNodeDatasByType(rootNode, undefined, undefined, opts);
         }
         else {
             // 有父节点的计算节点关系查询对应节点数据并合并
@@ -55,7 +55,7 @@ export class GanttService extends TreeService {
             }
             const results = await handleAllSettled(childNodeRSs.map(async (childNodeRS) => {
                 const childNode = getTreeNode(this.model, childNodeRS.childDETreeNodeId);
-                return this.fetchGanttNodeDatasByType(childNode, childNodeRS, parentNodeData, opts);
+                return this.fetchNodeDatasByType(childNode, childNodeRS, parentNodeData, opts);
             }), false);
             results.forEach(result => {
                 childrenNodes.push(...result);
@@ -75,7 +75,7 @@ export class GanttService extends TreeService {
      * @param {TreeFetchOpts} opts
      * @return {*}  {Promise<IGanttNodeData[]>}
      */
-    async fetchGanttNodeDatasByType(nodeModel, nodeRS, parentNodeData, opts) {
+    async fetchNodeDatasByType(nodeModel, nodeRS, parentNodeData, opts) {
         // 有没有下级
         const leaf = getChildNodeRSs(this.model, {
             parentId: nodeModel.id,
@@ -108,7 +108,7 @@ export class GanttService extends TreeService {
                 if ((expanded && // 全展开合只展开首节点expanded都为true
                     (!expandFirstOnly || (expandFirstOnly && index === 0))) ||
                     isExpandedRoot) {
-                    const subChildrenNodes = await this.fetchGanttChildNodes(childNode, opts);
+                    const subChildrenNodes = await this.fetchChildNodes(childNode, opts);
                     childNode.children = subChildrenNodes;
                 }
             }));

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

@@ -167,10 +167,10 @@ export declare class KanbanController extends DataViewControlController<IDEKanba
     /**
      * 打开批操作工具栏
      *
-     * @param {string} groupKey
+     * @param {string | number} groupKey
      * @memberof KanbanController
      */
-    openBatch(groupKey: string): void;
+    openBatch(groupKey: string | number): void;
     /**
      * 关闭批操作工具栏
      *

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

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

package/out/controller/control/kanban/kanban.controller.js

@@ -490,7 +490,7 @@ export class KanbanController extends DataViewControlController {
     /**
      * 打开批操作工具栏
      *
-     * @param {string} groupKey
+     * @param {string | number} groupKey
      * @memberof KanbanController
      */
     openBatch(groupKey) {

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

@@ -1,5 +1,5 @@
 import { IDEList } from '@ibiz/model-core';
-import { IListState, IListEvent, IListController, IToolbarController, MDCtrlLoadParams } from '../../../interface';
+import { IListState, IListEvent, IListController, MDCtrlLoadParams } from '../../../interface';
 import { MDControlController } from '../../common';
 import { ListService } from './list.service';
 export declare class ListController extends MDControlController<IDEList, IListState, IListEvent> implements IListController {
@@ -15,35 +15,6 @@ export declare class ListController extends MDControlController<IDEList, IListSt
      * @param {string} order 排序顺序
      */
     setSort(key?: string, order?: 'asc' | 'desc'): void;
-    /**
-     * 工具栏
-     *
-     * @author zk
-     * @date 2023-08-02 06:08:34
-     * @readonly
-     * @type {(IToolbarController | undefined)}
-     * @memberof ListController
-     */
-    protected get batchToolbarController(): IToolbarController | undefined;
-    /**
-     * 工具栏
-     *
-     * @author zk
-     * @date 2023-08-02 06:08:34
-     * @readonly
-     * @type {(IToolbarController | undefined)}
-     * @memberof ListController
-     */
-    protected get quickToolbarController(): IToolbarController | undefined;
-    /**
-     * 根据数据计算工具栏权限和状态
-     *
-     * @author zk
-     * @date 2023-08-02 06:08:11
-     * @param {IData[]} selection
-     * @memberof ListController
-     */
-    setSelection(selection: IData[]): void;
     /**
      * 加载更多
      * @author lxm

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

@@ -1 +1 @@
-{"version":3,"file":"list.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAenD;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAatC;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzE;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAI7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAsBjC;;;;OAIG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAoCrD"}
+{"version":3,"file":"list.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAenD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzE;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAI7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAsBjC;;;;OAIG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAoCrD"}

package/out/controller/control/list/list.controller.js

@@ -35,47 +35,6 @@ export class ListController extends MDControlController {
             }
         }
     }
-    /**
-     * 工具栏
-     *
-     * @author zk
-     * @date 2023-08-02 06:08:34
-     * @readonly
-     * @type {(IToolbarController | undefined)}
-     * @memberof ListController
-     */
-    get batchToolbarController() {
-        const controller = this.view.getController(`${this.model.name}_batchtoolbar`);
-        return controller;
-    }
-    /**
-     * 工具栏
-     *
-     * @author zk
-     * @date 2023-08-02 06:08:34
-     * @readonly
-     * @type {(IToolbarController | undefined)}
-     * @memberof ListController
-     */
-    get quickToolbarController() {
-        const controller = this.view.getController(`${this.model.name}_quicktoolbar`);
-        return controller;
-    }
-    /**
-     * 根据数据计算工具栏权限和状态
-     *
-     * @author zk
-     * @date 2023-08-02 06:08:11
-     * @param {IData[]} selection
-     * @memberof ListController
-     */
-    setSelection(selection) {
-        var _a, _b;
-        super.setSelection(selection);
-        const data = selection === null || selection === void 0 ? void 0 : selection[0];
-        (_a = this.batchToolbarController) === null || _a === void 0 ? void 0 : _a.calcButtonState(data, this.model.appDataEntityId);
-        (_b = this.quickToolbarController) === null || _b === void 0 ? void 0 : _b.calcButtonState(data, this.model.appDataEntityId);
-    }
     /**
      * 加载更多
      * @author lxm

package/out/controller/control/md-ctrl/md-ctrl.controller.js

@@ -52,7 +52,7 @@ export class MDCtrlController extends MDControlController {
     async loadMore() {
         // 修复加载更多时，数据未加载成功 但是还是会继续加载的问题
         if (this.state.total > this.state.items.length && !this.state.isLoading) {
-            await this.load({ isLoadMore: true });
+            await this.load({ isLoadMore: true, silent: true });
         }
     }
     /**

package/out/controller/control/search-bar/index.d.ts

@@ -1,2 +1,3 @@
 export * from './search-bar.controller';
+export { SearchBarFilterController } from './search-bar-filter.controller';
 //# sourceMappingURL=index.d.ts.map