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

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

@@ -1,18 +1,20 @@
+/* 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 { getAutoGridColumnProvider, getGridColumnProvider, } from '../../../../register';
+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, initModelByEntitySchema, switchRowEditDynamic, } from './auto-grid.util';
+import { newRowDynamic, switchRowEditDynamic, initModelByEntitySchema, } from './auto-grid.util';
 /**
  * 表格控制器
  *
@@ -107,12 +109,12 @@ export class GridController extends MDControlController {
          * @date 2023-08-07 04:11:00
          * @type {string}
          */
-        this.aggTitle = '合计';
+        this.aggTitle = ibiz.i18n.t('runtime.controller.control.grid.total');
         /**
          * 数据导出列
          * @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;
+        }
     }
     /**
      * 计算表格展示模式
@@ -442,9 +488,8 @@ export class GridController extends MDControlController {
      * @return {*}  {Promise<void>}
      */
     async initGroup() {
-        if (!this.model.enableGroup) {
+        if (!this.state.enableGroup)
             return;
-        }
         const { groupAppDEFieldId, groupCodeListId, groupMode } = this.model;
         this.groupFieldColumn = Object.values(this.fieldColumns).find(item => item.model.appDEFieldId === groupAppDEFieldId);
         if (!this.groupFieldColumn) {
@@ -476,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) => {
@@ -534,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
@@ -546,6 +571,41 @@ export class GridController extends MDControlController {
             ]);
         }
     }
+    /**
+     * @description 执行多数据分组
+     * @param {IApiMDGroupParams[]} [arg] 分组参数集合（多层分组暂未支持）
+     * @param {IParams} [_params] 额外参数
+     * @returns {*}  {Promise<void>}
+     * @memberof MDControlController
+     */
+    async execGroup(arg, _params) {
+        var _a;
+        const group = arg[0];
+        this.model = clone(this.model);
+        this.model.groupMode = 'AUTO';
+        const { columnStates } = this.state;
+        const column = (_a = this.model.degridColumns) === null || _a === void 0 ? void 0 : _a.find(c => {
+            var _a, _b;
+            return (group === null || group === void 0 ? void 0 : group.groupFieldId) &&
+                c.columnType === 'DEFGRIDCOLUMN' &&
+                ((_a = c.appDEFieldId) === null || _a === void 0 ? void 0 : _a.toLowerCase()) ===
+                    ((_b = group === null || group === void 0 ? void 0 : group.groupFieldId) === null || _b === void 0 ? void 0 : _b.toLowerCase());
+        });
+        const columnState = columnStates.find(c => !c.hidden && (column === null || column === void 0 ? void 0 : column.codeName) === c.key);
+        const groupAppDEFieldId = column === null || column === void 0 ? void 0 : column.appDEFieldId;
+        // 如果不存在或不显示分组列时，则重置分组
+        if (!groupAppDEFieldId || !columnState) {
+            this.state.groups = [];
+            this.state.enableGroup = false;
+        }
+        else if (groupAppDEFieldId !== this.model.groupAppDEFieldId) {
+            // 分组属性变更时才重新初始化分组
+            this.state.enableGroup = true;
+            this.model.groupAppDEFieldId = groupAppDEFieldId;
+            await this.initGroup();
+            this.calcGroupData(this.state.items);
+        }
+    }
     /**
      * 计算分组数据
      * @author lxm
@@ -554,7 +614,8 @@ export class GridController extends MDControlController {
      * @param {IData[]} items
      */
     calcGroupData(items) {
-        const { enableGroup, groupMode } = this.model;
+        const { enableGroup } = this.state;
+        const { groupMode } = this.model;
         if (enableGroup) {
             const groupMap = new Map();
             const codeListGroup = groupMode === 'CODELIST';
@@ -579,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,
                 });
             });
@@ -624,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);
         });
     }
     /**
@@ -653,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;
@@ -818,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
@@ -1097,11 +1173,13 @@ export class GridController extends MDControlController {
      * @param {string} order 排序顺序
      */
     setSort(fieldId, order) {
+        var _a;
         let fieldName;
         if (fieldId) {
             fieldName = this.state.isAutoGrid
                 ? fieldId.toLowerCase()
-                : this.fieldIdNameMap.get(fieldId).toLowerCase();
+                : ((_a = this.fieldIdNameMap.get(fieldId)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) ||
+                    fieldId.toLowerCase();
         }
         super.setSort(fieldName, order);
     }
@@ -1251,8 +1329,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;
@@ -1337,28 +1427,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
      */
@@ -1377,7 +1450,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,
+        });
     }
     /**
      * 计算默认值并返回一个对象，对象里的属性就是要填充的默认值
@@ -1416,7 +1493,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
@@ -1453,20 +1549,17 @@ export class GridController extends MDControlController {
      * @protected
      */
     convertMultipleLanguages() {
-        const convertColumnCaption = (columns) => {
-            columns.forEach((column) => {
-                if (column.capLanguageRes && column.capLanguageRes.lanResTag) {
-                    column.caption = ibiz.i18n.t(column.capLanguageRes.lanResTag, column.caption);
-                }
-                if (column.columnType === 'GROUPGRIDCOLUMN' &&
-                    column.degridColumns) {
-                    convertColumnCaption(column.degridColumns);
-                }
-            });
-        };
-        if (this.model.degridColumns && this.model.degridColumns.length > 0) {
-            convertColumnCaption(this.model.degridColumns);
-        }
+        const { emptyTextLanguageRes, emptyText } = this.model;
+        if (emptyTextLanguageRes === null || emptyTextLanguageRes === void 0 ? void 0 : emptyTextLanguageRes.lanResTag) {
+            this.model.emptyText = ibiz.i18n.t(emptyTextLanguageRes.lanResTag, emptyText);
+        }
+        recursiveIterate(this.model, (item) => {
+            var _a;
+            if ((_a = item.capLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag)
+                item.caption = ibiz.i18n.t(item.capLanguageRes.lanResTag, item.caption);
+        }, {
+            childrenFields: ['degridColumns'],
+        });
     }
     /**
      * 控制列显示
@@ -1618,32 +1711,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
@@ -1670,7 +1737,7 @@ export class GridController extends MDControlController {
         this.state.totalResult = totalResult;
     }
     /**
-     * 切换行展开
+     * 切换折叠(分组表格使用),tag=指定分组标识(不传则全部)，expand=目标状态(不传则反转)
      * @author: zzq
      * @date 2024-08-23 17:12:58
      * @return {*}  {void}
@@ -1695,4 +1762,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;IAsBjD;;;;;;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
@@ -107,7 +108,7 @@ export class GridFieldColumnController extends GridColumnController {
         if (filterEditor &&
             columnEnableFilter &&
             filterEditor.editorType !== 'HIDDEN') {
-            this.filterEditorProvider = await getEditorProvider(filterEditor);
+            this.filterEditorProvider = await getEditorProvider(filterEditor, this.model, this.grid.model);
             if (this.filterEditorProvider) {
                 this.filterEditor = await this.filterEditorProvider.createController(filterEditor, this);
             }
@@ -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
      */