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

package/dist/index.esm.js

@@ -20003,7 +20003,8 @@ var GlobalConfig = class {
       enableAsyncActionNotice: false,
       aiChunkView: "",
       aiChunkEntity: "",
-      counterMaxValue: 99
+      counterMaxValue: 99,
+      enhancedUI: false
     };
     // 全局分页流布局配置
     this.drtab = {
@@ -20597,6 +20598,17 @@ var HelperAbs = class extends HelperBase {
   }
 };
 
+// src/utils/handlebars/helpers/date-format/date-format.ts
+import dayjs from "dayjs";
+var HelperDateFormat = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "dateFormat");
+  }
+  onExecute(date, format) {
+    return dayjs(date).format(format);
+  }
+};
+
 // src/utils/handlebars/helpers/index.ts
 function installHelpers(hsb) {
   new HelperAbs(hsb);
@@ -20619,6 +20631,7 @@ function installHelpers(hsb) {
   new HelperSpinalCase(hsb);
   new HelperUpperCase(hsb);
   new HelperEqPropertyValue(hsb);
+  new HelperDateFormat(hsb);
 }
 
 // src/utils/handlebars/handlebars.ts
@@ -25958,7 +25971,7 @@ var ValueExUtil = class {
 
 // src/controller/utils/value-default/value-default.ts
 import { RuntimeError as RuntimeError12, ModelError as ModelError4 } from "@ibiz-template/core";
-import dayjs from "dayjs";
+import dayjs2 from "dayjs";
 import { createUUID as createUUID3 } from "qx-util";
 import { isNil as isNil9, isNotNil } from "ramda";
 function getDefaultValue(opts, origins) {
@@ -25992,7 +26005,7 @@ function getDefaultValue(opts, origins) {
     case "OPERATOR":
       return context.srfuserid;
     case "CURTIME":
-      return dayjs().format(valueFormat);
+      return dayjs2().format(valueFormat);
     case "PARAM":
       return data[defaultValue];
     case "SESSION":
@@ -28417,12 +28430,12 @@ var BaseController = class {
   async created() {
     this.mountCounter.enroll(SELF_KEY);
     await this.onCreated();
+    ibiz.log.debug("".concat(this.constructor.name, ":").concat(this.name, " onCreated"));
+    await this._evt.emit("onCreated", void 0);
     this.state.isCreated = true;
     this.force(() => {
       this.mountSelf();
     });
-    ibiz.log.debug("".concat(this.constructor.name, ":").concat(this.name, " onCreated"));
-    this._evt.emit("onCreated", void 0);
   }
   /**
    * 生命周期-创建完成，实际执行逻辑，子类重写用这个
@@ -28872,8 +28885,8 @@ var ViewController = class extends BaseController {
         return this.getEventArgs();
       };
       if (this.scheduler.hasViewEventTrigger) {
-        this.evt.onAll((_eventName, event) => {
-          this.scheduler.triggerViewEvent(event);
+        this.evt.onAll(async (_eventName, event) => {
+          await this.scheduler.triggerViewEvent(event);
         });
       }
     }
@@ -29340,7 +29353,7 @@ var HtmlViewController = class extends ViewController {
 
 // src/controller/common/editor/editor.controller.ts
 import { DataTypes } from "@ibiz-template/core";
-import dayjs2 from "dayjs";
+import dayjs3 from "dayjs";
 var EditorController = class {
   /**
    * Creates an instance of EditorController.
@@ -29513,7 +29526,7 @@ var EditorController = class {
     await this.onInit();
   }
   async onInit() {
-    var _a3, _b2;
+    var _a3, _b2, _c, _d;
     if (this.model.placeHolder) {
       this.placeHolder = this.model.placeHolder;
     }
@@ -29560,6 +29573,14 @@ var EditorController = class {
         (item) => item.id !== this.model.id
       );
     }
+    const controlAttributes = ((_d = (_c = this.parent.model) == null ? void 0 : _c.controlAttributes) == null ? void 0 : _d.filter(
+      (item) => "classNames" /* CLASSNAMES */ === item.attrName || "styles" /* STYLES */ === item.attrName
+    )) || [];
+    if (controlAttributes.length) {
+      if (!this.model.controlAttributes)
+        this.model.controlAttributes = [];
+      this.model.controlAttributes.push(...controlAttributes);
+    }
     this.initExtraParams();
   }
   /**
@@ -29649,7 +29670,7 @@ var EditorController = class {
     }
     const isDate = DataTypes.isDate(this.dataType);
     if (isDate) {
-      const formatVal = dayjs2(strVal).format(this.valueFormat);
+      const formatVal = dayjs3(strVal).format(this.valueFormat);
       if (formatVal !== "Invalid Date") {
         return formatVal;
       }
@@ -31943,8 +31964,8 @@ var AppMenuIconViewController = class extends AppMenuController {
 };
 
 // src/controller/control/calendar/calendar.controller.ts
-import dayjs3 from "dayjs";
-import { RuntimeError as RuntimeError30, RuntimeModelError as RuntimeModelError40 } from "@ibiz-template/core";
+import dayjs4 from "dayjs";
+import { RuntimeError as RuntimeError30 } from "@ibiz-template/core";
 
 // src/controller/control/calendar/calendar.service.ts
 import { RuntimeError as RuntimeError20 } from "@ibiz-template/core";
@@ -36295,41 +36316,41 @@ var CalendarController = class extends MDControlController {
     switch (this.timeRangeMode) {
       case "year":
         this.state.timeRange = [
-          dayjs3().startOf("year").toDate(),
-          dayjs3().endOf("year").toDate()
+          dayjs4().startOf("year").toDate(),
+          dayjs4().endOf("year").toDate()
         ];
         break;
       case "halfYear":
-        const year = dayjs3().year();
-        const isFirstHalf = dayjs3().month() < 6;
+        const year = dayjs4().year();
+        const isFirstHalf = dayjs4().month() < 6;
         if (isFirstHalf) {
           this.state.timeRange = [
-            dayjs3("".concat(year, "-01-01")).toDate(),
-            dayjs3("".concat(year, "-06-30")).toDate()
+            dayjs4("".concat(year, "-01-01")).toDate(),
+            dayjs4("".concat(year, "-06-30")).toDate()
           ];
         } else {
           this.state.timeRange = [
-            dayjs3("".concat(year, "-07-01")).toDate(),
-            dayjs3("".concat(year, "-12-31")).toDate()
+            dayjs4("".concat(year, "-07-01")).toDate(),
+            dayjs4("".concat(year, "-12-31")).toDate()
           ];
         }
         break;
       case "quarter":
         this.state.timeRange = [
-          dayjs3().startOf("quarter").toDate(),
-          dayjs3().endOf("quarter").toDate()
+          dayjs4().startOf("quarter").toDate(),
+          dayjs4().endOf("quarter").toDate()
         ];
         break;
       case "custom":
         const { begintime } = this.controlParams;
         const { endtime } = this.controlParams;
-        if (!begintime || !dayjs3(begintime).isValid() || !endtime || !dayjs3(endtime).isValid())
+        if (!begintime || !dayjs4(begintime).isValid() || !endtime || !dayjs4(endtime).isValid())
           throw new RuntimeError30(
             ibiz.i18n.t("runtime.controller.control.calendar.illegalTime")
           );
         this.state.timeRange = [
-          dayjs3(begintime).toDate(),
-          dayjs3(endtime).toDate()
+          dayjs4(begintime).toDate(),
+          dayjs4(endtime).toDate()
         ];
         break;
       default:
@@ -36400,8 +36421,8 @@ var CalendarController = class extends MDControlController {
         return this.getEventArgs();
       };
       if (this.viewScheduler.hasViewEventTrigger) {
-        this.evt.onAll((_eventName, event) => {
-          this.viewScheduler.triggerViewEvent(event);
+        this.evt.onAll(async (_eventName, event) => {
+          await this.viewScheduler.triggerViewEvent(event);
         });
       }
     }
@@ -36463,13 +36484,12 @@ var CalendarController = class extends MDControlController {
         ctrl: this
       }
     ));
-    if (result === -1)
-      throw new RuntimeModelError40(
-        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
     };
@@ -36499,13 +36519,12 @@ var CalendarController = class extends MDControlController {
         ctrl: this
       }
     ));
-    if (result === -1)
-      throw new RuntimeModelError40(
-        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
     };
@@ -36645,9 +36664,9 @@ var CalendarController = class extends MDControlController {
       let result = 0;
       const x = a[sortField];
       const y = b[sortField];
-      if (dayjs3(x).isAfter(y)) {
+      if (dayjs4(x).isAfter(y)) {
         result = -1;
-      } else if (dayjs3(x).isBefore(y)) {
+      } else if (dayjs4(x).isBefore(y)) {
         result = 1;
       }
       return result;
@@ -36715,15 +36734,15 @@ var CalendarController = class extends MDControlController {
           );
           break;
         case "USER2":
-          srfstartdate = dayjs3(timeRange[0]).format("YYYY-MM-DD");
-          srfenddate = dayjs3(timeRange[1]).format("YYYY-MM-DD");
+          srfstartdate = dayjs4(timeRange[0]).format("YYYY-MM-DD");
+          srfenddate = dayjs4(timeRange[1]).format("YYYY-MM-DD");
           break;
         default:
           break;
       }
       return {
-        srfstartdate: dayjs3(srfstartdate).format("YYYY-MM-DD HH:mm:ss"),
-        srfenddate: dayjs3(srfenddate).format("YYYY-MM-DD HH:mm:ss")
+        srfstartdate: dayjs4(srfstartdate).format("YYYY-MM-DD HH:mm:ss"),
+        srfenddate: dayjs4(srfenddate).format("YYYY-MM-DD HH:mm:ss")
       };
     }
     return { srfstartdate, srfenddate };
@@ -36913,22 +36932,22 @@ import { isObject as isObject2, isString as isString2 } from "qx-util";
 import { RuntimeError as RuntimeError31 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/line-series-generator.ts
-import { RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/base-series-generator.ts
-import { plus, RuntimeModelError as RuntimeModelError41, toNumberOrNil } from "@ibiz-template/core";
-import dayjs4 from "dayjs";
+import { plus, RuntimeModelError as RuntimeModelError40, toNumberOrNil } from "@ibiz-template/core";
+import dayjs5 from "dayjs";
 import minMax from "dayjs/plugin/minMax";
 import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
 import quarterOfYear from "dayjs/plugin/quarterOfYear";
 import weekOfYear from "dayjs/plugin/weekOfYear";
 import isoWeek from "dayjs/plugin/isoWeek";
 import { clone as clone16, isNil as isNil15, mergeDeepRight } from "ramda";
-dayjs4.extend(minMax);
-dayjs4.extend(isSameOrBefore);
-dayjs4.extend(quarterOfYear);
-dayjs4.extend(weekOfYear);
-dayjs4.extend(isoWeek);
+dayjs5.extend(minMax);
+dayjs5.extend(isSameOrBefore);
+dayjs5.extend(quarterOfYear);
+dayjs5.extend(weekOfYear);
+dayjs5.extend(isoWeek);
 var DEFAULT_GROUP = "$default_group";
 var BaseSeriesGenerator = class {
   /**
@@ -36998,13 +37017,13 @@ var BaseSeriesGenerator = class {
     var _a3;
     const { chartSeriesEncode, caption, id, userParam } = model;
     if (!model.catalogField) {
-      throw new RuntimeModelError41(
+      throw new RuntimeModelError40(
         model,
         ibiz.i18n.t("runtime.controller.control.chart.missingClassification")
       );
     }
     if (!model.valueField) {
-      throw new RuntimeModelError41(
+      throw new RuntimeModelError40(
         model,
         ibiz.i18n.t("runtime.controller.control.chart.missingValue")
       );
@@ -37550,25 +37569,25 @@ var BaseSeriesGenerator = class {
             format = "YYYY-MM";
           }
           if (singleData[this.catalogField]) {
-            const formattedDate = dayjs4(singleData[this.catalogField]).format(
+            const formattedDate = dayjs5(singleData[this.catalogField]).format(
               format
             );
             singleData[this.catalogField] = formattedDate;
           }
         } else if (groupMode === "QUARTER") {
           if (singleData[this.catalogField]) {
-            const formattedDate = "".concat(dayjs4(
+            const formattedDate = "".concat(dayjs5(
               singleData[this.catalogField]
-            ).format("YYYY"), "-").concat(dayjs4(
+            ).format("YYYY"), "-").concat(dayjs5(
               singleData[this.catalogField]
             ).quarter());
             singleData[this.catalogField] = formattedDate;
           }
         } else if (groupMode === "YEARWEEK") {
           if (singleData[this.catalogField]) {
-            const formattedDate = "".concat(dayjs4(
+            const formattedDate = "".concat(dayjs5(
               singleData[this.catalogField]
-            ).format("YYYY"), "-").concat(dayjs4(singleData[this.catalogField]).week());
+            ).format("YYYY"), "-").concat(dayjs5(singleData[this.catalogField]).week());
             singleData[this.catalogField] = formattedDate;
           }
         }
@@ -37590,7 +37609,7 @@ var BaseSeriesGenerator = class {
       let sortedKeys = [];
       if (groupMode === "DAY" || groupMode === "YEAR" || groupMode === "MONTH") {
         sortedKeys = Array.from(dateMap.keys()).sort(
-          (a, b) => dayjs4(a).diff(dayjs4(b))
+          (a, b) => dayjs5(a).diff(dayjs5(b))
         );
       } else if (groupMode === "QUARTER" || groupMode === "YEARWEEK") {
         sortedKeys = Array.from(dateMap.keys()).sort((a, b) => {
@@ -37623,13 +37642,13 @@ var BaseSeriesGenerator = class {
     const dates = [];
     Object.keys(data).forEach((key) => {
       data[key].forEach((_val, date) => {
-        dates.push(dayjs4(date));
+        dates.push(dayjs5(date));
       });
     });
     if (!dates.length)
       return;
-    const maxDate = dayjs4.max(dates);
-    const minDate = dayjs4.min(dates);
+    const maxDate = dayjs5.max(dates);
+    const minDate = dayjs5.min(dates);
     if (groupMode === "DAY") {
       let currentDate = minDate;
       const endDate = maxDate;
@@ -37751,13 +37770,13 @@ var BaseSeriesGenerator = class {
 var LineSeriesGenerator = class extends BaseSeriesGenerator {
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError42(
+      throw new RuntimeModelError41(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredX")
       );
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError42(
+      throw new RuntimeModelError41(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredY")
       );
@@ -37776,17 +37795,17 @@ var LineSeriesGenerator = class extends BaseSeriesGenerator {
 };
 
 // src/controller/control/chart/generator/bar-series-generator.ts
-import { RuntimeModelError as RuntimeModelError43 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
 var BarSeriesGenerator = class extends BaseSeriesGenerator {
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError43(
+      throw new RuntimeModelError42(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredX")
       );
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError43(
+      throw new RuntimeModelError42(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredY")
       );
@@ -37842,17 +37861,17 @@ var PieSeriesGenerator = class extends BaseSeriesGenerator {
 };
 
 // src/controller/control/chart/generator/scatter-series-generator.ts
-import { RuntimeModelError as RuntimeModelError44 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError43 } from "@ibiz-template/core";
 var ScatterSeriesGenerator = class extends BaseSeriesGenerator {
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError44(
+      throw new RuntimeModelError43(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredX")
       );
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError44(
+      throw new RuntimeModelError43(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredY")
       );
@@ -37982,7 +38001,7 @@ var RadarSeriesGenerator = class extends BaseSeriesGenerator {
 };
 
 // src/controller/control/chart/generator/area-series-generator.ts
-import { RuntimeModelError as RuntimeModelError45 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError44 } from "@ibiz-template/core";
 var AreaSeriesGenerator = class extends BaseSeriesGenerator {
   /**
    * 计算静态序列的options
@@ -37991,13 +38010,13 @@ var AreaSeriesGenerator = class extends BaseSeriesGenerator {
    */
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError45(
+      throw new RuntimeModelError44(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredX")
       );
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError45(
+      throw new RuntimeModelError44(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredY")
       );
@@ -38047,7 +38066,7 @@ var GaugeSeriesGenerator = class extends BaseSeriesGenerator {
 // src/controller/control/chart/generator/candlestick-series-generator.ts
 import { isNil as isNil16 } from "ramda";
 import { isArray as isArray9, isNumber as isNumber3 } from "qx-util";
-import { plus as plus2, RuntimeModelError as RuntimeModelError46, toNumberOrNil as toNumberOrNil2 } from "@ibiz-template/core";
+import { plus as plus2, RuntimeModelError as RuntimeModelError45, toNumberOrNil as toNumberOrNil2 } from "@ibiz-template/core";
 var CandlestickSeriesGenerator = class extends BaseSeriesGenerator {
   /**
    * 初始化参数
@@ -38060,7 +38079,7 @@ var CandlestickSeriesGenerator = class extends BaseSeriesGenerator {
     var _a3;
     const { chartSeriesEncode, caption, id, userParam, navViewParamJO } = model;
     if (!model.catalogField) {
-      throw new RuntimeModelError46(
+      throw new RuntimeModelError45(
         model,
         ibiz.i18n.t("runtime.controller.control.chart.missingClassification")
       );
@@ -41392,7 +41411,7 @@ import { clone as clone23 } from "ramda";
 import { isString as isString3 } from "lodash-es";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
-import { RuntimeModelError as RuntimeModelError47 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError46 } from "@ibiz-template/core";
 
 // src/controller/control/search-bar/util.ts
 var ItemsValueOPs = [
@@ -41473,7 +41492,7 @@ var SearchBarFilterController = class {
   async init() {
     if (!this.noEditor) {
       if (!this.model.editor) {
-        throw new RuntimeModelError47(
+        throw new RuntimeModelError46(
           this.model,
           ibiz.i18n.t("runtime.controller.control.searchBar.missingModel")
         );
@@ -43581,7 +43600,7 @@ import {
   clone as clone25,
   DataTypes as DataTypes2,
   isElementSame as isElementSame2,
-  RuntimeModelError as RuntimeModelError48
+  RuntimeModelError as RuntimeModelError47
 } from "@ibiz-template/core";
 import { isNil as isNil18, isNotNil as isNotNil4 } from "ramda";
 import { createUUID as createUUID6, isBoolean } from "qx-util";
@@ -44044,7 +44063,7 @@ var DataViewControlController = class extends MDControlController {
     const { enableGroup } = this.state;
     if (enableGroup && groupMode) {
       if (!groupAppDEFieldId) {
-        throw new RuntimeModelError48(
+        throw new RuntimeModelError47(
           this.model,
           ibiz.i18n.t(
             "runtime.controller.control.dataView.propertiesNoConfigured"
@@ -44137,7 +44156,7 @@ var DataViewControlController = class extends MDControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError48(
+      throw new RuntimeModelError47(
         this.model,
         ibiz.i18n.t("runtime.controller.control.dataView.tableNoConfigured")
       );
@@ -44251,7 +44270,7 @@ var DataViewControlController = class extends MDControlController {
         caption = ibiz.i18n.t(item.capLanguageRes.lanResTag, item.caption);
       }
       if (!item.appDEFieldId) {
-        throw new RuntimeModelError48(
+        throw new RuntimeModelError47(
           item,
           ibiz.i18n.t("runtime.controller.control.dataView.sortingItems")
         );
@@ -44472,13 +44491,13 @@ var DataViewControlController = class extends MDControlController {
       await this.updateChangedItems([draggedItem]);
     } else {
       if (!minorSortAppDEFieldId)
-        throw new RuntimeModelError48(
+        throw new RuntimeModelError47(
           this.model,
           ibiz.i18n.t("runtime.controller.common.md.sortingProperties")
         );
       const moveAction = moveControlAction == null ? void 0 : moveControlAction.appDEMethodId;
       if (!moveAction)
-        throw new RuntimeModelError48(
+        throw new RuntimeModelError47(
           this.model,
           ibiz.i18n.t("runtime.controller.common.md.noMoveDataCconfig")
         );
@@ -45474,7 +45493,7 @@ import { RuntimeError as RuntimeError37 } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.controller.ts
 import {
-  RuntimeModelError as RuntimeModelError49,
+  RuntimeModelError as RuntimeModelError48,
   debounceAndAsyncMerge,
   recursiveIterate as recursiveIterate8,
   EntityError,
@@ -45744,7 +45763,7 @@ var FormController = class extends ControlController {
           return;
         }
         if (form.details[detail.id]) {
-          throw new RuntimeModelError49(
+          throw new RuntimeModelError48(
             detail,
             ibiz.i18n.t(
               "runtime.controller.control.form.initializationException",
@@ -47959,6 +47978,13 @@ var FormItemState = class extends FormDetailState {
      * @memberof FormItemState
      */
     this.inputTipUrl = void 0;
+    /**
+     * 编辑器类名集合
+     *
+     * @type {string[]}
+     * @memberof FormItemState
+     */
+    this.editorClass = [];
     let $disabled = false;
     Object.defineProperty(this, "disabled", {
       enumerable: true,
@@ -48462,6 +48488,19 @@ var FormItemController = class extends FormDetailController {
   clearTipsCache() {
     localStorage.removeItem(this.TIPS_CACHE);
   }
+  /**
+   * @description 计算动态样式表
+   * @param {IData} data
+   * @memberof FormItemController
+   */
+  calcDynaClass(data) {
+    var _a3;
+    super.calcDynaClass(data);
+    if ((_a3 = this.model.editor) == null ? void 0 : _a3.dynaClass) {
+      const dynaClass = calcDynaClass(this.model.editor.dynaClass, data);
+      this.state.editorClass = dynaClass;
+    }
+  }
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.ts
@@ -48670,7 +48709,7 @@ var FormMDCtrlController = class extends FormDetailController {
 import {
   ModelError as ModelError20,
   mergeInLeft as mergeInLeft2,
-  RuntimeModelError as RuntimeModelError50
+  RuntimeModelError as RuntimeModelError49
 } from "@ibiz-template/core";
 var FormMDCtrlMDController = class extends FormMDCtrlController {
   constructor() {
@@ -48709,7 +48748,7 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
       if (((_a3 = this.context) == null ? void 0 : _a3.srfrunmode) === "DESIGN") {
         return;
       }
-      throw new RuntimeModelError50(
+      throw new RuntimeModelError49(
         this.model,
         ibiz.i18n.t("runtime.controller.control.form.unconfiguredWidgets")
       );
@@ -48848,7 +48887,7 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts
-import { RuntimeError as RuntimeError38, RuntimeModelError as RuntimeModelError51 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError38, RuntimeModelError as RuntimeModelError50 } from "@ibiz-template/core";
 import { createUUID as createUUID8 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.ts
@@ -48893,7 +48932,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
       if (((_a3 = this.context) == null ? void 0 : _a3.srfrunmode) === "DESIGN") {
         return;
       }
-      throw new RuntimeModelError51(
+      throw new RuntimeModelError50(
         this.model,
         ibiz.i18n.t("runtime.controller.control.form.unconfiguredWidgets")
       );
@@ -49458,6 +49497,20 @@ var FormRawItemController = class extends FormDetailController {
     var _a3;
     return new FormRawItemState((_a3 = this.parent) == null ? void 0 : _a3.state);
   }
+  /**
+   * @description 计算动态样式表
+   * @protected
+   * @param {IData} data
+   * @memberof FormRawItemController
+   */
+  calcDynaClass(data) {
+    var _a3;
+    super.calcDynaClass(data);
+    if ((_a3 = this.model.rawItem) == null ? void 0 : _a3.dynaClass) {
+      const dynaClass = calcDynaClass(this.model.rawItem.dynaClass, data);
+      this.state.class.containerDyna = dynaClass;
+    }
+  }
 };
 
 // src/controller/control/form/form-detail/form-tab-page/form-tab-page.state.ts
@@ -49897,7 +49950,7 @@ import { clone as clone30, isNil as isNil21 } from "ramda";
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
   recursiveIterate as recursiveIterate12,
-  RuntimeModelError as RuntimeModelError52
+  RuntimeModelError as RuntimeModelError51
 } from "@ibiz-template/core";
 var EditFormService = class extends FormService {
   /**
@@ -50024,7 +50077,7 @@ var EditFormService = class extends FormService {
     const wizardForm = this.model;
     const methodName = (_a3 = wizardForm.goBackControlAction) == null ? void 0 : _a3.appDEMethodId;
     if (!methodName) {
-      throw new RuntimeModelError52(
+      throw new RuntimeModelError51(
         this.model,
         ibiz.i18n.t("runtime.controller.control.form.lackBehavior")
       );
@@ -51277,15 +51330,15 @@ import {
   awaitTimeout as awaitTimeout2,
   RuntimeError as RuntimeError40,
   recursiveIterate as recursiveIterate13,
-  RuntimeModelError as RuntimeModelError54,
+  RuntimeModelError as RuntimeModelError53,
   mergeDefaultInLeft as mergeDefaultInLeft2,
   debounceAndAsyncMerge as debounceAndAsyncMerge2
 } from "@ibiz-template/core";
 import { clone as clone32 } from "ramda";
-import dayjs5 from "dayjs";
+import dayjs6 from "dayjs";
 
 // src/controller/control/grid/grid/grid.service.ts
-import { RuntimeModelError as RuntimeModelError53 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError52 } from "@ibiz-template/core";
 var GridService = class extends MDControlService2 {
   /**
    * 初始化属性映射
@@ -51313,7 +51366,7 @@ var GridService = class extends MDControlService2 {
               dataType: dataItem.dataType
             });
           } else {
-            throw new RuntimeModelError53(
+            throw new RuntimeModelError52(
               column,
               ibiz.i18n.t("runtime.controller.control.grid.corresponding", {
                 deField
@@ -51864,8 +51917,8 @@ var GridController = class extends MDControlController {
       if (!valueFormat) {
         return strVal;
       }
-      if (isDate && dayjs5(strVal, valueFormat, true).isValid()) {
-        const formatVal = dayjs5(strVal).format(valueFormat);
+      if (isDate && dayjs6(strVal, valueFormat, true).isValid()) {
+        const formatVal = dayjs6(strVal).format(valueFormat);
         return formatVal;
       }
       return ibiz.util.text.format(strVal, valueFormat);
@@ -52243,7 +52296,7 @@ var GridController = class extends MDControlController {
       (item) => item.model.appDEFieldId === groupAppDEFieldId
     );
     if (!this.groupFieldColumn) {
-      throw new RuntimeModelError54(
+      throw new RuntimeModelError53(
         this.model,
         ibiz.i18n.t("runtime.controller.control.grid.attributeColumns")
       );
@@ -52254,7 +52307,7 @@ var GridController = class extends MDControlController {
     );
     if (index !== -1 && index !== 0) {
       if (this.isMultistageHeader) {
-        throw new RuntimeModelError54(
+        throw new RuntimeModelError53(
           this.model,
           ibiz.i18n.t("runtime.controller.control.grid.configureFirstColumn", {
             groupFieldName
@@ -52266,13 +52319,13 @@ var GridController = class extends MDControlController {
     }
     if (groupMode === "CODELIST") {
       if (!groupCodeListId) {
-        throw new RuntimeModelError54(
+        throw new RuntimeModelError53(
           this.model,
           ibiz.i18n.t("runtime.controller.control.grid.requiresCodeTable")
         );
       }
       if (this.groupFieldColumn.model.appCodeListId !== groupCodeListId) {
-        throw new RuntimeModelError54(
+        throw new RuntimeModelError53(
           this.model,
           ibiz.i18n.t("runtime.controller.control.grid.noMatchCodeTable", {
             groupFieldName
@@ -52431,7 +52484,7 @@ var GridController = class extends MDControlController {
       return;
     }
     if (!aggAppDEDataSetId || !aggAppDataEntityId) {
-      throw new RuntimeModelError54(
+      throw new RuntimeModelError53(
         this.model,
         ibiz.i18n.t("runtime.controller.control.grid.missingConfiguration")
       );
@@ -53203,7 +53256,7 @@ var GridController = class extends MDControlController {
    * @memberof GridController
    */
   async exportData(args) {
-    var _a3;
+    var _a3, _b2;
     if ((_a3 = this.dataExport) == null ? void 0 : _a3.enableBackend) {
       await this.excuteBackendExport(args.params);
       return;
@@ -53218,10 +53271,19 @@ var GridController = class extends MDControlController {
     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 ((_b2 = this.dataExport) == null ? void 0 : _b2.fileNameFormat) {
+      fileName = await ibiz.util.hbs.render(this.dataExport.fileNameFormat, {
+        context: this.context,
+        params: this.params,
+        data: this.view.state.srfactiveviewdata,
+        now: /* @__PURE__ */ new Date()
+      });
+    }
     await ibiz.platform.frontExport({
       header,
       data: table,
-      fileName: this.model.logicName
+      fileName
     });
   }
   /**
@@ -53476,7 +53538,7 @@ var GridController = class extends MDControlController {
     var _a3;
     const moveAction = (_a3 = this.model.moveControlAction) == null ? void 0 : _a3.appDEMethodId;
     if (!moveAction) {
-      throw new RuntimeModelError54(
+      throw new RuntimeModelError53(
         this.model,
         ibiz.i18n.t("runtime.controller.common.md.noMoveDataCconfig")
       );
@@ -53588,7 +53650,7 @@ import {
   ModelError as ModelError22,
   base64ToStr
 } from "@ibiz-template/core";
-import dayjs6 from "dayjs";
+import dayjs7 from "dayjs";
 import { debounce as debounce2 } from "lodash-es";
 import { clone as clone33, isNil as isNil22 } from "ramda";
 import { isNilOrEmpty as isNilOrEmpty7 } from "qx-util";
@@ -53996,7 +54058,7 @@ var GridFieldColumnController = class extends GridColumnController {
     }
     const isDate = DataTypes4.isDate(this.dataType);
     if (isDate) {
-      const formatVal = dayjs6(strVal).format(this.valueFormat);
+      const formatVal = dayjs7(strVal).format(this.valueFormat);
       if (formatVal !== "Invalid Date") {
         return formatVal;
       }
@@ -54033,7 +54095,7 @@ var GridFieldColumnController = class extends GridColumnController {
 };
 
 // src/controller/control/grid/grid-column/grid-ua-column/grid-ua-column.controller.ts
-import { RuntimeModelError as RuntimeModelError55 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError54 } from "@ibiz-template/core";
 var GridUAColumnController = class extends GridColumnController {
   /**
    * 给rowController初始化操作列的状态
@@ -54046,7 +54108,7 @@ var GridUAColumnController = class extends GridColumnController {
     var _a3;
     const { deuiactionGroup } = this.model;
     if (!deuiactionGroup) {
-      throw new RuntimeModelError55(
+      throw new RuntimeModelError54(
         this.model,
         ibiz.i18n.t("runtime.controller.control.grid.behaviorGroup")
       );
@@ -54384,9 +54446,9 @@ import {
   clone as clone35,
   DataTypes as DataTypes5,
   isElementSame as isElementSame4,
-  RuntimeModelError as RuntimeModelError56
+  RuntimeModelError as RuntimeModelError55
 } from "@ibiz-template/core";
-import dayjs7 from "dayjs";
+import dayjs8 from "dayjs";
 
 // src/controller/control/list/list.service.ts
 import { clone as clone34 } from "@ibiz-template/core";
@@ -54811,9 +54873,9 @@ var ListController = class extends MDControlController {
         let groupVal = item[textDEFieldId];
         if (dateFormat)
           groupVal = formatDateByScale(groupVal, dateFormat);
-        if (this.model.groupStyle === "STYLE2" && dayjs7(groupVal).isValid()) {
+        if (this.model.groupStyle === "STYLE2" && dayjs8(groupVal).isValid()) {
           groupVal = formatDateByScale(groupVal, "day");
-          if (dayjs7(groupVal).isSame(dayjs7(), "day"))
+          if (dayjs8(groupVal).isSame(dayjs8(), "day"))
             groupVal = ibiz.i18n.t("runtime.controller.common.md.today");
         }
         if (isNil23(groupVal)) {
@@ -55099,13 +55161,13 @@ var ListController = class extends MDControlController {
       await this.updateChangedItems([draggedItem]);
     } else {
       if (!minorSortAppDEFieldId)
-        throw new RuntimeModelError56(
+        throw new RuntimeModelError55(
           this.model,
           ibiz.i18n.t("runtime.controller.common.md.sortingProperties")
         );
       const moveAction = moveControlAction == null ? void 0 : moveControlAction.appDEMethodId;
       if (!moveAction)
-        throw new RuntimeModelError56(
+        throw new RuntimeModelError55(
           this.model,
           ibiz.i18n.t("runtime.controller.common.md.noMoveDataCconfig")
         );
@@ -57826,7 +57888,7 @@ var TabExpPanelController = class extends ControlController {
 import {
   RuntimeError as RuntimeError43,
   recursiveIterate as recursiveIterate15,
-  RuntimeModelError as RuntimeModelError57
+  RuntimeModelError as RuntimeModelError56
 } from "@ibiz-template/core";
 import { isNil as isNil27 } from "ramda";
 import { isBoolean as isBoolean4 } from "qx-util";
@@ -58715,8 +58777,8 @@ var TreeController = class extends MDControlController {
         return this.getEventArgs();
       };
       if (this.viewScheduler.hasViewEventTrigger) {
-        this.evt.onAll((_eventName, event) => {
-          this.viewScheduler.triggerViewEvent(event);
+        this.evt.onAll(async (_eventName, event) => {
+          await this.viewScheduler.triggerViewEvent(event);
         });
       }
     }
@@ -59425,7 +59487,7 @@ var TreeController = class extends MDControlController {
       const { moveAppDEActionId, appDataEntityId, allowOrder } = orderNodeModel;
       if (allowOrder) {
         if (!moveAppDEActionId) {
-          throw new RuntimeModelError57(
+          throw new RuntimeModelError56(
             this.model,
             ibiz.i18n.t("runtime.controller.common.md.noMoveDataCconfig")
           );
@@ -59507,7 +59569,7 @@ var TreeController = class extends MDControlController {
   async modifyNodeText(nodeData, text) {
     const model = this.getNodeModel(nodeData._nodeId);
     if (!model.allowEditText) {
-      throw new RuntimeModelError57(
+      throw new RuntimeModelError56(
         model,
         ibiz.i18n.t("runtime.controller.control.tree.editMode")
       );
@@ -59620,7 +59682,7 @@ var TreeController = class extends MDControlController {
     const nodeModel = this.getNodeModel(nodeType);
     const parentNodeData = this.getNodeData(parentKey);
     if (!nodeModel) {
-      throw new RuntimeModelError57(
+      throw new RuntimeModelError56(
         this.model,
         ibiz.i18n.t("runtime.controller.control.tree.noFoundTreeNode")
       );
@@ -59753,13 +59815,12 @@ var TreeController = class extends MDControlController {
         ctrl: this
       }
     ));
-    if (result === -1)
-      throw new RuntimeModelError57(
-        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
     };
@@ -59792,13 +59853,12 @@ var TreeController = class extends MDControlController {
         ctrl: this
       }
     ));
-    if (result === -1)
-      throw new RuntimeModelError57(
-        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
     };
@@ -60389,7 +60449,7 @@ var WizardPanelController = class extends ControlController {
 };
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
-import { RuntimeError as RuntimeError45, RuntimeModelError as RuntimeModelError58 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError45, RuntimeModelError as RuntimeModelError57 } from "@ibiz-template/core";
 import { clone as clone38, isNil as isNil28, isNotNil as isNotNil8 } from "ramda";
 import { createUUID as createUUID15 } from "qx-util";
 
@@ -60708,7 +60768,7 @@ var MDCtrlController = class extends MDControlController {
     const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
     if (enableGroup && groupMode) {
       if (!groupAppDEFieldId) {
-        throw new RuntimeModelError58(
+        throw new RuntimeModelError57(
           this.model,
           ibiz.i18n.t(
             "runtime.controller.control.dataView.propertiesNoConfigured"
@@ -60800,7 +60860,7 @@ var MDCtrlController = class extends MDControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError58(
+      throw new RuntimeModelError57(
         this.model,
         ibiz.i18n.t("runtime.controller.control.dataView.tableNoConfigured")
       );
@@ -61138,7 +61198,7 @@ import {
   clone as clone39,
   RuntimeError as RuntimeError46,
   isElementSame as isElementSame5,
-  RuntimeModelError as RuntimeModelError59
+  RuntimeModelError as RuntimeModelError58
 } from "@ibiz-template/core";
 
 // src/controller/control/kanban/kanban.service.ts
@@ -61428,7 +61488,7 @@ var KanbanController = class extends DataViewControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError59(
+      throw new RuntimeModelError58(
         this.model,
         ibiz.i18n.t("runtime.controller.control.dataView.tableNoConfigured")
       );
@@ -61492,13 +61552,13 @@ var KanbanController = class extends DataViewControlController {
       await this.updateChangedItems([draggedItem]);
     } else {
       if (!minorSortAppDEFieldId)
-        throw new RuntimeModelError59(
+        throw new RuntimeModelError58(
           this.model,
           ibiz.i18n.t("runtime.controller.common.md.sortingProperties")
         );
       const moveAction = moveControlAction == null ? void 0 : moveControlAction.appDEMethodId;
       if (!moveAction)
-        throw new RuntimeModelError59(
+        throw new RuntimeModelError58(
           this.model,
           ibiz.i18n.t("runtime.controller.common.md.noMoveDataCconfig")
         );
@@ -61699,7 +61759,7 @@ import {
   RuntimeError as RuntimeError47,
   awaitTimeout as awaitTimeout3,
   recursiveIterate as recursiveIterate16,
-  RuntimeModelError as RuntimeModelError60
+  RuntimeModelError as RuntimeModelError59
 } from "@ibiz-template/core";
 import { clone as clone40 } from "ramda";
 
@@ -62128,7 +62188,7 @@ var TreeGridExController = class extends TreeController {
       );
     }
     if (!updateAppDEActionId) {
-      throw new RuntimeModelError60(
+      throw new RuntimeModelError59(
         nodeModel,
         ibiz.i18n.t("runtime.controller.control.treeGridEx.updateBehavior")
       );
@@ -62456,10 +62516,10 @@ var TreeGridExColumnController = class {
 import {
   DataTypes as DataTypes7,
   RuntimeError as RuntimeError48,
-  RuntimeModelError as RuntimeModelError61
+  RuntimeModelError as RuntimeModelError60
 } from "@ibiz-template/core";
 import { clone as clone41 } from "ramda";
-import dayjs8 from "dayjs";
+import dayjs9 from "dayjs";
 var TreeGridExNodeColumnController = class {
   /**
    * @author lxm
@@ -62487,7 +62547,7 @@ var TreeGridExNodeColumnController = class {
       }
     );
     if (!nodeColumn || !nodeDataItem) {
-      throw new RuntimeModelError61(
+      throw new RuntimeModelError60(
         nodeModel,
         ibiz.i18n.t("runtime.controller.control.treeGridEx.noConfigured", {
           name: this.fieldColumn.name
@@ -62503,7 +62563,7 @@ var TreeGridExNodeColumnController = class {
         }
       );
       if (!nodeEditItem) {
-        throw new RuntimeModelError61(
+        throw new RuntimeModelError60(
           nodeModel,
           ibiz.i18n.t("runtime.controller.control.treeGridEx.editItem", {
             name: this.fieldColumn.name
@@ -62759,7 +62819,7 @@ var TreeGridExNodeColumnController = class {
     }
     const isDate = DataTypes7.isDate(this.dataType);
     if (isDate || this.fieldColumn.name === "createdate") {
-      const formatVal = dayjs8(strVal).format(this.valueFormat);
+      const formatVal = dayjs9(strVal).format(this.valueFormat);
       if (formatVal !== "Invalid Date") {
         return formatVal;
       }
@@ -63012,7 +63072,7 @@ var TreeGridExUAColumnController = class extends TreeGridExColumnController {
 };
 
 // src/controller/control/tree-grid/tree-grid.controller.ts
-import { RuntimeModelError as RuntimeModelError62 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError61 } from "@ibiz-template/core";
 import { createUUID as createUUID16 } from "qx-util";
 var TreeGridController = class extends GridController {
   constructor() {
@@ -63057,7 +63117,7 @@ var TreeGridController = class extends GridController {
       return item.treeColumnMode === 4 || item.treeColumnMode === 12;
     });
     if (!treeGridParent)
-      throw new RuntimeModelError62(
+      throw new RuntimeModelError61(
         this.model,
         ibiz.i18n.t("runtime.controller.control.treeGrid.columnMode")
       );
@@ -63065,7 +63125,7 @@ var TreeGridController = class extends GridController {
       return item.treeColumnMode === 2 || item.treeColumnMode === 3;
     });
     if (!treeGridValue)
-      throw new RuntimeModelError62(
+      throw new RuntimeModelError61(
         this.model,
         ibiz.i18n.t("runtime.controller.control.treeGrid.columnsSchema")
       );
@@ -64635,18 +64695,18 @@ var GridConverterBase = class extends ConverterBase {
       grid_function_setting
     } = this.reportUIModel;
     result.vars = {
-      "--ibiz-control-grid-header-align": grid_header_position,
-      "--ibiz-control-grid-header-font-size": "".concat(grid_header_fontsize, "px"),
-      "--ibiz-control-grid-header-text-color": grid_header_fontcolor,
-      "--ibiz-control-grid-content-font-size": "".concat(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": "".concat(grid_header_fontsize, "px"),
+      "--ibiz-control-grid-header-cell-text-color": grid_header_fontcolor,
+      "--ibiz-control-grid-body-cell-font-size": "".concat(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";
+      const key = grid_header_fontstyle === "bold" ? "--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";
+      const key = grid_body_fontstyle === "bold" ? "--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") {
@@ -68673,7 +68733,7 @@ var AppCounter8 = class {
 };
 
 // src/service/utils/app-counter/app-de-counter.ts
-import { RuntimeModelError as RuntimeModelError63 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError62 } from "@ibiz-template/core";
 var AppDECounter = class extends AppCounter8 {
   /**
    * 计数器初始化
@@ -68687,7 +68747,7 @@ var AppDECounter = class extends AppCounter8 {
     this.appDataEntityId = this.model.appDataEntityId;
     const action = this.model.getAppDEActionId;
     if (!action) {
-      throw new RuntimeModelError63(
+      throw new RuntimeModelError62(
         this.model,
         ibiz.i18n.t("runtime.service.noFoundCounterBehavior")
       );
@@ -68834,7 +68894,7 @@ DEDQCondUtil.map = /* @__PURE__ */ new WeakMap();
 import {
   IBizContext as IBizContext8,
   ModelError as ModelError26,
-  RuntimeModelError as RuntimeModelError64,
+  RuntimeModelError as RuntimeModelError63,
   StringUtil as StringUtil5
 } from "@ibiz-template/core";
 import { clone as clone48, isNil as isNil29 } from "ramda";
@@ -69235,13 +69295,13 @@ var DynamicCodeListCache = class {
       return Object.freeze(presetresultItems);
     }
     if (!appDataEntityId) {
-      throw new RuntimeModelError64(
+      throw new RuntimeModelError63(
         this.codeList,
         ibiz.i18n.t("runtime.controller.utils.viewMsg.unconfiguredEntities")
       );
     }
     if (!appDEDataSetId) {
-      throw new RuntimeModelError64(
+      throw new RuntimeModelError63(
         this.codeList,
         ibiz.i18n.t("runtime.service.unconfiguredDataset")
       );
@@ -70563,7 +70623,7 @@ var ConfigService = class {
 };
 
 // src/service/service/counter/counter.service.ts
-import { RuntimeModelError as RuntimeModelError65 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError64 } from "@ibiz-template/core";
 var CounterService = class {
   /**
    * 获取计数器
@@ -70608,7 +70668,7 @@ var CounterService = class {
   static async getCounterByRef(model, context, params) {
     const { appCounter } = model;
     if (!appCounter) {
-      throw new RuntimeModelError65(
+      throw new RuntimeModelError64(
         model,
         ibiz.i18n.t("runtime.service.noConfiguredCounters")
       );
@@ -70633,7 +70693,7 @@ import {
   IBizContext as IBizContext9,
   ModelError as ModelError28,
   RuntimeError as RuntimeError60,
-  RuntimeModelError as RuntimeModelError67
+  RuntimeModelError as RuntimeModelError66
 } from "@ibiz-template/core";
 import { createUUID as createUUID20 } from "qx-util";
 import { isNil as isNil34, isUndefined } from "lodash-es";
@@ -71255,7 +71315,7 @@ var AppDataEntity = class _AppDataEntity {
 };
 
 // src/service/dto/method.dto.ts
-import { ModelError as ModelError27, RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
+import { ModelError as ModelError27, RuntimeModelError as RuntimeModelError65 } from "@ibiz-template/core";
 import { clone as clone51 } from "ramda";
 var MethodDto = class {
   /**
@@ -71361,7 +71421,7 @@ var MethodDto = class {
                 context
               );
             } else {
-              throw new RuntimeModelError66(
+              throw new RuntimeModelError65(
                 field,
                 ibiz.i18n.t("runtime.service.subRelationships")
               );
@@ -71626,7 +71686,7 @@ var DEService = class {
     }
     const model = findAppDEMethod(this.model, id);
     if (!model) {
-      throw new RuntimeModelError67(
+      throw new RuntimeModelError66(
         this.model,
         ibiz.i18n.t("runtime.service.noFoundServiceMethod", { id })
       );
@@ -72625,14 +72685,14 @@ import {
   HttpError as HttpError8,
   HttpResponse as HttpResponse5,
   RuntimeError as RuntimeError62,
-  RuntimeModelError as RuntimeModelError69
+  RuntimeModelError as RuntimeModelError68
 } from "@ibiz-template/core";
 import { isArray as isArray10, isNil as isNil36, isUndefined as isUndefined2 } from "lodash-es";
 import { ascSort } from "qx-util";
 import { clone as clone52 } from "ramda";
 
 // src/service/service/entity/method/method.ts
-import { HttpResponse as HttpResponse4, RuntimeModelError as RuntimeModelError68 } from "@ibiz-template/core";
+import { HttpResponse as HttpResponse4, RuntimeModelError as RuntimeModelError67 } from "@ibiz-template/core";
 
 // src/service/service/entity/method/method-input.ts
 var MethodInput = class {
@@ -72851,12 +72911,12 @@ var Method = class {
           break;
         default:
           if (requestMethod) {
-            throw new RuntimeModelError68(
+            throw new RuntimeModelError67(
               this.method,
               ibiz.i18n.t("runtime.service.requestMethods", { requestMethod })
             );
           } else {
-            throw new RuntimeModelError68(
+            throw new RuntimeModelError67(
               this.method,
               ibiz.i18n.t("runtime.service.noConfiguredRequestMethod")
             );
@@ -72867,7 +72927,7 @@ var Method = class {
     if (actionType === "SCRIPT") {
       return new HttpResponse4(data);
     }
-    throw new RuntimeModelError68(
+    throw new RuntimeModelError67(
       this.method,
       ibiz.i18n.t("runtime.service.unsupportedBehaviorTypes", { actionType })
     );
@@ -72983,7 +73043,7 @@ var DEActionMethod = class extends Method {
     if (this.method.actionType === "DELOGIC") {
       const deLogic = findDELogic(this.method.appDELogicId, this.entity);
       if (!deLogic) {
-        throw new RuntimeModelError69(
+        throw new RuntimeModelError68(
           this.method,
           ibiz.i18n.t("runtime.service.lackEntityLogic")
         );
@@ -73373,7 +73433,7 @@ var DEActionMethod = class extends Method {
         configs = ascSort(configs, "removeOrder");
         for (const config of configs) {
           if (config.rstype !== "DER1N") {
-            throw new RuntimeModelError69(
+            throw new RuntimeModelError68(
               config,
               ibiz.i18n.t("runtime.service.deletionDeletion")
             );
@@ -73652,7 +73712,7 @@ import {
   HttpResponse as HttpResponse6,
   ModelError as ModelError29,
   RuntimeError as RuntimeError63,
-  RuntimeModelError as RuntimeModelError70
+  RuntimeModelError as RuntimeModelError69
 } from "@ibiz-template/core";
 import { isArray as isArray11 } from "lodash-es";
 import { clone as clone53, isEmpty as isEmpty9, isNil as isNil37 } from "ramda";
@@ -73696,7 +73756,7 @@ var FetchMethod = class extends Method {
           break;
         case "SCRIPT":
           if (!this.method.scriptCode) {
-            throw new RuntimeModelError70(
+            throw new RuntimeModelError69(
               this.method,
               ibiz.i18n.t("runtime.service.scriptCodeNotConfig")
             );
@@ -73881,7 +73941,7 @@ var FetchMethod = class extends Method {
   async fetchCodeListSet(context, params) {
     const { appCodeListId } = this.method;
     if (!appCodeListId) {
-      throw new RuntimeModelError70(
+      throw new RuntimeModelError69(
         this.method,
         ibiz.i18n.t("runtime.service.sourceCodeTable")
       );
@@ -73908,7 +73968,7 @@ var FetchMethod = class extends Method {
   async fetchCodeListSetWithMeta(context, params) {
     const { appCodeListId } = this.method;
     if (!appCodeListId) {
-      throw new RuntimeModelError70(
+      throw new RuntimeModelError69(
         this.method,
         ibiz.i18n.t("runtime.service.sourceCodeTable")
       );
@@ -84485,29 +84545,29 @@ function paramsToSearchconds(_params) {
 }
 
 // src/utils/date-util/index.ts
-import dayjs9 from "dayjs";
+import dayjs10 from "dayjs";
 function formatDateByScale(val, timeScale) {
   let value = val;
   const date = new Date(val);
   if (!val || isNaN(date.getTime()))
     return value;
-  const year = dayjs9(date).year();
+  const year = dayjs10(date).year();
   const type = timeScale === "yearweek" ? "week" : timeScale;
   switch (type) {
     case "year":
       value = "".concat(year);
       break;
     case "quarter":
-      value = "".concat(year, " ").concat(dayjs9(date).quarter()).concat(ibiz.i18n.t("runtime.controller.utils.util.quarter"));
+      value = "".concat(year, " ").concat(dayjs10(date).quarter()).concat(ibiz.i18n.t("runtime.controller.utils.util.quarter"));
       break;
     case "month":
-      value = "".concat(year, " ").concat(dayjs9(date).month() + 1).concat(ibiz.i18n.t("runtime.controller.utils.util.month"));
+      value = "".concat(year, " ").concat(dayjs10(date).month() + 1).concat(ibiz.i18n.t("runtime.controller.utils.util.month"));
       break;
     case "week":
-      value = "".concat(year, " ").concat(dayjs9(date).week()).concat(ibiz.i18n.t("runtime.controller.utils.util.week"));
+      value = "".concat(year, " ").concat(dayjs10(date).week()).concat(ibiz.i18n.t("runtime.controller.utils.util.week"));
       break;
     case "day":
-      value = dayjs9(date).format("YYYY-MM-DD");
+      value = dayjs10(date).format("YYYY-MM-DD");
       break;
     default:
       break;
@@ -84515,7 +84575,7 @@ function formatDateByScale(val, timeScale) {
   return value;
 }
 function getWeeksInYear(year) {
-  const lastDayOfYear = dayjs9("".concat(year, "-12-31"));
+  const lastDayOfYear = dayjs10("".concat(year, "-12-31"));
   const week = lastDayOfYear.isoWeek();
   return week === 1 ? 52 : week;
 }
@@ -84552,7 +84612,7 @@ function generateYearWeekRange(minYearWeek, maxYearWeek, paddingWeeks = 0) {
 function calcDateRangeByScale(val, timeScale) {
   if (!val || isNaN(new Date(val).getTime()))
     return;
-  let date = dayjs9(val);
+  let date = dayjs10(val);
   const type = timeScale === "yearweek" ? "week" : timeScale;
   switch (type) {
     case "year":
@@ -84580,8 +84640,8 @@ function calcDateRangeByScale(val, timeScale) {
 }
 function compareDateEqualByScale(dateStr1, dateStr2, timeScale) {
   let result = false;
-  const date1 = dayjs9(dateStr1);
-  const date2 = dayjs9(dateStr2);
+  const date1 = dayjs10(dateStr1);
+  const date2 = dayjs10(dateStr2);
   if (!dateStr1 || !dateStr2 || !date1.isValid() || !date2.isValid())
     return result;
   switch (timeScale) {
@@ -86547,7 +86607,7 @@ import { QXEvent as QXEvent14 } from "qx-util";
 import { QXEvent as QXEvent12 } from "qx-util";
 import { clone as clone60 } from "ramda";
 import { isNil as isNil40, isNumber as isNumber5 } from "lodash-es";
-import dayjs10 from "dayjs";
+import dayjs11 from "dayjs";
 var AsyncActionController = class {
   constructor() {
     this.evt = new QXEvent12();
@@ -86621,7 +86681,7 @@ var AsyncActionController = class {
     ];
     dateFields.forEach((key) => {
       if (isNumber5(data[key])) {
-        data[key] = dayjs10(data[key]).format("YYYY-MM-DD HH:mm:ss");
+        data[key] = dayjs11(data[key]).format("YYYY-MM-DD HH:mm:ss");
       }
     });
     if (!isNil40(data.actionresult)) {
@@ -88515,7 +88575,7 @@ var ViewEngineBase = class {
 };
 
 // src/engine/md-view.engine.ts
-import { RuntimeModelError as RuntimeModelError71 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError70 } from "@ibiz-template/core";
 import { clone as clone61 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
@@ -88767,21 +88827,20 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError71(
-        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
+    };
   }
   /**
    * 打开新建数据视图
@@ -88799,7 +88858,7 @@ var MDViewEngine = class extends ViewEngineBase {
       (item) => item.id === "newdata"
     );
     if (!openAppViewLogic) {
-      throw new RuntimeModelError71(
+      throw new RuntimeModelError70(
         this.view.model,
         ibiz.i18n.t("runtime.engine.logicNewdata")
       );
@@ -88819,21 +88878,20 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError71(
-        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
+    };
   }
   /**
    * 视图删除
@@ -89856,13 +89914,13 @@ var ScriptExecutor = class extends LogicExecutor {
 };
 
 // src/logic-scheduler/executor/app-de-ui-logic-executor.ts
-import { RuntimeModelError as RuntimeModelError72 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError71 } from "@ibiz-template/core";
 var AppDEUILogicExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
     const { appDEUILogicId, appDataEntityId } = this.logic;
     if (!appDEUILogicId) {
-      throw new RuntimeModelError72(
+      throw new RuntimeModelError71(
         this.logic,
         ibiz.i18n.t("runtime.logicScheduler.executor.noConfiguredLogic")
       );
@@ -90132,16 +90190,18 @@ var ViewLogicScheduler = class 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 ? void 0 : result.length) {
+      await Promise.all(result);
+    }
   }
 };
 
@@ -90353,7 +90413,7 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError81, RuntimeModelError as RuntimeModelError73 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError81, RuntimeModelError as RuntimeModelError72 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -90361,7 +90421,7 @@ var TimerTrigger = class extends LogicTrigger {
   }
   start() {
     if (!this.logic.timer) {
-      throw new RuntimeModelError73(
+      throw new RuntimeModelError72(
         this.logic,
         ibiz.i18n.t("runtime.logicScheduler.trigger.timerLacks")
       );
@@ -90401,7 +90461,7 @@ var TimerTrigger = class extends LogicTrigger {
 import {
   ModelError as ModelError34,
   RuntimeError as RuntimeError82,
-  RuntimeModelError as RuntimeModelError74
+  RuntimeModelError as RuntimeModelError73
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty11 } from "qx-util";
 var AppUILogicExecutor = class extends LogicExecutor {
@@ -90449,7 +90509,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       openViewRef = appUILogic.openDataAppView;
       if (!openViewRef) {
-        throw new RuntimeModelError74(
+        throw new RuntimeModelError73(
           appUILogic,
           ibiz.i18n.t(
             "runtime.logicScheduler.executor.defaultOpendataViewLogic"
@@ -90459,7 +90519,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const openView = openViewRef.refAppViewId;
     if (!openView) {
-      throw new RuntimeModelError74(
+      throw new RuntimeModelError73(
         appUILogic,
         ibiz.i18n.t("runtime.logicScheduler.executor.noActuallyReference")
       );
@@ -90497,7 +90557,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     );
     const typeFileName = appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
     if (!typeFileName) {
-      throw new RuntimeModelError74(
+      throw new RuntimeModelError73(
         appUILogic,
         ibiz.i18n.t("runtime.logicScheduler.executor.attributeConfiguration", {
           codeName: appDataEntity.codeName
@@ -90507,7 +90567,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { data } = parameters;
     const formTypeValue = data[0][typeFileName];
     if (!formTypeValue) {
-      throw new RuntimeModelError74(
+      throw new RuntimeModelError73(
         appUILogic,
         ibiz.i18n.t("runtime.logicScheduler.executor.entityAttributeValues")
       );
@@ -90554,7 +90614,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         return viewRef.refMode.toLowerCase() !== parentDeName;
       });
       if (!newViewRef) {
-        throw new RuntimeModelError74(
+        throw new RuntimeModelError73(
           appUILogic,
           ibiz.i18n.t("runtime.logicScheduler.executor.selectionView")
         );
@@ -90567,7 +90627,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       newViewRef = newDataAppView;
       if (!newViewRef || !newViewRef.refAppViewId) {
-        throw new RuntimeModelError74(
+        throw new RuntimeModelError73(
           appUILogic,
           ibiz.i18n.t("runtime.logicScheduler.executor.newdataViewLogic")
         );
@@ -90640,7 +90700,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { context, params, ...rest } = parameters;
     const { view } = parameters;
     if (!wizardAppView || !wizardAppView.refAppViewId) {
-      throw new RuntimeModelError74(
+      throw new RuntimeModelError73(
         appUILogic,
         ibiz.i18n.t("runtime.logicScheduler.executor.indexEntity")
       );
@@ -90698,7 +90758,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       const minorDERs = selfDe.minorAppDERSs;
       const pickParentDeName = newViewRef.refMode.toLowerCase();
       if (!minorDERs) {
-        throw new RuntimeModelError74(
+        throw new RuntimeModelError73(
           selfDe,
           ibiz.i18n.t("runtime.logicScheduler.executor.relationships")
         );
@@ -90809,17 +90869,17 @@ var ControlEventTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/executor/app-ui-action-executor.ts
-import { RuntimeModelError as RuntimeModelError75 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError74 } from "@ibiz-template/core";
 var AppDEUIActionExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
     if (!this.logic.appDEUIActionId) {
-      throw new RuntimeModelError75(
+      throw new RuntimeModelError74(
         this.logic,
         ibiz.i18n.t("runtime.logicScheduler.executor.missingTrigger")
       );
     }
-    UIActionUtil.execAndResolved(
+    return UIActionUtil.execAndResolved(
       this.logic.appDEUIActionId,
       executeParams,
       this.logic.appId