@ibiz-template/runtime 0.7.39 → 0.7.40

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

@@ -3,8 +3,8 @@ import { GridFieldColumnController } from '../grid-column/grid-field-column/grid
 import { GridColumnController } from './grid-column.controller';
 import { GridRowState } from './grid-row.state';
 import { GridService } from './grid.service';
-import { GridFieldEditColumnController, GridUAColumnController } from '../grid-column';
-import { IGridState, IGridEvent, IGridController, IGridColumnProvider, CodeListItem, MDCtrlLoadParams, IGridRowState, IExportColumn, IColumnState, ISearchGroupData } from '../../../../interface';
+import { GridUAColumnController, GridFieldEditColumnController } from '../grid-column';
+import { IGridState, IGridEvent, CodeListItem, IColumnState, IGridRowState, IExportColumn, IGridController, MDCtrlLoadParams, ISearchGroupData, IGridColumnProvider } from '../../../../interface';
 import { ControlVO } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
@@ -175,13 +175,6 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @type {IDEDataExport}
      */
     dataExport: IDEDataExport | undefined;
-    /**
-     * 数据导出参数
-     * @author zzq
-     * @date 2024-03-20 16:11:00
-     * @type {IData}
-     */
-    dataExportParam: IData;
     /**
      * 数据导出列
      * @author lxm
@@ -196,6 +189,12 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @type {Map<string, readonly CodeListItem[]>}
      */
     allExportCodelistMap: Map<string, readonly CodeListItem[]>;
+    /**
+     * 所有的自定义列
+     *
+     * @type {IDEGridColumn[]}
+     */
+    allCustomColumns: IDEGridColumn[];
     /**
      * 分组代码表项集合
      * @author lxm
@@ -382,8 +381,8 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @author lxm
      * @date 2022-08-24 10:08:40
      * @param {GridRowState} row 行状态控制器
-     * @param {unknown} value 要设置的值
      * @param {string} name 要设置的表单数据的属性名称
+     * @param {unknown} value 要设置的值
      * @param {boolean} ignore 忽略脏值检查
      */
     setRowValue(row: GridRowState, name: string, value: unknown, ignore?: boolean): Promise<void>;
@@ -481,13 +480,21 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @Date: 2024-03-20 17:54:16
      */
     formatValue: (isDate: boolean, valueFormat?: string, value?: unknown) => string;
+    /**
+     * 获取数据导出模型
+     * @returns
+     */
+    getDataExcelModel(): {
+        header: string[];
+        fields: string[];
+    };
     /**
      * 格式化导出数据
      * @return {string}
      * @author: zzq
      * @Date: 2024-03-20 17:54:16
      */
-    formatExcelData(data: IData[]): IData[];
+    formatExcelData(data: IData[], fields: string[]): IData[];
     /**
      * 获取导出数据
      * @return {Promise<IData[]>}
@@ -496,15 +503,19 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      */
     getExportData(params: IData): Promise<IData[]>;
     /**
-     * 数据导出
-     *
-     * @param {MouseEvent} event 原生js点击事件
+     * @description 执行后台导出
+     * @param params 额外参数
+     */
+    excuteBackendExport(params: IData): Promise<void>;
+    /**
+     * @description 导出数据
+     * @param {{  event: MouseEvent; params: IData }} args
      * @returns {*}  {Promise<void>}
-     * @memberof MDControlController
+     * @memberof GridController
      */
     exportData(args: {
-        event: MouseEvent;
         params: IData;
+        event: MouseEvent;
     }): Promise<void>;
     /**
      * 计算默认值并返回一个对象，对象里的属性就是要填充的默认值

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,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import { awaitTimeout, DataTypes, debounceAndAsyncMerge, EntityError, mergeDefaultInLeft, plus, recursiveIterate, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
+import { plus, DataTypes, EntityError, awaitTimeout, RuntimeError, recursiveIterate, RuntimeModelError, mergeDefaultInLeft, debounceAndAsyncMerge, } from '@ibiz-template/core';
 import { clone, isNil } from 'ramda';
 import dayjs from 'dayjs';
 import { GridRowState } from './grid-row.state';
@@ -9,10 +9,10 @@ import { getAutoGridColumnProvider, getGridColumnProvider, } from '../../../../r
 import { Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
-import { exportData, getDefaultValue, getEntitySchema, isValueChange, ValueExUtil, } from '../../../utils';
-import { convertNavData, handleAllSettled, ScriptFactory, } from '../../../../utils';
+import { exportData, ValueExUtil, isValueChange, getDefaultValue, getEntitySchema, } from '../../../utils';
+import { ScriptFactory, convertNavData, handleAllSettled, } from '../../../../utils';
 import { calcColumnModelBySchema } from './entity-schema';
-import { initModelByEntitySchema, newRowDynamic, switchRowEditDynamic, } from './auto-grid.util';
+import { newRowDynamic, initModelByEntitySchema, switchRowEditDynamic, } from './auto-grid.util';
 /**
  * 表格控制器
  *
@@ -108,13 +108,6 @@ export class GridController extends MDControlController {
          * @type {string}
          */
         this.aggTitle = '合计';
