@ibiz-template/runtime 0.7.41-alpha.112 → 0.7.41-alpha.113

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

@@ -49,6 +49,7 @@ import {
   IStorageColumnStates,
   IApiGridColumnMapping,
   IApiExportParams,
+  IFrontExportParams,
 } from '../../../../interface';
 import { calcDeCodeNameById, calcUIActionGroup } from '../../../../model';
 import {
@@ -76,6 +77,7 @@ import {
   switchRowEditDynamic,
   initModelByEntitySchema,
 } from './auto-grid.util';
+import { PredefinedAttributes } from '../../../../constant';
 
 /**
  * 表格控制器
@@ -1649,16 +1651,29 @@ export class GridController<
    * 获取数据导出模型
    * @returns
    */
-  getDataExcelModel(): { header: string[]; fields: string[] } {
+  getDataExcelModel(): {
+    header: string[];
+    fields: string[];
+    exportColumns: IData[];
+    colWidths: { wpx: number }[];
+  } {
     const { dedataExportId, degridColumns = [] } = this.model;
-    const excelModel: { header: string[]; fields: string[] } = {
+    const excelModel: {
+      header: string[];
+      fields: string[];
+      exportColumns: IData[];
+      colWidths: { wpx: number }[];
+    } = {
       header: [],
       fields: [],
+      exportColumns: [],
+      colWidths: [],
     };
     if (dedataExportId) {
       if (this.allExportColumns.length) {
         excelModel.fields = this.allExportColumns.map(x => x.appDEFieldId!);
         excelModel.header = this.allExportColumns.map(x => x.caption!);
+        excelModel.exportColumns = this.allExportColumns;
       }
     } else {
       const exportColumns = this.state.columnStates
@@ -1676,6 +1691,12 @@ export class GridController<
         });
       excelModel.fields = exportColumns.map(item => item.id!);
       excelModel.header = exportColumns.map(item => item.caption!);
+      excelModel.colWidths = exportColumns.map(item => {
+        return {
+          wpx: item.width || 150,
+        };
+      });
+      excelModel.exportColumns = exportColumns;
     }
     return excelModel;
   }
@@ -1829,18 +1850,18 @@ export class GridController<
       await this.excuteBackendExport(args.params);
       return;
     }
-    const { header, fields } = this.getDataExcelModel();
+    // 导出前先填充导出代码表数据
+    await this.fillExportCodelistMap();
+    const data = await this.getExportData(args.params);
+    const { header, fields, exportColumns, colWidths } =
+      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, fields);
     const table = formatData.map(v => Object.values(v));
-
     // 获取导出文件名,如果有自定义文件名格式则使用自定义文件名格式
     let fileName = this.model.logicName!;
     if (this.dataExport?.fileNameFormat) {
@@ -1851,12 +1872,33 @@ export class GridController<
         now: new Date(),
       });
     }
