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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.41-alpha.112",
+  "version": "0.7.41-alpha.114",
   "description": "运行时逻辑库",
   "type": "module",
   "main": "out/index.js",
@@ -39,7 +39,7 @@
     "jsencrypt": "^3.3.2"
   },
   "devDependencies": {
-    "@ibiz-template/core": "^0.7.41-alpha.106",
+    "@ibiz-template/core": "^0.7.41-alpha.113",
     "@ibiz/model-core": "^0.1.88",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
@@ -70,5 +70,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "884c135f203cf1a0ae3977442b559b757acd6b47"
+  "gitHead": "bb921e3d86b25ee998088e744d6d47fb5fedc45c"
 }

package/src/config/global-config.ts

@@ -130,6 +130,7 @@ export class GlobalConfig implements IGlobalConfig {
     aiChunkEntity: '',
     counterMaxValue: 99,
     enhancedUI: false,
+    maxExportRowsDefault: 1000,
   };
 
   // 全局分页流布局配置

package/src/constant/predefined-attributes.ts

@@ -16,4 +16,9 @@ export enum PredefinedAttributes {
    * 样式注入标识
    */
   STYLES = 'styles',
+
+  /**
+   * 前置导出标识
+   */
+  BEFORE_FRONT_EXPORT = 'before-front-export',
 }

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

@@ -890,7 +890,7 @@ export class MDControlController<
     //   'DataExport',
     //   {
     //     dismiss: (result: unknown) => popover.dismiss(result),
-    //     maxRowCount: dataExport.maxRowCount || 1000,
+    //     maxRowCount: dataExport.maxRowCount || ibiz.config.common.maxExportRowsDefault,
     //     pageSize: this.state.size,
     //   },
     //   { autoClose: true, placement: 'bottom-end' },

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

@@ -562,12 +562,19 @@ export abstract class FormController<
    * @returns {*}  {Promise<boolean>}
    */
   async validate(): Promise<boolean> {
-    const values = await Promise.all(
-      [...this.formItems, ...this.formMDCtrls, ...this.formDruipart].map(
-        formItem => formItem.validate(),
-      ),
-    );
-    return values.findIndex(value => !value) === -1;
+    const details = [
+      ...this.formItems,
+      ...this.formMDCtrls,
+      ...this.formDruipart,
+    ];
+    const values = await Promise.all(details.map(detail => detail.validate()));
+    const result = values.findIndex(value => !value) === -1;
+    if (!result) {
+      // 收集校验失败的成员并输出错误日志
+      const failedDetails = details.filter((_, index) => !values[index]);
+      this.logValidateFail(failedDetails);
+    }
+    return result;
   }
 
   /**
@@ -605,14 +612,47 @@ export abstract class FormController<
    * @memberof FormController
    */
   async silentValidate(): Promise<boolean> {
+    const details = [
+      ...this.formItems,
+      ...this.formMDCtrls,
+      ...this.formDruipart,
+    ];
     const values = await Promise.all(
-      [...this.formItems, ...this.formMDCtrls, ...this.formDruipart].map(
-        formItem => formItem.silentValidate(),
-      ),
+      details.map(detail => detail.silentValidate()),
     );
 
     // 找不到value为false即全部是true
-    return values.findIndex(value => !value) === -1;
+    const result = values.findIndex(value => !value) === -1;
+    if (!result) {
+      // 收集校验失败的成员并输出错误日志
+      const failedDetails = details.filter((_, index) => !values[index]);
+      this.logValidateFail(failedDetails);
+    }
+    return result;
+  }
+
+  /**
+   * 输出校验失败的错误日志
+   * @description 收集校验失败的表单成员名称，通过 ibiz.log.error 输出。名称使用表单成员标识
+   * @protected
+   * @param {FormDetailController[]} failedDetails 校验失败的表单成员集合
+   * @memberof FormController
+   */
+  protected logValidateFail(failedDetails: FormDetailController[]): void {
+    const separator = ibiz.i18n.t(
+      'runtime.controller.control.form.validateFailSeparator',
+    );
+    const names = failedDetails
+      .map(detail => detail.model.id || '')
+      .filter(name => !!name);
+    if (names.length === 0) {
+      return;
+    }
+    ibiz.log.error(
+      ibiz.i18n.t('runtime.controller.control.form.validateFail', {
+        names: names.join(separator),
+      }),
+    );
   }
 
   /**
@@ -710,7 +750,14 @@ export abstract class FormController<
    * @memberof FormController
    */
   setDetailError(name: string, message: string): void {
-    const detail = this.details[name];
+    let detail: IFormDetailController | undefined = this.details[name];
+    // 界面表单项标识和属性标识可能不一致，尝试通过属性标识找下表单项，后台返回错误信息是以属性标识返回
+    if (!detail) {
+      detail = Object.values(this.details).find((item: IData) => {
+        const fieldId = item?.model?.appDEFieldId;
+        return !!fieldId && fieldId === name;
+      });
+    }
     const state = detail?.state as FormItemState;
     if (state) {
       state.error = message;

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

@@ -129,6 +129,9 @@ export class FormDRUIPartController
         if (this.isNeedSyncEmbed && this.embedView && this.embedDataService) {
           await this.saveEmbedViewData();
           await this.SyncEmbedDataToForm();
+        } else if (this.model.needSave && this.embedView) {
+          // 常规子视图保存
+          await this.embedView?.call(SysUIActionTag.SAVE);
         }
       });
     }

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;
   }
