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

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

@@ -1,10 +1,11 @@
 /* eslint-disable no-param-reassign */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { plus, DataTypes, EntityError, awaitTimeout, RuntimeError, recursiveIterate, RuntimeModelError, mergeDefaultInLeft, debounceAndAsyncMerge, } from '@ibiz-template/core';
-import { clone, isNil } from 'ramda';
+import { clone } from 'ramda';
 import dayjs from 'dayjs';
 import { GridRowState } from './grid-row.state';
 import { GridService } from './grid.service';
-import { calcDeCodeNameById } from '../../../../model';
+import { calcDeCodeNameById, calcAllUIActionDetails } from '../../../../model';
 import { getGridColumnProvider, getAutoGridColumnProvider, } from '../../../../register';
 import { Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
@@ -112,7 +113,7 @@ export class GridController extends MDControlController {
          * 数据导出列
          * @author lxm
          * @date 2023-08-07 04:11:00
-         * @type {IDEDataExport}
+         * @type {IAppDEDataExport}
          */
         this.allExportColumns = [];
         /**
@@ -275,6 +276,7 @@ export class GridController extends MDControlController {
         this.state.hideHeader = hideHeader;
         this.state.enablePagingBar = enablePagingBar;
         this.state.simpleData = [];
+        this.state.expandRowKeys = [];
     }
     /**
      * 初始化方法
@@ -288,7 +290,7 @@ export class GridController extends MDControlController {
         this.addSchemaColumn = this.controlParams.enablejsonschema === 'true';
         const jsonSchemaParams = JSON.parse(this.controlParams.jsonschemaparams || '{}');
         this.jsonSchemaParams = convertNavData(jsonSchemaParams, this.params, this.context);
-        this.percentkeys = this.controlParams.percentkeys || [];
+        this.percentkeys = JSON.parse(this.controlParams.percentkeys || '[]');
         await this.initByEntitySchema();
         await super.onCreated();
         this.service = new GridService(this.model);
@@ -303,6 +305,50 @@ export class GridController extends MDControlController {
         await this.initGroup();
         // 初始化数据导出对象
         await this.initExportData();
+        this.initAutoSaveTimer();
+    }
+    /**
+     * @description 初始化界面行为组
+     * @protected
+     * @memberof GridController
+     */
+    async initUIActions() {
+        // 收集所有遍历过程中的异步任务
+        const asyncTasks = [];
+        // 遍历所有列，计算属性列界面行为组与操作列界面行为组
+        recursiveIterate(this.model, (column) => {
+            var _a, _b;
+            if ((_b = (_a = column.deuiactionGroup) === null || _a === void 0 ? void 0 : _a.uiactionGroupDetails) === null || _b === void 0 ? void 0 : _b.length) {
+                const task = calcAllUIActionDetails(column.deuiactionGroup.uiactionGroupDetails, this.context, this.params);
+                asyncTasks.push(task);
+            }
+        }, { childrenFields: ['degridColumns'] });
+        await Promise.all(asyncTasks);
+    }
+    /**
+     * @description 初始化自动保存定时器
+     * @protected
+     * @memberof GridController
+     */
+    initAutoSaveTimer() {
+        if (this.editSaveMode !== 'auto')
+            return;
+        this.destroyAutoSaveTimer();
+        this.autoSaveTimer = setInterval(() => {
+            // 该方法只会保存修改过的行数据
+            this.saveAll();
+        }, 3000);
+    }
+    /**
+     * @description 销毁自动保存定时器
+     * @protected
+     * @memberof GridController
+     */
+    destroyAutoSaveTimer() {
+        if (this.autoSaveTimer) {
+            clearInterval(this.autoSaveTimer);
+            this.autoSaveTimer = undefined;
+        }
     }
     /**
      * 计算表格展示模式
@@ -475,38 +521,7 @@ export class GridController extends MDControlController {
         }
         this.calcColumnFixed();
     }
-    /**
-     * 本地排序items
-     * @author zzq
-     * @date 2024-04-22 19:30:55
-     * @param {IData[]} items
-     */
-    sortItems(items) {
-        const sortField = this.model.orderValueAppDEFieldId;
-        if (!sortField || !this.enableRowEditOrder) {
-            return;
-        }
-        // 格式化排序属性的值
-        items.forEach(item => {
-            const sortValue = item[sortField];
-            if (isNil(sortValue)) {
-                item[sortField] = 0;
-            }
-            else {
-                const toNum = Number(sortValue);
-                if (Number.isNaN(toNum)) {
-                    throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.grid.convertedValue', {
-                        srfmajortext: item.srfmajortext,
-                    }));
-                }
-            }
-        });
-        // 排序,本地排序默认升序
-        items.sort((a, b) => a[sortField] - b[sortField]);
-    }
     async afterLoad(args, items) {
-        // 每次加载回来先本地排序，把数据的排序属性规范一下
-        this.sortItems(this.state.items);
         await super.afterLoad(args, items);
         // 每次表格刷新时通知表格属性列,加载代码表,避免动态代码表更新不及时
         await handleAllSettled(Object.values(this.fieldColumns).map(async (fieldColumn) => {
@@ -533,6 +548,17 @@ export class GridController extends MDControlController {
         this.calcTotalData();
         return items;
     }
+    /**
+     * @description 处理刷新模式
+     * @protected
+     * @param {MDCtrlLoadParams} args
+     * @memberof GridController
+     */
+    handleRefreshMode(args) {
+        super.handleRefreshMode(args);
+        if (args.isInitialLoad || this.refreshMode === 'nocache')
+            this.state.expandRowKeys = [];
+    }
     /**
      * 更新行状态
      * @param rows
@@ -614,8 +640,10 @@ export class GridController extends MDControlController {
                 var _a;
                 const codeListItem = (_a = this.groupCodeListItems) === null || _a === void 0 ? void 0 : _a.find(item => item.value === key);
                 this.state.groups.push({
-                    caption: (codeListItem === null || codeListItem === void 0 ? void 0 : codeListItem.text) || `${key}`,
-                    key,
+                    caption: (codeListItem === null || codeListItem === void 0 ? void 0 : codeListItem.text) ||
+                        key ||
+                        ibiz.i18n.t('runtime.controller.common.md.unclassified'),
+                    key: `${key}`,
                     children: value,
                 });
             });
@@ -659,10 +687,7 @@ export class GridController extends MDControlController {
      */
     calcAggResult(items) {
         Object.values(this.fieldColumns).forEach(column => {
-            const result = column.calcFieldAgg(items);
-            if (result) {
-                this.state.aggResult[column.model.id] = result;
-            }
+            this.state.aggResult[column.model.id] = column.calcFieldAgg(items);
         });
     }
     /**
@@ -688,12 +713,12 @@ export class GridController extends MDControlController {
         });
     }
     /**
-     * 新建行
-     *
-     * @author lxm
-     * @date 2022-09-06 21:09:05
+     * @description 新建行
+     * @param {MDCtrlLoadParams} [args]
+     * @returns {*}  {Promise<void>}
+     * @memberof GridController
      */
-    async newRow() {
+    async newRow(args = {}) {
         if (this.state.isAutoGrid) {
             await newRowDynamic(this);
             return;
@@ -853,6 +878,22 @@ export class GridController extends MDControlController {
             })) || []);
         }
     }
+    /**
+     * 初始化部件逻辑调度器
+     * @param {IControlLogic[]} logics
+     * @return {*}  {void}
+     * @protected
+     */
+    initControlScheduler(logics = []) {
+        const actualLogics = [...logics];
+        // 遍历所有的项，如果有逻辑的话加入
+        recursiveIterate(this.model, (item) => {
+            if (item.controlLogics) {
+                actualLogics.push(...item.controlLogics);
+            }
+        }, { childrenFields: ['degridColumns'] });
+        super.initControlScheduler(actualLogics);
+    }
     /**
      * 初始化表格列状态
      * @author lxm
@@ -1393,7 +1434,7 @@ export class GridController extends MDControlController {
     }
     /**
      * @description 导出数据
-     * @param {{  event: MouseEvent; params: IData }} args
+     * @param {{  event: MouseEvent; params: IApiExportParams }} args
      * @returns {*}  {Promise<void>}
      * @memberof GridController
      */
@@ -1451,7 +1492,26 @@ export class GridController extends MDControlController {
     findRowStateIndex(data) {
         const isCreate = data.srfuf === Srfuf.CREATE;
         const compareKey = isCreate ? 'tempsrfkey' : 'srfkey';
-        return this.state.rows.findIndex(item => item.data[compareKey] === data[compareKey]);
+        // 识别联合主键场景，unionkeys参数以|分割，同一条数据关联多个版本情况
+        const unionKeys = this.controlParams.unionkeys
+            ? this.controlParams.unionkeys.split('|')
+            : undefined;
+        return this.state.rows.findIndex(item => {
+            if (unionKeys) {
+                let result = item.data[compareKey] === data[compareKey];
+                if (!result)
+                    return false;
+                for (let i = 0; i < unionKeys.length; i++) {
+                    const tempResult = item.data[unionKeys[i]] === data[unionKeys[i]];
+                    if (!tempResult) {
+                        return false;
+                    }
+                    result = result && tempResult;
+                }
+                return result;
+            }
+            return item.data[compareKey] === data[compareKey];
+        });
     }
     /**
      * 查找rowState
@@ -1653,32 +1713,6 @@ export class GridController extends MDControlController {
             await this.refresh();
         }
     }
-    /**
-     * 更新改变项数据
-     * @author: zzq
-     * @date 2024-04-22 17:12:58
-     * @return {*}  {Promise<void>}
-     */
-    async updateChangedItems(changedItems) {
-        try {
-            await Promise.all(changedItems.map(async (item) => {
-                // 往上下文添加主键
-                const deName = calcDeCodeNameById(this.model.appDataEntityId);
-                const tempContext = this.context.clone();
-                tempContext[deName] = item.srfkey;
-                // 调用接口修改数据
-                const res = await this.service.update(tempContext, item);
-                // 更新完之后更新state里的数据。
-                if (res.data) {
-                    const index = this.state.items.findIndex(x => x.srfkey === item.srfkey);
-                    this.state.items.splice(index, 1, res.data);
-                }
-            }));
-        }
-        finally {
-            await this.afterLoad({}, this.state.items);
-        }
-    }
     /**
      * 计算统计数据
      * @author: zzq
@@ -1705,7 +1739,7 @@ export class GridController extends MDControlController {
         this.state.totalResult = totalResult;
     }
     /**
-     * 切换行展开
+     * 切换折叠(分组表格使用),其中tag表示操作指定表格分组行标识，若不传则操作当前表格的所有分组展开状态，expand表示是否展开，若不传则以当前分组状态为基准切换
      * @author: zzq
      * @date 2024-08-23 17:12:58
      * @return {*}  {void}
@@ -1730,4 +1764,40 @@ export class GridController extends MDControlController {
             });
         }
     }
+    /**
+     * @description 展开改变
+     * @param {IData} item
+     * @param {boolean} expanded
+     * @memberof TreeGridController
+     */
+    expandChange(item, expanded) {
+        const index = this.state.expandRowKeys.findIndex(key => key === item.srfkey);
+        if (index === -1 && expanded) {
+            this.state.expandRowKeys.push(item.srfkey);
+        }
+        else if (index > -1 && !expanded) {
+            this.state.expandRowKeys.splice(index, 1);
+        }
+    }
+    /**
+     * @description 获取表格列
+     * @template K
+     * @param {K} type 表格列类型
+     * @param {string} id 表格列标识
+     * @returns {*}  {IApiGridColumnMapping[K]}
+     * @memberof IApiGridController
+     */
+    getGridColumn(type, id) {
+        return this.columns[id];
+    }
+    /**
+     * @description 生命周期-销毁完成
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof GridController
+     */
+    async onDestroyed() {
+        await super.onDestroyed();
+        this.destroyAutoSaveTimer();
+    }
 }

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

@@ -1,14 +1,15 @@
 import { IAppCodeList, IDEGridFieldColumn, IUIActionGroupDetail } from '@ibiz/model-core';
-import { CodeListItem } from '../../../../../interface';
+import { CodeListItem, IApiGridFieldColumnController } from '../../../../../interface';
 import { GridColumnController } from '../../grid/grid-column.controller';
 import { GridRowState } from '../../grid/grid-row.state';
 /**
- * 表格属性列控制器
- * @return {*}
- * @author: zhujiamin
- * @Date: 2022-09-01 18:25:20
+ * @description 表格属性列控制器
+ * @export
+ * @class GridFieldColumnController
+ * @extends {GridColumnController<IDEGridFieldColumn>}
+ * @implements {IApiGridFieldColumnController}
  */
-export declare class GridFieldColumnController extends GridColumnController<IDEGridFieldColumn> {
+export declare class GridFieldColumnController extends GridColumnController<IDEGridFieldColumn> implements IApiGridFieldColumnController {
     /**
      * 代码表项
      *
@@ -33,7 +34,7 @@ export declare class GridFieldColumnController extends GridColumnController<IDEG
      */
     get isLinkColumn(): boolean;
     /**
-     * 是否有触发界面行为
+     * 是否可触发界面行为
      *
      * @author lxm
      * @date 2022-12-08 14:12:37
@@ -149,9 +150,9 @@ export declare class GridFieldColumnController extends GridColumnController<IDEG
      *
      * @author zk
      * @date 2023-12-15 11:12:01
-     * @param {IUIActionGroupDetail} detail
-     * @param {GridRowState} row
-     * @param {MouseEvent} event
+     * @param {IUIActionGroupDetail} detail 界面行为组成员
+     * @param {GridRowState} row 行数据
+     * @param {MouseEvent} event 鼠标事件
      * @return {*}  {Promise<void>}
      * @memberof GridFieldColumnController
      */

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

@@ -1 +1 @@
-{"version":3,"file":"grid-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AASpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,kBAAkB,CAAC;IACrF;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAa;IAE/C;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;OAKG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;cAEe,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAcvC;;;;;;OAMG;IACG,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAQvD;;;;;;OAMG;cACa,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBjD;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAqBzC;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAKrC;;;;;OAKG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAoBzC;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAuDvE;;;;;;;;OAQG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBxE;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC;IAqBnE;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,SAAS;IA8FhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;IA4BxC;;;;;;;;;;OAUG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAejB"}
+{"version":3,"file":"grid-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EAEL,YAAY,EACZ,6BAA6B,EAC9B,MAAM,0BAA0B,CAAC;AASlC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD;;;;;;GAMG;AACH,qBAAa,yBACX,SAAQ,oBAAoB,CAAC,kBAAkB,CAC/C,YAAW,6BAA6B;IAExC;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAa;IAE/C;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;OAKG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;cAEe,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAcvC;;;;;;OAMG;IACG,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAQvD;;;;;;OAMG;cACa,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBjD;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAqBzC;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAKrC;;;;;OAKG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAoBzC;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAuDvE;;;;;;;;OAQG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBxE;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC;IAqBnE;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,SAAS;IA+FhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;IA4BxC;;;;;;;;;;OAUG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAejB"}

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

@@ -5,17 +5,18 @@ import { debounce } from 'lodash-es';
 import { clone, isNil } from 'ramda';
 import { isNilOrEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../../../../command';
-import { parseUserParams } from '../../../../../model';
+import { getAllUIActionItems, parseUserParams } from '../../../../../model';
 import { UIActionUtil } from '../../../../../ui-action';
 import { convertNavData, getWFContext } from '../../../../../utils';
 import { ValueExUtil, UIActionButtonState, ButtonContainerState, } from '../../../../utils';
 import { GridColumnController } from '../../grid/grid-column.controller';
 import { getEditorProvider } from '../../../../../register';
 /**
- * 表格属性列控制器
- * @return {*}
- * @author: zhujiamin
- * @Date: 2022-09-01 18:25:20
+ * @description 表格属性列控制器
+ * @export
+ * @class GridFieldColumnController
+ * @extends {GridColumnController<IDEGridFieldColumn>}
+ * @implements {IApiGridFieldColumnController}
  */
 export class GridFieldColumnController extends GridColumnController {
     constructor() {
@@ -39,7 +40,7 @@ export class GridFieldColumnController extends GridColumnController {
         return !!this.model.enableLinkView && !!this.model.linkAppViewId;
     }
     /**
-     * 是否有触发界面行为
+     * 是否可触发界面行为
      *
      * @author lxm
      * @date 2022-12-08 14:12:37
@@ -121,19 +122,21 @@ export class GridFieldColumnController extends GridColumnController {
      * @param {GridRowState} row
      */
     initActionStates(row) {
+        var _a;
         // 属性列界面行为按钮状态
         const { deuiactionGroup } = this.model;
-        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.grid.context.srfappid, actionid, detail);
-                    containerState.addState(detail.id, buttonState);
-                }
-            });
-            row.uiActionGroupStates[this.model.codeName] = 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.grid.context.srfappid, actionid, detail);
+                containerState.addState(detail.id, buttonState);
+            }
+        });
+        row.uiActionGroupStates[this.model.codeName] = containerState;
     }
     /**
      * 行是否可点击（影响列的界面样式）
@@ -273,7 +276,9 @@ export class GridFieldColumnController extends GridColumnController {
             if (!this.grid.state.remoteAggResult) {
                 return;
             }
-            aggValue = this.grid.state.remoteAggResult[fieldName] || '';
+            aggValue = this.grid.state.remoteAggResult[fieldName];
+            if (isNil(aggValue))
+                aggValue = '';
         }
         else {
             // 无聚合配置的列，返回undefined
@@ -375,9 +380,9 @@ export class GridFieldColumnController extends GridColumnController {
      *
      * @author zk
      * @date 2023-12-15 11:12:01
-     * @param {IUIActionGroupDetail} detail
-     * @param {GridRowState} row
-     * @param {MouseEvent} event
+     * @param {IUIActionGroupDetail} detail 界面行为组成员
+     * @param {GridRowState} row 行数据
+     * @param {MouseEvent} event 鼠标事件
      * @return {*}  {Promise<void>}
      * @memberof GridFieldColumnController
      */

