@ibiz-template/runtime 0.7.41-alpha.8 → 0.7.41-alpha.80

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

@@ -1,10 +1,10 @@
-import { IDEGrid, IDEGridColumn, IDEDataExport } 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 } 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';
@@ -172,14 +172,14 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * 数据导出对象
      * @author lxm
      * @date 2023-08-07 04:11:00
-     * @type {IDEDataExport}
+     * @type {IAppDEDataExport}
      */
-    dataExport: IDEDataExport | undefined;
+    dataExport: IAppDEDataExport | undefined;
     /**
      * 数据导出列
      * @author lxm
      * @date 2023-08-07 04:11:00
-     * @type {IDEDataExport}
+     * @type {IAppDEDataExport}
      */
     allExportColumns: IExportColumn[];
     /**
@@ -226,6 +226,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 +243,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 +299,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 +353,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 +377,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 +541,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 +649,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,11 +657,37 @@ 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
+     * @param {K} type 表格列类型
+     * @param {string} id 表格列标识
+     * @returns {*}  {IApiGridColumnMapping[K]}
+     * @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

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

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

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

@@ -1,15 +1,17 @@
+/* eslint-disable eqeqeq */
 /* 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, calcUIActionGroup } from '../../../../model';
 import { getGridColumnProvider, getAutoGridColumnProvider, } from '../../../../register';
 import { Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
-import { exportData, ValueExUtil, isValueChange, getDefaultValue, getEntitySchema, } from '../../../utils';
+import { ValueExUtil, isValueChange, getDefaultValue, getEntitySchema, } from '../../../utils';
 import { ScriptFactory, convertNavData, handleAllSettled, } from '../../../../utils';
 import { calcColumnModelBySchema } from './entity-schema';
 import { newRowDynamic, switchRowEditDynamic, initModelByEntitySchema, } from './auto-grid.util';
@@ -112,7 +114,7 @@ export class GridController extends MDControlController {
          * 数据导出列
          * @author lxm
          * @date 2023-08-07 04:11:00
-         * @type {IDEDataExport}
+         * @type {IAppDEDataExport}
          */
         this.allExportColumns = [];
         /**
@@ -275,6 +277,7 @@ export class GridController extends MDControlController {
         this.state.hideHeader = hideHeader;
         this.state.enablePagingBar = enablePagingBar;
         this.state.simpleData = [];
+        this.state.expandRowKeys = [];
     }
     /**
      * 初始化方法
@@ -288,7 +291,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 +306,49 @@ 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) => {
+            if (column.deuiactionGroup) {
+                const task = calcUIActionGroup(column.deuiactionGroup, 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
@@ -1286,8 +1327,20 @@ export class GridController extends MDControlController {
                     value = ValueExUtil.toText(fieldColumnC.model, value);
                 }
                 if (this.allExportCodelistMap.get(key)) {
-                    value =
-                        ((_b = this.allExportCodelistMap.get(key).find(x => x.value === item[key])) === null || _b === void 0 ? void 0 : _b.text) || value;
+                    // fix: 修复多选的代码表项未正常转换
+                    const codelist = fieldColumnC.codeList;
+                    const getVal = (val) => {
+                        var _a;
+                        return (((_a = this.allExportCodelistMap.get(key).find(x => x.value == val)) === null || _a === void 0 ? void 0 : _a.text) || val);
+                    };
+                    if (codelist && codelist.valueSeparator) {
+                        const textSeparator = codelist.textSeparator || codelist.valueSeparator || ',';
+                        const values = (_b = item[key]) === null || _b === void 0 ? void 0 : _b.split(codelist.valueSeparator);
+                        value = values === null || values === void 0 ? void 0 : values.map(v => getVal(v)).join(textSeparator);
+                    }
+                    else {
+                        value = getVal(item[key]);
+                    }
                 }
                 else {
                     value = this.formatValue(isDate, format, value) + unitName;
@@ -1372,28 +1425,11 @@ export class GridController extends MDControlController {
         }
         Object.assign(fetchParams, tempParams);
         // 执行导出
-        const res = await this.service.exportData(this.dataExport, this.context, fetchParams);
-        if (res.status === 200) {
-            const fileName = ibiz.util.file.getFileName(res);
-            const blob = new Blob([res.data], {
-                type: 'application/vnd.ms-excel',
-            });
-            const elink = document.createElement('a');
-            elink.download = fileName;
-            elink.style.display = 'none';
-            elink.href = URL.createObjectURL(blob);
-            document.body.appendChild(elink);
-            elink.click();
-            URL.revokeObjectURL(elink.href); // 释放URL 对象
-            document.body.removeChild(elink);
-        }
-        else {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.common.md.exportRequestFailed'));
-        }
+        await this.service.exportData(this.dataExport, this.context, fetchParams);
     }
     /**
      * @description 导出数据
-     * @param {{  event: MouseEvent; params: IData }} args
+     * @param {{  event: MouseEvent; params: IApiExportParams }} args
      * @returns {*}  {Promise<void>}
      * @memberof GridController
      */
@@ -1412,7 +1448,11 @@ export class GridController extends MDControlController {
         const data = await this.getExportData(args.params);
         const formatData = this.formatExcelData(data, fields);
         const table = formatData.map(v => Object.values(v));
-        await exportData(header, table, this.model.logicName);
+        await ibiz.platform.frontExport({
+            header,
+            data: table,
+            fileName: this.model.logicName,
+        });
     }
     /**
      * 计算默认值并返回一个对象，对象里的属性就是要填充的默认值
@@ -1451,7 +1491,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 +1712,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 +1738,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 +1763,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
      */