@ibiz-template/runtime 0.7.41-alpha.11 → 0.7.41-alpha.111

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

@@ -1,8 +1,8 @@
-import { awaitTimeout, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
+import { awaitTimeout, RuntimeError, recursiveIterate, } from '@ibiz-template/core';
 import { GanttService } from './gantt.service';
 import { TreeGridExController, TreeGridExRowState } from '../tree-grid-ex';
-import { Srfuf } from '../../../service';
-import { calcDeCodeNameById, getChildNodeRSs, getRootNode, } from '../../../model';
+import { Srfuf, GanttNodeLinkData, } from '../../../service';
+import { getRootNode, getChildNodeRSs, calcDeCodeNameById, } from '../../../model';
 import { TreeGridExNotifyState } from '../../constant';
 import { handleAllSettled } from '../../../utils';
 import { isValueChange } from '../../utils';
@@ -32,6 +32,8 @@ export class GanttController extends TreeGridExController {
         this.state.ganttStyle = {};
         this.state.sliderDraggable = true;
         this.state.mustShowColumns = null;
+        this.state.unit = 'day';
+        this.state.links = [];
     }
     /**
      * 部件参数解析
@@ -50,6 +52,9 @@ export class GanttController extends TreeGridExController {
         if (this.controlParams.mustshowcolumns) {
             this.state.mustShowColumns = JSON.parse(this.controlParams.mustshowcolumns);
         }
+        if (this.controlParams.unit) {
+            this.state.unit = this.controlParams.unit;
+        }
     }
     /**
      * 当数据放生变更时，若为当前应用实体数据。则多数据部件进行刷新
@@ -71,73 +76,33 @@ export class GanttController extends TreeGridExController {
         await this.service.init(this.context);
     }
     /**
-     * 设置甘特图样式
-     *
+     * @description 设置甘特图样式
      * @param {IGanttStyle} style
      * @memberof GanttController
      */
     setGanttStyle(style) {
         this.state.ganttStyle = style;
     }
-    async onCreated() {
-        await super.onCreated();
-        this.initViewScheduler();
-    }
-    /**
-     * 初始化视图触发器
-     *
-     * @protected
-     * @memberof GanttController
-     */
-    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);
-                });
-            }
-        }
-    }
     /**
-     * 设置激活数据
-     *
+     * @description 设置激活数据
      * @param {IGanttNodeData} item
-     * @return {*}  {Promise<void>}
+     * @returns {*}  {Promise<void>}
      * @memberof GanttController
      */
     async setActive(item) {
         const nodeParams = this.parseTreeNodeData(item);
         if (item._nodeType === 'DE') {
-            await this.onNodeDataActive(nodeParams);
+            const res = await this.openData(item);
+            if (!res.cancel)
+                this.refreshNodeChildren(item, true);
         }
         return this.evt.emit('onActive', Object.assign(Object.assign({}, nodeParams), { nodeData: item }));
     }
     /**
-     * 节点数据激活
-     *
-     * @param {IGanttNodeData} item
-     * @return {*}  {Promise<void>}
+     * @description 部件刷新，走初始加载(规避预置后续刷新和通知刷新同时进行)
+     * @returns {*}  {Promise<void>}
      * @memberof GanttController
      */
