@ibiz-template/runtime 0.3.1 → 0.3.3

package/out/ui-action/provider/front-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAuD3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;CAYnB"}
+{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAgE3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiChB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,eAAe,CAAC;IA8B3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,IAAI,CAAC;CA4CjB"}

package/out/ui-action/provider/front-ui-action-provider.js

@@ -1,4 +1,4 @@
-import { StringUtil, RuntimeModelError, ModelError } from '@ibiz-template/core';
+import { StringUtil, RuntimeModelError, ModelError, RuntimeError, } from '@ibiz-template/core';
 import { OpenAppViewCommand } from '../../command';
 import { ScriptFactory } from '../../utils';
 import { UIActionProviderBase } from './ui-action-provider-base';
@@ -42,6 +42,15 @@ export class FrontUIActionProvider extends UIActionProviderBase {
                 }
                 break;
             }
+            case 'PRINT':
+                await this.executePrint(action, args);
+                break;
+            case 'DATAIMP':
+                actionResult = await this.executeDataImport(action, args);
+                break;
+            case 'DATAEXP':
+                await this.executeDataExport(action, args);
+                break;
             case 'OTHER':
                 actionResult = this.doOther(action, args);
                 break;
@@ -69,4 +78,122 @@ export class FrontUIActionProvider extends UIActionProviderBase {
         }
         throw new RuntimeModelError(action, '自定义类型缺少配置脚本代码');
     }
+    /**
+     * 执行打印行为
+     * @protected
+     * @param {IAppDEUIAction} action
+     * @param {IUILogicParams} args
+     * @return {*}
+     */
+    async executePrint(action, args) {
+        var _a, _b;
+        const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId);
+        const appDEPrint = (_a = appDataEntity.appDEPrints) === null || _a === void 0 ? void 0 : _a.find(print => {
+            return print.id === action.appDEPrintId;
+        });
+        if (appDEPrint) {
+            let requestUrl = '';
+            const { context } = args;
+            if (context && context[appDataEntity.codeName.toLowerCase()]) {
+                // TODO 临时写死printdata， 非标准，后续优化
+                requestUrl += `/${(_b = appDataEntity.codeName2) === null || _b === void 0 ? void 0 : _b.toLowerCase()}/printdata/${context[appDataEntity.codeName.toLowerCase()]}?srfprinttag=${appDEPrint.codeName}`;
+            }
+            else {
+                throw new RuntimeError('没有找到数据主键');
+            }
+            const res = await ibiz.net.request(requestUrl, {
+                method: 'get',
+                responseType: 'blob',
+            });
+            if (res.ok) {
+                const link = window.URL.createObjectURL(res.data);
+                window.open(link, '_blank');
+            }
+            else {
+                throw new RuntimeError('打印失败');
+            }
+        }
+        else {
+            throw new RuntimeError('没有找到实体打印项');
+        }
+    }
+    /**
+     * 执行导入行为
+     * @protected
+     * @param {IAppDEUIAction} action
+     * @param {IUILogicParams} args
+     * @return {*}
+     */
+    async executeDataImport(action, _args) {
+        var _a;
+        const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId);
+        const appDEDataImport = (_a = appDataEntity.appDEDataImports) === null || _a === void 0 ? void 0 : _a.find(dataImport => dataImport.id === action.appDEDataImportId);
+        if (appDEDataImport) {
+            const modal = ibiz.overlay.createModal('DataImport', {
+                dismiss: () => modal.dismiss(),
+                appDataEntity,
+                dataImport: appDEDataImport,
+            }, {
+                width: 'auto',
+                placement: 'center',
+            });
+            modal.present();
+            await modal.onWillDismiss();
+            return {
+                refresh: true,
+                refreshMode: 1,
+            };
+        }
+        throw new RuntimeError('没有找到实体导入项');
+    }
+    /**
+     * 执行导出行为
+     * @protected
+     * @param {IAppDEUIAction} action
+     * @param {IUILogicParams} args
+     * @return {*}
+     */
+    async executeDataExport(action, _args) {
+        var _a, _b;
+        const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId);
+        const appDEDataExport = (_a = appDataEntity.appDEDataExports) === null || _a === void 0 ? void 0 : _a.find(dataExport => {
+            return dataExport.id === action.appDEDataExportId;
+        });
+        if (appDEDataExport) {
+            // TODO 临时写死fetchdefault，应该从appDEDataExport的主表格上获取加载行为，但现在缺主表格模型，后续优化
+            const url = `/${(_b = appDataEntity.codeName2) === null || _b === void 0 ? void 0 : _b.toLowerCase()}/exportdata/fetchdefault?srfexporttag=${appDEDataExport.codeName}`;
+            //  参数
+            const params = {
+                page: 0,
+                size: appDEDataExport.maxRowCount ? appDEDataExport.maxRowCount : 1000,
+                responseType: 'blob',
+            };
+            const res = await ibiz.net.request(url, {
+                method: 'post',
+                data: params,
+                responseType: 'blob',
+            });
+            if (res.status === 200) {
+                let fileName = `${appDataEntity.logicName}表.xlsx`;
+                fileName = decodeURIComponent(fileName);
+                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('导出请求失败');
+            }
+        }
+        else {
+            throw new RuntimeError('没有找到实体导出项');
+        }
+    }
 }

