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

package/out/logic-scheduler/scheduler/view-logic-scheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-logic-scheduler.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/scheduler/view-logic-scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAmB,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,cAAc;gBACxC,MAAM,EAAE,eAAe,EAAE,EAAE,aAAa,GAAE,MAAM,EAAO;IAQnE;;;;;;;OAOG;IACH,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;CAOzC"}
+{"version":3,"file":"view-logic-scheduler.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/scheduler/view-logic-scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAmB,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,cAAc;gBACxC,MAAM,EAAE,eAAe,EAAE,EAAE,aAAa,GAAE,MAAM,EAAO;IAQnE;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAUxD"}

package/out/logic-scheduler/scheduler/view-logic-scheduler.js

@@ -19,15 +19,17 @@ export class ViewLogicScheduler extends LogicScheduler {
      * 触发视图事件
      * @author lxm
      * @date 2023-06-26 02:26:33
-     * @param {string} itemName 子项名称
-     * @param {Partial<IUILogicParams>} executeParams 执行参数
-     * @return {*}  {(boolean | undefined)}
+     * @param {EventBase} event 事件对象
+     * @return {*}  {Promise<void>}
      */
-    triggerViewEvent(event) {
+    async triggerViewEvent(event) {
         const matchParams = {
             eventName: event.eventName,
             triggerType: 'VIEWEVENT',
         };
-        this.triggerAndExecute(matchParams, event);
+        const result = this.triggerAndExecute(matchParams, event);
+        if (result === null || result === void 0 ? void 0 : result.length) {
+            await Promise.all(result);
+        }
     }
 }

package/out/utils/handlebars/helpers/date-format/date-format.d.ts

@@ -0,0 +1,14 @@
+import { HelperBase } from '../helper-base';
+/**
+ * @description 时间格式化，用法: 销售内示数据{{dateFormat now "YYYYMMDDHHmmss"}}.xlsx
+ * @author tony001
+ * @date 2026-07-06 15:07:49
+ * @export
+ * @class HelperDateFormat
+ * @extends {HelperBase}
+ */
+export declare class HelperDateFormat extends HelperBase {
+    constructor(hbs: IData);
+    onExecute(date: Date, format: string): string;
+}
+//# sourceMappingURL=date-format.d.ts.map

package/out/utils/handlebars/helpers/date-format/date-format.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"date-format.d.ts","sourceRoot":"","sources":["../../../../../src/utils/handlebars/helpers/date-format/date-format.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;GAOG;AACH,qBAAa,gBAAiB,SAAQ,UAAU;gBAClC,GAAG,EAAE,KAAK;IAItB,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;CAG9C"}

package/out/utils/handlebars/helpers/date-format/date-format.js

@@ -0,0 +1,18 @@
+import dayjs from 'dayjs';
+import { HelperBase } from '../helper-base';
+/**
+ * @description 时间格式化，用法: 销售内示数据{{dateFormat now "YYYYMMDDHHmmss"}}.xlsx
+ * @author tony001
+ * @date 2026-07-06 15:07:49
+ * @export
+ * @class HelperDateFormat
+ * @extends {HelperBase}
+ */
+export class HelperDateFormat extends HelperBase {
+    constructor(hbs) {
+        super(hbs, 'dateFormat');
+    }
+    onExecute(date, format) {
+        return dayjs(date).format(format);
+    }
+}

package/out/utils/handlebars/helpers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/handlebars/helpers/index.ts"],"names":[],"mappings":"AAqBA;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,CAqB/C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/handlebars/helpers/index.ts"],"names":[],"mappings":"AAsBA;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,CAsB/C"}

package/out/utils/handlebars/helpers/index.js

@@ -18,6 +18,7 @@ import { HelperSnakeCase } from './snake-case/snake-case';
 import { HelperSpinalCase } from './spinal-case/spinal-case';
 import { HelperUpperCase } from './upper-case/upper-case';
 import { HelperAbs } from './abs/abs';
+import { HelperDateFormat } from './date-format/date-format';
 /**
  * 安装自定义助手
  *
@@ -46,4 +47,5 @@ export function installHelpers(hsb) {
     new HelperSpinalCase(hsb);
     new HelperUpperCase(hsb);
     new HelperEqPropertyValue(hsb);
+    new HelperDateFormat(hsb);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.41-alpha.111",
+  "version": "0.7.41-alpha.112",
   "description": "运行时逻辑库",
   "type": "module",
   "main": "out/index.js",
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@ibiz-template/core": "^0.7.41-alpha.106",
-    "@ibiz/model-core": "^0.1.87",
+    "@ibiz/model-core": "^0.1.88",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
@@ -58,7 +58,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.6.0",
-    "@ibiz/model-core": "^0.1.87",
+    "@ibiz/model-core": "^0.1.88",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -70,5 +70,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "2c908d8a4d16897d7e1a1beea2f3ac9f4ac0bfdc"
+  "gitHead": "884c135f203cf1a0ae3977442b559b757acd6b47"
 }

package/src/config/global-config.ts

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

package/src/controller/common/base.controller.ts

@@ -156,12 +156,12 @@ export class BaseController<
     // 登记自身
     this.mountCounter.enroll(SELF_KEY);
     await this.onCreated();
+    ibiz.log.debug(`${this.constructor.name}:${this.name} onCreated`);
+    await this._evt.emit('onCreated', undefined);
     this.state.isCreated = true;
     this.force(() => {
       this.mountSelf();
     });
-    ibiz.log.debug(`${this.constructor.name}:${this.name} onCreated`);
-    this._evt.emit('onCreated', undefined);
   }
 
   /**

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

@@ -1840,10 +1840,22 @@ export class GridController<
     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) {
+      fileName = await ibiz.util.hbs.render(this.dataExport.fileNameFormat, {
+        context: this.context,
+        params: this.params,
+        data: this.view.state.srfactiveviewdata,
+        now: new Date(),
+      });
+    }
+
     await ibiz.platform.frontExport({
       header,
       data: table,
-      fileName: this.model.logicName!,
+      fileName,
     });
   }
 

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/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/logic-scheduler/executor/app-ui-action-executor.ts

@@ -22,7 +22,7 @@ export class AppDEUIActionExecutor extends LogicExecutor {
         ibiz.i18n.t('runtime.logicScheduler.executor.missingTrigger'),
       );
     }
-    UIActionUtil.execAndResolved(
+    return UIActionUtil.execAndResolved(
       this.logic.appDEUIActionId,
       executeParams,
       this.logic.appId,

package/src/logic-scheduler/scheduler/view-logic-scheduler.ts

@@ -23,15 +23,17 @@ export class ViewLogicScheduler extends LogicScheduler {
    * 触发视图事件
    * @author lxm
    * @date 2023-06-26 02:26:33
-   * @param {string} itemName 子项名称
-   * @param {Partial<IUILogicParams>} executeParams 执行参数
-   * @return {*}  {(boolean | undefined)}
+   * @param {EventBase} event 事件对象
+   * @return {*}  {Promise<void>}
    */
-  triggerViewEvent(event: EventBase): void {
+  async triggerViewEvent(event: EventBase): Promise<void> {
     const matchParams = {
       eventName: event.eventName,
       triggerType: 'VIEWEVENT',
     } as const;
-    this.triggerAndExecute(matchParams, event);
+    const result = this.triggerAndExecute(matchParams, event);
+    if (result?.length) {
+      await Promise.all(result);
+    }
   }
 }

package/src/utils/handlebars/helpers/date-format/date-format.ts

@@ -0,0 +1,20 @@
+import dayjs from 'dayjs';
+import { HelperBase } from '../helper-base';
+
+/**
+ * @description 时间格式化，用法: 销售内示数据{{dateFormat now "YYYYMMDDHHmmss"}}.xlsx
+ * @author tony001
+ * @date 2026-07-06 15:07:49
+ * @export
+ * @class HelperDateFormat
+ * @extends {HelperBase}
+ */
+export class HelperDateFormat extends HelperBase {
+  constructor(hbs: IData) {
+    super(hbs, 'dateFormat');
+  }
+
+  onExecute(date: Date, format: string): string {
+    return dayjs(date).format(format);
+  }
+}

package/src/utils/handlebars/helpers/index.ts

@@ -18,6 +18,7 @@ import { HelperSnakeCase } from './snake-case/snake-case';
 import { HelperSpinalCase } from './spinal-case/spinal-case';
 import { HelperUpperCase } from './upper-case/upper-case';
 import { HelperAbs } from './abs/abs';
+import { HelperDateFormat } from './date-format/date-format';
 
 /**
  * 安装自定义助手
@@ -47,4 +48,5 @@ export function installHelpers(hsb: IData): void {
   new HelperSpinalCase(hsb);
   new HelperUpperCase(hsb);
   new HelperEqPropertyValue(hsb);
+  new HelperDateFormat(hsb);
 }