package/out/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.d.ts

@@ -1,15 +1,17 @@
 import { IDEGridEditItem } from '@ibiz/model-core';
-import { IEditorContainerController, IEditorController, IEditorProvider } from '../../../../../interface';
+import { IApiGridFieldEditColumnController, IEditorContainerController, IEditorController, IEditorProvider } from '../../../../../interface';
 import { GridNotifyState } from '../../../../constant';
 import { GridRowState } from '../../grid/grid-row.state';
 import { GridFieldColumnController } from '../grid-field-column';
 /**
- * 表格属性列(开启行编辑)控制器
- * @return {*}
- * @author: zhujiamin
- * @Date: 2022-09-01 18:25:20
+ * @description 表格编辑列控制器
+ * @export
+ * @class GridFieldEditColumnController
+ * @extends {GridFieldColumnController}
+ * @implements {IEditorContainerController}
+ * @implements {IApiGridFieldEditColumnController}
  */
-export declare class GridFieldEditColumnController extends GridFieldColumnController implements IEditorContainerController {
+export declare class GridFieldEditColumnController extends GridFieldColumnController implements IEditorContainerController, IApiGridFieldEditColumnController {
     /**
      * 表格编辑项模型
      *
@@ -98,7 +100,7 @@ export declare class GridFieldEditColumnController extends GridFieldColumnContro
      *
      * @author lxm
      * @date 2022-08-24 10:08:40
-     * @param {GridRowState} row 行状态控制器
+     * @param {GridRowState} row 行状态对象
      * @param {unknown} value 要设置的值
      * @param {string} name 要设置的表单数据的属性名称
      * @param {boolean} ignore 忽略脏值检查
@@ -151,8 +153,7 @@ export declare class GridFieldEditColumnController extends GridFieldColumnContro
      */
     calcEnableCond(row: GridRowState): boolean;
     /**
-     * 表格编辑项值规则校验
-     * 如果表格编辑项不显示则不校验直接返回true
+     * 表格编辑项值规则校验（如果表格编辑项不显示则不校验直接返回true）
      *
      * @author lxm
      * @date 2022-09-01 22:09:29

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

@@ -1 +1 @@
-{"version":3,"file":"grid-field-edit-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGrE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,6BACX,SAAQ,yBACR,YAAW,0BAA0B;IAErC;;;;;;OAMG;IACH,QAAQ,EAAG,eAAe,CAAC;IAE3B;;;;;;OAMG;IACH,MAAM,EAAG,iBAAiB,CAAC;IAE3B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;;;OASG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAuDzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAMjE;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAiB3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAgB3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAQ3C;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAe1C;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CAgCpD"}
+{"version":3,"file":"grid-field-edit-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGrE,OAAO,EACL,iCAAiC,EACjC,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEjE;;;;;;;GAOG;AACH,qBAAa,6BACX,SAAQ,yBACR,YAAW,0BAA0B,EAAE,iCAAiC;IAExE;;;;;;OAMG;IACH,QAAQ,EAAG,eAAe,CAAC;IAE3B;;;;;;OAMG;IACH,MAAM,EAAG,iBAAiB,CAAC;IAE3B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;;;OASG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAuDzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAMjE;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAiB3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAgB3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAQ3C;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAe1C;;;;;OAKG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CAgCpD"}

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

@@ -9,10 +9,12 @@ import { filterValueRules } from '../../../../../utils';
 import { generateEditorRules, generateRules } from '../../../../utils';
 import { GridFieldColumnController } from '../grid-field-column';
 /**
- * 表格属性列(开启行编辑)控制器
- * @return {*}
- * @author: zhujiamin
- * @Date: 2022-09-01 18:25:20
+ * @description 表格编辑列控制器
+ * @export
+ * @class GridFieldEditColumnController
+ * @extends {GridFieldColumnController}
+ * @implements {IEditorContainerController}
+ * @implements {IApiGridFieldEditColumnController}
  */
 export class GridFieldEditColumnController extends GridFieldColumnController {
     constructor() {
@@ -110,7 +112,7 @@ export class GridFieldEditColumnController extends GridFieldColumnController {
      *
      * @author lxm
      * @date 2022-08-24 10:08:40
-     * @param {GridRowState} row 行状态控制器
+     * @param {GridRowState} row 行状态对象
      * @param {unknown} value 要设置的值
      * @param {string} name 要设置的表单数据的属性名称
      * @param {boolean} ignore 忽略脏值检查
@@ -255,8 +257,7 @@ export class GridFieldEditColumnController extends GridFieldColumnController {
         }
     }
     /**
-     * 表格编辑项值规则校验
-     * 如果表格编辑项不显示则不校验直接返回true
+     * 表格编辑项值规则校验（如果表格编辑项不显示则不校验直接返回true）
      *
      * @author lxm
      * @date 2022-09-01 22:09:29

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

@@ -1,11 +1,13 @@
 import { IDEGridGroupColumn } from '@ibiz/model-core';
 import { GridColumnController } from '../../grid/grid-column.controller';
+import { IApiGridGroupColumnController } from '../../../../../interface';
 /**
- * 表格分组列控制器
- * @return {*}
- * @author: zhujiamin
- * @Date: 2022-09-01 18:25:20
+ * @description 表格分组列控制器
+ * @export
+ * @class GridGroupColumnController
+ * @extends {GridColumnController<IDEGridGroupColumn>}
+ * @implements {IApiGridGroupColumnController}
  */
-export declare class GridGroupColumnController extends GridColumnController<IDEGridGroupColumn> {
+export declare class GridGroupColumnController extends GridColumnController<IDEGridGroupColumn> implements IApiGridGroupColumnController {
 }
 //# sourceMappingURL=grid-group-column.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"grid-group-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-group-column/grid-group-column.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,kBAAkB,CAAC;CAAG"}
+{"version":3,"file":"grid-group-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-group-column/grid-group-column.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AAEzE;;;;;;GAMG;AACH,qBAAa,yBACX,SAAQ,oBAAoB,CAAC,kBAAkB,CAC/C,YAAW,6BAA6B;CAAG"}

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

@@ -1,9 +1,10 @@
 import { GridColumnController } from '../../grid/grid-column.controller';
 /**
- * 表格分组列控制器
- * @return {*}
- * @author: zhujiamin
- * @Date: 2022-09-01 18:25:20
+ * @description 表格分组列控制器
+ * @export
+ * @class GridGroupColumnController
+ * @extends {GridColumnController<IDEGridGroupColumn>}
+ * @implements {IApiGridGroupColumnController}
  */
 export class GridGroupColumnController extends GridColumnController {
 }

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

@@ -1,13 +1,15 @@
 import { IDEGridUAColumn, IUIActionGroupDetail } from '@ibiz/model-core';
 import { GridColumnController } from '../../grid/grid-column.controller';
 import { GridRowState } from '../../grid/grid-row.state';
+import { IApiGridUAColumnController } from '../../../../../interface';
 /**
- * 表格操作列控制器
- * @return {*}
- * @author: zhujiamin
- * @Date: 2022-09-01 18:25:20
+ * @description 表格操作列控制器
+ * @export
+ * @class GridUAColumnController
+ * @extends {GridColumnController<IDEGridUAColumn>}
+ * @implements {IApiGridUAColumnController}
  */
-export declare class GridUAColumnController extends GridColumnController<IDEGridUAColumn> {
+export declare class GridUAColumnController extends GridColumnController<IDEGridUAColumn> implements IApiGridUAColumnController {
     /**
      * 给rowController初始化操作列的状态
      *
@@ -17,12 +19,12 @@ export declare class GridUAColumnController extends GridColumnController<IDEGrid
      */
     initActionStates(row: GridRowState): void;
     /**
-     * 触发操作列点击事件
-     *
-     * @author lxm
-     * @date 2022-09-07 22:09:46
-     * @param {IPSUIActionGroupDetail} detail
+     * @description 触发界面行为
+     * @param {IUIActionGroupDetail} detail
+     * @param {GridRowState} row
      * @param {MouseEvent} event
+     * @returns {*}  {Promise<void>}
+     * @memberof GridUAColumnController
      */
     onActionClick(detail: IUIActionGroupDetail, row: GridRowState, event: MouseEvent): Promise<void>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"grid-ua-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-ua-column/grid-ua-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAGzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;GAKG;AACH,qBAAa,sBAAuB,SAAQ,oBAAoB,CAAC,eAAe,CAAC;IAC/E;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IA+BzC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAejB"}
+{"version":3,"file":"grid-ua-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-ua-column/grid-ua-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAGzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAGtE;;;;;;GAMG;AACH,qBAAa,sBACX,SAAQ,oBAAoB,CAAC,eAAe,CAC5C,YAAW,0BAA0B;IAErC;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAgCzC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAejB"}