package/out/ui-action/provider/sys-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sys-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/sys-ui-action-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,mBAAoB,SAAQ,oBAAoB;IAC3D,OAAO,CAAC,mBAAmB,CAoCxB;IAEG,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAc5B"}
+{"version":3,"file":"sys-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/sys-ui-action-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,mBAAoB,SAAQ,oBAAoB;IAC3D,OAAO,CAAC,mBAAmB,CAsCxB;IAEG,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAc5B"}

package/out/ui-action/provider/sys-ui-action-provider.js

@@ -48,6 +48,8 @@ export class SysUIActionProvider extends UIActionProviderBase {
             ['GRIDVIEW_SAVEROWACTION', 'SaveRow'],
             ['APP_LOGIN', 'Login'],
             ['APP_LOGOUT', 'logout'],
+            ['UTIL_RESET', 'Reset'],
+            ['UTIL_SEARCH', 'Search'],
         ]);
     }
     async execAction(action, args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -46,7 +46,7 @@
     "ramda": "^0.29.1"
   },
   "peerDependencies": {
-    "@ibiz-template/core": "^0.2.13",
+    "@ibiz-template/core": "^0.3.0",
     "@ibiz/model-core": "^0.0.20",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "2827c2bd507c4ab3efafa7ebb4990c18e198823a"
+  "gitHead": "7f8e0137d5d235f6eebab383f046dd91a22ce94c"
 }

package/src/app-hub.ts

@@ -1,7 +1,7 @@
 import { IAppDataEntity, IAppView, IApplication } from '@ibiz/model-core';
 import { RuntimeError } from '@ibiz-template/core';
 import { Application } from './application';
-import { IAppHubService, ModelLoaderProvider } from './interface';
+import { IAppHubService, IAppService, ModelLoaderProvider } from './interface';
 import { AppConfigService, Convert } from './hub';
 import { HubController } from './controller';
 import { ConfigService } from './service';
