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

package/src/controller/common/editor/editor.controller.ts

@@ -3,6 +3,7 @@ import {
   IEditor,
   IEditorItem,
   INavigateParamContainer,
+  IControlAttribute,
 } from '@ibiz/model-core';
 import { DataTypes } from '@ibiz-template/core';
 import dayjs from 'dayjs';
@@ -15,6 +16,7 @@ import {
 } from '../../../interface/controller';
 import { ValueExUtil } from '../../utils';
 import { ControlController } from '../control';
+import { PredefinedAttributes } from '../../../constant';
 
 /**
  * 编辑器控制器基类
@@ -309,7 +311,17 @@ export class EditorController<T extends IEditor = IEditor>
         (item: IEditorItem) => item.id !== this.model.id,
       );
     }
-
+    // 合并语义化埋点属性
+    const controlAttributes =
+      (this.parent as IData).model?.controlAttributes?.filter(
+        (item: IControlAttribute) =>
+          PredefinedAttributes.CLASSNAMES === item.attrName ||
+          PredefinedAttributes.STYLES === item.attrName,
+      ) || [];
+    if (controlAttributes.length) {
+      if (!this.model.controlAttributes) this.model.controlAttributes = [];
+      this.model.controlAttributes.push(...controlAttributes);
+    }
     this.initExtraParams();
   }
 

package/src/controller/common/view/view.controller.ts

@@ -483,8 +483,8 @@ export class ViewController<
       };
       if (this.scheduler.hasViewEventTrigger) {
         // 监听视图事件触发视图事件触发器
-        this.evt.onAll((_eventName, event) => {
-          this.scheduler!.triggerViewEvent(event);
+        this.evt.onAll(async (_eventName, event) => {
+          await this.scheduler!.triggerViewEvent(event);
         });
       }
     }

package/src/controller/control/calendar/calendar.controller.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-case-declarations */
 import dayjs from 'dayjs';
 import { ISysCalendar, ISysCalendarItem } from '@ibiz/model-core';
-import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
+import { RuntimeError } from '@ibiz-template/core';
 import {
   CodeListItem,
   ICalendarState,
@@ -314,8 +314,8 @@ export class CalendarController
       };
       if (this.viewScheduler.hasViewEventTrigger) {
         // 监听视图事件触发视图事件触发器
-        this.evt.onAll((_eventName, event) => {
-          this.viewScheduler!.triggerViewEvent(event);
+        this.evt.onAll(async (_eventName, event) => {
+          await this.viewScheduler!.triggerViewEvent(event);
         });
       }
     }
@@ -379,13 +379,12 @@ export class CalendarController
         ctrl: this,
       },
     );
-    if (result === -1)
-      throw new RuntimeModelError(
-        calendarItem,
-        ibiz.i18n.t('runtime.controller.common.md.logicOpendata', {
-          itemType: calendarItem.itemType!.toLowerCase(),
-        }),
-      );
+    if (result === -1) {
+      ibiz.log.error(ibiz.i18n.t('runtime.engine.logicOpendata'));
+      return {
+        cancel: true,
+      };
+    }
     return {
       cancel: result ? result.ok : true,
     };
@@ -415,13 +414,12 @@ export class CalendarController
         ctrl: this,
       },
     );
-    if (result === -1)
-      throw new RuntimeModelError(
-        calendarItem,
-        ibiz.i18n.t('runtime.controller.common.md.logicNewdata', {
-          itemType: calendarItem.itemType!.toLowerCase(),
-        }),
-      );
+    if (result === -1) {
+      ibiz.log.error(ibiz.i18n.t('runtime.engine.logicNewdata'));
+      return {
+        cancel: true,
+      };
+    }
     return {
       cancel: result ? result.ok : true,
     };

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

@@ -17,7 +17,7 @@ import {
 } from '../../../../../interface';
 import { getEditorProvider } from '../../../../../register';
 import { Srfuf } from '../../../../../service';
-import { calcDeCodeNameById } from '../../../../../model';
+import { calcDeCodeNameById, calcDynaClass } from '../../../../../model';
 import { filterValueRules } from '../../../../../utils';
 import { FormNotifyState } from '../../../../constant';
 import { generateEditorRules, generateRules } from '../../../../utils';
@@ -620,4 +620,17 @@ export class FormItemController
   clearTipsCache(): void {
     localStorage.removeItem(this.TIPS_CACHE);
   }