@@ -1759,7 +1780,12 @@ export class GridController<
               offset: (startPage! - 1) * size,
               size: (endPage! - startPage! + 1) * size,
             }
-          : { size: this.dataExport?.maxRowCount || 1000, page: 0 };
+          : {
+              size:
+                this.dataExport?.maxRowCount ||
+                ibiz.config.common.maxExportRowsDefault,
+              page: 0,
+            };
       data = await this.loadData({ viewParam });
     } else if (type === 'selectedRows') {
       data = this.getData();
@@ -1808,7 +1834,12 @@ export class GridController<
               offset: (startPage! - 1) * size,
               size: (endPage! - startPage! + 1) * size,
             }
-          : { size: this.dataExport?.maxRowCount || 1000, page: 0 };
+          : {
+              size:
+                this.dataExport?.maxRowCount ||
+                ibiz.config.common.maxExportRowsDefault,
+              page: 0,
+            };
     }
     Object.assign(fetchParams, tempParams);
     // 执行导出
@@ -1829,18 +1860,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 +1882,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;
@@ -672,7 +685,12 @@ export class MDCtrlController
               offset: (startPage - 1) * size,
               size: (endPage - startPage + 1) * size,
             }
-          : { size: this.dataExport?.maxRowCount || 1000, page: 0 };
+          : {
+              size:
+                this.dataExport?.maxRowCount ||
+                ibiz.config.common.maxExportRowsDefault,
+              page: 0,
+            };
       data = await this.loadData({ viewParam });
     } else if (type === 'selectedRows') {
       data = this.getData();
@@ -773,7 +791,12 @@ export class MDCtrlController
               offset: (startPage - 1) * size,
               size: (endPage - startPage + 1) * size,
             }
-          : { size: this.dataExport?.maxRowCount || 1000, page: 0 };
+          : {
+              size:
+                this.dataExport?.maxRowCount ||
+                ibiz.config.common.maxExportRowsDefault,
+              page: 0,
+            };
     }
     Object.assign(fetchParams, tempParams);
     // 执行导出
