@ibiz-template/runtime 0.7.26-alpha.0 → 0.7.26-alpha.2

package/dist/index.esm.js

@@ -1829,11 +1829,29 @@ var ScriptFactory = class {
    * @param {IScriptFunctionOpts} options 选项
    * @return {*}
    */
-  static execScriptFn(args, scriptCode, options) {
+  static execScriptFn(args, scriptCode, options = {}) {
     return this.createScriptFn(Object.keys(args), scriptCode, options).exec(
       args
     );
   }
+  /**
+   * 直接创建并同步执行脚本
+   *
+   * @author tony001
+   * @date 2024-06-25 14:06:25
+   * @static
+   * @param {IParams} args
+   * @param {string} scriptCode
+   * @param {IScriptFunctionOpts} [options={}]
+   * @return {*}  {Promise<unknown>}
+   */
+  static async asyncExecScriptFn(args, scriptCode, options = {}) {
+    const result = await this.createScriptFn(Object.keys(args), scriptCode, {
+      ...options,
+      isAsync: true
+    }).exec(args);
+    return result;
+  }
   /**
    * 执行单行脚本
    * @author lxm
@@ -6708,6 +6726,7 @@ var AppDataEntity = class _AppDataEntity {
   clone() {
     const entity = new _AppDataEntity(this._entity, this._data);
     entity.srfkey = this.srfkey;
+    entity.srfordervalue = this.srfordervalue;
     return entity;
   }
   /**
@@ -6722,6 +6741,7 @@ var AppDataEntity = class _AppDataEntity {
     let _data = {};
     if (data instanceof _AppDataEntity) {
       _data = data._data;
+      this.srfordervalue = data.srfordervalue;
     } else {
       _data = data;
     }
@@ -15449,7 +15469,7 @@ function installCommand() {
 }
 
 // src/app-hub.ts
-import { RuntimeError as RuntimeError68 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError69 } from "@ibiz-template/core";
 
 // src/application.ts
 import { Net, getToken } from "@ibiz-template/core";
@@ -15461,8 +15481,9 @@ var Application = class {
    * @date 2022-12-22 15:12:26
    * @param {IApplication} model
    */
-  constructor(model) {
+  constructor(model, subAppRef) {
     this.model = model;
+    this.subAppRef = subAppRef;
     /**
      * 应用实体名称到应用实体代码名称的映射
      *
@@ -15496,7 +15517,7 @@ var Application = class {
      */
     this.appBIReportMap = /* @__PURE__ */ new Map();
     this.net = new Net({
-      baseURL: "".concat(ibiz.env.baseUrl, "/").concat(this.appId)
+      baseURL: "".concat(ibiz.env.baseUrl, "/").concat(subAppRef && subAppRef.serviceId ? subAppRef.serviceId : this.appId)
     });
     this.configCache = new ConfigService(
       this.appId,
@@ -19468,10 +19489,11 @@ var MDControlController = class extends ControlController {
    * @return {*}  {void}
    */
   onDEDataChange(msg) {
+    var _a;
     if (!isNil24(msg.triggerKey) && msg.triggerKey === this.triggerKey) {
       return;
     }
-    if (!msg.data || msg.data.srfdecodename !== this.dataEntity.codeName) {
+    if (!msg.data || msg.data.srfdecodename !== ((_a = this.dataEntity) == null ? void 0 : _a.codeName)) {
       return;
     }
     let isRefresh = false;
@@ -19936,7 +19958,7 @@ var AppMenuIconViewController = class extends AppMenuController {
 
 // src/controller/control/calendar/calendar.controller.ts
 import dayjs3 from "dayjs";
-import { RuntimeModelError as RuntimeModelError29 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError40, RuntimeModelError as RuntimeModelError29 } from "@ibiz-template/core";
 
 // src/controller/control/calendar/calendar.service.ts
 import { RuntimeError as RuntimeError39 } from "@ibiz-template/core";
@@ -19961,7 +19983,7 @@ var CalendarService = class extends MDControlService {
       async (item) => {
         const fetchAction = item.appDEDataSetId || "fetchdefault";
         const tempContext = context.clone();
-        const tempParams = clone20(params);
+        const tempParams = this.handleRequestParams(item, params);
         if (item.maxSize) {
           tempParams.size = item.maxSize;
         }
@@ -20032,6 +20054,26 @@ var CalendarService = class extends MDControlService {
     );
     return res;
   }
+  /**
+   * 处理请求参数
+   *
+   * @private
+   * @param {ISysCalendarItem} item
+   * @param {IParams} params
+   * @return {*}  {IParams}
+   * @memberof CalendarService
+   */
+  handleRequestParams(item, params) {
+    const tempParams = clone20(params);
+    const { srfstartdate, srfenddate } = tempParams;
+    Object.assign(tempParams, {
+      ["n_".concat(item.beginTimeAppDEFieldId, "_gtandeq")]: srfstartdate,
+      ["n_".concat(item.endTimeAppDEFieldId, "_ltandeq")]: srfenddate
+    });
+    delete tempParams.srfstartdate;
+    delete tempParams.srfenddate;
+    return tempParams;
+  }
 };
 
 // src/controller/control/calendar/calendar.controller.ts
@@ -20045,9 +20087,13 @@ var CalendarController = class extends MDControlController {
    * @memberof CalendarController
    */
   initState() {
+    var _a, _b;
     super.initState();
     this.state.selectedDate = /* @__PURE__ */ new Date();
     this.state.size = 1e3;
+    this.state.legends = [];
+    this.state.calendarTitle = this.model.logicName || "";
+    this.state.showDetail = ((_b = (_a = this.model.controlParam) == null ? void 0 : _a.ctrlParams) == null ? void 0 : _b.SHOWDETAIL) || false;
   }
   /**
    * 生命周期-创建完成
@@ -20063,6 +20109,30 @@ var CalendarController = class extends MDControlController {
     this.service = new CalendarService(this.model);
     await this.service.init(this.context);
     this.initViewScheduler();
+    this.initCalendarLegends();
+  }
+  /**
+   * 初始化日历图例
+   *
+   * @protected
+   * @memberof CalendarController
+   */
+  initCalendarLegends() {
+    const { sysCalendarItems } = this.model;
+    if (!sysCalendarItems) {
+      throw new RuntimeError40(
+        ibiz.i18n.t("runtime.controller.control.calendar.noFoundModel")
+      );
+    }
+    sysCalendarItems.forEach((calendarItem) => {
+      const { id, name, bkcolor, color } = calendarItem;
+      this.state.legends.push({
+        id,
+        name,
+        bkcolor,
+        color
+      });
+    });
   }
   /**
    * 初始化视图触发器
@@ -20071,7 +20141,7 @@ var CalendarController = class extends MDControlController {
    * @memberof CalendarService
    */
   initViewScheduler() {
-    const viewLogics = this.model.appViewLogics || [];
+    const viewLogics = getViewLogics(this.model);
     if (viewLogics.length !== 0) {
       this.viewScheduler = ibiz.scheduler.createViewScheduler(viewLogics);
       this.viewScheduler.defaultParamsCb = () => {
@@ -20084,6 +20154,19 @@ var CalendarController = class extends MDControlController {
       }
     }
   }
+  /**
+   * 销毁
+   *
+   * @protected
+   * @return {*}  {Promise<void>}
+   * @memberof LightCalendarController
+   */
+  async onDestroyed() {
+    await super.onDestroyed();
+    if (this.viewScheduler) {
+      this.viewScheduler.destroy();
+    }
+  }
   /**
    * 设置激活数据
    *
@@ -20092,10 +20175,13 @@ var CalendarController = class extends MDControlController {
    * @memberof CalendarService
    */
   async setActive(item) {
-    this.openData(item);
-    return this._evt.emit("onActive", {
-      data: [item]
+    this._evt.emit("onActive", {
+      data: item ? [item] : []
     });
+    if (!item) {
+      return;
+    }
+    await this.openData(item);
   }
   /**
    * 打开编辑数据视图
@@ -20104,11 +20190,11 @@ var CalendarController = class extends MDControlController {
    * @memberof CalendarService
    */
   async openData(item) {
-    var _a, _b;
+    var _a, _b, _c;
     const context = this.context.clone();
-    const deName = ((_a = item.deData.srfdecodename) == null ? void 0 : _a.toLowerCase()) || calcDeCodeNameById(this.model.appDataEntityId);
+    const deName = ((_b = (_a = item.deData) == null ? void 0 : _a.srfdecodename) == null ? void 0 : _b.toLowerCase()) || calcDeCodeNameById(this.model.appDataEntityId);
     context[deName.toLowerCase()] = item.deData.srfkey;
-    const result = await ((_b = this.viewScheduler) == null ? void 0 : _b.triggerCustom(
+    const result = await ((_c = this.viewScheduler) == null ? void 0 : _c.triggerCustom(
       "".concat(item.itemType.toLowerCase(), "_opendata"),
       {
         context,
@@ -20215,21 +20301,61 @@ var CalendarController = class extends MDControlController {
    */
   getCurSelectDate(param) {
     const { selectedDate } = this.state;
-    const { srfstartdate, srfenddate } = param;
+    const { calendarStyle } = this.model;
+    let { srfstartdate, srfenddate } = param;
     if (!srfstartdate || !srfenddate) {
-      const firstDayOfMonth = new Date(
-        selectedDate.getFullYear(),
-        selectedDate.getMonth(),
-        1
-      );
-      const lastDayOfMonth = new Date(
-        selectedDate.getFullYear(),
-        selectedDate.getMonth() + 1,
-        1
-      );
+      switch (calendarStyle) {
+        case "DAY":
+          srfstartdate = new Date(
+            selectedDate.getFullYear(),
+            selectedDate.getMonth(),
+            selectedDate.getDate()
+          );
+          srfenddate = new Date(
+            new Date(
+              selectedDate.getFullYear(),
+              selectedDate.getMonth(),
+              selectedDate.getDate() + 1
+            ).getTime() - 1
+          );
+          break;
+        case "WEEK":
+          const currentDayOfWeek = selectedDate.getDay();
+          const offset = currentDayOfWeek > 0 ? -currentDayOfWeek + 1 : -6;
+          srfstartdate = new Date(
+            selectedDate.getFullYear(),
+            selectedDate.getMonth(),
+            selectedDate.getDate() + offset
+          );
+          srfenddate = new Date(
+            new Date(
+              srfstartdate.getFullYear(),
+              srfstartdate.getMonth(),
+              srfstartdate.getDate() + 7
+            ).getTime() - 1
+          );
+          break;
+        case "MONTH":
+          srfstartdate = new Date(
+            selectedDate.getFullYear(),
+            selectedDate.getMonth(),
+            1
+          );
+          srfenddate = new Date(
+            new Date(
+              selectedDate.getFullYear(),
+              selectedDate.getMonth() + 1,
+              1
+            ).getTime() - 1
+          );
+          break;
+        default:
+          ibiz.log.warn("\u65E5\u5386".concat(calendarStyle, "\u6837\u5F0F\u6682\u672A\u652F\u6301"));
+          break;
+      }
       return {
-        srfstartdate: dayjs3(firstDayOfMonth).format("YYYY-MM-DD HH:mm:ss"),
-        srfenddate: dayjs3(lastDayOfMonth).format("YYYY-MM-DD HH:mm:ss")
+        srfstartdate: dayjs3(srfstartdate).format("YYYY-MM-DD HH:mm:ss"),
+        srfenddate: dayjs3(srfenddate).format("YYYY-MM-DD HH:mm:ss")
       };
     }
     return { srfstartdate, srfenddate };
@@ -20278,6 +20404,10 @@ var CalendarController = class extends MDControlController {
    * @memberof CalendarController
    */
   async onRowClick(data) {
+    if (!data) {
+      this.setSelection([]);
+      return;
+    }
     const { selectedData } = this.state;
     const filterArr = selectedData.filter(
       (item) => item.deData.srfkey !== data.deData.srfkey
@@ -20307,12 +20437,12 @@ var CalendarController = class extends MDControlController {
 };
 
 // src/controller/control/chart/chart.controller.ts
-import { RuntimeError as RuntimeError41 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError42 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/chart-options-generator.ts
 import { mergeDeepRight as mergeDeepRight3 } from "ramda";
 import { isObject as isObject2, isString as isString2 } from "qx-util";
-import { RuntimeError as RuntimeError40 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError41 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/line-series-generator.ts
 import { RuntimeModelError as RuntimeModelError31 } from "@ibiz-template/core";
@@ -20343,6 +20473,20 @@ var BaseSeriesGenerator = class {
   constructor(model, chartGenerator) {
     this.model = model;
     this.chartGenerator = chartGenerator;
+    /**
+     * 分类属性(小写)
+     * @author lxm
+     * @date 2023-06-09 02:44:57
+     * @type {string}
+     */
+    this.catalogField = "";
+    /**
+     * 分类属性(小写)数组，用于构建多维度分层
+     *
+     * @type {string[]}
+     * @memberof BaseSeriesGenerator
+     */
+    this.catalogFields = [];
     /**
      * 根据分组处理出来的图表数据数组
      * @author lxm
@@ -20364,6 +20508,7 @@ var BaseSeriesGenerator = class {
      * @type {boolean}
      */
     this.autoCompleteCategory = true;
+    var _a;
     this.model = model;
     this.chartGenerator = chartGenerator;
     const { chartSeriesEncode, caption, id, userParam } = model;
@@ -20379,6 +20524,18 @@ var BaseSeriesGenerator = class {
         ibiz.i18n.t("runtime.controller.control.chart.missingValue")
       );
     }
+    if (chartGenerator.model.controlParam && ((_a = chartGenerator.model.controlParam.ctrlParams) == null ? void 0 : _a.CATALOGFIELDS)) {
+      try {
+        const tempCatalogFields = JSON.parse(
+          chartGenerator.model.controlParam.ctrlParams.CATALOGFIELDS
+        );
+        if (Array.isArray(tempCatalogFields)) {
+          this.catalogFields = tempCatalogFields;
+        }
+      } catch (e) {
+        throw new Error(ibiz.i18n.t("runtime.control.chart.errorJson"));
+      }
+    }
     this.catalogField = chartGenerator.getFieldKey(model.catalogField);
     this.valueField = chartGenerator.getFieldKey(model.valueField);
     this.groupField = model.seriesField ? chartGenerator.getFieldKey(model.seriesField) : void 0;
@@ -20463,6 +20620,42 @@ var BaseSeriesGenerator = class {
     groupData[group].get(catalog).chartData = tempChartData;
     (_a = this.chartDataArr) == null ? void 0 : _a.push(tempChartData);
   }
+  /**
+   * 处理多分类分组
+   *
+   * @param {IData[]} prevItems
+   * @param {IData[]} nextItems
+   * @return {*}
+   * @memberof BaseSeriesGenerator
+   */
+  handleMultiCatalogGroup(prevItems, nextItems) {
+    let tempItems = [];
+    if (prevItems.length === 0) {
+      tempItems = nextItems.map((item) => {
+        return {
+          text: item.text,
+          value: item.value
+        };
+      });
+    } else {
+      for (let prev = 0; prev < prevItems.length; prev++) {
+        if (nextItems.length > 0) {
+          for (let next = 0; next < nextItems.length; next++) {
+            tempItems.push({
+              text: "".concat(prevItems[prev].text, "_").concat(nextItems[next].text),
+              value: nextItems[next].value
+            });
+          }
+        } else {
+          tempItems.push({
+            text: prevItems[prev].text,
+            value: prevItems[prev].value
+          });
+        }
+      }
+    }
+    return tempItems;
+  }
   /**
    * 计算分组数据
    * @author lxm
@@ -20489,7 +20682,35 @@ var BaseSeriesGenerator = class {
       }
       if (!groupData[group]) {
         groupData[group] = /* @__PURE__ */ new Map();
-        if (catalogCodeListId && this.autoCompleteCategory) {
+        if (this.catalogFields.length > 0) {
+          let tempCodes = [];
+          const tempCodeLists = [];
+          this.catalogFields.forEach((catalog2) => {
+            const { codelistId } = catalog2;
+            if (codelistId && this.autoCompleteCategory) {
+              const codeListItems = this.chartGenerator.codeListMap.get(codelistId);
+              tempCodeLists.push(clone21(codeListItems));
+            }
+          });
+          for (let i = 0; i < tempCodeLists.length; i++) {
+            tempCodes = this.handleMultiCatalogGroup(
+              tempCodes,
+              tempCodeLists[i]
+            );
+          }
+          tempCodes.forEach((x) => {
+            groupData[group].set(x.text, { value: 0 });
+            this.prepareChartData(
+              groupData,
+              {
+                [this.valueField]: 0,
+                [this.catalogField]: x.value
+              },
+              x.text,
+              group
+            );
+          });
+        } else if (catalogCodeListId && this.autoCompleteCategory) {
           const codeListItems = this.chartGenerator.codeListMap.get(catalogCodeListId);
           codeListItems.forEach((x) => {
             groupData[group].set(x.text, { value: 0 });
@@ -20505,11 +20726,31 @@ var BaseSeriesGenerator = class {
           });
         }
       }
-      const catalog = this.translateVal(
-        catalogCodeListId,
-        item[this.catalogField],
-        true
-      );
+      let catalog = "";
+      if (this.catalogFields.length > 0) {
+        const tempCatalog = [];
+        this.catalogFields.forEach((_catalog) => {
+          const mergeCatalog = this.translateVal(
+            _catalog.codelistId,
+            item[_catalog.codename],
+            true
+          );
+          if (!mergeCatalog) {
+            return;
+          }
+          tempCatalog.push(mergeCatalog);
+        });
+        if (tempCatalog.length !== this.catalogFields.length) {
+          return;
+        }
+        catalog = tempCatalog.join("_");
+      } else {
+        catalog = this.translateVal(
+          catalogCodeListId,
+          item[this.catalogField],
+          true
+        );
+      }
       if (!catalog) {
         return;
       }
@@ -20525,7 +20766,9 @@ var BaseSeriesGenerator = class {
       } else {
         this.prepareChartData(
           groupData,
-          { ...item, [this.valueField]: groupData[group].get(catalog).value },
+          Object.assign(item, {
+            [this.valueField]: groupData[group].get(catalog).value
+          }),
           catalog,
           group
         );
@@ -21255,6 +21498,239 @@ var ChartOptionsGenerator2 = class {
     });
     return AxisOption;
   }
+  /**
+   * 初始化多分类的X轴配置
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof ChartOptionsGenerator
+   */
+  async initMultiCatalogxAxis(context, params) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    const { controlParam } = this.model;
+    if (controlParam && ((_a = controlParam.ctrlParams) == null ? void 0 : _a.CATALOGFIELDS)) {
+      try {
+        const tempCatalogFields = JSON.parse(
+          controlParam.ctrlParams.CATALOGFIELDS
+        );
+        const tempaxis = [];
+        let titleshow = true;
+        let labelshow = true;
+        let gridIndex = 0;
+        if (Array.isArray(tempCatalogFields)) {
+          const app = ibiz.hub.getApp(context.srfappid);
+          if (this.chartUserParam && this.chartUserParam.xAxis) {
+            if (((_b = controlParam.ctrlParams) == null ? void 0 : _b.MODE) === "ROW") {
+              if (Array.isArray(this.chartUserParam.yAxis)) {
+                const tempconfig = this.chartUserParam.yAxis[this.chartUserParam.yAxis.length - 1];
+                titleshow = tempconfig.name === void 0 ? true : !!tempconfig.name;
+                labelshow = ((_c = tempconfig.axisLabel) == null ? void 0 : _c.show) === void 0 ? true : (_d = tempconfig.axisLabel) == null ? void 0 : _d.show;
+              } else {
+                titleshow = ((_e = this.chartUserParam.yAxis) == null ? void 0 : _e.name) === void 0 ? true : !!this.chartUserParam.yAxis.name;
+                labelshow = ((_g = (_f = this.chartUserParam.yAxis) == null ? void 0 : _f.axisLabel) == null ? void 0 : _g.show) === void 0 ? true : (_h = this.chartUserParam.yAxis.axisLabel) == null ? void 0 : _h.show;
+              }
+            } else if (Array.isArray(this.chartUserParam.xAxis)) {
+              const tempconfig = this.chartUserParam.xAxis[this.chartUserParam.xAxis.length - 1];
+              titleshow = tempconfig.name === void 0 ? true : !!tempconfig.name;
+              labelshow = ((_i = tempconfig.axisLabel) == null ? void 0 : _i.show) === void 0 ? true : (_j = tempconfig.axisLabel) == null ? void 0 : _j.show;
+            } else {
+              titleshow = this.chartUserParam.xAxis.name === void 0 ? true : !!this.chartUserParam.xAxis.name;
+              labelshow = ((_k = this.chartUserParam.xAxis.axisLabel) == null ? void 0 : _k.show) === void 0 ? true : (_l = this.chartUserParam.xAxis.axisLabel) == null ? void 0 : _l.show;
+            }
+          }
+          if (this.chartUserParam && this.chartUserParam.grid && Array.isArray(this.chartUserParam.grid)) {
+            gridIndex = this.chartUserParam.grid.length - 1;
+          }
+          await Promise.all(
+            tempCatalogFields.slice(0, -1).map(async (catalog, index) => {
+              var _a2;
+              if (catalog.mode === "codelist" && catalog.codelistId) {
+                const codeListItems = await app.codeList.get(
+                  catalog.codelistId,
+                  context,
+                  params
+                );
+                if (codeListItems) {
+                  const tempxAxisData = [];
+                  if (((_a2 = controlParam.ctrlParams) == null ? void 0 : _a2.MODE) === "ROW") {
+                    const yAxisData = codeListItems.map((code) => {
+                      return {
+                        value: code.text,
+                        textStyle: {
+                          padding: [
+                            0,
+                            40 + 40 * (tempCatalogFields.length - index - 1),
+                            0,
+                            0
+                          ]
+                        }
+                      };
+                    });
+                    if (index === 0) {
+                      tempaxis.push({
+                        show: labelshow,
+                        gridIndex,
+                        type: "category",
+                        data: yAxisData,
+                        position: "left"
+                      });
+                    } else {
+                      let length = 1;
+                      for (let i = 0; i < tempaxis.length; i++) {
+                        length *= tempaxis[i].data.length;
+                      }
+                      for (let i = 0; i < length; i++) {
+                        tempxAxisData.push(...yAxisData);
+                      }
+                      tempaxis.push({
+                        show: labelshow,
+                        gridIndex,
+                        type: "category",
+                        data: tempxAxisData,
+                        position: "left"
+                      });
+                    }
+                  } else {
+                    const xAxisData = codeListItems.map((code) => {
+                      return {
+                        value: code.text,
+                        textStyle: {
+                          lineHeight: 45 * (tempCatalogFields.length - 1 - index)
+                        }
+                      };
+                    });
+                    if (index === 0) {
+                      tempaxis.push({
+                        show: labelshow,
+                        gridIndex,
+                        type: "category",
+                        data: xAxisData,
+                        position: "bottom"
+                      });
+                    } else {
+                      let length = 1;
+                      for (let i = 0; i < tempaxis.length; i++) {
+                        length *= tempaxis[i].data.length;
+                      }
+                      for (let i = 0; i < length; i++) {
+                        tempxAxisData.push(...xAxisData);
+                      }
+                      tempaxis.push({
+                        show: labelshow,
+                        gridIndex,
+                        type: "category",
+                        data: tempxAxisData,
+                        position: "bottom"
+                      });
+                    }
+                  }
+                }
+              }
+            })
+          );
+          const mergeName = tempCatalogFields.map((catalog) => {
+            return catalog.name;
+          }).join("/").split("").join("\n");
+          if (((_m = controlParam.ctrlParams) == null ? void 0 : _m.MODE) !== "ROW") {
+            tempaxis.push({
+              type: "category",
+              gridIndex,
+              show: titleshow,
+              data: [
+                {
+                  value: mergeName,
+                  textStyle: {
+                    lineHeight: labelshow ? 45 * tempCatalogFields.length : 45
+                  }
+                }
+              ],
+              position: "bottom"
+            });
+          }
+          if (this.chartUserParam) {
+            if (((_n = controlParam.ctrlParams) == null ? void 0 : _n.MODE) === "ROW") {
+              if (!this.chartUserParam.grid) {
+                this.chartUserParam.grid = {};
+              }
+              let { length } = tempCatalogFields;
+              if (!labelshow) {
+                length = 1;
+              }
+              if (!titleshow) {
+                length -= 1;
+              }
+              if (length === 0) {
+                Object.assign(this.chartUserParam.grid, {
+                  bottom: 45
+                });
+              } else {
+                Object.assign(this.chartUserParam.grid, {
+                  left: (length + 1) * 60
+                });
+              }
+              tempaxis.push({
+                type: "category",
+                gridIndex,
+                show: titleshow,
+                data: [
+                  {
+                    value: mergeName,
+                    textStyle: {
+                      padding: [0, length * 60, 0, 0]
+                    }
+                  }
+                ],
+                position: "left"
+              });
+              if (this.chartUserParam.yAxis && Array.isArray(this.chartUserParam.yAxis)) {
+                this.chartUserParam.yAxis = [
+                  ...this.chartUserParam.yAxis,
+                  ...tempaxis
+                ];
+              } else if (this.chartUserParam.yAxis) {
+                this.chartUserParam.yAxis = [
+                  this.chartUserParam.yAxis,
+                  ...tempaxis
+                ];
+              }
+            } else {
+              if (this.chartUserParam.xAxis && Array.isArray(this.chartUserParam.xAxis)) {
+                this.chartUserParam.xAxis = [
+                  ...this.chartUserParam.xAxis,
+                  ...tempaxis
+                ];
+              } else if (this.chartUserParam.xAxis) {
+                this.chartUserParam.xAxis = [
+                  this.chartUserParam.xAxis,
+                  ...tempaxis
+                ];
+              }
+              if (!this.chartUserParam.grid) {
+                this.chartUserParam.grid = {};
+              }
+              let { length } = tempCatalogFields;
+              if (!labelshow) {
+                length = 1;
+              }
+              if (!titleshow) {
+                length -= 1;
+              }
+              if (length === 0) {
+                Object.assign(this.chartUserParam.grid, {
+                  bottom: 45
+                });
+              } else {
+                Object.assign(this.chartUserParam.grid, {
+                  bottom: (length > 2 ? length - 1 : length) * 45
+                });
+              }
+            }
+          }
+        }
+      } catch (e) {
+        throw new Error(ibiz.i18n.t("runtime.control.chart.errorJson"));
+      }
+    }
+  }
   /**
    * 初始化
    * @author lxm
@@ -21265,6 +21741,7 @@ var ChartOptionsGenerator2 = class {
    */
   async init(context, params) {
     await this.loadCodeList(context, params);
+    await this.initMultiCatalogxAxis(context, params);
     this.entity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.model.appId
@@ -21293,7 +21770,7 @@ var ChartOptionsGenerator2 = class {
    * @return {*}  {Promise<void>}
    */
   async loadCodeList(context, params) {
-    var _a;
+    var _a, _b, _c;
     this.codeListMap.clear();
     if (!((_a = this.model.dechartSerieses) == null ? void 0 : _a.length)) {
       return;
@@ -21306,11 +21783,29 @@ var ChartOptionsGenerator2 = class {
       const codeListItems = await app.codeList.get(key, context, params);
       this.codeListMap.set(key, codeListItems);
     };
+    if ((_c = (_b = this.model.controlParam) == null ? void 0 : _b.ctrlParams) == null ? void 0 : _c.CATALOGFIELDS) {
+      try {
+        const tempCatalogFields = JSON.parse(
+          this.model.controlParam.ctrlParams.CATALOGFIELDS
+        );
+        if (Array.isArray(tempCatalogFields)) {
+          await Promise.all(
+            tempCatalogFields.map(async (catalog) => {
+              if (catalog.mode === "codelist") {
+                await loadCodeList(catalog.codelistId);
+              }
+            })
+          );
+        }
+      } catch (e) {
+        throw new Error(ibiz.i18n.t("runtime.control.chart.errorJson"));
+      }
+    }
     await Promise.all(
       this.model.dechartSerieses.map(async (series) => {
         const { seriesCodeListId, catalogCodeListId } = series;
-        await loadCodeList(seriesCodeListId);
         await loadCodeList(catalogCodeListId);
+        await loadCodeList(seriesCodeListId);
       })
     );
   }
@@ -21377,7 +21872,7 @@ var ChartOptionsGenerator2 = class {
   getChartDataByParams(params) {
     const generator = this.seriesGeneratorIndexMap.get(params.seriesIndex);
     if (!generator) {
-      throw new RuntimeError40(
+      throw new RuntimeError41(
         ibiz.i18n.t("runtime.controller.control.chart.noFindSequence", {
           seriesIndex: params.seriesIndex
         })
@@ -21661,12 +22156,12 @@ var ChartController = class extends MDControlController {
    */
   updateChart() {
     if (!this.chart) {
-      throw new RuntimeError41(
+      throw new RuntimeError42(
         ibiz.i18n.t("runtime.controller.control.chart.noInitialised")
       );
     }
     if (!this.options) {
-      throw new RuntimeError41(
+      throw new RuntimeError42(
         ibiz.i18n.t("runtime.controller.control.chart.noCalculated")
       );
     }
@@ -21718,7 +22213,7 @@ var CaptionBarController = class extends ControlController {
 };
 
 // src/controller/control/toolbar/toolbar.controllerr.ts
-import { recursiveIterate as recursiveIterate2, RuntimeError as RuntimeError50 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate2, RuntimeError as RuntimeError51 } from "@ibiz-template/core";
 
 // src/ui-action/provider/backend-ui-action-provider.ts
 import { RuntimeModelError as RuntimeModelError52 } from "@ibiz-template/core";
@@ -21728,7 +22223,7 @@ import { isArray as isArray8 } from "qx-util";
 import { RuntimeModelError as RuntimeModelError51 } from "@ibiz-template/core";
 
 // src/ui-logic/index.ts
-import { RuntimeError as RuntimeError47 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError48 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic.ts
 import { ModelError as ModelError25, RuntimeModelError as RuntimeModelError50 } from "@ibiz-template/core";
@@ -22384,7 +22879,7 @@ var EndNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts
-import { ModelError as ModelError22, RuntimeError as RuntimeError42 } from "@ibiz-template/core";
+import { ModelError as ModelError22, RuntimeError as RuntimeError43 } from "@ibiz-template/core";
 import { clone as clone23 } from "ramda";
 var PrepareJSParamNode = class extends UILogicNode {
   async exec(ctx) {
@@ -22450,7 +22945,7 @@ var PrepareJSParamNode = class extends UILogicNode {
   setParamValue(nodeParam, ctx) {
     const { dstFieldName, dstDEUILogicParamId } = nodeParam;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeError42(ibiz.i18n.t("runtime.uiLogic.noTargetParameter"));
+      throw new RuntimeError43(ibiz.i18n.t("runtime.uiLogic.noTargetParameter"));
     }
     let dstField = dstFieldName;
     if (ctx.isEntityParam(dstDEUILogicParamId)) {
@@ -22567,7 +23062,7 @@ var PrepareJSParamNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-invoke-node/view-ctrl-invoke-node.ts
-import { RuntimeError as RuntimeError43, RuntimeModelError as RuntimeModelError38 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError44, RuntimeModelError as RuntimeModelError38 } from "@ibiz-template/core";
 import { isFunction } from "lodash-es";
 var ViewCtrlInvokeNode = class extends UILogicNode {
   async exec(ctx) {
@@ -22593,7 +23088,7 @@ var ViewCtrlInvokeNode = class extends UILogicNode {
     }
     const invokeParam = ctx.params[invokeParamId];
     if (!invokeParam) {
-      throw new RuntimeError43(
+      throw new RuntimeError44(
         ibiz.i18n.t("runtime.uiLogic.noFoundOperationParameter", {
           invokeParamId
         })
@@ -22601,14 +23096,14 @@ var ViewCtrlInvokeNode = class extends UILogicNode {
     }
     const invokeCtrl = ctx.params[invokeCtrlId];
     if (!invokeCtrl) {
-      throw new RuntimeError43(
+      throw new RuntimeError44(
         ibiz.i18n.t("runtime.uiLogic.noFoundInterfaceObject", {
           invokeCtrlId
         })
       );
     }
     if (!invokeCtrl[invokeMethod] || !isFunction(invokeCtrl[invokeMethod])) {
-      throw new RuntimeError43(
+      throw new RuntimeError44(
         ibiz.i18n.t("runtime.uiLogic.noFoundInvokeMethod", {
           invokeMethod
         })
@@ -22948,7 +23443,7 @@ var DataSetNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/throw-exception-node/throw-exception-node.ts
-import { RuntimeError as RuntimeError44 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError45 } from "@ibiz-template/core";
 var ThrowExceptionNode2 = class extends UILogicNode {
   async exec(_ctx) {
     const { errorInfo } = this.model;
@@ -22958,12 +23453,12 @@ var ThrowExceptionNode2 = class extends UILogicNode {
         errorInfo
       })
     );
-    throw new RuntimeError44(errorInfo);
+    throw new RuntimeError45(errorInfo);
   }
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-fire-event-node/view-ctrl-fire-event-node.ts
-import { RuntimeError as RuntimeError45, RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError46, RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
 var ViewCtrlFireEventNode = class extends UILogicNode {
   async exec(ctx) {
     ctx.isEndNode = true;
@@ -22988,13 +23483,13 @@ var ViewCtrlFireEventNode = class extends UILogicNode {
     }
     const invokeCtrl = ctx.params[fireCtrlId];
     if (!invokeCtrl) {
-      throw new RuntimeError45(
+      throw new RuntimeError46(
         ibiz.i18n.t("runtime.uiLogic.noFoundTriggerObject", { fireCtrlId })
       );
     }
     const eventParam = ctx.params[eventParamId];
     if (!eventParam) {
-      throw new RuntimeError45(
+      throw new RuntimeError46(
         ibiz.i18n.t("runtime.uiLogic.noFoundEventParameterObject", {
           eventParamId
         })
@@ -23016,7 +23511,7 @@ var ViewCtrlFireEventNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts
-import { RuntimeError as RuntimeError46, RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError47, RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
 var ExecuteDELogicNode = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -23045,7 +23540,7 @@ var ExecuteDELogicNode = class extends UILogicNode {
     }
     const dstParam = ctx.params[dstDEUILogicParamId];
     if (!dstParam) {
-      throw new RuntimeError46(
+      throw new RuntimeError47(
         ibiz.i18n.t("runtime.uiLogic.passedParameter", { dstDEUILogicParamId })
       );
     }
@@ -23081,15 +23576,14 @@ var RawJSCodeNode = class extends UILogicNode {
       }),
       this.model.code
     );
-    ScriptFactory.execScriptFn(
+    await ScriptFactory.asyncExecScriptFn(
       {
         view: ctx.view,
         context: ctx.context,
         params: ctx.viewParam,
         uiLogic: ctx.params
       },
-      this.model.code || "",
-      { isAsync: false }
+      this.model.code || ""
     );
   }
 };
@@ -23445,7 +23939,7 @@ async function execUILogic(deUILogicId, appDataEntityId, parameters) {
   const app = ibiz.hub.getApp(parameters.context.srfappid);
   const deUILogic = await app.getDEUILogic(deUILogicId, appDataEntityId);
   if (!deUILogic) {
-    throw new RuntimeError47(
+    throw new RuntimeError48(
       ibiz.i18n.t("runtime.uiLogic.interfaceLogic", {
         appDataEntityId,
         deUILogicId
@@ -23473,7 +23967,7 @@ async function execUILogic(deUILogicId, appDataEntityId, parameters) {
 }
 
 // src/ui-action/uiaction-util.ts
-import { RuntimeError as RuntimeError48 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError49 } from "@ibiz-template/core";
 var UIActionUtil = class {
   /**
    * 执行界面行为
@@ -23488,7 +23982,7 @@ var UIActionUtil = class {
   static async exec(actionId, params, appId2) {
     const action = await getUIActionById(actionId, appId2);
     if (!action) {
-      throw new RuntimeError48(
+      throw new RuntimeError49(
         ibiz.i18n.t("runtime.uiAction.noFoundBehaviorModel", { actionId })
       );
     }
@@ -23996,7 +24490,7 @@ import {
   StringUtil,
   RuntimeModelError as RuntimeModelError53,
   ModelError as ModelError26,
-  RuntimeError as RuntimeError49
+  RuntimeError as RuntimeError50
 } from "@ibiz-template/core";
 import { mergeRight as mergeRight4 } from "ramda";
 var FrontUIActionProvider = class extends UIActionProviderBase {
@@ -24122,7 +24616,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       if (resultContext && resultContext[appDataEntity.codeName.toLowerCase()]) {
         requestUrl += "/".concat(appDataEntity.deapicodeName2, "/printdata/").concat(resultContext[appDataEntity.codeName.toLowerCase()]);
       } else {
-        throw new RuntimeError49(ibiz.i18n.t("runtime.uiAction.dataPrimaryKey"));
+        throw new RuntimeError50(ibiz.i18n.t("runtime.uiAction.dataPrimaryKey"));
       }
       const res = await ibiz.net.request(requestUrl, {
         method: "get",
@@ -24148,10 +24642,10 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
           window.open(link, "_blank");
         }
       } else {
-        throw new RuntimeError49(ibiz.i18n.t("runtime.uiAction.printFailure"));
+        throw new RuntimeError50(ibiz.i18n.t("runtime.uiAction.printFailure"));
       }
     } else {
-      throw new RuntimeError49(ibiz.i18n.t("runtime.uiAction.physicalPrint"));
+      throw new RuntimeError50(ibiz.i18n.t("runtime.uiAction.physicalPrint"));
     }
   }
   /**
@@ -24236,12 +24730,12 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
         URL.revokeObjectURL(elink.href);
         document.body.removeChild(elink);
       } else {
-        throw new RuntimeError49(
+        throw new RuntimeError50(
           ibiz.i18n.t("runtime.uiAction.exportRequestFailed")
         );
       }
     } else {
-      throw new RuntimeError49(
+      throw new RuntimeError50(
         ibiz.i18n.t("runtime.uiAction.noEntityExportsFound")
       );
     }
@@ -24259,7 +24753,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
     const actionResult = {};
     const { context, params, data, event } = args;
     if (!event) {
-      throw new RuntimeError49(ibiz.i18n.t("runtime.uiAction.lackNativeEvent"));
+      throw new RuntimeError50(ibiz.i18n.t("runtime.uiAction.lackNativeEvent"));
     }
     const { resultContext, resultParams } = await this.handleParams(
       action,
@@ -24398,7 +24892,7 @@ var ToolbarController = class extends ControlController {
       const actionId = item.uiactionId;
       const uiAction = await getUIActionById(actionId, item.appId);
       if (!uiAction) {
-        throw new RuntimeError50(
+        throw new RuntimeError51(
           ibiz.i18n.t("runtime.controller.control.toolbar.noFound", {
             actionId
           })
@@ -25839,7 +26333,7 @@ var DataViewControlController = class extends MDControlController {
 import { RuntimeModelError as RuntimeModelError56 } from "@ibiz-template/core";
 
 // src/controller/control/exp-bar/exp-bar.controller.ts
-import { RuntimeError as RuntimeError51, RuntimeModelError as RuntimeModelError55 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError52, RuntimeModelError as RuntimeModelError55 } from "@ibiz-template/core";
 var ExpBarControlController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -26172,7 +26666,7 @@ var ExpBarControlController = class extends ControlController {
     if (["GRID", "DATAVIEW", "LIST"].includes(((_a = this.XDataModel) == null ? void 0 : _a.controlType) || "")) {
       return this.XDataModel.navAppViewId;
     }
-    throw new RuntimeError51(
+    throw new RuntimeError52(
       ibiz.i18n.t("runtime.controller.control.expBar.multiNode")
     );
   }
@@ -26319,7 +26813,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/exp-bar/tree-exp-bar.controller.ts
-import { RuntimeError as RuntimeError52, RuntimeModelError as RuntimeModelError57 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError53, RuntimeModelError as RuntimeModelError57 } from "@ibiz-template/core";
 var TreeExpBarController = class extends ExpBarControlController {
   constructor() {
     super(...arguments);
@@ -26410,7 +26904,7 @@ var TreeExpBarController = class extends ExpBarControlController {
     const deData = node._deData || node;
     const nodeModel = this.getNodeModel(node._nodeId);
     if (!nodeModel) {
-      throw new RuntimeError52(
+      throw new RuntimeError53(
         ibiz.i18n.t("runtime.controller.control.expBar.noFindNodeModel", {
           nodeId: node._nodeId
         })
@@ -26605,7 +27099,7 @@ var ChartExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/form/search-form/search-form.controller.ts
-import { RuntimeError as RuntimeError53 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError54 } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.controller.ts
 import {
@@ -27251,7 +27745,7 @@ var SearchFormController = class extends FormController {
   applyStoredFilter(index) {
     const filter = this.state.storedFilters[index];
     if (!filter) {
-      throw new RuntimeError53(
+      throw new RuntimeError54(
         ibiz.i18n.t("runtime.controller.control.form.searchTerms")
       );
     }
@@ -27269,7 +27763,7 @@ var SearchFormController = class extends FormController {
   async removeStoredFilter(index) {
     const filter = this.state.storedFilters[index];
     if (!filter) {
-      throw new RuntimeError53(
+      throw new RuntimeError54(
         ibiz.i18n.t("runtime.controller.control.form.saveSearch")
       );
     }
@@ -28759,7 +29253,7 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts
-import { RuntimeError as RuntimeError54, RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError55, RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
 import { createUUID as createUUID11 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.ts
@@ -28782,6 +29276,13 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
      * @date 2023-11-11 08:03:56
      */
     this.formMap = /* @__PURE__ */ new Map();
+    /**
+     * 数据集合
+     *
+     * @type {IData[]}
+     * @memberof FormMDCtrlFormController
+     */
+    this.items = [];
   }
   createState() {
     var _a;
@@ -28824,7 +29325,8 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
     const fetchAction = "fetchdefault";
     const res = await ibiz.hub.getApp(this.model.appId).deService.exec(appDataEntityId, fetchAction, this.context, this.params);
     if (res.ok) {
-      this.state.items = res.data.map((item) => {
+      this.items = res.data;
+      this.state.items = this.items.map((item) => {
         const context = this.context.clone();
         context[this.deName] = item.srfkey;
         const params = { ...this.params };
@@ -28836,6 +29338,30 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
       });
     }
   }
+  /**
+   * 更新数据
+   * - 仅支持更新临时数据
+   * @return {*}  {Promise<void>}
+   * @memberof FormMDCtrlFormController
+   */
+  async updateData() {
+    var _a;
+    const { appDataEntityId } = this.model.contentControl;
+    const fetchAction = "update";
+    const deService = await ibiz.hub.getAppDEService(
+      this.model.appId,
+      appDataEntityId,
+      this.context
+    );
+    const data = (_a = this.state.items) == null ? void 0 : _a.map((item, index) => {
+      const _item = this.items.find((v) => v.srfkey === item.id);
+      _item.srfordervalue = index + 1;
+      return _item;
+    });
+    if (deService.isLocalMode && data) {
+      await deService.exec(fetchAction, this.context, data);
+    }
+  }
   /**
    * 表单状态变更通知
    *
@@ -28900,7 +29426,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
   async remove(id) {
     const controller = this.formMap.get(id);
     if (!controller) {
-      throw new RuntimeError54(
+      throw new RuntimeError55(
         ibiz.i18n.t("runtime.controller.control.form.noFoundFormController", {
           id
         })
@@ -29252,7 +29778,7 @@ import {
   IBizContext as IBizContext6,
   isElementSame as isElementSame2,
   mergeInLeft as mergeInLeft2,
-  RuntimeError as RuntimeError55
+  RuntimeError as RuntimeError56
 } from "@ibiz-template/core";
 import { debounce } from "lodash-es";
 import { createUUID as createUUID12 } from "qx-util";
@@ -29721,7 +30247,7 @@ var EditFormController = class extends FormController {
     }
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError55(
+      throw new RuntimeError56(
         ibiz.i18n.t("runtime.controller.control.form.formCompletion")
       );
     }
@@ -29857,7 +30383,7 @@ var EditFormController = class extends FormController {
       (item) => item.id === formItemUpdateId
     );
     if (!formItemUpdate) {
-      throw new RuntimeError55(
+      throw new RuntimeError56(
         ibiz.i18n.t("runtime.controller.control.form.itemUpdate", {
           formItemUpdateId
         })
@@ -29920,7 +30446,7 @@ var EditFormController = class extends FormController {
   async wfStart(args) {
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError55(
+      throw new RuntimeError56(
         ibiz.i18n.t("runtime.controller.control.form.formCompletion")
       );
     }
@@ -29953,7 +30479,7 @@ var EditFormController = class extends FormController {
   async wfSubmit(args) {
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError55(
+      throw new RuntimeError56(
         ibiz.i18n.t("runtime.controller.control.form.formCompletion")
       );
     }
@@ -30366,7 +30892,7 @@ import {
   EntityError as EntityError2,
   mergeDefaultInLeft,
   recursiveIterate as recursiveIterate7,
-  RuntimeError as RuntimeError56,
+  RuntimeError as RuntimeError57,
   RuntimeModelError as RuntimeModelError63
 } from "@ibiz-template/core";
 import { clone as clone27, isNil as isNil28 } from "ramda";
@@ -30937,7 +31463,7 @@ var GridController = class extends MDControlController {
       } else {
         const toNum = Number(sortValue);
         if (Number.isNaN(toNum)) {
-          throw new RuntimeError56(
+          throw new RuntimeError57(
             ibiz.i18n.t("runtime.controller.control.grid.convertedValue", {
               srfmajortext: item.srfmajortext
             })
@@ -31128,7 +31654,7 @@ var GridController = class extends MDControlController {
     if (editShowMode === "row") {
       const editingRow = this.state.rows.find((item) => item.showRowEdit);
       if (editingRow) {
-        throw new RuntimeError56(
+        throw new RuntimeError57(
           ibiz.i18n.t("runtime.controller.common.md.firstComplete")
         );
       }
@@ -31171,7 +31697,7 @@ var GridController = class extends MDControlController {
     const isCreate = data.srfuf === 0 /* CREATE */;
     const rowState = this.findRowState(data);
     if (!rowState) {
-      throw new RuntimeError56(
+      throw new RuntimeError57(
         ibiz.i18n.t("runtime.controller.common.md.rowData")
       );
     }
@@ -31185,7 +31711,7 @@ var GridController = class extends MDControlController {
     }
     const isValid = await this.validate(rowState);
     if (!isValid) {
-      throw new RuntimeError56(
+      throw new RuntimeError57(
         ibiz.i18n.t("runtime.controller.control.grid.saveCancel")
       );
     }
@@ -31441,7 +31967,7 @@ var GridController = class extends MDControlController {
   }
   async toggleRowEdit() {
     if (!this.model.enableRowNew) {
-      throw new RuntimeError56(
+      throw new RuntimeError57(
         ibiz.i18n.t("runtime.controller.control.grid.noSupportRowEditing")
       );
     }
@@ -31476,7 +32002,7 @@ var GridController = class extends MDControlController {
     } else {
       const editingRow = this.state.rows.find((item) => item.showRowEdit);
       if (editingRow) {
-        throw new RuntimeError56(
+        throw new RuntimeError57(
           ibiz.i18n.t("runtime.controller.control.grid.lineEditing")
         );
       }
@@ -31533,7 +32059,7 @@ var GridController = class extends MDControlController {
       (item) => item.id === updateId
     );
     if (!findUpdate) {
-      throw new RuntimeError56(
+      throw new RuntimeError57(
         ibiz.i18n.t("runtime.controller.control.grid.updateColumns", {
           updateId
         })
@@ -31677,7 +32203,7 @@ var GridController = class extends MDControlController {
       data = this.getData();
     }
     if (data.length === 0) {
-      throw new RuntimeError56(
+      throw new RuntimeError57(
         ibiz.i18n.t("runtime.controller.control.grid.exported")
       );
     }
@@ -31693,7 +32219,7 @@ var GridController = class extends MDControlController {
   async exportData(args) {
     const { header } = this.dataExportParam;
     if (!header) {
-      throw new RuntimeError56(
+      throw new RuntimeError57(
         ibiz.i18n.t("runtime.controller.control.grid.tabularColumns")
       );
     }
@@ -32353,7 +32879,7 @@ var GridUAColumnController = class extends GridColumnController {
 };
 
 // src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts
-import { RuntimeError as RuntimeError57 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError58 } from "@ibiz-template/core";
 import Schema2 from "async-validator";
 import { isNilOrEmpty as isNilOrEmpty8 } from "qx-util";
 var GridFieldEditColumnController = class extends GridFieldColumnController {
@@ -32493,7 +33019,7 @@ var GridFieldEditColumnController = class extends GridFieldColumnController {
     if (requiredChanged || names.includes(this.fieldName) || names.includes(this.valueItemName)) {
       const result = await this.validate(row);
       if (!result) {
-        throw new RuntimeError57(
+        throw new RuntimeError58(
           ibiz.i18n.t("runtime.controller.control.grid.checksumErrors", {
             codeName: this.editItem.codeName,
             fieldName: row.errors[this.fieldName]
@@ -32817,7 +33343,7 @@ var ListController = class extends MDControlController {
 };
 
 // src/controller/control/panel/panel/panel.controller.ts
-import { recursiveIterate as recursiveIterate8, RuntimeError as RuntimeError58 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate8, RuntimeError as RuntimeError59 } from "@ibiz-template/core";
 import { AsyncSeriesHook as AsyncSeriesHook2 } from "qx-util";
 var PanelController = class extends ControlController {
   constructor(model, context, params, ctx, container) {
@@ -32974,7 +33500,7 @@ var PanelController = class extends ControlController {
     var _a, _b;
     const data = await this.prepareData();
     if (!data) {
-      throw new RuntimeError58(
+      throw new RuntimeError59(
         ibiz.i18n.t("runtime.controller.control.panel.panelData")
       );
     }
@@ -34108,7 +34634,7 @@ async function calcFilterModelBySchema(json, appDataEntityId, modelAppId) {
 }
 
 // src/controller/control/search-bar/search-bar-filter-items.controller.ts
-import { RuntimeError as RuntimeError59 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError60 } from "@ibiz-template/core";
 import { clone as clone29 } from "ramda";
 var SubFieldRegex2 = /^N_(.\w+)_(.\w+)$/;
 var SearchBarFilterItemsController = class extends SearchBarFilterController {
@@ -34167,7 +34693,7 @@ var SearchBarFilterItemsController = class extends SearchBarFilterController {
       return false;
     });
     if (!minorDEId) {
-      throw new RuntimeError59(
+      throw new RuntimeError60(
         ibiz.i18n.t("runtime.controller.control.searchBar.noFoundEntity", {
           targetField
         })
@@ -35366,7 +35892,7 @@ var TabExpPanelController = class extends ControlController {
 
 // src/controller/control/tree/tree.controller.ts
 import {
-  RuntimeError as RuntimeError60,
+  RuntimeError as RuntimeError61,
   RuntimeModelError as RuntimeModelError66,
   recursiveIterate as recursiveIterate11
 } from "@ibiz-template/core";
@@ -36452,7 +36978,7 @@ var TreeController = class extends MDControlController {
       );
     }
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError60(
+      throw new RuntimeError61(
         ibiz.i18n.t("runtime.controller.control.tree.nodeData")
       );
     }
@@ -36470,7 +36996,7 @@ var TreeController = class extends MDControlController {
     let needRefresh = false;
     const treeNode = this.getNodeModel(item._nodeId);
     if (!treeNode) {
-      throw new RuntimeError60(
+      throw new RuntimeError61(
         ibiz.i18n.t("runtime.controller.control.tree.noFoundTreeNode")
       );
     }
@@ -36516,7 +37042,7 @@ var TreeController = class extends MDControlController {
 };
 
 // src/controller/control/wizard-panel/wizard-panel.controller.ts
-import { RuntimeError as RuntimeError61 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError62 } from "@ibiz-template/core";
 
 // src/controller/control/wizard-panel/wizard-panel.service.ts
 var WizardPanelService = class extends ControlService {
@@ -36704,7 +37230,7 @@ var WizardPanelController = class extends ControlController {
     const { activeFormTag } = this.state;
     const controller = this.formControllers.get(activeFormTag);
     if (!controller) {
-      throw new RuntimeError61(
+      throw new RuntimeError62(
         ibiz.i18n.t("runtime.controller.control.wizardPanel.formController", {
           activeFormTag
         })
@@ -36754,7 +37280,7 @@ var WizardPanelController = class extends ControlController {
   getWizardFormByTag(tag) {
     var _a;
     if (!((_a = this.model.dewizard) == null ? void 0 : _a.dewizardForms)) {
-      throw new RuntimeError61(
+      throw new RuntimeError62(
         ibiz.i18n.t("runtime.controller.control.wizardPanel.noConfiguration")
       );
       return;
@@ -36765,7 +37291,7 @@ var WizardPanelController = class extends ControlController {
       }
     );
     if (!wizardForm) {
-      throw new RuntimeError61(
+      throw new RuntimeError62(
         ibiz.i18n.t(
           "runtime.controller.control.wizardPanel.wizardFormIdentifier",
           { tag }
@@ -36857,7 +37383,7 @@ var WizardPanelController = class extends ControlController {
       prevTag = this.tagHistory[this.tagHistory.length - 1];
     }
     if (!prevTag) {
-      throw new RuntimeError61(
+      throw new RuntimeError62(
         ibiz.i18n.t("runtime.controller.control.wizardPanel.noPreviousForm")
       );
     }
@@ -36895,7 +37421,7 @@ var WizardPanelController = class extends ControlController {
         });
         const nextWizardStep = wizardSteps[index + 1];
         if (!nextWizardStep) {
-          throw new RuntimeError61(
+          throw new RuntimeError62(
             ibiz.i18n.t("runtime.controller.control.wizardPanel.nextStep")
           );
         }
@@ -36906,7 +37432,7 @@ var WizardPanelController = class extends ControlController {
       }
     }
     if (!nextTag) {
-      throw new RuntimeError61(
+      throw new RuntimeError62(
         ibiz.i18n.t("runtime.controller.control.wizardPanel.nextForm")
       );
     }
@@ -37292,7 +37818,7 @@ var MDCtrlController = class extends MDControlController {
 };
 
 // src/controller/control/kanban/kanban.controller.ts
-import { RuntimeError as RuntimeError62, RuntimeModelError as RuntimeModelError68 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError63, RuntimeModelError as RuntimeModelError68 } from "@ibiz-template/core";
 import { clone as clone32, isNil as isNil33 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
@@ -37411,7 +37937,7 @@ var KanbanController = class extends DataViewControlController {
       } else {
         const toNum = Number(sortValue);
         if (Number.isNaN(toNum)) {
-          throw new RuntimeError62(
+          throw new RuntimeError63(
             ibiz.i18n.t("runtime.controller.control.grid.convertedValue", {
               srfmajortext: item.srfmajortext
             })
@@ -37535,47 +38061,12 @@ var KanbanController = class extends DataViewControlController {
   }
   handleDataGroup() {
     if (!this.model.enableGroup || this.model.groupMode === "NONE") {
-      throw new RuntimeError62(
+      throw new RuntimeError63(
         ibiz.i18n.t("runtime.controller.control.kanban.groupedOn")
       );
     }
     return super.handleDataGroup();
   }
-  /**
-   * 处理自动分组
-   *
-   * @memberof KanbanController
-   */
-  handleAutoGroup() {
-    const { groupAppDEFieldId } = this.model;
-    if (groupAppDEFieldId) {
-      const { items } = this.state;
-      const groupMap = /* @__PURE__ */ new Map();
-      items.forEach((item) => {
-        const groupVal = item[groupAppDEFieldId];
-        if (isNil33(groupVal)) {
-          return;
-        }
-        if (!groupMap.has(groupVal)) {
-          groupMap.set(groupVal, []);
-        }
-        groupMap.get(groupVal).push(item);
-      });
-      const groups = [];
-      groupMap.forEach((value, key) => {
-        const codeListItem = this.groupCodeListItems.find(
-          (item) => item.value === key
-        );
-        groups.push({
-          caption: codeListItem.text,
-          color: codeListItem.color,
-          key: codeListItem.value,
-          children: [...value]
-        });
-      });
-      this.state.groups = groups;
-    }
-  }
   /**
    * 处理代码表分组
    *
@@ -37658,7 +38149,7 @@ var KanbanController = class extends DataViewControlController {
       );
     }
     this.state.updating = true;
-    const computeMoveData = (_fromIndex, _toIndex, _draggedItem, targetArray) => {
+    const computeMoveData = (_fromIndex, _toIndex, _draggedItem, targetArray, isCrossGroup) => {
       let moveData = {};
       const targetItem = targetArray[_toIndex];
       if (!targetItem) {
@@ -37687,7 +38178,7 @@ var KanbanController = class extends DataViewControlController {
       } else {
         moveData = {
           srftargetkey: targetItem.srfkey,
-          srfmovetype: _fromIndex > _toIndex ? "MOVEBEFORE" : "MOVEAFTER"
+          srfmovetype: _toIndex < targetArray.length - 1 ? "MOVEBEFORE" : isCrossGroup ? "MOVEBEFORE" : "MOVEAFTER"
         };
       }
       return moveData;
@@ -37722,7 +38213,13 @@ var KanbanController = class extends DataViewControlController {
         );
       }
     }
-    const params = computeMoveData(fromIndex, toIndex, draggedItem, originArr);
+    const params = computeMoveData(
+      fromIndex,
+      toIndex,
+      draggedItem,
+      originArr,
+      info.from !== info.to
+    );
     try {
       const { ok, result } = await this.moveOrderItem(draggedItem, params);
       if (ok) {
@@ -37954,7 +38451,7 @@ var KanbanController = class extends DataViewControlController {
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts
 import {
-  RuntimeError as RuntimeError63,
+  RuntimeError as RuntimeError64,
   RuntimeModelError as RuntimeModelError69,
   awaitTimeout as awaitTimeout3,
   recursiveIterate as recursiveIterate12
@@ -38239,13 +38736,13 @@ var TreeGridExController = class extends TreeController {
       return;
     }
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError63(
+      throw new RuntimeError64(
         ibiz.i18n.t("runtime.controller.control.gantt.nonentity")
       );
     }
     const rowState = this.state.rows[nodeData._uuid];
     if (!rowState) {
-      throw new RuntimeError63(
+      throw new RuntimeError64(
         ibiz.i18n.t("runtime.controller.common.md.rowData")
       );
     }
@@ -38261,7 +38758,7 @@ var TreeGridExController = class extends TreeController {
     const { appDataEntityId, updateAppDEActionId } = nodeModel;
     const isCreate = nodeData._deData.srfuf === 0 /* CREATE */;
     if (isCreate) {
-      throw new RuntimeError63(
+      throw new RuntimeError64(
         ibiz.i18n.t("runtime.controller.control.treeGridEx.noSupportCreation")
       );
     }
@@ -38426,7 +38923,7 @@ var TreeGridExController = class extends TreeController {
         (item) => item.showRowEdit
       );
       if (editingRow) {
-        throw new RuntimeError63(
+        throw new RuntimeError64(
           ibiz.i18n.t("runtime.controller.control.grid.lineEditing")
         );
       }
@@ -38541,7 +39038,7 @@ var TreeGridExColumnController = class {
 // src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-node-column.controller.ts
 import {
   DataTypes as DataTypes5,
-  RuntimeError as RuntimeError64,
+  RuntimeError as RuntimeError65,
   RuntimeModelError as RuntimeModelError70
 } from "@ibiz-template/core";
 import { clone as clone34 } from "ramda";
@@ -38746,7 +39243,7 @@ var TreeGridExNodeColumnController = class {
     const valueItem = this.nodeColumn.linkValueItem || "srfkey";
     const value = row.data[valueItem];
     if (value == null) {
-      throw new RuntimeError64(
+      throw new RuntimeError65(
         ibiz.i18n.t("runtime.controller.control.treeGridEx.noPickedUp", {
           valueItem
         })
@@ -39175,7 +39672,7 @@ var TreeGridService = class extends GridService {
 };
 
 // src/controller/control/medit-view-panel/medit-view-panel.controller.ts
-import { RuntimeError as RuntimeError65 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError66 } from "@ibiz-template/core";
 import { createUUID as createUUID14 } from "qx-util";
 
 // src/controller/control/medit-view-panel/medit-view-panel.service.ts
@@ -39395,7 +39892,7 @@ var MEditViewPanelController = class extends MDControlController {
       (item) => item.id === id
     );
     if (panelUiItemIndex < 0) {
-      throw new RuntimeError65(
+      throw new RuntimeError66(
         ibiz.i18n.t("runtime.controller.control.meditViewPanel.dataExist")
       );
     }
@@ -39735,7 +40232,7 @@ var User2ReportPanelGenerator = class extends ReportPanelBaseGenerator {
 };
 
 // src/controller/control/report-panel/generator/bi-generator.ts
-import { RuntimeError as RuntimeError66 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError67 } from "@ibiz-template/core";
 var BIReportPanelGenerator = class extends ReportPanelBaseGenerator {
   /**
    * 设置配置
@@ -39747,7 +40244,7 @@ var BIReportPanelGenerator = class extends ReportPanelBaseGenerator {
   setConfig() {
     var _a;
     if (!((_a = this.model.appDEReport) == null ? void 0 : _a.reportUIModel)) {
-      throw new RuntimeError66(
+      throw new RuntimeError67(
         ibiz.i18n.t("runtime.controller.control.reportPanel.noReportUIModel")
       );
     }
@@ -40019,7 +40516,7 @@ var ReportPanelController = class extends ControlController {
 // src/controller/control/gantt/gantt.controller.ts
 import {
   awaitTimeout as awaitTimeout4,
-  RuntimeError as RuntimeError67,
+  RuntimeError as RuntimeError68,
   RuntimeModelError as RuntimeModelError72
 } from "@ibiz-template/core";
 
@@ -40565,13 +41062,13 @@ var GanttController = class extends TreeGridExController {
    */
   async modifyNodeTime(nodeData, { begin, end }) {
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError67(
+      throw new RuntimeError68(
         ibiz.i18n.t("runtime.controller.control.gantt.noNode")
       );
     }
     const rowState = this.getRowState(nodeData._id);
     if (!rowState) {
-      throw new RuntimeError67(
+      throw new RuntimeError68(
         ibiz.i18n.t("runtime.controller.common.md.rowData")
       );
     }
@@ -40593,13 +41090,13 @@ var GanttController = class extends TreeGridExController {
       return;
     }
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError67(
+      throw new RuntimeError68(
         ibiz.i18n.t("runtime.controller.control.gantt.nonentity")
       );
     }
     const rowState = this.state.rows[nodeData._uuid];
     if (!rowState) {
-      throw new RuntimeError67(
+      throw new RuntimeError68(
         ibiz.i18n.t("runtime.controller.common.md.rowData")
       );
     }
@@ -40649,7 +41146,7 @@ var GanttController = class extends TreeGridExController {
   async remove(args) {
     const { context, params, data } = this.handlerAbilityParams(args);
     if (!(data == null ? void 0 : data.length)) {
-      throw new RuntimeError67(
+      throw new RuntimeError68(
         ibiz.i18n.t("runtime.controller.common.control.uncheckedData")
       );
     }
@@ -40772,7 +41269,7 @@ var GanttController = class extends TreeGridExController {
         (item) => item.showRowEdit
       );
       if (editingRow) {
-        throw new RuntimeError67(
+        throw new RuntimeError68(
           ibiz.i18n.t("runtime.controller.common.md.firstComplete")
         );
       }
@@ -41311,7 +41808,11 @@ var InternalMessageController = class {
     find.status = "READ";
     this.unreadCount -= 1;
     this.evt.emit("unreadCountChange", this.unreadCount);
-    this.evt.emit("dataChange");
+    if (this.unreadOnly) {
+      this.load();
+    } else {
+      this.evt.emit("dataChange");
+    }
   }
   /**
    * 把所有未读消息标记为已读
@@ -41631,7 +42132,7 @@ var AppHub = class {
       this.registerAppView(appView);
       return appView;
     }
-    throw new RuntimeError68(ibiz.i18n.t("runtime.hub.noExist", { id }));
+    throw new RuntimeError69(ibiz.i18n.t("runtime.hub.noExist", { id }));
   }
   /**
    * 根据DrControl的名称和子应用标识获取模型
@@ -41670,7 +42171,7 @@ var AppHub = class {
       );
       return model;
     }
-    throw new RuntimeError68(
+    throw new RuntimeError69(
       ibiz.i18n.t("runtime.hub.noExist", { id: modelPath })
     );
   }
@@ -41710,7 +42211,7 @@ var AppHub = class {
       this.registerAppDataEntity(entity, appId2);
       return entity;
     }
-    throw new RuntimeError68(ibiz.i18n.t("runtime.service.noFound", { id }));
+    throw new RuntimeError69(ibiz.i18n.t("runtime.service.noFound", { id }));
   }
   /**
    * 新建 hub 应用
@@ -41725,10 +42226,11 @@ var AppHub = class {
       return this.appMap.get(id);
     }
     if (!this.modelLoaderProvider) {
-      throw new RuntimeError68(ibiz.i18n.t("runtime.utils.firstregister"));
+      throw new RuntimeError69(ibiz.i18n.t("runtime.utils.firstregister"));
     }
     const appModel = await this.modelLoaderProvider.getApp(id);
-    const app = new Application(appModel);
+    const subAppRef = await this.modelLoaderProvider.getSubAppRef(id);
+    const app = new Application(appModel, subAppRef);
     this.appMap.set(id, app);
     await this.modelLoaderProvider.initApp(id);
     await app.init();
@@ -41871,7 +42373,7 @@ var EngineFactory = class {
 
 // src/engine/view-base.engine.ts
 import {
-  RuntimeError as RuntimeError69,
+  RuntimeError as RuntimeError70,
   findRecursiveChild as findRecursiveChild3,
   IBizContext as IBizContext7
 } from "@ibiz-template/core";
@@ -42256,7 +42758,7 @@ var ViewEngineBase = class {
     const { appDataEntityId } = this.view.model;
     const { evt, context, params } = this.view;
     if (!appDataEntityId) {
-      throw new RuntimeError69(ibiz.i18n.t("runtime.engine.loadEntityData"));
+      throw new RuntimeError70(ibiz.i18n.t("runtime.engine.loadEntityData"));
     }
     const app = ibiz.hub.getApp(context.srfappid);
     const res = await app.deService.exec(
@@ -42738,7 +43240,7 @@ var MDViewEngine = class extends ViewEngineBase {
 };
 
 // src/global/global-util/global-util.ts
-import { RuntimeError as RuntimeError70 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError71 } from "@ibiz-template/core";
 var sourceTitle = document.title;
 var GlobalUtil = class {
   constructor() {
@@ -42879,7 +43381,7 @@ var GlobalUtil = class {
    * @return {*}  {IParams}
    */
   getGlobalParam() {
-    throw new RuntimeError70(ibiz.i18n.t("runtime.global.noImplemented"));
+    throw new RuntimeError71(ibiz.i18n.t("runtime.global.noImplemented"));
   }
   /**
    * 获取视图路由参数变量，数组类型，基于路由解析出来的，每一个对象里面都有context和params
@@ -42888,12 +43390,12 @@ var GlobalUtil = class {
    * @return {*}  {IParams}
    */
   getRouterParams() {
-    throw new RuntimeError70(ibiz.i18n.t("runtime.global.noImplementedRouting"));
+    throw new RuntimeError71(ibiz.i18n.t("runtime.global.noImplementedRouting"));
   }
 };
 
 // src/logic-scheduler/executor/logic-executor.ts
-import { RuntimeError as RuntimeError71 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError72 } from "@ibiz-template/core";
 var LogicExecutor = class {
   /**
    * @author lxm
@@ -42914,7 +43416,7 @@ var LogicExecutor = class {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(_executeParams) {
-    throw new RuntimeError71(
+    throw new RuntimeError72(
       ibiz.i18n.t("runtime.logicScheduler.executor.noImplementedMethod")
     );
   }
@@ -43366,7 +43868,7 @@ var LogicSchedulerCenter = class {
 };
 
 // src/logic-scheduler/trigger/logic-trigger.ts
-import { RuntimeError as RuntimeError72 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError73 } from "@ibiz-template/core";
 var LogicTrigger = class {
   /**
    * @author lxm
@@ -43426,7 +43928,7 @@ var LogicTrigger = class {
     if (this.executor) {
       return this.executor.execute(executeParams);
     }
-    throw new RuntimeError72(
+    throw new RuntimeError73(
       ibiz.i18n.t("runtime.logicScheduler.trigger.noExecutorBound", {
         id: this.logic.id
       })
@@ -43447,12 +43949,12 @@ var CustomTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/item-dyna-logic-trigger.ts
-import { RuntimeError as RuntimeError73 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError74 } from "@ibiz-template/core";
 var ItemDynaLogicTrigger = class extends LogicTrigger {
   bindExecutor(executor) {
     super.bindExecutor(executor);
     if (this.executor.type !== "SCRIPT") {
-      throw new RuntimeError73(
+      throw new RuntimeError74(
         ibiz.i18n.t("runtime.logicScheduler.trigger.triggerType")
       );
     }
@@ -43489,7 +43991,7 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError74, RuntimeModelError as RuntimeModelError75 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError75, RuntimeModelError as RuntimeModelError75 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -43504,7 +44006,7 @@ var TimerTrigger = class extends LogicTrigger {
     }
     this.timer = setInterval(() => {
       if (!this.scheduler.defaultParamsCb) {
-        throw new RuntimeError74(
+        throw new RuntimeError75(
           ibiz.i18n.t("runtime.logicScheduler.trigger.parameterCallback")
         );
       }
@@ -43523,7 +44025,7 @@ var TimerTrigger = class extends LogicTrigger {
 // src/logic-scheduler/executor/app-ui-logic-executor.ts
 import {
   ModelError as ModelError34,
-  RuntimeError as RuntimeError75,
+  RuntimeError as RuntimeError76,
   RuntimeModelError as RuntimeModelError76
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty11 } from "qx-util";
@@ -43561,7 +44063,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { context, params, ...rest } = parameters;
     const { data } = parameters;
     if (!(data == null ? void 0 : data[0])) {
-      throw new RuntimeError75(
+      throw new RuntimeError76(
         ibiz.i18n.t("runtime.logicScheduler.executor.noActionableData")
       );
     }
@@ -43630,7 +44132,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const openViewRefs = appUILogic.openDataAppViews;
     const findView = openViewRefs == null ? void 0 : openViewRefs.find((item) => item.refMode === formTypeValue);
     if (!findView) {
-      throw new RuntimeError75(
+      throw new RuntimeError76(
         ibiz.i18n.t("runtime.logicScheduler.executor.editViews", {
           formTypeValue
         })
@@ -43763,7 +44265,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const selectData = (_a = result.data) == null ? void 0 : _a[0];
     if (!selectData) {
-      throw new RuntimeError75(
+      throw new RuntimeError76(
         ibiz.i18n.t("runtime.logicScheduler.executor.checkOne")
       );
     }
@@ -43775,7 +44277,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       }
     );
     if (!findView) {
-      throw new RuntimeError75(
+      throw new RuntimeError76(
         ibiz.i18n.t("runtime.logicScheduler.executor.entitiesAssociated", {
           indexType
         })
@@ -43817,7 +44319,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         }
       });
       if (pickParentFieldName === void 0) {
-        throw new RuntimeError75(
+        throw new RuntimeError76(
           ibiz.i18n.t("runtime.logicScheduler.executor.foreignKey", {
             pickParentDeName
           })
@@ -44165,7 +44667,10 @@ var en = {
           noSupportSequence: "Charts do not support sequence types at this time {seriesType}",
           noFindSequence: "Cannot find generator for {seriesIndex} sequence!",
           noInitialised: "The chart object is not properly initialised",
-          noCalculated: "Options have not been calculated."
+          noCalculated: "Options have not been calculated.",
+          classificationNotArray: "The configured classification attribute value is not an array",
+          classificationNotString: "The configured classification attribute value is not an string",
+          errorJson: "JSON parsing error"
         },
         dataView: {
           noBehaviourGroup: "No interface behaviour group is configured for the action",
@@ -44747,7 +45252,10 @@ var zhCn = {
           noSupportSequence: "\u56FE\u8868\u6682\u672A\u652F\u6301\u5E8F\u5217\u7C7B\u578B{seriesType}",
           noFindSequence: "\u627E\u4E0D\u5230{seriesIndex}\u5E8F\u5217\u7684generator\uFF01",
           noInitialised: "chart\u5BF9\u8C61\u6CA1\u6709\u6B63\u786E\u521D\u59CB\u5316",
-          noCalculated: "options\u8FD8\u6CA1\u8BA1\u7B97"
+          noCalculated: "options\u8FD8\u6CA1\u8BA1\u7B97",
+          classificationNotArray: "\u914D\u7F6E\u7684\u5206\u7C7B\u5C5E\u6027\u503C\u4E0D\u662F\u4E00\u4E2A\u6570\u7EC4",
+          classificationNotString: "\u914D\u7F6E\u7684\u5206\u7C7B\u5C5E\u6027\u503C\u4E0D\u662F\u4E00\u4E2A\u5B57\u7B26\u4E32",
+          errorJson: "JSON\u89E3\u6790\u9519\u8BEF"
         },
         dataView: {
           noBehaviourGroup: "\u64CD\u4F5C\u9879\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4",