-
-    await ibiz.platform.frontExport({
+    // 准备前台导出参数
+    const frontExportParams: IFrontExportParams = {
       header,
       data: table,
       fileName,
+      colWidths: () => {
+        return colWidths;
+      },
+    };
+    // 前台导出注入属性识别
+    const frontExportAttri = this.model.controlAttributes?.find(item => {
+      return item.attrName === PredefinedAttributes.BEFORE_FRONT_EXPORT;
     });
+    if (frontExportAttri) {
+      const { attrValue } = frontExportAttri;
+      if (attrValue) {
+        const frontExportResult = await ScriptFactory.asyncExecScriptFn(
+          { exportColumns, data },
+          attrValue,
+        );
+        if (frontExportResult) {
+          Object.assign(frontExportParams, frontExportResult);
+        }
+      }
+    }
+    // 导出数据
+    await ibiz.platform.frontExport(frontExportParams);
   }
 
   /**

package/src/controller/control/md-ctrl/md-ctrl.controller.ts

@@ -20,6 +20,7 @@ import {
   ISearchGroupData,
   IExportColumn,
   IApiExportParams,
+  IFrontExportParams,
 } from '../../../interface';
 import { MDCtrlService } from './md-ctrl.service';
 import { MobMDCtrlRowState } from './md-ctrl-row.state';
@@ -28,6 +29,8 @@ import { ControlVO } from '../../../service';
 import { UIActionUtil } from '../../../ui-action';
 import { ButtonContainerState, UIActionButtonState } from '../../utils';
 import { calcUIActionGroup, getAllUIActionItems } from '../../../model';
+import { ScriptFactory } from '../../../utils';
+import { PredefinedAttributes } from '../../../constant';
 
 export class MDCtrlController
   extends MDControlController<IDEMobMDCtrl, IMobMdCtrlState, IMobMDCtrlEvent>
@@ -611,19 +614,29 @@ export class MDCtrlController
 
   /**
    * @description 获取数据导出模型
-   * @returns {*}  {{ header: string[]; fields: string[] }}
+   * @returns {*}  {{ header: string[], fields: string[], exportColumns: IData[] }}
    * @memberof MDCtrlController
    */
-  getDataExcelModel(): { header: string[]; fields: string[] } {
+  getDataExcelModel(): {
+    header: string[];
+    fields: string[];
+    exportColumns: IData[];
+  } {
     const { dedataExportId } = this.model;
-    const excelModel: { header: string[]; fields: string[] } = {
+    const excelModel: {
+      header: string[];
+      fields: string[];
+      exportColumns: IData[];
+    } = {
       header: [],
       fields: [],
+      exportColumns: [],
     };
     if (dedataExportId) {
       if (this.allExportColumns.length) {
         excelModel.fields = this.allExportColumns.map(x => x.appDEFieldId!);
         excelModel.header = this.allExportColumns.map(x => x.caption!);
+        excelModel.exportColumns = this.allExportColumns;
       }
     }
     return excelModel;
@@ -799,7 +812,7 @@ export class MDCtrlController
       await this.excuteBackendExport(args.params || {});
       return;
     }
-    const { header, fields } = this.getDataExcelModel();
+    const { header, fields, exportColumns } = this.getDataExcelModel();
     if (!header) {
       throw new RuntimeError(
         ibiz.i18n.t('runtime.controller.common.md.tabularColumns'),
@@ -808,10 +821,32 @@ export class MDCtrlController
     const data = await this.getExportData(args.params || {});
     const formatData = this.formatExcelData(data, fields);
     const table = formatData.map(v => Object.values(v));
-    await ibiz.platform.frontExport({
+    // 准备前台导出参数
+    const frontExportParams: IFrontExportParams = {
       header,
       data: table,
       fileName: this.model.logicName!,
+      colWidths: () => {
+        return [];
+      },
+    };
+    // 前台导出注入属性识别
+    const frontExportAttri = this.model.controlAttributes?.find(item => {
+      return item.attrName === PredefinedAttributes.BEFORE_FRONT_EXPORT;
     });
+    if (frontExportAttri) {
+      const { attrValue } = frontExportAttri;
+      if (attrValue) {
+        const frontExportResult = await ScriptFactory.asyncExecScriptFn(
+          { exportColumns, data },
+          attrValue,
+        );
+        if (frontExportResult) {
+          Object.assign(frontExportParams, frontExportResult);
+        }
+      }
+    }
+    // 导出数据
+    await ibiz.platform.frontExport(frontExportParams);
   }
 }

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

@@ -10,7 +10,7 @@ import { IAppDEDataImport, IAppDataEntity } from '@ibiz/model-core';
 import { mergeRight } from 'ramda';
 import { calcResPath } from '../../../service';
 import { OpenAppViewCommand } from '../../../command';
-import { IViewConfig } from '../../../interface';
+import { IViewConfig, IFrontExportParams } from '../../../interface';
 
 // 异步导入URL
 const asyncImportUrl = 'asyncimportdata2';
@@ -250,9 +250,7 @@ export async function importData2(opts: {
  * @return {*}  {Promise<IExportDataResult>}
  */
 export async function exportData(
-  header: string[],
-  data: IData[][],
-  fileName: string,
+  args: IFrontExportParams,
 ): Promise<IExportDataResult> {
   if (!ibiz.util.getExcelUtil) {
     throw new RuntimeError(
@@ -266,11 +264,25 @@ export async function exportData(
     );
   }
   try {
-    exportExcel.exportJsonToExcel({
-      header, // 表头内容 数组格式
-      data, // 具体数据 这是个二维数组
-      filename: fileName, // 文件名称
-      autoWidth: true, // 单元格是否自适应
+    const {
+      fileName,
+      header,
+      data,
+      rowHeights,
+      colWidths,
+      multiHeader,
+      merges,
+      cellStyle,
+    } = args;
+    exportExcel.exportJsonToExcelWithStyle({
+      fileName,
+      header,
+      data,
+      rowHeights,
+      colWidths,
+      multiHeader,
+      merges,
+      cellStyle,
     });
     return { ok: true };
   } catch (error) {

package/src/interface/api/util/i-api-excel-util.ts

@@ -7,7 +7,7 @@ import { IApiData } from '@ibiz-template/core';
  */
 export interface IApiExcelUtil {
   /**
-   * @description 导出成Excel文件
+   * @description 导出excel文件
    * @param {{
    *     header: string[]; // 表头内容
    *     data: IApiData[]; // 数据内容
@@ -22,4 +22,41 @@ export interface IApiExcelUtil {
     filename: string;
     autoWidth: boolean;
   }): void;
+
+  /**
+   * @description 导出excel文件（附加样式处理）
+   * @param {({
+   *     fileName: string;  // 文件名
+   *     header: string[];  // 表头内容
+   *     data: string[][];   // 数据内容
+   *     rowHeights?:(rows: string[][]) => { hpx: number }[] | { hpt: number }[];  // 行高，hpt（磅）/ hpx（像素）
+   *     colWidths?:(rows: string[][]) => { wch: number }[] | { wpx: number }[];   // 列宽，wch（字符数）/ wpx（像素）
+   *     multiHeader?: string[][];    // 多表头数据
+   *     merges?: { s: { r: number; c: number }; e: { r: number; c: number } }[];  // 合并单元格，s: 起始坐标, e: 结束坐标
+   *     cellStyle?: (       // 单元格样式
+   *       rows:string[][],
+   *       value: unknown,
+   *       rowIndex: number,
+   *       colIndex: number,
+   *       isHeaderCell: boolean,
+   *     ) => { fill?: IData; font?: IData; alignment?: IData; border?: IData };
+   *   })} args
+   * @memberof IApiExcelUtil
+   */
+  exportJsonToExcelWithStyle(args: {
+    fileName: string;
+    header: string[];
+    data: string[][];
+    rowHeights?: (rows: string[][]) => { hpx: number }[] | { hpt: number }[];
+    colWidths?: (rows: string[][]) => { wch: number }[] | { wpx: number }[];
+    multiHeader?: string[][];
+    merges?: { s: { r: number; c: number }; e: { r: number; c: number } }[];
+    cellStyle?: (
+      rows: string[][],
+      value: unknown,
+      rowIndex: number,
+      colIndex: number,
+      isHeaderCell: boolean,
+    ) => { fill?: IData; font?: IData; alignment?: IData; border?: IData };
+  }): void;
 }

package/src/interface/provider/i-platform-provider.ts

@@ -62,10 +62,51 @@ export interface IFrontExportParams {
   header: string[];
   /**
    * @description 表格数据
-   * @type {IData[][]}
+   * @type {string[][]}
    * @memberof IFrontExportParams
    */
-  data: IData[][];
+  data: string[][];
+
+  /**
+   * @description 行高集合
+   * @type hpt（磅）/ hpx（像素）
+   * @memberof IFrontExportParams
+   */
+  rowHeights?: (rows: string[][]) => { hpx: number }[] | { hpt: number }[];
+
+  /**
+   * @description 列宽集合
+   * @type wch（字符数）/ wpx（像素）
+   * @memberof IFrontExportParams
+   */
+  colWidths?: (rows: string[][]) => { wch: number }[] | { wpx: number }[];
+
+  /**
+   * @description 多表头数据
+   * @type {string[][]}
+   * @memberof IFrontExportParams
+   */
+  multiHeader?: string[][];
+
+  /**
+   * @description 合并单元格
+   * @type {{ s: { r: number; c: number }; e: { r: number; c: number } }[]} s: 起始坐标, e: 结束坐标
+   * @memberof IFrontExportParams
+   */
+  merges?: { s: { r: number; c: number }; e: { r: number; c: number } }[];
+
+  /**
+   * @description 单元格样式,详情参考：https://gitbrent.github.io/xlsx-js-style/
+   * @type {(rows: string[][], value: unknown, rowIndex: number, colIndex: number, isHeaderCell: boolean) => { fill?: IData; font?: IData; alignment?: IData; border?: IData }}
+   * @memberof IFrontExportParams
+   */
+  cellStyle?: (
+    rows: string[][],
+    value: unknown,
+    rowIndex: number,
+    colIndex: number,
+    isHeaderCell: boolean,
+  ) => { fill?: IData; font?: IData; alignment?: IData; border?: IData };
 }
 
 /**

package/src/platform/provider/platform-provider-base.ts

@@ -107,8 +107,7 @@ export abstract class PlatformProviderBase implements IPlatformProvider {
    * @memberof PlatformProviderBase
    */
   async frontExport(args: IFrontExportParams): Promise<boolean> {
-    const { header, data, fileName } = args;
-    await exportData(header, data, fileName);
+    await exportData(args);
     return true;
   }