-        /**
-         * 数据导出参数
-         * @author zzq
-         * @date 2024-03-20 16:11:00
-         * @type {IData}
-         */
-        this.dataExportParam = {};
         /**
          * 数据导出列
          * @author lxm
@@ -129,6 +122,12 @@ export class GridController extends MDControlController {
          * @type {Map<string, readonly CodeListItem[]>}
          */
         this.allExportCodelistMap = new Map();
+        /**
+         * 所有的自定义列
+         *
+         * @type {IDEGridColumn[]}
+         */
+        this.allCustomColumns = [];
         /**
          * 值格式化
          * @return {string}
@@ -264,6 +263,7 @@ export class GridController extends MDControlController {
     initState() {
         super.initState();
         this.state.rows = [];
+        this.state.columnFilter = {};
         this.state.noSort = this.model.noSort === true;
         this.state.size = this.model.pagingSize || 20;
         this.state.singleSelect = this.model.singleSelect === true;
@@ -358,6 +358,7 @@ export class GridController extends MDControlController {
         const result = await calcColumnModelBySchema(json, this);
         if (result && result.degridColumns.length > 0) {
             const { degridColumns, degridDataItems } = result;
+            this.allCustomColumns = degridColumns;
             // 修改模型之前拷贝一份，避免污染原始数据
             this.model = clone(this.model);
             this.model.degridColumns = [
@@ -393,8 +394,6 @@ export class GridController extends MDControlController {
                     this.allExportCodelistMap.set(exportColumn.appDEFieldId, exportColumn.codeListItems);
                 }
             });
-            this.dataExportParam.fields = this.allExportColumns.map(x => x.appDEFieldId);
-            this.dataExportParam.header = this.allExportColumns.map(x => x.caption);
         }
         else {
             Object.keys(this.fieldColumns).forEach((key) => {
@@ -402,14 +401,6 @@ export class GridController extends MDControlController {
                     this.allExportCodelistMap.set(key, this.fieldColumns[key].codeListItems);
                 }
             });
-            const { degridColumns = [] } = this.model;
-            // 隐藏列， 操作列不导出
-            const exportColumns = degridColumns.filter(x => !x.hiddenDataItem &&
-                !x.hideDefault &&
-                x.hideMode !== 2 &&
-                x.columnType !== 'UAGRIDCOLUMN');
-            this.dataExportParam.fields = exportColumns.map(item => item.id);
-            this.dataExportParam.header = exportColumns.map(item => item.caption);
         }
     }
     /**
@@ -421,9 +412,8 @@ export class GridController extends MDControlController {
      */
     async fillExportCodelistMap() {
         // 表格导出列已填充代码表
-        if (this.model.dedataExportId) {
+        if (this.model.dedataExportId)
             return;
-        }
         const fillCodeList = async (key, fieldColumnC) => {
             const dataItems = await fieldColumnC.loadCodeList();
             this.allExportCodelistMap.set(key, dataItems);
@@ -623,6 +613,7 @@ export class GridController extends MDControlController {
         if (this.model.enableItemPrivilege === true) {
             extraParams.srfdataaccessaction = true;
         }
+        Object.assign(extraParams, this.state.columnFilter);
         return super.getFetchParams(extraParams);
     }
     /**
@@ -935,8 +926,8 @@ export class GridController extends MDControlController {
      * @author lxm
      * @date 2022-08-24 10:08:40
      * @param {GridRowState} row 行状态控制器
-     * @param {unknown} value 要设置的值
      * @param {string} name 要设置的表单数据的属性名称
+     * @param {unknown} value 要设置的值
      * @param {boolean} ignore 忽略脏值检查
      */
     async setRowValue(row, name, value, ignore = false) {
@@ -954,9 +945,13 @@ export class GridController extends MDControlController {
         try {
             await this.dataChangeNotify(row, [name]);
             await this._evt.emit('onGridDataChange', {
-                data: this.state.rows.map(_row => {
-                    return _row.data;
-                }),
+                data: {
+                    name,
+                    index: this.findRowStateIndex(row.data),
+                    items: this.state.rows.map(_row => {
+                        return _row.data;
+                    }),
+                },
             });
         }
         finally {
@@ -1032,14 +1027,12 @@ export class GridController extends MDControlController {
             await switchRowEditDynamic(this, row, editable, isSave);
             return;
         }
-        if (!this.allowRowEdit) {
+        if (!this.allowRowEdit)
             return;
-        }
         const toState = editable === undefined ? !row.showRowEdit : editable;
         // 一样的状态不处理
-        if (row.showRowEdit === toState) {
+        if (row.showRowEdit === toState)
             return;
-        }
         if (toState === false) {
             // * 处理关闭行编辑
             if (isSave) {
@@ -1062,9 +1055,12 @@ export class GridController extends MDControlController {
             // * 处理显示行编辑
             // 如果已经有一行处于行编辑了，不开起另一行。
             const editingRow = this.state.rows.find(item => item.showRowEdit);
-            if (editingRow) {
+            if (editingRow === null || editingRow === void 0 ? void 0 : editingRow.modified) {
                 throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.grid.lineEditing'));
             }
+            else if (editingRow) {
+                await this.switchRowEdit(editingRow, false, false);
+            }
             if (row.data.srfuf === Srfuf.UPDATE) {
                 // 打开时先缓存一下
                 row.cacheData = clone(row.data);
@@ -1130,9 +1126,8 @@ export class GridController extends MDControlController {
         let updateData; // 要修改的数据
         if (customCode && scriptCode) {
             // 脚本模式获取修改数据
-            updateData = ScriptFactory.execScriptFn(Object.assign(Object.assign({}, this.getEventArgs()), { data: row.data }), scriptCode, {
-                isAsync: false,
-            });
+            const data = await ScriptFactory.asyncExecScriptFn(Object.assign(Object.assign({}, this.getEventArgs()), { data: row.data }), scriptCode);
+            updateData = data;
         }
         else {
             // 后台服务获取修改数据
@@ -1180,7 +1175,8 @@ export class GridController extends MDControlController {
     async findAllExportColumns(dataExport) {
         var _a;
         const app = ibiz.hub.getApp(this.context.srfappid);
-        const exportColumnsPromises = (_a = dataExport.dedataExportItems) === null || _a === void 0 ? void 0 : _a.map(async (item) => {
+        // 排除隐藏列
+        const exportColumnsPromises = (_a = dataExport.dedataExportItems) === null || _a === void 0 ? void 0 : _a.filter(item => !item.hidden).map(async (item) => {
             const tempExportColumn = Object.assign({}, item);
             if (item.codeListId) {
                 // 加载代码表模型
@@ -1195,14 +1191,47 @@ export class GridController extends MDControlController {
         }
         return [];
     }
+    /**
+     * 获取数据导出模型
+     * @returns
+     */
+    getDataExcelModel() {
+        const { dedataExportId, degridColumns = [] } = this.model;
+        const excelModel = {
+            header: [],
+            fields: [],
+        };
+        if (dedataExportId) {
+            if (this.allExportColumns.length) {
+                excelModel.fields = this.allExportColumns.map(x => x.appDEFieldId);
+                excelModel.header = this.allExportColumns.map(x => x.caption);
+            }
+        }
+        else {
+            const exportColumns = this.state.columnStates
+                .filter(column => {
+                let state = !column.hidden;
+                const customColumn = this.allCustomColumns.find(c => c.codeName === column.key);
+                // 默认显示自定义列
+                if (customColumn)
+                    state = true;
+                return state;
+            })
+                .map(column => {
+                return degridColumns.find(x => x.codeName === column.key);
+            });
+            excelModel.fields = exportColumns.map(item => item.id);
+            excelModel.header = exportColumns.map(item => item.caption);
+        }
+        return excelModel;
+    }
     /**
      * 格式化导出数据
      * @return {string}
      * @author: zzq
      * @Date: 2024-03-20 17:54:16
      */
-    formatExcelData(data) {
-        const { fields = [] } = this.dataExportParam;
+    formatExcelData(data, fields) {
         const cloneData = clone(data.map(item => {
             return fields.reduce((obj, key) => {
                 obj[key] = item[key];
@@ -1268,21 +1297,85 @@ export class GridController extends MDControlController {
         return data;
     }
     /**
-     * 数据导出
-     *
-     * @param {MouseEvent} event 原生js点击事件
+     * @description 执行后台导出
+     * @param params 额外参数
+     */
+    async excuteBackendExport(params) {
+        var _a;
+        // 准备参数
+        const fetchParams = await this.getFetchParams(Object.assign({}, this.params));
+        let tempParams = {};
+        const { type } = params;
+        if (!type || type === 'activatedPage') {
+            const { size, curPage } = this.state;
+            tempParams = {
+                page: curPage - 1,
+                size,
+            };
+        }
+        else if (type === 'selectedRows') {
+            const selectedData = this.getData();
+            if (selectedData.length === 0) {
+                throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.grid.exported'));
+            }
+            tempParams = {
+                page: 0,
+                srfkeys: selectedData.map(data => data.srfkey).join(','),
+            };
+        }
+        else if (type === 'maxRowCount' || type === 'customPage') {
+            const { size } = this.state;
+            const { startPage, endPage } = params;
+            tempParams =
+                type === 'customPage'
+                    ? {
+                        page: 0,
+                        offset: (startPage - 1) * size,
+                        size: (endPage - startPage + 1) * size,
+                    }
+                    : { size: ((_a = this.dataExport) === null || _a === void 0 ? void 0 : _a.maxRowCount) || 1000, page: 0 };
+        }
+        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'));
+        }
+    }
+    /**
+     * @description 导出数据
+     * @param {{  event: MouseEvent; params: IData }} args
      * @returns {*}  {Promise<void>}
-     * @memberof MDControlController
+     * @memberof GridController
      */
     async exportData(args) {
-        const { header } = this.dataExportParam;
+        var _a;
+        if ((_a = this.dataExport) === null || _a === void 0 ? void 0 : _a.enableBackend) {
+            await this.excuteBackendExport(args.params);
+            return;
+        }
+        const { header, fields } = this.getDataExcelModel();
         if (!header) {
             throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.grid.tabularColumns'));
         }
         // 导出前先填充导出代码表数据
         await this.fillExportCodelistMap();
         const data = await this.getExportData(args.params);
-        const formatData = this.formatExcelData(data);
+        const formatData = this.formatExcelData(data, fields);
         const table = formatData.map(v => Object.values(v));
         await exportData(header, table, this.model.logicName);
     }

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

@@ -48,7 +48,31 @@ export declare class GridFieldColumnController extends GridColumnController<IDEG
      * @readonly
      */
     get fieldName(): string;
+    /**
+     * 单位
+     *
+     * @readonly
+     * @type {(string | undefined)}
+     * @memberof GridFieldColumnController
+     */
+    get unitName(): string | undefined;
     protected onInit(): Promise<void>;
+    /**
+     * 处理列过滤
+     *
+     * @param {unknown} value
+     * @return {*}  {Promise<void>}
+     * @memberof GridFieldColumnController
+     */
+    handleColumnScreen(value: unknown): Promise<void>;
+    /**
+     * 初始化列过滤
+     *
+     * @protected
+     * @return {*}  {Promise<void>}
+     * @memberof GridFieldColumnController
+     */
+    protected initColumnFilter(): Promise<void>;
     /**
      * 初始化属性列界面行为组按钮状态
      *

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;AAEzD;;;;;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;cAEe,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC;;;;;;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,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"}

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

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { DataTypes, ModelError, plus, base64ToStr, isEmoji, } from '@ibiz-template/core';
+import { plus, isEmoji, DataTypes, ModelError, base64ToStr, } from '@ibiz-template/core';
 import dayjs from 'dayjs';
 import { debounce } from 'lodash-es';
 import { clone, isNil } from 'ramda';
@@ -8,8 +8,9 @@ import { OpenAppViewCommand } from '../../../../../command';
 import { parseUserParams } from '../../../../../model';
 import { UIActionUtil } from '../../../../../ui-action';
 import { convertNavData, getWFContext } from '../../../../../utils';
-import { ButtonContainerState, UIActionButtonState, ValueExUtil, } from '../../../../utils';
+import { ValueExUtil, UIActionButtonState, ButtonContainerState, } from '../../../../utils';
 import { GridColumnController } from '../../grid/grid-column.controller';
+import { getEditorProvider } from '../../../../../register';
 /**
  * 表格属性列控制器
  * @return {*}
@@ -57,6 +58,16 @@ export class GridFieldColumnController extends GridColumnController {
     get fieldName() {
         return this.model.id.toLowerCase();
     }
+    /**
+     * 单位
+     *
+     * @readonly
+     * @type {(string | undefined)}
+     * @memberof GridFieldColumnController
+     */
+    get unitName() {
+        return undefined;
+    }
     async onInit() {
         await super.onInit();
         // 加载代码表防抖
@@ -66,6 +77,41 @@ export class GridFieldColumnController extends GridColumnController {
         });
         // 默认加载一次代码表
         await this.loadCodeList();
+        await this.initColumnFilter();
+    }
+    /**
+     * 处理列过滤
+     *
+     * @param {unknown} value
+     * @return {*}  {Promise<void>}
+     * @memberof GridFieldColumnController
+     */
+    async handleColumnScreen(value) {
+        var _a, _b;
+        const filterName = (_b = (_a = this.model.filterEditor) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+        if (filterName) {
+            this.grid.state.columnFilter[filterName] = value;
+            await this.grid.refresh();
+        }
+    }
+    /**
+     * 初始化列过滤
+     *
+     * @protected
+     * @return {*}  {Promise<void>}
+     * @memberof GridFieldColumnController
+     */
+    async initColumnFilter() {
+        const { columnEnableFilter } = this.grid.model;
+        const { filterEditor } = this.model;
+        if (filterEditor &&
+            columnEnableFilter &&
+            filterEditor.editorType !== 'HIDDEN') {
+            this.filterEditorProvider = await getEditorProvider(filterEditor);
+            if (this.filterEditorProvider) {
+                this.filterEditor = await this.filterEditorProvider.createController(filterEditor, this);
+            }
+        }
     }
     /**
      * 初始化属性列界面行为组按钮状态

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

@@ -25,4 +25,5 @@ export * from './medit-view-panel/index';
 export * from './map/index';
 export * from './report-panel/index';
 export * from './gantt/index';
+export * from './view-panel/index';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC"}

package/out/controller/control/index.js

@@ -25,3 +25,4 @@ export * from './medit-view-panel/index';
 export * from './map/index';
 export * from './report-panel/index';
 export * from './gantt/index';
+export * from './view-panel/index';

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

@@ -1,7 +1,7 @@
 import { ISysMap } from '@ibiz/model-core';
 import { EChartsOption, EChartsType } from 'echarts';
 import { MapService } from './map.service';
-import { IMapController, IMapEvent, IMapState, MDCtrlLoadParams } from '../../../interface';
+import { IMapData, IMapEvent, IMapState, IMapController, MDCtrlLoadParams } from '../../../interface';
 import { MDControlController } from '../../common';
 export declare class MapController extends MDControlController<ISysMap, IMapState, IMapEvent> implements IMapController {
     service: MapService;
@@ -45,15 +45,15 @@ export declare class MapController extends MDControlController<ISysMap, IMapStat
      * 地图区域点击事件处理
      * @author lxm
      * @date 2023-10-31 05:30:54
-     * @param {IData} mapData
+     * @param {IMapData} mapData
      */
-    onAreaClick(mapData: IData): void;
+    onAreaClick(mapData: IMapData): void;
     /**
      * 地图散点点击事件处理
      * @author lxm
      * @date 2023-10-31 05:30:58
-     * @param {IData} mapData
+     * @param {IMapData} mapData
      */
-    onPointClick(mapData: IData): void;
+    onPointClick(mapData: IMapData): void;
 }
 //# sourceMappingURL=map.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"map.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/map/map.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EACL,cAAc,EAEd,SAAS,EACT,SAAS,EACT,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,qBAAa,aACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CACzD,YAAW,cAAc;IAEjB,OAAO,EAAE,UAAU,CAAC;IAE5B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;OAIG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,SAAS,CAAC,SAAS,IAAI,IAAI;cAQX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAuCnD,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBzE;;;;OAIG;IACH,kBAAkB,IAAI,IAAI;IA6B1B;;;;;OAKG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO3D;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,KAAK,GAAG,IAAI;IAIjC;;;;;OAKG;IACH,YAAY,CAAC,OAAO,EAAE,KAAK,GAAG,IAAI;CAGnC"}
+{"version":3,"file":"map.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/map/map.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EACL,QAAQ,EACR,SAAS,EACT,SAAS,EACT,cAAc,EACd,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,qBAAa,aACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CACzD,YAAW,cAAc;IAEjB,OAAO,EAAE,UAAU,CAAC;IAE5B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;OAIG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,SAAS,CAAC,SAAS,IAAI,IAAI;cASX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAuCnD,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBzE;;;;OAIG;IACH,kBAAkB,IAAI,IAAI;IAgC1B;;;;;OAKG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO3D;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAIpC;;;;;OAKG;IACH,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;CAItC"}