-    async onNodeDataActive(nodeParams) {
-        const res = await this.openData(nodeParams);
-        if (!res.cancel) {
-            this.refreshNodeChildren(nodeParams.data[0], true);
-        }
-    }
-    /**
-     * 部件刷新，走初始加载(规避预置后续刷新和通知刷新同时进行)
-     *
-     * @author ljx
-     * @date 2024-05-06 20:28:59
-     * @return {*}  {Promise<void>}
-     */
     async refresh() {
         this.doNextActive(async () => {
             const nodes = (await this.load({
@@ -152,11 +117,11 @@ export class GanttController extends TreeGridExController {
         });
     }
     /**
-     * 刷新指定树节点的子节点数据
-     *
-     * @param {(ITreeNodeData | IData)} nodeData 指定树节点数据，可以是节点数据，也可以是对应的实体数据
+     * @description 刷新指定树节点的子节点数据
+     * @param {{ _id?: string; srfkey?: string }} nodeData 指定树节点数据，可以是节点数据，也可以是对应的实体数据
      * @param {boolean} [refreshParent=false] 是否是刷新给定节点数据的父节点的子节点数据
-     * @return {*}  {Promise<void>}
+     * @returns {*}  {Promise<void>}
+     * @memberof GanttController
      */
     async refreshNodeChildren(nodeData, refreshParent = false) {
         const key = nodeData.srfkey ? 'srfkey' : '_id';
@@ -184,10 +149,10 @@ export class GanttController extends TreeGridExController {
         });
     }
     /**
-     * 处理默认展开
-     *
-     * @param {IGanttNodeData[]} data 子节点数据
-     * @return {*}  {Promise<void>}
+     * @description 处理默认展开
+     * @param {IGanttNodeData[]} data 节点数据
+     * @returns {*}  {Promise<void>}
+     * @memberof GanttController
      */
     async handleDefaultExpandNodes(data) {
         for (let i = 0; i < data.length; i++) {
@@ -201,11 +166,10 @@ export class GanttController extends TreeGridExController {
         }
     }
     /**
-     * 甘特图树节点点击事件
-     *
+     * @description 甘特图树节点点击事件
      * @param {IGanttNodeData} _nodeData
      * @param {MouseEvent} event
-     * @return {*}  {Promise<void>}
+     * @returns {*}  {Promise<void>}
      * @memberof GanttController
      */
     async onTreeNodeClick(_nodeData, event) {
@@ -246,46 +210,12 @@ export class GanttController extends TreeGridExController {
         }
     }
     /**
-     * 打开编辑数据视图
-     *
-     * @param {IGanttNodeData} item
-     * @memberof GanttController
-     */
-    async openData({ data, context, params, }) {
-        var _a, _b;
-        const nodeData = data[0];
-        const nodeModel = this.getNodeModel(nodeData._nodeId);
-        const { appDataEntityId } = nodeModel;
-        const deName = calcDeCodeNameById(appDataEntityId);
-        context[deName.toLowerCase()] = (_a = nodeData._deData) === null || _a === void 0 ? void 0 : _a.srfkey;
-        // 添加srfnavctrlid到上下文
-        context.srfnavctrlid = this.ctrlId;
-        const result = await ((_b = this.viewScheduler) === null || _b === void 0 ? void 0 : _b.triggerCustom(`${nodeModel.id.toLowerCase()}_opendata`, {
-            context,
-            params,
-            data,
-            event: undefined,
-            view: this.view,
-            ctrl: this,
-        }));
-        if (result === -1) {
-            throw new RuntimeModelError(nodeModel, ibiz.i18n.t('runtime.controller.control.calendar.missingViewLogic', {
-                itemType: nodeModel.id.toLowerCase(),
-            }));
-        }
-        else {
-            return {
-                cancel: result ? !result.ok : true,
-            };
-        }
-    }
-    /**
-     * 设置行属性的值
-     *
+     * @description 设置行属性的值
      * @param {TreeGridExRowState} row
      * @param {string} name
      * @param {unknown} value
-     * @return {*}  {Promise<void>}
+     * @param {boolean} [ignore=false]
+     * @returns {*}  {Promise<void>}
      * @memberof GanttController
      */
     async setRowValue(row, name, value, ignore = false) {
@@ -315,9 +245,10 @@ export class GanttController extends TreeGridExController {
         }
     }
     /**
-     * 修改节点时间
-     *
-     * @param {IGanttNodeData} nodeData
+     * @description 修改节点时间
+     * @param {IGanttNodeData} nodeData 节点数据
+     * @param {{ begin?: string; end?: string }} { begin, end } 开始时间，结束时间
+     * @returns {*}  {Promise<void>}
      * @memberof GanttController
      */
     async modifyNodeTime(nodeData, { begin, end }) {
@@ -334,10 +265,9 @@ export class GanttController extends TreeGridExController {
         await this.save(rowState.data);
     }
     /**
-     * 保存
-     *
-     * @param {IGanttNodeData} nodeData
-     * @return {*}  {Promise<void>}
+     * @description 保存数据
+     * @param {IGanttNodeData} nodeData 节点数据
+     * @returns {*}  {Promise<void>}
      * @memberof GanttController
      */
     async save(nodeData) {
@@ -362,7 +292,7 @@ export class GanttController extends TreeGridExController {
             return;
         }
         const nodeModel = this.getNodeModel(nodeData._nodeId);
-        const { appDataEntityId } = nodeModel;
+        const { appDataEntityId, updateAppDEActionId } = nodeModel;
         const isCreate = nodeData._deData.srfuf === Srfuf.CREATE;
         // 处理接口
         const deName = calcDeCodeNameById(appDataEntityId);
@@ -370,8 +300,9 @@ export class GanttController extends TreeGridExController {
         tempContext[deName] = nodeData._deData.srfkey;
         const app = ibiz.hub.getApp(this.context.srfappid);
         let res;
+        const updateMethodName = updateAppDEActionId || 'update';
         try {
-            res = await app.deService.exec(appDataEntityId, isCreate ? 'create' : 'update', tempContext, nodeData._deData);
+            res = await app.deService.exec(appDataEntityId, isCreate ? 'create' : updateMethodName, tempContext, nodeData._deData);
         }
         catch (error) {
             await this.evt.emit('onSaveError', undefined);
@@ -389,10 +320,9 @@ export class GanttController extends TreeGridExController {
         await this.evt.emit('onSaveSuccess', undefined);
     }
     /**
-     * 删除
-     *
+     * @description 删除
      * @param {MDCtrlRemoveParams} [args]
-     * @return {*}  {Promise<void>}
+     * @returns {*}  {Promise<void>}
      * @memberof GanttController
      */
     async remove(args) {
@@ -430,11 +360,12 @@ export class GanttController extends TreeGridExController {
                     const nodeModel = this.getNodeModel(item._nodeId);
                     // 新建未保存的数据直接走后续删除处理逻辑
                     if (nodeModel && item._deData.srfuf !== Srfuf.CREATE) {
-                        const { appDataEntityId } = nodeModel;
+                        const { appDataEntityId, removeAppDEActionId } = nodeModel;
                         const deName = calcDeCodeNameById(appDataEntityId);
                         tempContext[deName] = item.srfkey;
+                        const removeMethodName = removeAppDEActionId || 'remove';
                         // 删除后台的数据
-                        await app.deService.exec(appDataEntityId, 'remove', tempContext, params);
+                        await app.deService.exec(appDataEntityId, removeMethodName, tempContext, params);
                         if (!refreshNode && item._parent) {
                             const parentNodeData = this.getNodeData(item._parent._id);
                             refreshNode = parentNodeData;
@@ -474,8 +405,7 @@ export class GanttController extends TreeGridExController {
         await this.evt.emit('onRemoveSuccess', undefined);
     }
     /**
-     * 后台删除结束后界面删除逻辑
-     *
+     * @description 后台删除结束后界面删除逻辑
      * @param {GanttDataSetNodeData} data
      * @memberof GanttController
      */
@@ -500,10 +430,9 @@ export class GanttController extends TreeGridExController {
         }
     }
     /**
-     * 新建行
-     *
+     * @description 新建行
      * @param {MDCtrlLoadParams} [args={}]
-     * @return {*}  {Promise<void>}
+     * @returns {*}  {Promise<void>}
      * @memberof GanttController
      */
     async newRow(args = {}) {
@@ -582,8 +511,8 @@ export class GanttController extends TreeGridExController {
     }
     onDEDataChange(msg) { }
     /**
-     * @description 切换折叠
-     * @param {IData} [params={}]
+     * @description 切换折叠，tag=指定分组标识(不传则全部)，expand=目标状态(不传则反转)
+     * @param {{ tag?: string; expand?: boolean }} [params={}]
      * @memberof GanttController
      */
     changeCollapse(params = {}) {
@@ -689,4 +618,69 @@ export class GanttController extends TreeGridExController {
         }
         return columnStates;
     }
+    /**
+     * loadNodes加载完子数据之后的处理
+     * @param {IGanttNodeData[]} nodes 加载回来的子数据
+     * @return {*}  {Promise<void>}
+     */
+    async afterLoadNodes(nodes) {
+        await super.afterLoadNodes(nodes);
+        await this.updateLinks();
+    }
+    /**
+     * @description 更新链接线数据
+     * @returns {*}  {Promise<void>}
+     * @memberof GanttController
+     */
+    async updateLinks() {
+        const { linkdatasourcetype, linkappdataentityname, linkappdedatasetname, linknodedataname, fromdataitemname, todataitemname, } = this.controlParams;
+        let result = [];
+        const app = ibiz.hub.getApp(this.context.srfappid);
+        // 适配数据源模式
+        switch (linkdatasourcetype) {
+            case 'DEDATASET':
+                result = await this.service.getDEDatasByDEDataset({
+                    appDataEntityId: `${app.id}.${linkappdataentityname}`,
+                    appDEDataSetName: linkappdedatasetname,
+                    context: this.context,
+                    params: this.params,
+                });
+                break;
+            case 'NODEDATA':
+            default:
+                recursiveIterate({ _children: this.state.rootNodes }, (node) => {
+                    var _a, _b;
+                    if ((_b = (_a = node._deData) === null || _a === void 0 ? void 0 : _a[linknodedataname]) === null || _b === void 0 ? void 0 : _b.length) {
+                        result.push(...node._deData[linknodedataname]);
+                    }
+                }, { childrenFields: ['_children'] });
+                break;
+        }
+        // 处理links数据
+        const _links = [];
+        result.forEach(data => {
+            let fromData;
+            let toData;
+            this.state.items.find(_ganttNode => {
+                if (data[fromdataitemname] === _ganttNode._value)
+                    fromData = _ganttNode;
+                if (data[todataitemname] === _ganttNode._value)
+                    toData = _ganttNode;
+                if (fromData && toData)
+                    return true;
+                return false;
+            });
+            // 起始节点或结束节点不存在时不显示链接线
+            if (fromData && toData) {
+                _links.push(new GanttNodeLinkData({
+                    fromDataItemName: fromdataitemname,
+                    toDataItemName: todataitemname,
+                    fromData,
+                    toData,
+                    data,
+                }));
+            }
+        });
+        this.state.links = _links;
+    }
 }

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

@@ -84,5 +84,22 @@ export declare class GanttService extends TreeService {
      * @return {*}  {Promise<IGanttNodeData[]>}
      */
     protected getCodeListGanttNodeDatas(nodeModel: IDETreeCodeListNode, nodeRS: IDETreeNodeRS | undefined, parentNodeData: IGanttNodeData | undefined, opts: TreeFetchOpts): Promise<IGanttNodeData[]>;
+    /**
+     * @description 通过实体数据集获取实体数据
+     * @param {{
+     *     appDataEntityId: string;
+     *     appDEDataSetId: string;
+     *     context: IContext;
+     *     params: IParams;
+     *   }} opts
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof GanttService
+     */
+    getDEDatasByDEDataset(opts: {
+        appDataEntityId: string;
+        appDEDataSetName: string;
+        context: IContext;
+        params: IParams;
+    }): Promise<IData[]>;
 }
 //# sourceMappingURL=gantt.service.d.ts.map

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;AAE1B,OAAO,EAAgB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGlE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAQrD;;;;;;;;GAQG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C;;;;;;;;;OASG;IACG,YAAY,CAChB,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,CAAC;IAgC1B;;;;;;;;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;IAsE5B;;;;;;;;;;;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;IAe1B;;;;;;;;;;;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;IAmG5B;;;;;;;;;;;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;CAqC7B"}
+{"version":3,"file":"gantt.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/gantt/gantt.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAgB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGlE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAQrD;;;;;;;;GAQG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C;;;;;;;;;OASG;IACG,YAAY,CAChB,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,CAAC;IAgC1B;;;;;;;;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;IAsE5B;;;;;;;;;;;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;IAe1B;;;;;;;;;;;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;IAmG5B;;;;;;;;;;;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;IAsC5B;;;;;;;;;;OAUG;IACG,qBAAqB,CAAC,IAAI,EAAE;QAChC,eAAe,EAAE,MAAM,CAAC;QACxB,gBAAgB,EAAE,MAAM,CAAC;QACzB,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;CAyBrB"}

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

@@ -280,4 +280,32 @@ export class GanttService extends TreeService {
         }
         return [];
     }
+    /**
+     * @description 通过实体数据集获取实体数据
+     * @param {{
+     *     appDataEntityId: string;
+     *     appDEDataSetId: string;
+     *     context: IContext;
+     *     params: IParams;
+     *   }} opts
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof GanttService
+     */
+    async getDEDatasByDEDataset(opts) {
+        var _a;
+        const { appDataEntityId, appDEDataSetName, context, params } = opts;
+        const appDataEntity = await ibiz.hub.getAppDataEntity(appDataEntityId, context.srfappid);
+        const dataSet = (_a = appDataEntity.appDEMethods) === null || _a === void 0 ? void 0 : _a.find(appDEMethod => {
+            return appDEMethod.dataSetName === appDEDataSetName;
+        });
+        const fetchAction = dataSet === null || dataSet === void 0 ? void 0 : dataSet.codeName;
+        let result = [];
+        if (fetchAction && appDataEntityId) {
+            const response = await this.app.deService.exec(appDataEntityId, fetchAction, context, params);
+            if (response.ok && response.data) {
+                result = response.data;
+            }
+        }
+        return result;
+    }
 }

package/out/controller/control/grid/grid/grid-column.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-column.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid-column.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,uBAAuB,CAAC;AAE/B;;;;;;GAMG;AACH,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;OAIG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;OAIG;IACH,gBAAgB,EAAE,OAAO,CAAS;IAElC;;;;OAIG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,iBAAiB,CAAC;IAEjC;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,eAAe,CAAC;IAEvC;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,eAAe,GAAG,SAAS,CAIhD;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc;IAa1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;;OAMG;IACG,kBAAkB,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxD;;;;;;OAMG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAwCnE;;;;OAIG;IACH,aAAa,IAAI,MAAM;CAWxB"}
+{"version":3,"file":"grid-column.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid-column.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,uBAAuB,CAAC;AAE/B;;;;;;GAMG;AACH,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;OAIG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;OAIG;IACH,gBAAgB,EAAE,OAAO,CAAS;IAElC;;;;OAIG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,iBAAiB,CAAC;IAEjC;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,eAAe,CAAC;IAEvC;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,eAAe,GAAG,SAAS,CAIhD;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc;IAa1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;;OAMG;IACG,kBAAkB,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxD;;;;;;OAMG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAwCnE;;;;OAIG;IACH,aAAa,IAAI,MAAM;CAgBxB"}

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

@@ -182,8 +182,12 @@ export class GridColumnController {
      */
     getRenderCode() {
         let result = '';
-        const { controlRenders = [] } = this.model;
-        const item = controlRenders.find(renderItem => renderItem.renderType === 'LAYOUTPANEL_MODEL');
+        const { controlRenders = [], id } = this.model;
+        const item = controlRenders.find(renderItem => renderItem.renderType === 'LAYOUTPANEL_MODEL' &&
+            ![
+                `${id === null || id === void 0 ? void 0 : id.toLowerCase()}_tooltip`,
+                `${id === null || id === void 0 ? void 0 : id.toLowerCase()}_edit_tooltip`,
+            ].includes(renderItem.id));
         if (item) {
             result = item.layoutPanelModel || '';
         }

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

@@ -1,10 +1,10 @@
-import { IDEGrid, IDEGridColumn, IDEDataExport, IAppDEDataExport } from '@ibiz/model-core';
+import { IDEGrid, IDEGridColumn, IDEDataExport, IControlLogic, IAppDEDataExport } from '@ibiz/model-core';
 import { GridFieldColumnController } from '../grid-column/grid-field-column/grid-field-column.controller';
 import { GridColumnController } from './grid-column.controller';
 import { GridRowState } from './grid-row.state';
 import { GridService } from './grid.service';
 import { GridUAColumnController, GridFieldEditColumnController } from '../grid-column';
-import { IGridState, IGridEvent, CodeListItem, IColumnState, IGridRowState, IExportColumn, IGridController, MDCtrlLoadParams, ISearchGroupData, IApiMDGroupParams, IGridColumnProvider, IApiGridColumnMapping } from '../../../../interface';
+import { IGridState, IGridEvent, CodeListItem, IColumnState, IGridRowState, IExportColumn, IGridController, MDCtrlLoadParams, ISearchGroupData, IApiMDGroupParams, IGridColumnProvider, IApiGridColumnMapping, IApiExportParams } from '../../../../interface';
 import { ControlVO } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
@@ -68,6 +68,13 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @type {('default' | 'reset')}
      */
     get saveErrorHandleMode(): 'default' | 'reset';
+    /**
+     * @description 列对齐方式
+     * @readonly
+     * @type {("left" | "right" | "center")}
+     * @memberof GridController
+     */
+    get columnAlign(): 'left' | 'right' | 'center';
     /**
      * 是否有配置宽度自适应列
      *
@@ -226,6 +233,13 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @type {boolean}
      */
     get enableRowEditOrder(): boolean;
+    /**
+     * @description 自动保存的定时器引用
+     * @protected
+     * @type {unknown}
+     * @memberof GridController
+     */
+    protected autoSaveTimer?: unknown;
     protected initState(): void;
     /**
      * 初始化方法
@@ -236,6 +250,24 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @returns {*}  {Promise<void>}
      */
     protected onCreated(): Promise<void>;
+    /**
+     * @description 初始化界面行为组
+     * @protected
+     * @memberof GridController
+     */
+    protected initUIActions(): Promise<void>;
+    /**
+     * @description 初始化自动保存定时器
+     * @protected
+     * @memberof GridController
+     */
+    protected initAutoSaveTimer(): void;
+    /**
+     * @description 销毁自动保存定时器
+     * @protected
+     * @memberof GridController
+     */
+    protected destroyAutoSaveTimer(): void;
     /**
      * 计算表格展示模式
      * @author fzh
@@ -274,14 +306,14 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @return {*}  {Promise<void>}
      */
     protected initGroup(): Promise<void>;
+    afterLoad(args: MDCtrlLoadParams, items: ControlVO[]): Promise<ControlVO[]>;
     /**
-     * 本地排序items
-     * @author zzq
-     * @date 2024-04-22 19:30:55
-     * @param {IData[]} items
+     * @description 处理刷新模式
+     * @protected
+     * @param {MDCtrlLoadParams} args
+     * @memberof GridController
      */
-    sortItems(items: IData[]): void;
-    afterLoad(args: MDCtrlLoadParams, items: ControlVO[]): Promise<ControlVO[]>;
+    protected handleRefreshMode(args: MDCtrlLoadParams): void;
     /**
      * 更新行状态
      * @param rows
@@ -328,12 +360,12 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      */
     afterRemove(data: IData): void;
     /**
-     * 新建行
-     *
-     * @author lxm
-     * @date 2022-09-06 21:09:05
+     * @description 新建行
+     * @param {MDCtrlLoadParams} [args]
+     * @returns {*}  {Promise<void>}
+     * @memberof GridController
      */
-    newRow(): Promise<void>;
+    newRow(args?: MDCtrlLoadParams): Promise<void>;
     /**
      * 保存
      *
@@ -352,6 +384,13 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @protected
      */
     protected initColumnsController(column: IDEGridColumn): Promise<void>;
+    /**
+     * 初始化部件逻辑调度器
+     * @param {IControlLogic[]} logics
+     * @return {*}  {void}
+     * @protected
+     */
+    protected initControlScheduler(logics?: IControlLogic[]): void;
     /**
      * 初始化表格列状态
      * @author lxm
@@ -509,20 +548,20 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @author: zzq
      * @Date: 2024-03-20 17:54:16
      */
-    getExportData(params: IData): Promise<IData[]>;
+    getExportData(params: IApiExportParams): Promise<IData[]>;
     /**
      * @description 执行后台导出
      * @param params 额外参数
      */
-    excuteBackendExport(params: IData): Promise<void>;
+    excuteBackendExport(params: IApiExportParams): Promise<void>;
     /**
      * @description 导出数据
-     * @param {{  event: MouseEvent; params: IData }} args
+     * @param {{  event: MouseEvent; params: IApiExportParams }} args
      * @returns {*}  {Promise<void>}
      * @memberof GridController
      */
     exportData(args: {
-        params: IData;
+        params: IApiExportParams;
         event: MouseEvent;
     }): Promise<void>;
     /**
@@ -617,13 +656,6 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @param dropType 放置类型
      */
     onDragChange(dragging: IGridRowState, drop: IGridRowState, dropType: 'prev' | 'next'): Promise<void>;
-    /**
-     * 更新改变项数据
-     * @author: zzq
-     * @date 2024-04-22 17:12:58
-     * @return {*}  {Promise<void>}
-     */
-    updateChangedItems(changedItems: ControlVO[]): Promise<void>;
     /**
      * 计算统计数据
      * @author: zzq
@@ -632,12 +664,22 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      */
     calcTotalData(): void;
     /**
-     * 切换行展开
+     * 切换折叠(分组表格使用),tag=指定分组标识(不传则全部)，expand=目标状态(不传则反转)
      * @author: zzq
      * @date 2024-08-23 17:12:58
      * @return {*}  {void}
      */
-    changeCollapse(params?: IData): void;
+    changeCollapse(params?: {
+        tag?: string;
+        expand?: boolean;
+    }): void;
+    /**
+     * @description 展开改变
+     * @param {IData} item
+     * @param {boolean} expanded
+     * @memberof TreeGridController
+     */
+    expandChange(item: IData, expanded: boolean): void;
     /**
      * @description 获取表格列
      * @template K
@@ -647,5 +689,12 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @memberof IApiGridController
      */
     getGridColumn<K extends keyof IApiGridColumnMapping>(type: K, id: string): IApiGridColumnMapping[K];
+    /**
+     * @description 生命周期-销毁完成
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof GridController
+     */
+    protected onDestroyed(): Promise<void>;
 }
 //# sourceMappingURL=grid.controller.d.ts.map