+
+  /**
+   * @description 计算动态样式表
+   * @param {IData} data
+   * @memberof FormItemController
+   */
+  protected calcDynaClass(data: IData): void {
+    super.calcDynaClass(data);
+    if (this.model.editor?.dynaClass) {
+      const dynaClass = calcDynaClass(this.model.editor.dynaClass, data);
+      this.state.editorClass = dynaClass;
+    }
+  }
 }

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

@@ -68,4 +68,12 @@ export class FormItemState
    * @memberof FormItemState
    */
   inputTipUrl: string | undefined = undefined;
+
+  /**
+   * 编辑器类名集合
+   *
+   * @type {string[]}
+   * @memberof FormItemState
+   */
+  editorClass: string[] = [];
 }

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

@@ -2,6 +2,7 @@ import { IDEFormRawItem } from '@ibiz/model-core';
 import { FormDetailController } from '../form-detail';
 import { FormRawItemState } from './form-rawitem.state';
 import { IApiFormRawItemController } from '../../../../../interface';
+import { calcDynaClass } from '../../../../../model';
 
 /**
  * @description 表单直接内容控制器
@@ -19,4 +20,18 @@ export class FormRawItemController
   protected createState(): FormRawItemState {
     return new FormRawItemState(this.parent?.state);
   }
+
+  /**
+   * @description 计算动态样式表
+   * @protected
+   * @param {IData} data
+   * @memberof FormRawItemController
+   */
+  protected calcDynaClass(data: IData): void {
+    super.calcDynaClass(data);
+    if (this.model.rawItem?.dynaClass) {
+      const dynaClass = calcDynaClass(this.model.rawItem.dynaClass, data);
+      this.state.class.containerDyna = dynaClass;
+    }
+  }
 }

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,22 +1850,55 @@ 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));
-    await ibiz.platform.frontExport({
+    // 获取导出文件名,如果有自定义文件名格式则使用自定义文件名格式
+    let fileName = this.model.logicName!;
+    if (this.dataExport?.fileNameFormat) {
+      fileName = await ibiz.util.hbs.render(this.dataExport.fileNameFormat, {
+        context: this.context,
+        params: this.params,
+        data: this.view.state.srfactiveviewdata,
+        now: new Date(),
+      });
+    }
+    // 准备前台导出参数
+    const frontExportParams: IFrontExportParams = {
       header,
       data: table,
-      fileName: this.model.logicName!,
+      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/control/report-panel/generator/bi-converter/base/grid-converter-base.ts

@@ -35,24 +35,24 @@ export abstract class GridConverterBase extends ConverterBase {
       grid_function_setting,
     } = this.reportUIModel;
     result.vars = {
-      '--ibiz-control-grid-header-align': grid_header_position,
-      '--ibiz-control-grid-header-font-size': `${grid_header_fontsize}px`,
-      '--ibiz-control-grid-header-text-color': grid_header_fontcolor,
-      '--ibiz-control-grid-content-font-size': `${grid_body_fontsize}px`,
-      '--ibiz-control-grid-content-text-color': grid_body_fontcolor,
+      '--ibiz-control-grid-header-cell-align': grid_header_position,
+      '--ibiz-control-grid-header-cell-font-size': `${grid_header_fontsize}px`,
+      '--ibiz-control-grid-header-cell-text-color': grid_header_fontcolor,
+      '--ibiz-control-grid-body-cell-font-size': `${grid_body_fontsize}px`,
+      '--ibiz-control-grid-body-cell-text-color': grid_body_fontcolor,
     };
     if (grid_header_fontstyle) {
       const key =
         grid_header_fontstyle === 'bold'
-          ? '--ibiz-control-grid-header-font-weight'
-          : '--ibiz-control-grid-header-font-style';
+          ? '--ibiz-control-grid-header-cell-font-weight'
+          : '--ibiz-control-grid-header-cell-font-style';
       result.vars[key] = grid_header_fontstyle;
     }
     if (grid_body_fontstyle) {
       const key =
         grid_body_fontstyle === 'bold'
-          ? '--ibiz-control-grid-content-font-weight'
-          : '--ibiz-control-grid-content-font-style';
+          ? '--ibiz-control-grid-body-cell-font-weight'
+          : '--ibiz-control-grid-body-cell-font-style';
       result.vars[key] = grid_body_fontstyle;
     }
     if (grid_show_agg == '1') {

package/src/controller/control/tree/tree.controller.ts

@@ -255,8 +255,8 @@ export class TreeController<
       };
       if (this.viewScheduler.hasViewEventTrigger) {
         // 监听视图事件触发视图事件触发器
-        this.evt.onAll((_eventName, event) => {
-          this.viewScheduler!.triggerViewEvent(event);
+        this.evt.onAll(async (_eventName, event) => {
+          await this.viewScheduler!.triggerViewEvent(event);
         });
       }
     }
@@ -1493,13 +1493,12 @@ export class TreeController<
       },
     );
 
-    if (result === -1)
-      throw new RuntimeModelError(
-        nodeModel,
-        ibiz.i18n.t('runtime.controller.common.md.logicOpendata', {
-          itemType: nodeModel.id!.toLowerCase(),
-        }),
-      );
+    if (result === -1) {
+      ibiz.log.error(ibiz.i18n.t('runtime.engine.logicOpendata'));
+      return {
+        cancel: true,
+      };
+    }
 
     return {
       cancel: result ? !result.ok : true,
@@ -1537,13 +1536,12 @@ export class TreeController<
       },
     );
 
-    if (result === -1)
-      throw new RuntimeModelError(
-        nodeModel,
-        ibiz.i18n.t('runtime.controller.common.md.logicNewdata', {
-          itemType: nodeModel.id!.toLowerCase(),
-        }),
-      );
+    if (result === -1) {
+      ibiz.log.error(ibiz.i18n.t('runtime.engine.logicNewdata'));
+      return {
+        cancel: true,
+      };
+    }
 
     return {
       cancel: result ? !result.ok : true,

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/engine/md-view.engine.ts

@@ -332,21 +332,20 @@ export class MDViewEngine extends ViewEngineBase {
     });
 
     if (result === -1) {
-      throw new RuntimeModelError(
-        this.view.model,
-        ibiz.i18n.t('runtime.engine.logicOpendata'),
-      );
-    } else {
-      if (result && result.ok && result.data && result.data.length > 0) {
-        this.view.evt.emit('onDataChange', {
-          data: result.data,
-          actionType: 'EDIT',
-        });
-      }
+      ibiz.log.error(ibiz.i18n.t('runtime.engine.logicOpendata'));
       return {
-        cancel: result ? !result.ok : true,
+        cancel: true,
       };
     }
+    if (result && result.ok && result.data && result.data.length > 0) {
+      this.view.evt.emit('onDataChange', {
+        data: result.data,
+        actionType: 'EDIT',
+      });
+    }
+    return {
+      cancel: result ? !result.ok : true,
+    };
   }
 
   /**
@@ -393,21 +392,20 @@ export class MDViewEngine extends ViewEngineBase {
     });
 
     if (result === -1) {
-      throw new RuntimeModelError(
-        this.view.model,
-        ibiz.i18n.t('runtime.engine.logicNewdata'),
-      );
-    } else {
-      if (result.ok && result.data && result.data.length > 0) {
-        this.view.evt.emit('onDataChange', {
-          data: result.data,
-          actionType: 'NEW',
-        });
-      }
+      ibiz.log.error(ibiz.i18n.t('runtime.engine.logicNewdata'));
       return {
-        cancel: result ? !result.ok : true,
+        cancel: true,
       };
     }
+    if (result.ok && result.data && result.data.length > 0) {
+      this.view.evt.emit('onDataChange', {
+        data: result.data,
+        actionType: 'NEW',
+      });
+    }
+    return {
+      cancel: result ? !result.ok : true,
+    };
   }
 
   /**

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

@@ -231,4 +231,14 @@ export interface IApiGlobalCommonConfig {
    * @memberof IApiGlobalCommonConfig
    */
   counterMaxValue: number;
+
+  /**
+   * @description 是否启用增强UI,非兼容性功能增强开关
+   * @type {boolean}
+   * @default false
+   * @platform web
+   * @platform mob
+   * @memberof IApiGlobalCommonConfig
+   */
+  enhancedUI: boolean;
 }

package/src/interface/api/state/control/form-detail/i-api-form-item.state.ts

@@ -33,4 +33,11 @@ export interface IApiFormItemState extends IApiFormDetailState {
    * @memberof IApiFormItemState
    */
   inputTipUrl: string | undefined;
+
+  /**
+   * @description 编辑器类名集合
+   * @type {(string[])}
+   * @memberof IApiFormItemState
+   */
+  editorClass: string[];
 }

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;
 }