@@ -329,9 +329,9 @@ export class AppHub implements IAppHubService {
    * @author chitanda
    * @date 2023-04-17 21:04:41
    * @param {string} [key=ibiz.env.appId]
-   * @return {*}  {Promise<Application>}
+   * @return {*}  {Promise<IAppService>}
    */
-  async getAppAsync(key: string = ibiz.env.appId): Promise<Application> {
+  async getAppAsync(key: string = ibiz.env.appId): Promise<IAppService> {
     return this.createApp(key);
   }
 
@@ -341,9 +341,9 @@ export class AppHub implements IAppHubService {
    * @author chitanda
    * @date 2023-04-17 22:04:42
    * @param {(string | IApplication)} [app]
-   * @return {*}  {Application}
+   * @return {*}  {IAppService}
    */
-  getApp(app?: string | IApplication): Application {
+  getApp(app?: string | IApplication): IAppService {
     let key: string | null = null;
     if (app) {
       if (app instanceof Object) {

package/src/config/global-config.ts

@@ -26,6 +26,7 @@ export class GlobalConfig implements IGlobalConfig {
   grid: IGlobalGridConfig = {
     editShowMode: 'row',
     editSaveMode: 'cell-blur',
+    overflowMode: 'wrap',
   };
 
   // 全局菜单配置

package/src/constant/sys-uiaction-tag.ts

@@ -91,6 +91,10 @@ export enum SysUIActionTag {
    * 搜索
    */
   'SEARCH' = 'Search',
+  /**
+   * 重置
+   */
+  'RESET' = 'Reset',
   /**
    * 完成
    */

package/src/controller/common/control/control.controller.ts

@@ -5,7 +5,7 @@ import {
   IViewLayoutPanel,
 } from '@ibiz/model-core';
 import { IBizContext, IBizParams, NoticeError } from '@ibiz-template/core';
-import { isNil } from 'ramda';
+import { clone, isNil } from 'ramda';
 import { notNilEmpty } from 'qx-util';
 import { BaseController } from '..';
 import { CTX } from '../../ctx';
@@ -110,7 +110,7 @@ export class ControlController<
       `${model.controlType}_DEFAULT`,
     );
     if (panelModel) {
-      this.controlPanel = panelModel;
+      this.controlPanel = clone(panelModel);
     }
 
     this.updateContextParams({});

package/src/controller/control/app-menu/app-menu.controller.ts

@@ -4,12 +4,12 @@ import {
   RuntimeModelError,
 } from '@ibiz-template/core';
 import { IAppMenu, IAppMenuItem } from '@ibiz/model-core';
-import { Application } from '../../../application';
 import { AppFuncCommand } from '../../../command';
 import {
   IAppMenuState,
   IAppMenuEvent,
   IAppMenuController,
+  IAppService,
 } from '../../../interface';
 import { AppCounter } from '../../../service';
 import { ControlController } from '../../common';
@@ -27,7 +27,7 @@ export class AppMenuController
   extends ControlController<IAppMenu, IAppMenuState, IAppMenuEvent>
   implements IAppMenuController
 {
-  app!: Application;
+  app!: IAppService;
 
   protected initState(): void {
     super.initState();

package/src/controller/control/form/edit-form/edit-form.service.ts

@@ -266,7 +266,7 @@ export class EditFormService<
       (item: IDEFormDetail) => {
         if (item.detailType === 'FORMITEM' || item.detailType === 'MDCTRL') {
           const formItem = item as IDEEditFormItem;
-          const uiKey = formItem.fieldName || formItem.id!.toLowerCase();
+          const uiKey = formItem.id!.toLowerCase();
           const deField =
             formItem.fieldName || (item as IDEEditFormItem).appDEFieldId!;
           let mapField: UIMapField;

package/src/controller/control/form/form-detail/form-item/form-item.controller.ts

@@ -95,7 +95,7 @@ export class FormItemController
    * @readonly
    */
   get name(): string {
-    return this.model.fieldName || this.model.id!;
+    return this.model.id!;
   }
 
   /**

package/src/controller/control/form/search-form/search-form.controller.ts

@@ -34,6 +34,7 @@ export class SearchFormController
 
   protected async onCreated(): Promise<void> {
     await super.onCreated();
+    this.preprocessLayoutPanel();
     // 实例部件服务
     this.service = new SearchFormService(this.model);
     await this.service.init(this.context);
@@ -159,4 +160,67 @@ export class SearchFormController
       await this.onSearchButtonClick();
     }
   }
+
+  /**
+   * 根据搜索表单的按钮位置和按钮样式
+   * 预处理部件布局面板模型
+   * @author lxm
+   * @date 2023-11-21 04:17:43
+   * @protected
+   * @return {*}
+   */
+  protected preprocessLayoutPanel(): void {
+    if (!this.controlPanel) {
+      return;
+    }
+    const { searchButtonStyle } = this.model;
+    let deleteRight = false;
+    let deleteBottom = false;
+    const searchButtonPos = this.model.searchButtonPos || 'RIGHT';
+    deleteRight = searchButtonPos === 'BOTTOM';
+    deleteBottom = searchButtonPos !== 'BOTTOM';
+
+    if (searchButtonStyle === 'NONE') {
+      deleteRight = true;
+      deleteBottom = true;
+    }
+
+    /**
+     * 递归面板项
+     * @author lxm
+     * @date 2023-11-21 04:16:36
+     * @param {IData} parent
+     */
+    const recursivePanelItems = (parent: IData): void => {
+      let children: IData[] | undefined;
+      let childrenKey = '';
+      ['rootPanelItems', 'panelItems'].find(key => {
+        if (parent[key]) {
+          children = parent[key];
+          childrenKey = key;
+          return true;
+        }
+        return false;
+      });
+      if (children && children.length > 0) {
+        const newArr: IData[] = [];
+        children.forEach((item: IData) => {
+          const isDelete =
+            (deleteRight && item.id === 'control_buttons_right') ||
+            (deleteBottom && item.id === 'control_buttons_bottom');
+          if (!isDelete) {
+            newArr.push(item);
+            recursivePanelItems(item);
+          }
+        });
+        if (newArr.length < children.length) {
+          parent[childrenKey] = newArr;
+        }
+      }
+    };
+
+    if (deleteBottom || deleteRight) {
+      recursivePanelItems(this.controlPanel);
+    }
+  }
 }

package/src/controller/control/grid/grid/grid.controller.ts

@@ -8,7 +8,12 @@ import {
   RuntimeError,
   RuntimeModelError,
 } from '@ibiz-template/core';
-import { IDEGrid, IDEGridGroupColumn, IDEGridColumn } from '@ibiz/model-core';
+import {
+  IDEGrid,
+  IDEGridGroupColumn,
+  IDEGridColumn,
+  IDEDataExport,
+} from '@ibiz/model-core';
 import { clone } from 'ramda';
 import { GridFieldColumnController } from '../grid-column/grid-field-column/grid-field-column.controller';
 import { GridColumnController } from './grid-column.controller';
@@ -26,6 +31,7 @@ import {
   CodeListItem,
   MDCtrlLoadParams,
   IGridRowState,
+  IExportColumn,
 } from '../../../../interface';
 import { calcDeCodeNameById } from '../../../../model';
 import { getGridColumnProvider } from '../../../../register';
@@ -134,6 +140,22 @@ export class GridController
    */
   aggTitle: string = '合计';
 
+  /**
+   * 数据导出对象
+   * @author lxm
+   * @date 2023-08-07 04:11:00
+   * @type {IDEDataExport}
+   */
+  dataExport: IDEDataExport | undefined;
+
+  /**
+   * 数据导出列
+   * @author lxm
+   * @date 2023-08-07 04:11:00
+   * @type {IDEDataExport}
+   */
+  allExportColumns: IExportColumn[] | undefined;
+
   /**
    * 分组代码表项集合
    * @author lxm
@@ -166,6 +188,17 @@ export class GridController
     return !!this.model.enableRowEdit && this.state.rowEditOpen;
   }
 
+  /**
+   * 单元格超出呈现模式
+   * @author lxm
+   * @date 2023-11-17 01:56:26
+   * @readonly
+   * @type {('wrap' | 'ellipsis')}
+   */
+  get overflowMode(): 'wrap' | 'ellipsis' {
+    return ibiz.config.grid.overflowMode;
+  }
+
   protected initState(): void {
     super.initState();
     this.state.rows = [];
@@ -902,6 +935,35 @@ export class GridController
     return res.data;
   }
 
+  /**
+   * 初始化数据导出列
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-21 18:54:16
+   */
+  async findAllExportColumns(
+    dataExport: IDEDataExport,
+  ): Promise<IExportColumn[] | undefined> {
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    const exportColumnsPromises: Promise<IExportColumn>[] | undefined =
+      dataExport.dedataExportItems?.map(async item => {
+        const tempExportColumn: IExportColumn = { ...item };
+        if (item.codeListId) {
+          // 加载代码表模型
+          tempExportColumn.codeList = app.codeList.getCodeList(item.codeListId);
+          tempExportColumn.codeListItems = await app.codeList.get(
+            item.codeListId,
+          );
+        }
+        return tempExportColumn;
+      });
+    // 使用 Promise.all 等待所有 Promise 解析
+    if (exportColumnsPromises) {
+      return Promise.all(exportColumnsPromises);
+    }
+    return undefined;
+  }
+
   /**
    * 数据导出
    *
@@ -910,35 +972,55 @@ export class GridController
    * @memberof MDControlController
    */
   async exportData(_args: { event: MouseEvent; params: IData }): Promise<void> {
-    // 前台导出
-    const items: { [key: string]: GridFieldColumnController } =
-      this.fieldColumns;
+    // 初始化导出对象
+    if (this.model.dedataExportId && !this.dataExport) {
+      this.dataExport = this.dataEntity.appDEDataExports?.find(dataExport => {
+        return dataExport.id === this.model.dedataExportId;
+      });
+      if (this.dataExport) {
+        this.allExportColumns = await this.findAllExportColumns(
+          this.dataExport,
+        );
+      }
+    }
     // 数据格式化
     const formatExcelData = (data: IData[]): IData[] => {
-      // const codeListMap: Map<string, readonly CodeListItem[]> = new Map();
-      // Object.keys(items).forEach((key: string) => {
-      //   if (items[key].codeList) {
-      //     codeListMap.set(key, items[key].codeListItems!);
-      //   }
-      // });
+      const codeListMap: Map<string, readonly CodeListItem[]> = new Map();
+      if (this.allExportColumns && this.allExportColumns.length > 0) {
+        this.allExportColumns?.forEach((exportColumn: IExportColumn) => {
+          if (exportColumn.codeListItems) {
+            codeListMap.set(
+              exportColumn.appDEFieldId!,
+              exportColumn.codeListItems!,
+            );
+          }
+        });
+      } else {
+        Object.keys(this.fieldColumns).forEach((key: string) => {
+          if (this.fieldColumns[key].codeList) {
+            codeListMap.set(key, this.fieldColumns[key].codeListItems!);
+          }
+        });
+      }
       const cloneData = clone(
         data.map(item => {
           return item.getOrigin();
         }),
       );
-      // cloneData.forEach(item => {
-      //   const fields = Object.keys(item);
-      //   fields.forEach((key: string) => {
-      //     if (codeListMap.get(key)) {
-      //       item[key] =
-      //         codeListMap.get(key)!.find(_item => {
-      //           return _item.value === item[key];
-      //         })?.text || item[key];
-      //     }
-      //   });
-      // });
+      cloneData.forEach(item => {
+        const fields = Object.keys(item);
+        fields.forEach((key: string) => {
+          if (codeListMap.get(key)) {
+            item[key] =
+              codeListMap.get(key)!.find(_item => {
+                return _item.value === item[key];
+              })?.text || item[key];
+          }
+        });
+      });
       return cloneData;
     };
+    // 获取导出数据
     const getExportData = async (): Promise<IData[]> => {
       const type = _args.params?.type;
       let data: IData[] = [];
@@ -977,14 +1059,26 @@ export class GridController
         });
       });
     };
+
     // 头部id数组
-    const filterVal = Object.keys(items).map(
-      (key: string) => items[key].model.id!,
-    );
+    let filterVal: string[] = [];
     // 表头数组
-    const header = Object.keys(items).map(
-      (key: string) => items[key].model.caption!,
-    );
+    let header: string[] = [];
+    if (this.allExportColumns && this.allExportColumns.length > 0) {
+      filterVal = this.allExportColumns.map(
+        (column: IExportColumn) => column.appDEFieldId!,
+      );
+      header = this.allExportColumns.map(
+        (column: IExportColumn) => column.caption!,
+      );
+    } else {
+      filterVal = Object.keys(this.fieldColumns).map(
+        (key: string) => this.fieldColumns[key].model.id!,
+      );
+      header = Object.keys(this.fieldColumns).map(
+        (key: string) => this.fieldColumns[key].model.caption!,
+      );
+    }
     // 二维数组
     const data = formatArrayData(filterVal, await getExportData());
     await exportData(header, data, this.model.logicName!);

package/src/controller/control/panel/panel/panel.controller.ts

@@ -15,6 +15,7 @@ import {
   IPanelItemProvider,
   IControlProvider,
   IPanelItemContainerController,
+  IController,
 } from '../../../../interface';
 import { getAllPanelField } from '../../../../model';
 import { getPanelItemProvider } from '../../../../register';
@@ -22,6 +23,7 @@ import { PanelData } from '../../../../service/vo';
 import { ControlController } from '../../../common';
 import { PanelNotifyState } from '../../../constant';
 import { ControllerEvent } from '../../../utils';
+import { CTX } from '../../../ctx';
 
 /**
  * 面板部件控制器
@@ -72,6 +74,8 @@ export class PanelController<
    */
   inputData: IData | undefined;
 
+  container?: IController;
+
   /**
    * 面板数据
    *
@@ -84,6 +88,17 @@ export class PanelController<
     return this.state.data;
   }
 
+  constructor(
+    model: T,
+    context: IContext,
+    params: IParams,
+    ctx: CTX,
+    container?: IController,
+  ) {
+    super(model, context, params, ctx);
+    this.container = container;
+  }
+
   protected initState(): void {
     super.initState();
     this.state.data = {};

package/src/controller/utils/data-file-util/data-file-util.ts

@@ -3,7 +3,7 @@ import {
   IPortalMessage,
   RuntimeError,
 } from '@ibiz-template/core';
-import { IAppDataEntity } from '@ibiz/model-core';
+import { IAppDEDataImport, IAppDataEntity } from '@ibiz/model-core';
 
 // 异步导入URL
 const asyncImportUrl = 'asyncimportdata2';
@@ -65,10 +65,14 @@ function listenAsyncAction(id: string): Promise<void> {
 export async function asyncImportData(
   file: File,
   appDataEntity: IAppDataEntity,
+  dataImport?: IAppDEDataImport,
 ): Promise<void> {
   const data = new FormData();
   data.append('file', file);
-  const url = `${appDataEntity.codeName2!.toLowerCase()}/${asyncImportUrl}`;
+  let url = `${appDataEntity.codeName2!.toLowerCase()}/${asyncImportUrl}`;
+  if (dataImport?.codeName) {
+    url += `?srfimporttag=${dataImport.codeName}`;
+  }
   const res = await ibiz.net.request(url, {
     method: 'post',
     data,
@@ -95,10 +99,14 @@ export async function asyncImportData(
 export async function importData(
   file: File,
   appDataEntity: IAppDataEntity,
+  dataImport?: IAppDEDataImport,
 ): Promise<ImportDataResult> {
   const data = new FormData();
   data.append('file', file);
-  const url = `${appDataEntity.codeName2!.toLowerCase()}/${importUrl}`;
+  let url = `${appDataEntity.codeName2!.toLowerCase()}/${importUrl}`;
+  if (dataImport?.codeName) {
+    url += `?srfimporttag=${dataImport.codeName}`;
+  }
   const res = await ibiz.net.request(url, {
     method: 'post',
     data,