@@ -799,7 +822,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 +831,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/control/medit-view-panel/medit-view-panel.controller.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-shadow */
-import { RuntimeError } from '@ibiz-template/core';
+import { IApiData, IPortalMessage, RuntimeError } from '@ibiz-template/core';
 import { IDEMultiEditViewPanel } from '@ibiz/model-core';
 import { createUUID } from 'qx-util';
 import {
@@ -11,10 +11,12 @@ import {
   DataChangeEvent,
   EventBase,
   IViewController,
+  IApiFormSaveParams,
 } from '../../../interface';
 import { ControlVO } from '../../../service';
 import { MDControlController } from '../../common';
 import { MEditViewPanelService } from './medit-view-panel.service';
+import { SysUIActionTag } from '../../../constant';
 
 /**
  * 多编辑视图面板部件控制器
@@ -328,4 +330,40 @@ export class MEditViewPanelController
   getActiveView(): IViewController | undefined {
     return this.embedViews.get(this.state.activeTab);
   }
+
+  /**
+   * @description 检测实体数据变更，子视图数据变更不应该触发列表加载
+   * @protected
+   * @param {IPortalMessage} _msg
+   * @memberof MEditViewPanelController
+   */
+  protected onDEDataChange(_msg: IPortalMessage): void {
+    ibiz.log.debug(
+      ibiz.i18n.t('runtime.controller.control.meditViewPanel.ignoreDataChange'),
+    );
+  }
+
+  /**
+   * @description 保存数据
+   * @param {IApiFormSaveParams} [args]
+   * @returns {*}  {Promise<IApiData[]>}
+   * @memberof MEditViewPanelController
+   */
+  async save(args: IApiFormSaveParams = { silent: true }): Promise<IApiData[]> {
+    if (this.state.panelUiItems.length === 0) {
+      return [];
+    }
+    const allViews = this.state.panelUiItems.map(item => {
+      return this.embedViews.get(item.id);
+    });
+    if (allViews.length === 0) {
+      return [];
+    }
+    const result = await Promise.all(
+      allViews.map(async view => {
+        return view?.call(SysUIActionTag.SAVE, args);
+      }),
+    );
+    return result.flatMap(r => r?.data ?? []);
+  }
 }

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/call/i-api-medit-view9.call.ts

@@ -27,4 +27,25 @@ export interface IApiMEditView9Call extends Omit<IApiMDViewCall, 'New'> {
   Refresh: {
     args: undefined;
   };
+
+  /**
+   * @description 保存
+   * @type {{
+   *     args: undefined;
+   *   }}
+   * @memberof IApiMEditView9Call
+   */
+  Save: {
+    args: undefined;
+  };
+  /**
+   * @description 保存并关闭
+   * @type {{
+   *     args: undefined;
+   *   }}
+   * @memberof IApiMEditView9Call
+   */
+  SaveAndExit: {
+    args: undefined;
+  };
 }

package/src/interface/api/common/global-config/i-api-global-common-config.ts

@@ -241,4 +241,14 @@ export interface IApiGlobalCommonConfig {
    * @memberof IApiGlobalCommonConfig
    */
   enhancedUI: boolean;
+
+  /**
+   * @description 导出最大行数默认值
+   * @type {number}
+   * @default 1000
+   * @platform web
+   * @platform mob
+   * @memberof IApiGlobalCommonConfig
+   */
+  maxExportRowsDefault: number;
 }

package/src/interface/api/controller/control/i-api-medit-view-panel.controller.ts

@@ -1,7 +1,9 @@
 import { IDEMultiEditViewPanel } from '@ibiz/model-core';
+import { IApiData } from '@ibiz-template/core';
 import { IApiMEditViewPanelState, IApiPanelUiItem } from '../../state';
 import { IApiMDControlController } from './i-api-md-control.controller';
 import { IApiViewController } from '../view';
+import { IApiFormSaveParams } from './i-api-edit-form.controller';
 
 /**
  * 多编辑视图面板
@@ -45,4 +47,12 @@ export interface IApiMEditViewPanelController<
    * @memberof IApiMEditViewPanelController
    */
   getActiveView(): IApiViewController | undefined;
+
+  /**
+   * @description 保存表单数据
+   * @param {IApiFormSaveParams} [args] 保存参数
+   * @returns {*}  {Promise<IApiData[]>}
+   * @memberof IApiMEditViewPanelController
+   */
+  save(args?: IApiFormSaveParams): Promise<IApiData[]>;
 }

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/controller/state/control/i-tree.state.ts

@@ -101,6 +101,20 @@ export interface ITreeNodeData extends IApiTreeNodeData {
    */
   _parentValue?: string | undefined;
 
+  /**
+   * @description 动态样式表
+   * @type {string[]}
+   * @memberof ITreeNodeData
+   */
+  _dynaClass?: string[];
+
+  /**
+   * @description 图形动态样式表
+   * @type {string[]}
+   * @memberof ITreeNodeData
+   */
+  _shapeDynaClass?: string[];
+
   /**
    * @description 获取改变数据
    * @returns {*}  {(IData | undefined)}