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

package/dist/index.esm.js

@@ -80,7 +80,7 @@ var RegisterCenter = class {
 };
 
 // src/command/app/app-func/app-func.ts
-import { ModelError as ModelError16, RuntimeError as RuntimeError26 } from "@ibiz-template/core";
+import { ModelError as ModelError16, RuntimeError as RuntimeError27 } from "@ibiz-template/core";
 
 // src/utils/error-handler/default-error-handler.ts
 import {
@@ -1829,7 +1829,7 @@ 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
     );
@@ -11463,10 +11463,11 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
     });
   }
   calcIcon(model) {
-    const icon = super.calcIcon(model) || {};
+    let icon = super.calcIcon(model) || {};
     const { iconAppDEFieldId, detreeNodeDataItems } = model;
     if (iconAppDEFieldId && this._deData[iconAppDEFieldId]) {
       const value = this._deData[iconAppDEFieldId];
+      icon = {};
       if (value.indexOf("fa-") !== -1) {
         icon.cssClass = value;
       } else {
@@ -13091,8 +13092,8 @@ var baseStyle = {
   position: "fixed",
   zIndex: "10000"
 };
-function cloneElement(clone37, teleport = document.body, isRemoveChild = true) {
-  const element = getAnimationElement(clone37);
+function cloneElement(clone41, teleport = document.body, isRemoveChild = true) {
+  const element = getAnimationElement(clone41);
   if (element == null) {
     throw new Error(ibiz.i18n.t("runtime.utils.anime.noClone"));
   }
@@ -13511,11 +13512,11 @@ function arrayContains(arr, val) {
   });
 }
 function cloneObject(o) {
-  var clone37 = {};
+  var clone41 = {};
   for (var p in o) {
-    clone37[p] = o[p];
+    clone41[p] = o[p];
   }
-  return clone37;
+  return clone41;
 }
 function replaceObjectProps(o1, o2) {
   var o = cloneObject(o1);
@@ -15076,6 +15077,309 @@ var ShortCutUtil = class {
   }
 };
 
+// src/utils/bi-report-util/bi-report-util.ts
+import { clone as clone18 } from "ramda";
+import { RuntimeError as RuntimeError25 } from "@ibiz-template/core";
+var BIReportUtil = class {
+  /**
+   * 打开设计界面
+   *
+   * @author tony001
+   * @date 2024-06-30 11:06:21
+   * @param {IContext} context
+   * @param {IParams} params
+   * @param {IData} data
+   * @return {*}  {Promise<IModalData>}
+   */
+  async openDesignPage(context, params, data) {
+    if (!data.mode)
+      data.mode = "DATA";
+    const tempContext = clone18(context);
+    let config = {};
+    if (data.mode === "DATA") {
+      const app = ibiz.hub.getApp(ibiz.env.appId);
+      try {
+        Object.assign(tempContext, { pssysbireport: data.reportId });
+        const res = await app.deService.exec(
+          "pssysbireport",
+          "get",
+          tempContext,
+          params
+        );
+        if (res.data) {
+          config = await this.translateDEReportToConfig(res.data);
+        }
+      } catch (error) {
+        throw new RuntimeError25(error.message);
+      }
+    } else if (data.mode === "UI") {
+      config = data.reportPanel.generator.config;
+    }
+    const modal = ibiz.overlay.createModal(
+      "iBizBIReportDesign",
+      {
+        dismiss: (_data) => modal.dismiss(_data),
+        context: tempContext,
+        viewParams: params,
+        config
+      },
+      {
+        width: "90%",
+        height: "90%",
+        footerHide: true
+      }
+    );
+    modal.present();
+    const result = await modal.onWillDismiss();
+    return result;
+  }
+  /**
+   * 实体报表数据转化配置数据
+   *
+   * @author tony001
+   * @date 2024-06-30 11:06:00
+   * @private
+   * @param {IData} data
+   * @return {*}  {IData}
+   */
+  async translateDEReportToConfig(data) {
+    const config = {};
+    let biReportUIModel = {};
+    if (data.bireportuimodel) {
+      biReportUIModel = JSON.parse(data.bireportuimodel);
+    }
+    config.selectChartType = (biReportUIModel == null ? void 0 : biReportUIModel.selectChartType) || "NUMBER";
+    config.reportTag = "bi_report";
+    config.selectCubeId = data.pssysbicubeid;
+    config.selectedSchemeId = data.pssysbischemeid;
+    const biReportItems = {};
+    const extendDimension = (biReportUIModel == null ? void 0 : biReportUIModel.extendDimension) || [];
+    if (data.pssysbireportitems && data.pssysbireportitems.length > 0) {
+      data.pssysbireportitems.forEach((item) => {
+        var _a, _b;
+        if (item.birepitemtype === "MEASURE") {
+          if (!biReportItems.measure) {
+            biReportItems.measure = [];
+          }
+          biReportItems.measure.push({
+            pssysbischemeid: item.pssysbischemeid,
+            pssysbicubemeasureid: item.pssysbicubemeasureid,
+            pssysbicubeid: item.pssysbicubeid,
+            codename: (_a = item.pssysbicubemeasureid) == null ? void 0 : _a.split(".").pop(),
+            pssysbicubemeasurename: item.pssysbicubemeasurename
+          });
+        }
+        if (item.birepitemtype === "DIMENSION") {
+          if (!biReportItems.dimension) {
+            biReportItems.dimension = [];
+          }
+          if (extendDimension.length > 0 && !biReportItems.extendDimension) {
+            biReportItems.extendDimension = [];
+          }
+          const codename = (_b = item.pssysbicubedimensionid) == null ? void 0 : _b.split(".").pop();
+          if (extendDimension.includes(codename)) {
+            biReportItems.extendDimension.push({
+              pssysbischemeid: item.pssysbischemeid,
+              pssysbicubedimensionid: item.pssysbicubedimensionid,
+              pssysbicubeid: item.pssysbicubeid,
+              codename,
+              pssysbicubedimensionname: item.pssysbicubedimensionname
+            });
+          } else {
+            biReportItems.dimension.push({
+              pssysbischemeid: item.pssysbischemeid,
+              pssysbicubedimensionid: item.pssysbicubedimensionid,
+              pssysbicubeid: item.pssysbicubeid,
+              codename,
+              pssysbicubedimensionname: item.pssysbicubedimensionname
+            });
+          }
+        }
+      });
+    }
+    const propertyData = {
+      caption: data.pssysbireportname
+    };
+    if (Object.keys(biReportItems).length > 0) {
+      Object.assign(propertyData, { data: biReportItems });
+    }
+    if (biReportUIModel.style) {
+      Object.assign(propertyData, { style: biReportUIModel.style });
+    }
+    if (biReportUIModel.filter) {
+      propertyData.data.filter = biReportUIModel.filter;
+    }
+    config.propertyData = propertyData;
+    return config;
+  }
+  /**
+   * 报表面板数据转化配置界面数据
+   *
+   * @param {IDEReportPanel} model
+   * @return {*}  {Promise<IData>}
+   * @memberof BIReportUtil
+   */
+  async translateReportPanelToConfig(model) {
+    const config = {};
+    const biReportDatas = {};
+    const { appDEReport } = model;
+    const propertyData = {
+      data: biReportDatas
+    };
+    config.reportTag = appDEReport.id;
+    const tempAppBISchemeId = appDEReport.appBISchemeId.split(".").pop();
+    config.selectedSchemeId = tempAppBISchemeId;
+    const {
+      name,
+      appBICubeId,
+      appBIReportDimensions,
+      appBIReportMeasures,
+      reportUIModel
+    } = appDEReport.appBIReport;
+    propertyData.caption = name;
+    config.selectCubeId = "".concat(tempAppBISchemeId, ".").concat(appBICubeId);
+    let extendDimension = [];
+    if (reportUIModel) {
+      const reportUIModelObj = JSON.parse(reportUIModel);
+      config.selectChartType = reportUIModelObj.selectChartType;
+      propertyData.style = reportUIModelObj.style;
+      propertyData.data.filter = reportUIModelObj.filter;
+      if (reportUIModelObj.extendDimension) {
+        extendDimension = reportUIModelObj.extendDimension;
+      }
+    } else {
+      config.selectChartType = "NUMBER";
+    }
+    if (appBIReportMeasures && appBIReportMeasures.length > 0) {
+      appBIReportMeasures.forEach((measure) => {
+        if (!biReportDatas.measure) {
+          biReportDatas.measure = [];
+        }
+        biReportDatas.measure.push({
+          pssysbischemeid: tempAppBISchemeId,
+          pssysbicubemeasureid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId, ".").concat(measure.measureTag),
+          pssysbicubemeasurename: measure.measureName,
+          pssysbicubeid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId),
+          codename: measure.measureTag
+        });
+      });
+    }
+    if (appBIReportDimensions && appBIReportDimensions.length > 0) {
+      appBIReportDimensions.forEach((dimension) => {
+        if (!biReportDatas.dimension) {
+          biReportDatas.dimension = [];
+        }
+        if (extendDimension.length > 0 && !biReportDatas.extendDimension) {
+          biReportDatas.extendDimension = [];
+        }
+        if (extendDimension.includes(dimension.dimensionTag)) {
+          biReportDatas.extendDimension.push({
+            pssysbischemeid: tempAppBISchemeId,
+            pssysbicubedimensionid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId, ".").concat(dimension.dimensionTag),
+            pssysbicubedimensionname: dimension.dimensionName,
+            pssysbicubeid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId),
+            codename: dimension.dimensionTag,
+            pscodelistid: dimension.appCodeListId
+          });
+        } else {
+          biReportDatas.dimension.push({
+            pssysbischemeid: tempAppBISchemeId,
+            pssysbicubedimensionid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId, ".").concat(dimension.dimensionTag),
+            pssysbicubedimensionname: dimension.dimensionName,
+            pssysbicubeid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId),
+            codename: dimension.dimensionTag,
+            pscodelistid: dimension.appCodeListId
+          });
+        }
+      });
+    }
+    config.propertyData = propertyData;
+    return config;
+  }
+  /**
+   * 指定参数数据转化为应用BI报表数据
+   *
+   * @param {{
+   *     reportTag: string;
+   *     selectChartType: string;
+   *     selectCubeId: string;
+   *     caption: string;
+   *     data: IData;
+   *     style: IData;
+   *   }} arg
+   * @return {*}  {Promise<IData>}
+   * @memberof BIReportUtil
+   */
+  async translateDataToAppBIReport(arg) {
+    const { reportTag, selectChartType, selectCubeId, caption, data, style } = arg;
+    const app = ibiz.hub.getApp(ibiz.env.appId);
+    const targetData = {
+      pssysbireportitems: [],
+      pssysbischemeid: selectCubeId.split(".")[0],
+      pssysbicubeid: selectCubeId,
+      bireportuimodel: JSON.stringify({
+        selectChartType,
+        style,
+        filter: data == null ? void 0 : data.filter
+      }),
+      pssysappid: app.model.codeName,
+      bireporttag: reportTag,
+      pssysbireportname: caption,
+      validflag: 1
+    };
+    if (data && data.measure) {
+      data.measure.forEach((measure) => {
+        const tempMeasure = {
+          birepitemtype: "MEASURE",
+          pssysbischemeid: measure.pssysbischemeid,
+          pssysbicubemeasureid: measure.pssysbicubemeasureid,
+          pssysbicubeid: measure.pssysbicubeid,
+          pssysbicubename: measure.pssysbicubename,
+          pssysbicubemeasurename: measure.pssysbicubemeasurename,
+          validflag: 1
+        };
+        targetData.pssysbireportitems.push(tempMeasure);
+      });
+    }
+    if (data && data.dimension) {
+      data.dimension.forEach((dimension) => {
+        const tempDimension = {
+          birepitemtype: "DIMENSION",
+          pssysbischemeid: dimension.pssysbischemeid,
+          pssysbicubedimensionid: dimension.pssysbicubedimensionid,
+          pssysbicubeid: dimension.pssysbicubeid,
+          pssysbicubename: dimension.pssysbicubename,
+          pssysbicubedimensionname: dimension.pssysbicubedimensionname,
+          validflag: 1
+        };
+        targetData.pssysbireportitems.push(tempDimension);
+      });
+    }
+    if (data && data.extendDimension) {
+      const extendDimension = [];
+      data.extendDimension.forEach((dimension) => {
+        extendDimension.push(dimension.codename);
+        const tempDimension = {
+          birepitemtype: "DIMENSION",
+          pssysbischemeid: dimension.pssysbischemeid,
+          pssysbicubedimensionid: dimension.pssysbicubedimensionid,
+          pssysbicubeid: dimension.pssysbicubeid,
+          pssysbicubename: dimension.pssysbicubename,
+          pssysbicubedimensionname: dimension.pssysbicubedimensionname,
+          validflag: 1
+        };
+        targetData.pssysbireportitems.push(tempDimension);
+      });
+      const uiModel = JSON.parse(targetData.bireportuimodel);
+      targetData.bireportuimodel = JSON.stringify({
+        ...uiModel,
+        extendDimension
+      });
+    }
+    return targetData;
+  }
+};
+
 // src/utils/dr-ctrl-util/index.ts
 function calcItemVisibleByCounter(item, counter) {
   const { enableMode, counterId } = item;
@@ -15133,8 +15437,8 @@ async function calcItemVisible(item, context, params, appDeId, appId2, data) {
 }
 
 // src/command/app/open-app-view/open-app-view.ts
-import { ModelError as ModelError15, RuntimeError as RuntimeError25 } from "@ibiz-template/core";
-import { clone as clone18 } from "ramda";
+import { ModelError as ModelError15, RuntimeError as RuntimeError26 } from "@ibiz-template/core";
+import { clone as clone19 } from "ramda";
 var _OpenAppViewCommand = class _OpenAppViewCommand {
   constructor() {
     ibiz.commands.register(_OpenAppViewCommand.TAG, this.exec.bind(this));
@@ -15151,13 +15455,13 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
    * @return {*}  {(Promise<IModalData | void>)}
    */
   async exec(appViewId, _context, params = {}, opts = {}) {
-    const context = clone18(_context);
+    const context = clone19(_context);
     if (context.srfsimple) {
       delete context.srfsimple;
     }
     const appView = await ibiz.hub.config.view.get(appViewId);
     if (!appView) {
-      throw new RuntimeError25(
+      throw new RuntimeError26(
         ibiz.i18n.t("runtime.command.app.noFindApplicationView", {
           appViewId
         })
@@ -15280,7 +15584,7 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
   async openPopover(appView, context, params = {}, opts = {}) {
     const { event, modalOption } = opts;
     if (!event) {
-      throw new RuntimeError25(ibiz.i18n.t("runtime.command.app.missingEvent"));
+      throw new RuntimeError26(ibiz.i18n.t("runtime.command.app.missingEvent"));
     }
     return ibiz.openView.popover(appView.id, event, context, params, {
       ...modalOption
@@ -15338,7 +15642,7 @@ var _AppFuncCommand = class _AppFuncCommand {
     const app = await ibiz.hub.getAppAsync(context.srfappid);
     const appFunc = app.getAppFunc(appFuncId);
     if (!appFunc) {
-      throw new RuntimeError26(
+      throw new RuntimeError27(
         ibiz.i18n.t("runtime.command.app.noFindApplicationFunction", {
           appFuncId
         })
@@ -15382,7 +15686,7 @@ var _AppFuncCommand = class _AppFuncCommand {
    */
   async openAppView(appFunc, context, params, opts) {
     if (!appFunc.appViewId) {
-      throw new RuntimeError26(
+      throw new RuntimeError27(
         ibiz.i18n.t("runtime.command.app.noFindApplicationView", {
           appViewId: appFunc.appViewId
         })
@@ -15420,7 +15724,7 @@ var _AppFuncCommand = class _AppFuncCommand {
    */
   openPdAppFunc(appFunc, context, params) {
     ibiz.log.warn("openPdAppFunc", appFunc, context, params);
-    throw new RuntimeError26(ibiz.i18n.t("runtime.common.unrealized"));
+    throw new RuntimeError27(ibiz.i18n.t("runtime.common.unrealized"));
   }
   /**
    * 执行 JavaScript 脚本
@@ -15434,7 +15738,7 @@ var _AppFuncCommand = class _AppFuncCommand {
    */
   executeJavaScript(appFunc, context, params) {
     ibiz.log.warn("executeJavaScript", appFunc, context, params);
-    throw new RuntimeError26(ibiz.i18n.t("runtime.common.unrealized"));
+    throw new RuntimeError27(ibiz.i18n.t("runtime.common.unrealized"));
   }
   /**
    * 自定义应用功能
@@ -15448,7 +15752,7 @@ var _AppFuncCommand = class _AppFuncCommand {
    */
   custom(appFunc, context, params) {
     ibiz.log.warn("custom", appFunc, context, params);
-    throw new RuntimeError26(ibiz.i18n.t("runtime.common.unrealized"));
+    throw new RuntimeError27(ibiz.i18n.t("runtime.common.unrealized"));
   }
 };
 /**
@@ -15725,7 +16029,7 @@ var Convert = class {
 };
 
 // src/hub/config/app-view-config-service.ts
-import { RuntimeError as RuntimeError27 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError28 } from "@ibiz-template/core";
 var AppViewConfigService = class {
   constructor() {
     /**
@@ -15796,7 +16100,7 @@ var AppViewConfigService = class {
     if (!this.viewConfigs.has(id)) {
       const model = await ibiz.hub.getAppView(id);
       if (!model) {
-        throw new RuntimeError27(ibiz.i18n.t("runtime.hub.noExist", { id }));
+        throw new RuntimeError28(ibiz.i18n.t("runtime.hub.noExist", { id }));
       }
       this.set(model.id, {
         id: model.id,
@@ -15866,7 +16170,7 @@ import {
   HttpError as HttpError7,
   IBizContext as IBizContext3,
   Namespace,
-  RuntimeError as RuntimeError34
+  RuntimeError as RuntimeError35
 } from "@ibiz-template/core";
 import { isEmpty as isEmpty9, isNil as isNil22, isNotNil as isNotNil2 } from "ramda";
 
@@ -15874,7 +16178,7 @@ import { isEmpty as isEmpty9, isNil as isNil22, isNotNil as isNotNil2 } from "ra
 import { NOOP } from "@ibiz-template/core";
 
 // src/controller/utils/counter/counter.ts
-import { RuntimeError as RuntimeError28 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError29 } from "@ibiz-template/core";
 var Counter = class {
   /**
    * Creates an instance of Counter.
@@ -15936,7 +16240,7 @@ var Counter = class {
       return;
     }
     if (this.count === 0) {
-      throw new RuntimeError28(
+      throw new RuntimeError29(
         ibiz.i18n.t("runtime.controller.utils.counter.decrement")
       );
     }
@@ -16545,7 +16849,7 @@ function getOriginData(data) {
 }
 
 // src/controller/utils/value-rule/value-rule.ts
-import { RuntimeError as RuntimeError29 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError30 } from "@ibiz-template/core";
 import { isNilOrEmpty as isNilOrEmpty6, isNumber } from "qx-util";
 import { isNil as isNil18 } from "ramda";
 function generateRules(itemVRs, name, valueItemName) {
@@ -16595,7 +16899,7 @@ function generateRules(itemVRs, name, valueItemName) {
             deRule.groupCond
           );
           if (!isPast) {
-            callback(new RuntimeError29(infoMessage || deRule.ruleInfo));
+            callback(new RuntimeError30(infoMessage || deRule.ruleInfo));
           }
           return true;
         },
@@ -16668,7 +16972,7 @@ function generateEditorRules(editor) {
 }
 
 // src/controller/utils/value-ex/value-ex.ts
-import { RuntimeError as RuntimeError30 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError31 } from "@ibiz-template/core";
 import { isNil as isNil19, mergeLeft } from "ramda";
 var ValueExUtil = class {
   /**
@@ -16700,7 +17004,7 @@ var ValueExUtil = class {
     const { valueType, objectNameField, textSeparator } = this.mergeDefault(options);
     if (["OBJECTS", "OBJECT"].includes(valueType)) {
       if (!objectNameField) {
-        throw new RuntimeError30(
+        throw new RuntimeError31(
           ibiz.i18n.t("runtime.controller.utils.valueEx.objectNameField")
         );
       }
@@ -16718,7 +17022,7 @@ var ValueExUtil = class {
 };
 
 // src/controller/utils/value-default/value-default.ts
-import { RuntimeError as RuntimeError31, ModelError as ModelError17 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError32, ModelError as ModelError17 } from "@ibiz-template/core";
 import dayjs from "dayjs";
 import { createUUID as createUUID8 } from "qx-util";
 import { isNil as isNil20, isNotNil } from "ramda";
@@ -16759,7 +17063,7 @@ function getDefaultValue(opts, origins) {
     case "SESSION":
     case "APPLICATION":
       if (!((_a = ibiz.appData) == null ? void 0 : _a.context)) {
-        throw new RuntimeError31(
+        throw new RuntimeError32(
           ibiz.i18n.t("runtime.controller.utils.valueDefault.noExist")
         );
       }
@@ -16780,7 +17084,7 @@ function getDefaultValue(opts, origins) {
 
 // src/controller/utils/data-file-util/data-file-util.ts
 import {
-  RuntimeError as RuntimeError32,
+  RuntimeError as RuntimeError33,
   selectFile
 } from "@ibiz-template/core";
 import { mergeRight as mergeRight2 } from "ramda";
@@ -16885,13 +17189,13 @@ async function importData2(opts) {
 }
 async function exportData(header, data, fileName) {
   if (!ibiz.util.getExcelUtil) {
-    throw new RuntimeError32(
+    throw new RuntimeError33(
       ibiz.i18n.t("runtime.controller.utils.dataFileUtil.noExist")
     );
   }
   const exportExcel = await ibiz.util.getExcelUtil();
   if (!exportExcel) {
-    throw new RuntimeError32(
+    throw new RuntimeError33(
       ibiz.i18n.t("runtime.controller.utils.dataFileUtil.loadError")
     );
   }
@@ -16921,7 +17225,7 @@ async function getDataImportModels(opts) {
     (item) => item.id === opts.deDataImportId
   );
   if (!deDataImport) {
-    throw new RuntimeError32(
+    throw new RuntimeError33(
       ibiz.i18n.t("runtime.controller.utils.dataFileUtil.importData")
     );
   }
@@ -17118,7 +17422,7 @@ async function getEntitySchema(entityId, context) {
 }
 
 // src/controller/utils/view-msg/view-msg-controller.ts
-import { RuntimeError as RuntimeError33, RuntimeModelError as RuntimeModelError24 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError34, RuntimeModelError as RuntimeModelError24 } from "@ibiz-template/core";
 import { isNil as isNil21, mergeRight as mergeRight3 } from "ramda";
 var VIEW_MSG_PREFIX = "VIEW_MSG";
 var ViewMsgController = class _ViewMsgController {
@@ -17153,7 +17457,7 @@ var ViewMsgController = class _ViewMsgController {
       (item) => item.id === this.msgGroupId
     );
     if (!msgGroup) {
-      throw new RuntimeError33(
+      throw new RuntimeError34(
         ibiz.i18n.t("runtime.controller.utils.viewMsg.message", {
           msgGroupId: this.msgGroupId
         })
@@ -17171,7 +17475,7 @@ var ViewMsgController = class _ViewMsgController {
       }
     });
     if (msgDetailsViewMsgIds.length) {
-      throw new RuntimeError33(
+      throw new RuntimeError34(
         ibiz.i18n.t("runtime.controller.utils.viewMsg.noFound", {
           message: msgDetailsViewMsgIds.join(",")
         })
@@ -18059,7 +18363,7 @@ var ViewController = class extends BaseController {
   async callUIAction(key, args) {
     const result = this.call(key, args);
     if (result === void 0) {
-      throw new RuntimeError34(
+      throw new RuntimeError35(
         ibiz.i18n.t("runtime.controller.common.view.noSupportBehavior", {
           key
         })
@@ -18548,9 +18852,9 @@ import {
   IBizContext as IBizContext4,
   IBizParams,
   NoticeError as NoticeError2,
-  RuntimeError as RuntimeError35
+  RuntimeError as RuntimeError36
 } from "@ibiz-template/core";
-import { clone as clone19, isNil as isNil23 } from "ramda";
+import { clone as clone20, isNil as isNil23 } from "ramda";
 import { notNilEmpty as notNilEmpty9 } from "qx-util";
 var ControlController = class extends BaseController {
   /**
@@ -18614,7 +18918,7 @@ var ControlController = class extends BaseController {
         "".concat(model.controlType, "_DEFAULT")
       );
       if (panelModel) {
-        this.controlPanel = clone19(panelModel);
+        this.controlPanel = clone20(panelModel);
       }
     }
     this.updateContextParams({});
@@ -18975,7 +19279,7 @@ var ControlController = class extends BaseController {
         ibiz.mc.command.remove.send(msg, meta);
         break;
       default:
-        throw new RuntimeError35(
+        throw new RuntimeError36(
           ibiz.i18n.t("runtime.controller.common.control.unsupportedType", {
             type
           })
@@ -19016,7 +19320,7 @@ var ControlController = class extends BaseController {
 // src/controller/common/control/md-control.controller.ts
 import {
   isElementSame,
-  RuntimeError as RuntimeError36,
+  RuntimeError as RuntimeError37,
   RuntimeModelError as RuntimeModelError26
 } from "@ibiz-template/core";
 import { isNil as isNil24 } from "ramda";
@@ -19289,7 +19593,7 @@ var MDControlController = class extends ControlController {
   async remove(args) {
     const { context, params, data } = this.handlerAbilityParams(args);
     if (!(data == null ? void 0 : data.length)) {
-      throw new RuntimeError36(
+      throw new RuntimeError37(
         ibiz.i18n.t("runtime.controller.common.control.uncheckedData")
       );
     }
@@ -19526,7 +19830,7 @@ var MDControlController = class extends ControlController {
 // src/controller/control/app-menu/app-menu.controller.ts
 import {
   findRecursiveChild,
-  RuntimeError as RuntimeError37,
+  RuntimeError as RuntimeError38,
   RuntimeModelError as RuntimeModelError27
 } from "@ibiz-template/core";
 
@@ -19782,7 +20086,7 @@ var AppMenuController = class extends ControlController {
       childrenFields: ["appMenuItems"]
     });
     if (!menuItem) {
-      throw new RuntimeError37(
+      throw new RuntimeError38(
         ibiz.i18n.t("runtime.controller.control.menu.noFindMenu", { id })
       );
     }
@@ -19917,7 +20221,7 @@ var AppMenuController = class extends ControlController {
 // src/controller/control/app-menu-icon-view/app-menu-icon-view.controller.ts
 import {
   findRecursiveChild as findRecursiveChild2,
-  RuntimeError as RuntimeError38,
+  RuntimeError as RuntimeError39,
   RuntimeModelError as RuntimeModelError28
 } from "@ibiz-template/core";
 var AppMenuIconViewController = class extends AppMenuController {
@@ -19927,7 +20231,7 @@ var AppMenuIconViewController = class extends AppMenuController {
       childrenFields: ["appMenuItems"]
     });
     if (!menuItem) {
-      throw new RuntimeError38(
+      throw new RuntimeError39(
         ibiz.i18n.t("runtime.controller.control.menu.noFindMenu", { id })
       );
     }
@@ -19958,11 +20262,11 @@ var AppMenuIconViewController = class extends AppMenuController {
 
 // src/controller/control/calendar/calendar.controller.ts
 import dayjs3 from "dayjs";
-import { RuntimeError as RuntimeError40, RuntimeModelError as RuntimeModelError29 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError41, RuntimeModelError as RuntimeModelError29 } from "@ibiz-template/core";
 
 // src/controller/control/calendar/calendar.service.ts
-import { RuntimeError as RuntimeError39 } from "@ibiz-template/core";
-import { clone as clone20 } from "ramda";
+import { RuntimeError as RuntimeError40 } from "@ibiz-template/core";
+import { clone as clone21 } from "ramda";
 var CalendarService = class extends MDControlService {
   /**
    * 执行查询多条数据的方法
@@ -20017,13 +20321,13 @@ var CalendarService = class extends MDControlService {
   setCalendarConfigData(items, index) {
     const { sysCalendarItems } = this.model;
     if (!sysCalendarItems) {
-      throw new RuntimeError39(
+      throw new RuntimeError40(
         ibiz.i18n.t("runtime.controller.control.calendar.noFoundModel")
       );
     }
     const calendarItem = sysCalendarItems[index];
     if (!calendarItem) {
-      throw new RuntimeError39(
+      throw new RuntimeError40(
         ibiz.i18n.t("runtime.controller.control.calendar.noFoundModel")
       );
     }
@@ -20064,7 +20368,7 @@ var CalendarService = class extends MDControlService {
    * @memberof CalendarService
    */
   handleRequestParams(item, params) {
-    const tempParams = clone20(params);
+    const tempParams = clone21(params);
     const { srfstartdate, srfenddate } = tempParams;
     Object.assign(tempParams, {
       ["n_".concat(item.beginTimeAppDEFieldId, "_gtandeq")]: srfstartdate,
@@ -20120,7 +20424,7 @@ var CalendarController = class extends MDControlController {
   initCalendarLegends() {
     const { sysCalendarItems } = this.model;
     if (!sysCalendarItems) {
-      throw new RuntimeError40(
+      throw new RuntimeError41(
         ibiz.i18n.t("runtime.controller.control.calendar.noFoundModel")
       );
     }
@@ -20437,12 +20741,12 @@ var CalendarController = class extends MDControlController {
 };
 
 // src/controller/control/chart/chart.controller.ts
-import { RuntimeError as RuntimeError42 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError43 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/chart-options-generator.ts
-import { mergeDeepRight as mergeDeepRight3 } from "ramda";
+import { clone as clone24, mergeDeepRight as mergeDeepRight3 } from "ramda";
 import { isObject as isObject2, isString as isString2 } from "qx-util";
-import { RuntimeError as RuntimeError41 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError42 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/line-series-generator.ts
 import { RuntimeModelError as RuntimeModelError31 } from "@ibiz-template/core";
@@ -20455,7 +20759,7 @@ 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 clone21, isNil as isNil25, mergeDeepRight } from "ramda";
+import { clone as clone22, isNil as isNil25, mergeDeepRight } from "ramda";
 dayjs4.extend(minMax2);
 dayjs4.extend(isSameOrBefore);
 dayjs4.extend(quarterOfYear);
@@ -20600,6 +20904,23 @@ var BaseSeriesGenerator = class {
     }
     return isExclude ? void 0 : val;
   }
+  /**
+   * 获取序列颜色
+   *
+   * @param {string} group
+   * @return {*}  {string}
+   * @memberof BaseSeriesGenerator
+   */
+  getSeriesColor(group) {
+    let color = "";
+    const maps = this.chartGenerator.codeListMap.values();
+    const codeListItems = [...maps].flat();
+    const item = codeListItems.find((x) => x.text === group);
+    if (item) {
+      color = item.color || "";
+    }
+    return color;
+  }
   /**
    * 准备图表数据
    * @return {*}
@@ -20689,7 +21010,7 @@ var BaseSeriesGenerator = class {
             const { codelistId } = catalog2;
             if (codelistId && this.autoCompleteCategory) {
               const codeListItems = this.chartGenerator.codeListMap.get(codelistId);
-              tempCodeLists.push(clone21(codeListItems));
+              tempCodeLists.push(clone22(codeListItems));
             }
           });
           for (let i = 0; i < tempCodeLists.length; i++) {
@@ -20792,6 +21113,10 @@ var BaseSeriesGenerator = class {
       if (group !== DEFAULT_GROUP) {
         options.name = group;
       }
+      const color = this.getSeriesColor(group);
+      if (color) {
+        options.color = color;
+      }
       if (this.seriesUserParam) {
         options = mergeDeepRight(options, this.seriesUserParam);
       }
@@ -20855,7 +21180,7 @@ var BaseSeriesGenerator = class {
   dataPreprocess(data) {
     const tempData = [];
     data.forEach((singleData) => {
-      tempData.push(clone21(singleData));
+      tempData.push(clone22(singleData));
     });
     const { groupMode } = this.model;
     if (groupMode) {
@@ -21163,7 +21488,7 @@ var ScatterSeriesGenerator = class extends BaseSeriesGenerator {
 };
 
 // src/controller/control/chart/generator/radar-series-generator.ts
-import { mergeDeepRight as mergeDeepRight2 } from "ramda";
+import { clone as clone23, mergeDeepRight as mergeDeepRight2 } from "ramda";
 
 // src/controller/control/chart/generator/radar-coord-system.ts
 var RadarCoordSystem = class {
@@ -21238,7 +21563,10 @@ var RadarSeriesGenerator = class extends BaseSeriesGenerator {
    * @param {IData[]} data
    */
   calcRadarCoordSystem(data) {
-    const groupData = this.calcGroupData(data);
+    const tempItems = data.map((item) => {
+      return clone23(item);
+    });
+    const groupData = this.calcGroupData(tempItems);
     if (!this.chartGenerator.radarMap.has(this.catalogField)) {
       this.chartGenerator.radarMap.set(
         this.catalogField,
@@ -21498,6 +21826,112 @@ var ChartOptionsGenerator2 = class {
     });
     return AxisOption;
   }
+  /**
+   * 处理轴布局位置
+   *
+   * @param {CodeListItem[]} items
+   * @param {number} padding
+   * @param {number} total
+   * @param {number} index
+   * @param {boolean} isRow 是否横向
+   * @return {*}
+   * @memberof ChartOptionsGenerator
+   */
+  handleAxisLayout(items, padding, total, index, isRow = true) {
+    const axisData = items.map((code) => {
+      if (isRow) {
+        return {
+          value: code.text,
+          textStyle: {
+            padding: [0, padding * (total - 1 - index), 0, 0]
+          }
+        };
+      }
+      return {
+        value: code.text,
+        textStyle: {
+          padding: [padding * (total - 1 - index), 0, 0, 0]
+        }
+      };
+    });
+    return axisData;
+  }
+  /**
+   * 处理轴层级
+   *
+   * @param {IData[]} tempaxis
+   * @param {number} index
+   * @param {IData[]} axisData
+   * @return {*}
+   * @memberof ChartOptionsGenerator
+   */
+  handleAxisLevel(tempaxis, index, axisData) {
+    const tempAxisData = [];
+    if (index === 0) {
+      return axisData;
+    }
+    let length = 1;
+    for (let i = 0; i < tempaxis.length; i++) {
+      length *= tempaxis[i].data.length;
+    }
+    for (let i = 0; i < length; i++) {
+      tempAxisData.push(...axisData);
+    }
+    return tempAxisData;
+  }
+  /**
+   * 合并轴参数
+   *
+   * @param {(IData[] | IData)} axisData
+   * @param {IData[]} tempAxis
+   * @return {*}
+   * @memberof ChartOptionsGenerator
+   */
+  mergeAxisData(axisData, tempAxis) {
+    if (axisData && Array.isArray(axisData)) {
+      return [...axisData, ...tempAxis];
+    }
+    return [axisData, ...tempAxis];
+  }
+  /**
+   * 处理分区模式下序列模型的坐标轴位置
+   *
+   * @param {IData[]} seriesModel
+   * @param {IData} opts
+   * @memberof ChartOptionsGenerator
+   */
+  handleSeriesModelCoordinateAxis(seriesModel, opts) {
+    const { xAxisParam, yAxisParam } = opts;
+    const xaxis = [];
+    const yaxis = [];
+    for (let i = 0; i < seriesModel.length; i++) {
+      const tempXAxis = clone24(xAxisParam);
+      const tempYAxis = clone24(yAxisParam);
+      Object.assign(tempXAxis, { gridIndex: i });
+      Object.assign(tempYAxis, { gridIndex: i });
+      tempYAxis.axisLabel.formatter = function(_param) {
+        if (_param === 0) {
+          return "{top|".concat(_param, "}");
+        }
+        return "{bottom|".concat(_param, "}");
+      };
+      if (i !== seriesModel.length - 1) {
+        tempXAxis.name = "";
+        tempXAxis.axisLine.show = false;
+        tempXAxis.axisLabel.show = false;
+        tempXAxis.axisTick.show = false;
+      }
+      if (tempYAxis.showTitle) {
+        Object.assign(tempYAxis, {
+          name: seriesModel[i].serieText
+        });
+      }
+      xaxis.push(tempXAxis);
+      yaxis.push(tempYAxis);
+    }
+    this.chartUserParam.xAxis = xaxis;
+    this.chartUserParam.yAxis = yaxis;
+  }
   /**
    * 初始化多分类的X轴配置
    *
@@ -21505,9 +21939,32 @@ var ChartOptionsGenerator2 = class {
    * @memberof ChartOptionsGenerator
    */
   async initMultiCatalogxAxis(context, params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const { controlParam } = this.model;
-    if (controlParam && ((_a = controlParam.ctrlParams) == null ? void 0 : _a.CATALOGFIELDS)) {
+    if (controlParam && ((_a = controlParam.ctrlParams) == null ? void 0 : _a.ZONE)) {
+      const length = (_b = this.model.dechartSerieses) == null ? void 0 : _b.length;
+      if (length) {
+        const height = 90 / length;
+        const items = [];
+        for (let i = 0; i < length; i++) {
+          const top = i * height + 5;
+          const bottom = 100 - (height + top);
+          items.push({
+            top: "".concat(top, "%"),
+            bottom: "".concat(bottom, "%"),
+            containLabel: true
+          });
+        }
+        if (this.chartUserParam) {
+          this.chartUserParam.grid = items;
+          this.handleSeriesModelCoordinateAxis(this.model.dechartSerieses, {
+            xAxisParam: ((_c = this.chartUserParam) == null ? void 0 : _c.xAxis) || {},
+            yAxisParam: ((_d = this.chartUserParam) == null ? void 0 : _d.yAxis) || {}
+          });
+        }
+      }
+    }
+    if (controlParam && ((_e = controlParam.ctrlParams) == null ? void 0 : _e.CATALOGFIELDS)) {
       try {
         const tempCatalogFields = JSON.parse(
           controlParam.ctrlParams.CATALOGFIELDS
@@ -21518,23 +21975,22 @@ var ChartOptionsGenerator2 = class {
         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 (this.chartUserParam) {
+            let tempconfig = {};
+            if (((_f = controlParam.ctrlParams) == null ? void 0 : _f.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;
+                tempconfig = this.chartUserParam.yAxis[this.chartUserParam.yAxis.length - 1];
               } 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;
+                tempconfig = this.chartUserParam.yAxis;
               }
             } 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;
+              tempconfig = this.chartUserParam.xAxis[this.chartUserParam.xAxis.length - 1];
             } 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;
+              tempconfig = this.chartUserParam.xAxis;
+            }
+            if (tempconfig) {
+              titleshow = tempconfig.name === void 0 ? true : !!tempconfig.name;
+              labelshow = ((_g = tempconfig.axisLabel) == null ? void 0 : _g.show) === void 0 ? true : (_h = tempconfig.axisLabel) == null ? void 0 : _h.show;
             }
           }
           if (this.chartUserParam && this.chartUserParam.grid && Array.isArray(this.chartUserParam.grid)) {
@@ -21550,78 +22006,45 @@ var ChartOptionsGenerator2 = class {
                   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
-                          ]
-                        }
-                      };
+                    const yAxisData = this.handleAxisLayout(
+                      codeListItems,
+                      40,
+                      tempCatalogFields.length,
+                      index
+                    );
+                    const tempxAxisData = this.handleAxisLevel(
+                      tempaxis,
+                      index,
+                      yAxisData
+                    );
+                    tempaxis.push({
+                      show: labelshow,
+                      gridIndex,
+                      type: "category",
+                      data: tempxAxisData,
+                      position: "left"
                     });
-                    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)
-                        }
-                      };
+                    const xAxisData = this.handleAxisLayout(
+                      codeListItems,
+                      24,
+                      tempCatalogFields.length,
+                      index,
+                      false
+                    );
+                    const tempxAxisData = this.handleAxisLevel(
+                      tempaxis,
+                      index,
+                      xAxisData
+                    );
+                    tempaxis.push({
+                      show: labelshow,
+                      gridIndex,
+                      type: "category",
+                      data: tempxAxisData,
+                      position: "bottom"
                     });
-                    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"
-                      });
-                    }
                   }
                 }
               }
@@ -21629,42 +22052,26 @@ var ChartOptionsGenerator2 = class {
           );
           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"
-            });
+          }).join("/");
+          let catalogLength = tempCatalogFields.length;
+          if (!labelshow) {
+            catalogLength = 1;
+          }
+          if (!titleshow) {
+            catalogLength -= 1;
           }
           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) {
+            if (!this.chartUserParam.grid) {
+              this.chartUserParam.grid = {};
+            }
+            if (((_i = controlParam.ctrlParams) == null ? void 0 : _i.MODE) === "ROW") {
+              if (catalogLength === 0) {
                 Object.assign(this.chartUserParam.grid, {
                   bottom: 45
                 });
               } else {
                 Object.assign(this.chartUserParam.grid, {
-                  left: (length + 1) * 60
+                  left: (catalogLength + 1) * 40
                 });
               }
               tempaxis.push({
@@ -21673,56 +22080,50 @@ var ChartOptionsGenerator2 = class {
                 show: titleshow,
                 data: [
                   {
-                    value: mergeName,
+                    value: mergeName.split("").join("\n"),
                     textStyle: {
-                      padding: [0, length * 60, 0, 0]
+                      padding: [0, catalogLength * 40, 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 = [
+              if (this.chartUserParam.yAxis) {
+                this.chartUserParam.yAxis = this.mergeAxisData(
                   this.chartUserParam.yAxis,
-                  ...tempaxis
-                ];
+                  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) {
+              if (catalogLength === 0) {
                 Object.assign(this.chartUserParam.grid, {
-                  bottom: 45
+                  bottom: 30
                 });
               } else {
                 Object.assign(this.chartUserParam.grid, {
-                  bottom: (length > 2 ? length - 1 : length) * 45
+                  bottom: (catalogLength + 1) * 24
                 });
               }
+              tempaxis.push({
+                type: "category",
+                gridIndex,
+                show: titleshow,
+                data: [
+                  {
+                    value: mergeName,
+                    textStyle: {
+                      padding: [24 * catalogLength, 0, 0, 0]
+                    }
+                  }
+                ],
+                position: "bottom"
+              });
+              if (this.chartUserParam.xAxis) {
+                this.chartUserParam.xAxis = this.mergeAxisData(
+                  this.chartUserParam.xAxis,
+                  tempaxis
+                );
+              }
             }
           }
         }
@@ -21872,7 +22273,7 @@ var ChartOptionsGenerator2 = class {
   getChartDataByParams(params) {
     const generator = this.seriesGeneratorIndexMap.get(params.seriesIndex);
     if (!generator) {
-      throw new RuntimeError41(
+      throw new RuntimeError42(
         ibiz.i18n.t("runtime.controller.control.chart.noFindSequence", {
           seriesIndex: params.seriesIndex
         })
@@ -21936,6 +22337,9 @@ var ChartService = class extends MDControlService {
 
 // src/controller/control/chart/chart.controller.ts
 var ChartController = class extends MDControlController {
+  get _evt() {
+    return this.evt;
+  }
   initState() {
     super.initState();
     this.state.size = 1e3;
@@ -22154,17 +22558,18 @@ var ChartController = class extends MDControlController {
    * @author lxm
    * @date 2023-06-07 10:03:48
    */
-  updateChart() {
+  async updateChart() {
     if (!this.chart) {
-      throw new RuntimeError42(
+      throw new RuntimeError43(
         ibiz.i18n.t("runtime.controller.control.chart.noInitialised")
       );
     }
     if (!this.options) {
-      throw new RuntimeError42(
+      throw new RuntimeError43(
         ibiz.i18n.t("runtime.controller.control.chart.noCalculated")
       );
     }
+    await this._evt.emit("onBeforeUpdate", void 0);
     this.chart.setOption(this.options, { notMerge: true });
     this.resizeChart();
   }
@@ -22213,7 +22618,7 @@ var CaptionBarController = class extends ControlController {
 };
 
 // src/controller/control/toolbar/toolbar.controllerr.ts
-import { recursiveIterate as recursiveIterate2, RuntimeError as RuntimeError51 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate2, RuntimeError as RuntimeError52 } from "@ibiz-template/core";
 
 // src/ui-action/provider/backend-ui-action-provider.ts
 import { RuntimeModelError as RuntimeModelError52 } from "@ibiz-template/core";
@@ -22223,7 +22628,7 @@ import { isArray as isArray8 } from "qx-util";
 import { RuntimeModelError as RuntimeModelError51 } from "@ibiz-template/core";
 
 // src/ui-logic/index.ts
-import { RuntimeError as RuntimeError48 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError49 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic.ts
 import { ModelError as ModelError25, RuntimeModelError as RuntimeModelError50 } from "@ibiz-template/core";
@@ -22396,7 +22801,7 @@ import { ModelError as ModelError19, RuntimeModelError as RuntimeModelError34 }
 
 // src/ui-logic/utils/handle-src-val.ts
 import { ModelError as ModelError18 } from "@ibiz-template/core";
-import { clone as clone22 } from "ramda";
+import { clone as clone25 } from "ramda";
 function handleSrcVal2(ctx, srcValParams) {
   const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
@@ -22423,7 +22828,7 @@ function handleSrcVal2(ctx, srcValParams) {
       value = ctx.parameters.context;
       break;
     case "ENVPARAM":
-      value = clone22(ibiz.env);
+      value = clone25(ibiz.env);
       break;
     default:
       throw new ModelError18(
@@ -22879,8 +23284,8 @@ 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 RuntimeError43 } from "@ibiz-template/core";
-import { clone as clone23 } from "ramda";
+import { ModelError as ModelError22, RuntimeError as RuntimeError44 } from "@ibiz-template/core";
+import { clone as clone26 } from "ramda";
 var PrepareJSParamNode = class extends UILogicNode {
   async exec(ctx) {
     const nodeParams = this.model.deuilogicNodeParams;
@@ -22890,7 +23295,7 @@ var PrepareJSParamNode = class extends UILogicNode {
     for (const nodeParam of nodeParams) {
       let originValue;
       if (nodeParam.dstDEUILogicParamId && ibiz.env.logLevel === "DEBUG") {
-        originValue = clone23(ctx.params[nodeParam.dstDEUILogicParamId]);
+        originValue = clone26(ctx.params[nodeParam.dstDEUILogicParamId]);
       }
       switch (nodeParam.paramAction) {
         case "SETPARAMVALUE":
@@ -22945,7 +23350,7 @@ var PrepareJSParamNode = class extends UILogicNode {
   setParamValue(nodeParam, ctx) {
     const { dstFieldName, dstDEUILogicParamId } = nodeParam;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeError43(ibiz.i18n.t("runtime.uiLogic.noTargetParameter"));
+      throw new RuntimeError44(ibiz.i18n.t("runtime.uiLogic.noTargetParameter"));
     }
     let dstField = dstFieldName;
     if (ctx.isEntityParam(dstDEUILogicParamId)) {
@@ -22985,7 +23390,7 @@ var PrepareJSParamNode = class extends UILogicNode {
   copyParam(nodeParam, ctx) {
     const { dstDEUILogicParamId } = nodeParam;
     const srcVal = handleSrcVal2(ctx, nodeParam);
-    ctx.params[dstDEUILogicParamId] = clone23(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone26(srcVal);
   }
   /**
    * 绑定参数
@@ -23062,7 +23467,7 @@ var PrepareJSParamNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-invoke-node/view-ctrl-invoke-node.ts
-import { RuntimeError as RuntimeError44, RuntimeModelError as RuntimeModelError38 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError45, RuntimeModelError as RuntimeModelError38 } from "@ibiz-template/core";
 import { isFunction } from "lodash-es";
 var ViewCtrlInvokeNode = class extends UILogicNode {
   async exec(ctx) {
@@ -23088,7 +23493,7 @@ var ViewCtrlInvokeNode = class extends UILogicNode {
     }
     const invokeParam = ctx.params[invokeParamId];
     if (!invokeParam) {
-      throw new RuntimeError44(
+      throw new RuntimeError45(
         ibiz.i18n.t("runtime.uiLogic.noFoundOperationParameter", {
           invokeParamId
         })
@@ -23096,14 +23501,14 @@ var ViewCtrlInvokeNode = class extends UILogicNode {
     }
     const invokeCtrl = ctx.params[invokeCtrlId];
     if (!invokeCtrl) {
-      throw new RuntimeError44(
+      throw new RuntimeError45(
         ibiz.i18n.t("runtime.uiLogic.noFoundInterfaceObject", {
           invokeCtrlId
         })
       );
     }
     if (!invokeCtrl[invokeMethod] || !isFunction(invokeCtrl[invokeMethod])) {
-      throw new RuntimeError44(
+      throw new RuntimeError45(
         ibiz.i18n.t("runtime.uiLogic.noFoundInvokeMethod", {
           invokeMethod
         })
@@ -23292,7 +23697,7 @@ var ResetParamNode2 = class extends UILogicNode {
 
 // src/ui-logic/ui-logic-node/copy-param-node/copy-param-node.ts
 import { RuntimeModelError as RuntimeModelError43 } from "@ibiz-template/core";
-import { clone as clone24 } from "ramda";
+import { clone as clone27 } from "ramda";
 var CopyParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
@@ -23303,7 +23708,7 @@ var CopyParamNode2 = class extends UILogicNode {
       );
     }
     const srcVal = handleSrcVal2(ctx, this.model);
-    ctx.params[dstDEUILogicParamId] = clone24(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone27(srcVal);
     ctx.setLastReturn(ctx.params[dstDEUILogicParamId]);
     ibiz.log.debug(
       ibiz.i18n.t("runtime.uiLogic.copyParameter", {
@@ -23443,7 +23848,7 @@ var DataSetNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/throw-exception-node/throw-exception-node.ts
-import { RuntimeError as RuntimeError45 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError46 } from "@ibiz-template/core";
 var ThrowExceptionNode2 = class extends UILogicNode {
   async exec(_ctx) {
     const { errorInfo } = this.model;
@@ -23453,12 +23858,12 @@ var ThrowExceptionNode2 = class extends UILogicNode {
         errorInfo
       })
     );
-    throw new RuntimeError45(errorInfo);
+    throw new RuntimeError46(errorInfo);
   }
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-fire-event-node/view-ctrl-fire-event-node.ts
-import { RuntimeError as RuntimeError46, RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError47, RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
 var ViewCtrlFireEventNode = class extends UILogicNode {
   async exec(ctx) {
     ctx.isEndNode = true;
@@ -23483,13 +23888,13 @@ var ViewCtrlFireEventNode = class extends UILogicNode {
     }
     const invokeCtrl = ctx.params[fireCtrlId];
     if (!invokeCtrl) {
-      throw new RuntimeError46(
+      throw new RuntimeError47(
         ibiz.i18n.t("runtime.uiLogic.noFoundTriggerObject", { fireCtrlId })
       );
     }
     const eventParam = ctx.params[eventParamId];
     if (!eventParam) {
-      throw new RuntimeError46(
+      throw new RuntimeError47(
         ibiz.i18n.t("runtime.uiLogic.noFoundEventParameterObject", {
           eventParamId
         })
@@ -23511,7 +23916,7 @@ var ViewCtrlFireEventNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts
-import { RuntimeError as RuntimeError47, RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError48, RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
 var ExecuteDELogicNode = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -23540,7 +23945,7 @@ var ExecuteDELogicNode = class extends UILogicNode {
     }
     const dstParam = ctx.params[dstDEUILogicParamId];
     if (!dstParam) {
-      throw new RuntimeError47(
+      throw new RuntimeError48(
         ibiz.i18n.t("runtime.uiLogic.passedParameter", { dstDEUILogicParamId })
       );
     }
@@ -23939,7 +24344,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 RuntimeError48(
+    throw new RuntimeError49(
       ibiz.i18n.t("runtime.uiLogic.interfaceLogic", {
         appDataEntityId,
         deUILogicId
@@ -23967,7 +24372,7 @@ async function execUILogic(deUILogicId, appDataEntityId, parameters) {
 }
 
 // src/ui-action/uiaction-util.ts
-import { RuntimeError as RuntimeError49 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError50 } from "@ibiz-template/core";
 var UIActionUtil = class {
   /**
    * 执行界面行为
@@ -23982,7 +24387,7 @@ var UIActionUtil = class {
   static async exec(actionId, params, appId2) {
     const action = await getUIActionById(actionId, appId2);
     if (!action) {
-      throw new RuntimeError49(
+      throw new RuntimeError50(
         ibiz.i18n.t("runtime.uiAction.noFoundBehaviorModel", { actionId })
       );
     }
@@ -24490,7 +24895,7 @@ import {
   StringUtil,
   RuntimeModelError as RuntimeModelError53,
   ModelError as ModelError26,
-  RuntimeError as RuntimeError50
+  RuntimeError as RuntimeError51
 } from "@ibiz-template/core";
 import { mergeRight as mergeRight4 } from "ramda";
 var FrontUIActionProvider = class extends UIActionProviderBase {
@@ -24578,7 +24983,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       return result || {};
     }
     if (scriptCode) {
-      const result = ScriptFactory.execScriptFn(
+      const result = await ScriptFactory.asyncExecScriptFn(
         { context, params, data, el: event == null ? void 0 : event.target, view },
         scriptCode
       );
@@ -24616,7 +25021,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 RuntimeError50(ibiz.i18n.t("runtime.uiAction.dataPrimaryKey"));
+        throw new RuntimeError51(ibiz.i18n.t("runtime.uiAction.dataPrimaryKey"));
       }
       const res = await ibiz.net.request(requestUrl, {
         method: "get",
@@ -24642,10 +25047,10 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
           window.open(link, "_blank");
         }
       } else {
-        throw new RuntimeError50(ibiz.i18n.t("runtime.uiAction.printFailure"));
+        throw new RuntimeError51(ibiz.i18n.t("runtime.uiAction.printFailure"));
       }
     } else {
-      throw new RuntimeError50(ibiz.i18n.t("runtime.uiAction.physicalPrint"));
+      throw new RuntimeError51(ibiz.i18n.t("runtime.uiAction.physicalPrint"));
     }
   }
   /**
@@ -24730,12 +25135,12 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
         URL.revokeObjectURL(elink.href);
         document.body.removeChild(elink);
       } else {
-        throw new RuntimeError50(
+        throw new RuntimeError51(
           ibiz.i18n.t("runtime.uiAction.exportRequestFailed")
         );
       }
     } else {
-      throw new RuntimeError50(
+      throw new RuntimeError51(
         ibiz.i18n.t("runtime.uiAction.noEntityExportsFound")
       );
     }
@@ -24753,7 +25158,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
     const actionResult = {};
     const { context, params, data, event } = args;
     if (!event) {
-      throw new RuntimeError50(ibiz.i18n.t("runtime.uiAction.lackNativeEvent"));
+      throw new RuntimeError51(ibiz.i18n.t("runtime.uiAction.lackNativeEvent"));
     }
     const { resultContext, resultParams } = await this.handleParams(
       action,
@@ -24892,7 +25297,7 @@ var ToolbarController = class extends ControlController {
       const actionId = item.uiactionId;
       const uiAction = await getUIActionById(actionId, item.appId);
       if (!uiAction) {
-        throw new RuntimeError51(
+        throw new RuntimeError52(
           ibiz.i18n.t("runtime.controller.control.toolbar.noFound", {
             actionId
           })
@@ -25005,6 +25410,12 @@ var ToolbarController = class extends ControlController {
       _data = data.getOrigin();
     }
     await this.state.buttonsState.update(this.context, _data, appDeId);
+    this.allToolbarItems.forEach((item) => {
+      const itemState = this.state.buttonsState[item.id];
+      if (item.hiddenItem) {
+        itemState.visible = false;
+      }
+    });
     if (this.scheduler) {
       const logicParams = {};
       if (_data) {
@@ -25097,6 +25508,7 @@ var ContextMenuController = class extends ToolbarController {
 };
 
 // src/controller/control/dashboard/dashboard.controller.ts
+import { clone as clone28 } from "ramda";
 var DashboardController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -25116,13 +25528,25 @@ var DashboardController = class extends ControlController {
      * @type {{ [key: string]: IPortletController }}
      */
     this.portlets = {};
+    /**
+     * 启用动态
+     *
+     * @author tony001
+     * @date 2024-06-27 11:06:24
+     * @type {boolean}
+     */
+    this.enableDynamic = false;
   }
   initState() {
     super.initState();
   }
   async onCreated() {
+    this.model.enableCustomized = true;
     await super.onCreated();
     await this.initPortlets(this.model.controls);
+    if (this.controlParams.enabledynamic === "true") {
+      this.enableDynamic = true;
+    }
     const { appDataEntityId } = this.view.model;
     if (appDataEntityId) {
       this.view.evt.on("onDataChange", (event) => {
@@ -25208,6 +25632,57 @@ var DashboardController = class extends ControlController {
     });
     this.evt.emit("onResetPortlet", void 0);
   }
+  /**
+   * 加载动态
+   *
+   * @author tony001
+   * @date 2024-06-27 16:06:21
+   * @return {*}  {Promise<IData[]>}
+   */
+  async loadAllDynaPortlet() {
+    var _a;
+    const app = ibiz.hub.getApp(ibiz.env.appId);
+    const res = await app.deService.exec(
+      "psappportlet",
+      "fetchdefault",
+      this.context,
+      {
+        size: 1e3,
+        n_pssysappid_eq: app.model.codeName,
+        n_dynamodelflag_noteq: 0
+      }
+    );
+    if (res && ((_a = res.data) == null ? void 0 : _a.length) > 0) {
+      return res.data;
+    }
+    return [];
+  }
+  /**
+   * 通过指定标识加载门户部件
+   *
+   * @author tony001
+   * @date 2024-06-27 17:06:12
+   * @param {string} id
+   * @return {*}  {(Promise<IDBPortletPart | undefined>)}
+   */
+  async loadDynaPortletById(id) {
+    const app = ibiz.hub.getApp(ibiz.env.appId);
+    const tempContext = clone28(this.context);
+    Object.assign(tempContext, { psappportlet: id });
+    const res = await app.deService.exec(
+      "psappportlet",
+      "get",
+      tempContext,
+      this.params
+    );
+    if (res && res.data && res.data.controlmodel) {
+      const controlModel = JSON.parse(res.data.controlmodel);
+      return await ibiz.hub.translationModelToDsl(
+        controlModel,
+        "CTRL"
+      );
+    }
+  }
   /**
    * 通知所有表单成员表单操作过程中的数据变更
    *
@@ -25264,7 +25739,7 @@ var CustomDashboardController = class {
      */
     this.portletConfig = {};
     /**
-     * 自定义定制范围类型（public：公开，personal：个人，data：数据，默认是按照个人区分，配置了应用功能组件才生效）
+     * 自定义定制范围类型（public：公开，personal：个人，data：数据，dynamic: 自定义动态,默认是按照个人区分，配置了应用功能组件才生效）
      *
      * @author tony001
      * @date 2024-04-24 19:04:47
@@ -25287,13 +25762,6 @@ var CustomDashboardController = class {
      * @type {string}
      */
     this.ownerId = "";
-    /**
-     * 是否多模式
-     *
-     * @type {boolean}
-     * @memberof CustomDashboardController
-     */
-    this.multiMode = false;
     this.context = dashboard.context;
     this.params = dashboard.params;
     this.init(dashboard.controlParams);
@@ -25319,7 +25787,6 @@ var CustomDashboardController = class {
       this.ownerId = this.context[controlParams.owner_id];
     }
     if (controlParams.multimode === "true") {
-      this.multiMode = true;
       this.type = "dynamic";
     }
     if (this.model.appDynaDashboardUtilId) {
@@ -26333,7 +26800,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 RuntimeError52, RuntimeModelError as RuntimeModelError55 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError53, RuntimeModelError as RuntimeModelError55 } from "@ibiz-template/core";
 var ExpBarControlController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -26666,7 +27133,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 RuntimeError52(
+    throw new RuntimeError53(
       ibiz.i18n.t("runtime.controller.control.expBar.multiNode")
     );
   }
@@ -26813,7 +27280,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/exp-bar/tree-exp-bar.controller.ts
-import { RuntimeError as RuntimeError53, RuntimeModelError as RuntimeModelError57 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError54, RuntimeModelError as RuntimeModelError57 } from "@ibiz-template/core";
 var TreeExpBarController = class extends ExpBarControlController {
   constructor() {
     super(...arguments);
@@ -26904,7 +27371,7 @@ var TreeExpBarController = class extends ExpBarControlController {
     const deData = node._deData || node;
     const nodeModel = this.getNodeModel(node._nodeId);
     if (!nodeModel) {
-      throw new RuntimeError53(
+      throw new RuntimeError54(
         ibiz.i18n.t("runtime.controller.control.expBar.noFindNodeModel", {
           nodeId: node._nodeId
         })
@@ -27099,7 +27566,7 @@ var ChartExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/form/search-form/search-form.controller.ts
-import { RuntimeError as RuntimeError54 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError55 } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.controller.ts
 import {
@@ -27745,7 +28212,7 @@ var SearchFormController = class extends FormController {
   applyStoredFilter(index) {
     const filter = this.state.storedFilters[index];
     if (!filter) {
-      throw new RuntimeError54(
+      throw new RuntimeError55(
         ibiz.i18n.t("runtime.controller.control.form.searchTerms")
       );
     }
@@ -27763,7 +28230,7 @@ var SearchFormController = class extends FormController {
   async removeStoredFilter(index) {
     const filter = this.state.storedFilters[index];
     if (!filter) {
-      throw new RuntimeError54(
+      throw new RuntimeError55(
         ibiz.i18n.t("runtime.controller.control.form.saveSearch")
       );
     }
@@ -29253,7 +29720,7 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts
-import { RuntimeError as RuntimeError55, RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError56, 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
@@ -29426,7 +29893,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
   async remove(id) {
     const controller = this.formMap.get(id);
     if (!controller) {
-      throw new RuntimeError55(
+      throw new RuntimeError56(
         ibiz.i18n.t("runtime.controller.control.form.noFoundFormController", {
           id
         })
@@ -29489,7 +29956,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.ts
 import { ModelError as ModelError28 } from "@ibiz-template/core";
-import { clone as clone25 } from "ramda";
+import { clone as clone29 } from "ramda";
 var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
   constructor() {
     super(...arguments);
@@ -29581,7 +30048,7 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
     copyFields.forEach((key) => {
       tempForm[key] = this.form.model[key];
     });
-    this.repeatedForm = clone25(tempForm);
+    this.repeatedForm = clone29(tempForm);
   }
   /**
    * 设置重复器控制器
@@ -29620,18 +30087,22 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
    * @date 2023-11-22 04:50:19
    */
   create(index) {
+    const item = {};
     if (this.isSingleData) {
-      this.setValue({});
+      this.setValue(item);
     } else {
       let tempValue = this.value;
       tempValue = tempValue ? [...tempValue] : [];
       if (index !== void 0) {
-        tempValue.splice(index, 0, {});
+        tempValue.splice(index, 0, item);
       } else {
-        tempValue.push({});
+        tempValue.push(item);
       }
       this.setValue(tempValue);
     }
+    this.form.evt.emit("onMDCtrlNew", {
+      args: item
+    });
   }
   /**
    * 删除数据
@@ -29648,6 +30119,9 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
       return index !== i;
     });
     this.setValue(newArr);
+    this.form.evt.emit("onMDCtrlRemove", {
+      args: newArr
+    });
   }
   /**
    * 表单数据变更通知
@@ -29778,11 +30252,11 @@ import {
   IBizContext as IBizContext6,
   isElementSame as isElementSame2,
   mergeInLeft as mergeInLeft2,
-  RuntimeError as RuntimeError56
+  RuntimeError as RuntimeError57
 } from "@ibiz-template/core";
 import { debounce } from "lodash-es";
 import { createUUID as createUUID12 } from "qx-util";
-import { clone as clone26, isNil as isNil27 } from "ramda";
+import { clone as clone30, isNil as isNil27 } from "ramda";
 
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
@@ -30151,8 +30625,8 @@ var EditFormController = class extends FormController {
    * @return {*}  {Promise<IData>}
    */
   async copy() {
-    const context = clone26(this.context);
-    const queryParams = clone26(this.params);
+    const context = clone30(this.context);
+    const queryParams = clone30(this.params);
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.model.appId
@@ -30209,7 +30683,7 @@ var EditFormController = class extends FormController {
       return this.loadDraft();
     }
     const { context, params } = this.handlerAbilityParams(args);
-    const queryParams = clone26(params);
+    const queryParams = clone30(params);
     let res;
     try {
       await this.startLoading();
@@ -30247,7 +30721,7 @@ var EditFormController = class extends FormController {
     }
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError56(
+      throw new RuntimeError57(
         ibiz.i18n.t("runtime.controller.control.form.formCompletion")
       );
     }
@@ -30383,7 +30857,7 @@ var EditFormController = class extends FormController {
       (item) => item.id === formItemUpdateId
     );
     if (!formItemUpdate) {
-      throw new RuntimeError56(
+      throw new RuntimeError57(
         ibiz.i18n.t("runtime.controller.control.form.itemUpdate", {
           formItemUpdateId
         })
@@ -30446,7 +30920,7 @@ var EditFormController = class extends FormController {
   async wfStart(args) {
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError56(
+      throw new RuntimeError57(
         ibiz.i18n.t("runtime.controller.control.form.formCompletion")
       );
     }
@@ -30479,7 +30953,7 @@ var EditFormController = class extends FormController {
   async wfSubmit(args) {
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError56(
+      throw new RuntimeError57(
         ibiz.i18n.t("runtime.controller.control.form.formCompletion")
       );
     }
@@ -30891,11 +31365,12 @@ import {
   debounceAndAsyncMerge as debounceAndAsyncMerge2,
   EntityError as EntityError2,
   mergeDefaultInLeft,
+  plus as plus2,
   recursiveIterate as recursiveIterate7,
-  RuntimeError as RuntimeError57,
+  RuntimeError as RuntimeError58,
   RuntimeModelError as RuntimeModelError63
 } from "@ibiz-template/core";
-import { clone as clone27, isNil as isNil28 } from "ramda";
+import { clone as clone31, isNil as isNil28 } from "ramda";
 import dayjs5 from "dayjs";
 
 // src/controller/control/grid/grid/grid.service.ts
@@ -30961,6 +31436,24 @@ var GridService = class extends MDControlService {
     res = this.handleResponse(res);
     return res;
   }
+  /**
+   * 移动并排序数据
+   *
+   * @param {IContext} context
+   * @param {ControlVO} data
+   * @param {IData} args
+   * @return {*}  {Promise<IHttpResponse<ControlVO[]>>}
+   * @memberof GridService
+   */
+  async moveOrderItem(context, data, params) {
+    const moveAction = this.model.moveControlAction.appDEMethodId;
+    const deName = calcDeCodeNameById(this.model.appDataEntityId);
+    const tempContext = context.clone();
+    tempContext[deName] = data.srfkey;
+    let res = await this.exec(moveAction, tempContext, params);
+    res = this.handleResponse(res);
+    return res;
+  }
 };
 
 // src/controller/control/grid/grid/entity-schema.ts
@@ -31032,6 +31525,7 @@ async function calcColumnModelBySchema(json, c) {
       widthUnit: "PX",
       valueType: "SIMPLE",
       caption: item.description,
+      hideDefault: true,
       dataItemName: item.key
     });
     addDataItems.push({
@@ -31070,6 +31564,13 @@ var GridController = class extends MDControlController {
      * @type {boolean}
      */
     this.addSchemaColumn = false;
+    /**
+     * 是否显示百分比
+     *
+     * @type {boolean}
+     * @memberof GridController
+     */
+    this.showPercent = false;
     /**
      * 所有表格列控制器集合
      *
@@ -31232,6 +31733,7 @@ var GridController = class extends MDControlController {
    */
   async onCreated() {
     this.addSchemaColumn = this.controlParams.enablejsonschema === "true";
+    this.showPercent = this.controlParams.showpercent === "true";
     await this.initByEntitySchema();
     await super.onCreated();
     this.service = new GridService(this.model);
@@ -31295,7 +31797,7 @@ var GridController = class extends MDControlController {
     const result = await calcColumnModelBySchema(json, this);
     if (result && result.degridColumns.length > 0) {
       const { degridColumns, degridDataItems } = result;
-      this.model = clone27(this.model);
+      this.model = clone31(this.model);
       this.model.degridColumns = [
         ...this.model.degridColumns || [],
         ...degridColumns
@@ -31463,7 +31965,7 @@ var GridController = class extends MDControlController {
       } else {
         const toNum = Number(sortValue);
         if (Number.isNaN(toNum)) {
-          throw new RuntimeError57(
+          throw new RuntimeError58(
             ibiz.i18n.t("runtime.controller.control.grid.convertedValue", {
               srfmajortext: item.srfmajortext
             })
@@ -31497,6 +31999,7 @@ var GridController = class extends MDControlController {
     await this.loadRemoteAgg();
     this.calcAggResult(this.state.items);
     this.calcShowMode(this.state.items);
+    this.calcTotalData();
     return items;
   }
   /**
@@ -31605,7 +32108,6 @@ var GridController = class extends MDControlController {
    * 计算当前页的聚合数据
    * @author lxm
    * @date 2023-08-07 04:22:09
-   * @protected
    * @param {IData[]} items
    */
   calcAggResult(items) {
@@ -31654,7 +32156,7 @@ var GridController = class extends MDControlController {
     if (editShowMode === "row") {
       const editingRow = this.state.rows.find((item) => item.showRowEdit);
       if (editingRow) {
-        throw new RuntimeError57(
+        throw new RuntimeError58(
           ibiz.i18n.t("runtime.controller.common.md.firstComplete")
         );
       }
@@ -31697,7 +32199,7 @@ var GridController = class extends MDControlController {
     const isCreate = data.srfuf === 0 /* CREATE */;
     const rowState = this.findRowState(data);
     if (!rowState) {
-      throw new RuntimeError57(
+      throw new RuntimeError58(
         ibiz.i18n.t("runtime.controller.common.md.rowData")
       );
     }
@@ -31711,7 +32213,7 @@ var GridController = class extends MDControlController {
     }
     const isValid = await this.validate(rowState);
     if (!isValid) {
-      throw new RuntimeError57(
+      throw new RuntimeError58(
         ibiz.i18n.t("runtime.controller.control.grid.saveCancel")
       );
     }
@@ -31967,7 +32469,7 @@ var GridController = class extends MDControlController {
   }
   async toggleRowEdit() {
     if (!this.model.enableRowNew) {
-      throw new RuntimeError57(
+      throw new RuntimeError58(
         ibiz.i18n.t("runtime.controller.control.grid.noSupportRowEditing")
       );
     }
@@ -32002,12 +32504,12 @@ var GridController = class extends MDControlController {
     } else {
       const editingRow = this.state.rows.find((item) => item.showRowEdit);
       if (editingRow) {
-        throw new RuntimeError57(
+        throw new RuntimeError58(
           ibiz.i18n.t("runtime.controller.control.grid.lineEditing")
         );
       }
       if (row.data.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone27(row.data);
+        row.cacheData = clone31(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -32059,7 +32561,7 @@ var GridController = class extends MDControlController {
       (item) => item.id === updateId
     );
     if (!findUpdate) {
-      throw new RuntimeError57(
+      throw new RuntimeError58(
         ibiz.i18n.t("runtime.controller.control.grid.updateColumns", {
           updateId
         })
@@ -32150,7 +32652,7 @@ var GridController = class extends MDControlController {
    */
   formatExcelData(data) {
     const { fields = [] } = this.dataExportParam;
-    const cloneData = clone27(
+    const cloneData = clone31(
       data.map((item) => {
         return fields.reduce((obj, key) => {
           obj[key] = item[key];
@@ -32203,7 +32705,7 @@ var GridController = class extends MDControlController {
       data = this.getData();
     }
     if (data.length === 0) {
-      throw new RuntimeError57(
+      throw new RuntimeError58(
         ibiz.i18n.t("runtime.controller.control.grid.exported")
       );
     }
@@ -32219,7 +32721,7 @@ var GridController = class extends MDControlController {
   async exportData(args) {
     const { header } = this.dataExportParam;
     if (!header) {
-      throw new RuntimeError57(
+      throw new RuntimeError58(
         ibiz.i18n.t("runtime.controller.control.grid.tabularColumns")
       );
     }
@@ -32420,35 +32922,32 @@ var GridController = class extends MDControlController {
     super.actionNotification(tag, { ...opts || {} });
   }
   /**
-   * 拖拽变更事件处理回调
-   * @author: zzq
-   * @date 2024-04-22 18:12:58
-   * @return {*}  {Promise<void>}
+   * 拖拽改变
+   * @param dragging 拖拽目标
+   * @param drop 放置目标
+   * @param dropType 放置类型
    */
-  async onDragChange() {
-    const sortField = this.model.orderValueAppDEFieldId;
-    const getNextSort = (num) => {
-      return num + (100 - num % 100);
+  async onDragChange(dragging, drop, dropType) {
+    var _a;
+    const moveAction = (_a = this.model.moveControlAction) == null ? void 0 : _a.appDEMethodId;
+    if (!moveAction) {
+      throw new RuntimeModelError63(
+        this.model,
+        ibiz.i18n.t("runtime.controller.common.md.noMoveDataCconfig")
+      );
+    }
+    const moveParams = {
+      srftargetkey: drop.data.srfkey,
+      srfmovetype: dropType === "prev" ? "MOVEBEFORE" : "MOVEAFTER"
     };
-    const changedArr = this.state.rows.map((row) => row.data);
-    let lastSort;
-    const modifiedItems = [];
-    changedArr.forEach((item) => {
-      if (lastSort === void 0) {
-        lastSort = item[sortField] || 100;
-        if (!item[sortField]) {
-          item[sortField] = lastSort;
-          modifiedItems.push(item);
-        }
-      } else {
-        if (!item[sortField] || lastSort >= item[sortField]) {
-          item[sortField] = getNextSort(lastSort);
-          modifiedItems.push(item);
-        }
-        lastSort = item[sortField];
-      }
-    });
-    this.updateChangedItems(modifiedItems);
+    const res = await this.service.moveOrderItem(
+      this.context,
+      dragging.data,
+      moveParams
+    );
+    if (res.ok) {
+      this.refresh();
+    }
   }
   /**
    * 更新改变项数据
@@ -32476,13 +32975,40 @@ var GridController = class extends MDControlController {
       await this.afterLoad({}, this.state.items);
     }
   }
+  /**
+   * 计算统计数据
+   * @author: zzq
+   * @date 2024-06-28 17:12:58
+   * @return {*}  {Promise<void>}
+   */
+  calcTotalData() {
+    if (!this.showPercent) {
+      return;
+    }
+    const totalResult = {};
+    Object.values(this.fieldColumns).forEach((column) => {
+      const fieldName = column.model.id;
+      const result = this.state.items.map((item) => item[fieldName]).reduce((a, b) => plus2(a, b), 0);
+      if (result) {
+        totalResult[fieldName] = result;
+      }
+    });
+    this.state.totalResult = totalResult;
+  }
 };
 
 // src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
-import { DataTypes as DataTypes4, ModelError as ModelError29, plus as plus2 } from "@ibiz-template/core";
+import {
+  DataTypes as DataTypes4,
+  ModelError as ModelError29,
+  plus as plus3,
+  base64ToStr,
+  isBase64
+} from "@ibiz-template/core";
 import dayjs6 from "dayjs";
 import { debounce as debounce2 } from "lodash-es";
-import { clone as clone28, isNil as isNil29 } from "ramda";
+import { clone as clone32, isNil as isNil29 } from "ramda";
+import { isNilOrEmpty as isNilOrEmpty8 } from "qx-util";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
     super(...arguments);
@@ -32625,7 +33151,7 @@ var GridFieldColumnController = class extends GridColumnController {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone28(this.params);
+    const tempParams = clone32(this.params);
     const { context: newContext, params: newParams } = this.handlePublicParams(
       row.data,
       tempContext,
@@ -32714,10 +33240,10 @@ var GridFieldColumnController = class extends GridColumnController {
       if (this.grid.model.aggMode === "PAGE") {
         switch (aggMode) {
           case "SUM":
-            aggValue = items.map((item) => item[fieldName]).reduce((a, b) => plus2(a, b), 0);
+            aggValue = items.map((item) => item[fieldName]).reduce((a, b) => plus3(a, b), 0);
             break;
           case "AVG":
-            aggValue = items.map((item) => item[fieldName]).reduce((a, b) => plus2(a, b), 0) / items.length;
+            aggValue = items.map((item) => item[fieldName]).reduce((a, b) => plus3(a, b), 0) / items.length;
             break;
           case "MAX":
             aggValue = Math.max(
@@ -32774,7 +33300,10 @@ var GridFieldColumnController = class extends GridColumnController {
     if (this.model.valueType !== "SIMPLE") {
       return ValueExUtil.toText(this.model, value);
     }
-    const strVal = "".concat(value || "");
+    const strVal = "".concat(isNilOrEmpty8(value) ? "" : value);
+    if (Number.isNaN(Number(strVal)) && isBase64(strVal)) {
+      return base64ToStr(strVal);
+    }
     if (!this.valueFormat) {
       return strVal;
     }
@@ -32879,9 +33408,9 @@ var GridUAColumnController = class extends GridColumnController {
 };
 
 // src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts
-import { RuntimeError as RuntimeError58 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError59 } from "@ibiz-template/core";
 import Schema2 from "async-validator";
-import { isNilOrEmpty as isNilOrEmpty8 } from "qx-util";
+import { isNilOrEmpty as isNilOrEmpty9 } from "qx-util";
 var GridFieldEditColumnController = class extends GridFieldColumnController {
   constructor() {
     super(...arguments);
@@ -33019,7 +33548,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 RuntimeError58(
+        throw new RuntimeError59(
           ibiz.i18n.t("runtime.controller.control.grid.checksumErrors", {
             codeName: this.editItem.codeName,
             fieldName: row.errors[this.fieldName]
@@ -33125,7 +33654,7 @@ var GridFieldEditColumnController = class extends GridFieldColumnController {
    */
   async validate(row) {
     const editName = this.fieldName;
-    if (ibiz.config.grid.editShowMode !== "cell" && row.editColStates[editName].required === true && (typeof row.data[editName] === "string" ? isNilOrEmpty8(row.data[editName].trimEnd()) : isNilOrEmpty8(row.data[editName]))) {
+    if (ibiz.config.grid.editShowMode !== "cell" && row.editColStates[editName].required === true && (typeof row.data[editName] === "string" ? isNilOrEmpty9(row.data[editName].trimEnd()) : isNilOrEmpty9(row.data[editName]))) {
       row.errors[editName] = ibiz.i18n.t(
         "runtime.controller.control.form.fillIn",
         {
@@ -33343,7 +33872,7 @@ var ListController = class extends MDControlController {
 };
 
 // src/controller/control/panel/panel/panel.controller.ts
-import { recursiveIterate as recursiveIterate8, RuntimeError as RuntimeError59 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate8, RuntimeError as RuntimeError60 } from "@ibiz-template/core";
 import { AsyncSeriesHook as AsyncSeriesHook2 } from "qx-util";
 var PanelController = class extends ControlController {
   constructor(model, context, params, ctx, container) {
@@ -33500,7 +34029,7 @@ var PanelController = class extends ControlController {
     var _a, _b;
     const data = await this.prepareData();
     if (!data) {
-      throw new RuntimeError59(
+      throw new RuntimeError60(
         ibiz.i18n.t("runtime.controller.control.panel.panelData")
       );
     }
@@ -34146,7 +34675,7 @@ var PickupViewPanelController = class extends ControlController {
 
 // src/controller/control/search-bar/search-bar.controller.ts
 import { mergeInLeft as mergeInLeft3, recursiveIterate as recursiveIterate10 } from "@ibiz-template/core";
-import { clone as clone30 } from "ramda";
+import { clone as clone34 } from "ramda";
 import { isString as isString3 } from "lodash-es";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
@@ -34634,8 +35163,8 @@ async function calcFilterModelBySchema(json, appDataEntityId, modelAppId) {
 }
 
 // src/controller/control/search-bar/search-bar-filter-items.controller.ts
-import { RuntimeError as RuntimeError60 } from "@ibiz-template/core";
-import { clone as clone29 } from "ramda";
+import { RuntimeError as RuntimeError61 } from "@ibiz-template/core";
+import { clone as clone33 } from "ramda";
 var SubFieldRegex2 = /^N_(.\w+)_(.\w+)$/;
 var SearchBarFilterItemsController = class extends SearchBarFilterController {
   constructor(filterModels, appDataEntity, context, params) {
@@ -34693,7 +35222,7 @@ var SearchBarFilterItemsController = class extends SearchBarFilterController {
       return false;
     });
     if (!minorDEId) {
-      throw new RuntimeError60(
+      throw new RuntimeError61(
         ibiz.i18n.t("runtime.controller.control.searchBar.noFoundEntity", {
           targetField
         })
@@ -34720,7 +35249,7 @@ var SearchBarFilterItemsController = class extends SearchBarFilterController {
       const matches = subStr.match(SubFieldRegex2);
       const subField = matches[1];
       const subOP = matches[2];
-      const cloneItem = clone29(item);
+      const cloneItem = clone33(item);
       cloneItem.defsearchMode.valueOP = subOP;
       cloneItem.id = subField;
       const filterC = new SearchBarFilterController(
@@ -35172,7 +35701,7 @@ var SearchBarController = class extends ControlController {
       }
     });
     if (addSearchBarFilters.length > 0) {
-      this.model = clone30(this.model);
+      this.model = clone34(this.model);
       this.model.searchBarFilters = addSearchBarFilters.concat(...mergeFilters);
       this.model.enableFilter = true;
     }
@@ -35892,7 +36421,7 @@ var TabExpPanelController = class extends ControlController {
 
 // src/controller/control/tree/tree.controller.ts
 import {
-  RuntimeError as RuntimeError61,
+  RuntimeError as RuntimeError62,
   RuntimeModelError as RuntimeModelError66,
   recursiveIterate as recursiveIterate11
 } from "@ibiz-template/core";
@@ -36840,92 +37369,59 @@ var TreeController = class extends MDControlController {
    * @return {*}  {Promise<void>}
    */
   async onNodeDrop(draggingNode, dropNode, dropType) {
-    var _a, _b, _c;
+    var _a, _b;
     if (dropType === "inner" && !dropNode._leaf && dropNode._children === void 0) {
       await this.expandNodeByKey([dropNode._id]);
     }
-    const modifiedNodeDatas = [];
     const draggingNodeModel = this.getNodeModel(draggingNode._nodeId);
     const dropInNode = dropType === "inner" ? dropNode : dropNode._parent;
-    const isChangedParent = (dropNode == null ? void 0 : dropNode._id) !== ((_a = draggingNode._parent) == null ? void 0 : _a._id);
+    const isChangedParent = ((_a = dropNode._parent) == null ? void 0 : _a._id) !== ((_b = draggingNode._parent) == null ? void 0 : _b._id);
     let orderNodeModel = this.getNodeModel(dropNode._nodeId);
-    if (dropType === "inner" || ((_b = dropNode._parent) == null ? void 0 : _b._id) !== ((_c = draggingNode._parent) == null ? void 0 : _c._id)) {
+    if (dropType === "inner" || isChangedParent) {
       const dropNodeRs = this.findDropNodeRS(
         dropInNode._nodeId,
         draggingNodeModel.appDataEntityId
       );
       if (dropNodeRs) {
         draggingNode._deData[dropNodeRs.pickupDEFName] = dropInNode._value;
-        modifiedNodeDatas.push(draggingNode);
         orderNodeModel = this.getNodeModel(dropNodeRs.childDETreeNodeId);
       }
-    }
-    const originArr = draggingNode._parent._children;
-    originArr.splice(originArr.indexOf(draggingNode), 1);
-    if (dropType === "inner") {
-      if (!dropNode._children) {
-        dropNode._children = [];
-        dropNode._leaf = true;
-        this.state.expandedKeys.push(dropNode._id);
-      }
-      dropNode._children.push(draggingNode);
-    } else {
-      let insertIndex = dropInNode._children.indexOf(dropNode);
-      if (dropType === "next") {
-        insertIndex += 1;
-      }
-      dropInNode._children.splice(insertIndex, 0, draggingNode);
-    }
-    if (dropType === "inner" || isChangedParent) {
       draggingNode._parent = dropInNode;
       draggingNode._nodeId = orderNodeModel.id;
       this.state.expandedKeys = this.calcExpandedKeys([dropInNode]);
+      await this.updateDeNodeData([draggingNode]);
     }
-    const { sortAppDEFieldId, sortDir, allowOrder } = orderNodeModel;
-    if (allowOrder === true) {
-      if (!sortAppDEFieldId) {
-        throw new RuntimeModelError66(
-          orderNodeModel,
-          ibiz.i18n.t("runtime.controller.control.tree.sortAttribute")
-        );
-      }
-      const sortField = sortAppDEFieldId.toLowerCase();
-      const isAsc = sortDir === "ASC";
-      const changedArr = [...dropInNode._children];
-      if (!isAsc) {
-        changedArr.reverse();
-      }
-      const getNextSort = (num) => {
-        return num + (100 - num % 100);
-      };
-      const getSort = (deData) => {
-        return deData[sortField] || 0;
+    const { moveAppDEActionId, appDataEntityId, allowOrder } = orderNodeModel;
+    if (!moveAppDEActionId) {
+      throw new RuntimeModelError66(
+        this.model,
+        ibiz.i18n.t("runtime.controller.common.md.noMoveDataCconfig")
+      );
+    }
+    if (dropType !== "inner" && allowOrder) {
+      const moveParams = {
+        srftargetkey: dropNode.srfkey,
+        srfmovetype: dropType === "prev" ? "MOVEBEFORE" : "MOVEAFTER"
       };
-      let lastSort;
-      changedArr.forEach((item, index) => {
-        const deData = item._deData;
-        if (lastSort === void 0) {
-          if (item === draggingNode) {
-            if (index === 0) {
-              lastSort = 100;
-            } else {
-              lastSort = getNextSort(getSort(changedArr[index - 1]._deData));
-            }
-            deData[sortField] = lastSort;
-            if (modifiedNodeDatas.indexOf(item) === -1) {
-              modifiedNodeDatas.push(item);
-            }
-          }
+      const app = ibiz.hub.getApp(this.context.srfappid);
+      const deName = calcDeCodeNameById(appDataEntityId);
+      const tempContext = this.context.clone();
+      tempContext[deName] = draggingNode.srfkey;
+      const res = await app.deService.exec(
+        appDataEntityId,
+        moveAppDEActionId,
+        tempContext,
+        moveParams
+      );
+      if (res.ok) {
+        if (isChangedParent) {
+          await this.refreshNodeChildren(draggingNode, true);
+          await this.refreshNodeChildren(dropInNode);
         } else {
-          if (lastSort >= getSort(deData)) {
-            deData[sortField] = getNextSort(lastSort);
-            modifiedNodeDatas.push(item);
-          }
-          lastSort = getSort(deData);
+          await this.refreshNodeChildren(dropInNode);
         }
-      });
+      }
     }
-    await this.updateDeNodeData(modifiedNodeDatas);
     this._evt.emit("onAfterNodeDrop", { isChangedParent });
   }
   /**
@@ -36978,7 +37474,7 @@ var TreeController = class extends MDControlController {
       );
     }
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError61(
+      throw new RuntimeError62(
         ibiz.i18n.t("runtime.controller.control.tree.nodeData")
       );
     }
@@ -36996,7 +37492,7 @@ var TreeController = class extends MDControlController {
     let needRefresh = false;
     const treeNode = this.getNodeModel(item._nodeId);
     if (!treeNode) {
-      throw new RuntimeError61(
+      throw new RuntimeError62(
         ibiz.i18n.t("runtime.controller.control.tree.noFoundTreeNode")
       );
     }
@@ -37042,7 +37538,7 @@ var TreeController = class extends MDControlController {
 };
 
 // src/controller/control/wizard-panel/wizard-panel.controller.ts
-import { RuntimeError as RuntimeError62 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError63 } from "@ibiz-template/core";
 
 // src/controller/control/wizard-panel/wizard-panel.service.ts
 var WizardPanelService = class extends ControlService {
@@ -37230,7 +37726,7 @@ var WizardPanelController = class extends ControlController {
     const { activeFormTag } = this.state;
     const controller = this.formControllers.get(activeFormTag);
     if (!controller) {
-      throw new RuntimeError62(
+      throw new RuntimeError63(
         ibiz.i18n.t("runtime.controller.control.wizardPanel.formController", {
           activeFormTag
         })
@@ -37280,7 +37776,7 @@ var WizardPanelController = class extends ControlController {
   getWizardFormByTag(tag) {
     var _a;
     if (!((_a = this.model.dewizard) == null ? void 0 : _a.dewizardForms)) {
-      throw new RuntimeError62(
+      throw new RuntimeError63(
         ibiz.i18n.t("runtime.controller.control.wizardPanel.noConfiguration")
       );
       return;
@@ -37291,7 +37787,7 @@ var WizardPanelController = class extends ControlController {
       }
     );
     if (!wizardForm) {
-      throw new RuntimeError62(
+      throw new RuntimeError63(
         ibiz.i18n.t(
           "runtime.controller.control.wizardPanel.wizardFormIdentifier",
           { tag }
@@ -37383,7 +37879,7 @@ var WizardPanelController = class extends ControlController {
       prevTag = this.tagHistory[this.tagHistory.length - 1];
     }
     if (!prevTag) {
-      throw new RuntimeError62(
+      throw new RuntimeError63(
         ibiz.i18n.t("runtime.controller.control.wizardPanel.noPreviousForm")
       );
     }
@@ -37421,7 +37917,7 @@ var WizardPanelController = class extends ControlController {
         });
         const nextWizardStep = wizardSteps[index + 1];
         if (!nextWizardStep) {
-          throw new RuntimeError62(
+          throw new RuntimeError63(
             ibiz.i18n.t("runtime.controller.control.wizardPanel.nextStep")
           );
         }
@@ -37432,7 +37928,7 @@ var WizardPanelController = class extends ControlController {
       }
     }
     if (!nextTag) {
-      throw new RuntimeError62(
+      throw new RuntimeError63(
         ibiz.i18n.t("runtime.controller.control.wizardPanel.nextForm")
       );
     }
@@ -37818,11 +38314,11 @@ var MDCtrlController = class extends MDControlController {
 };
 
 // src/controller/control/kanban/kanban.controller.ts
-import { RuntimeError as RuntimeError63, RuntimeModelError as RuntimeModelError68 } from "@ibiz-template/core";
-import { clone as clone32, isNil as isNil33 } from "ramda";
+import { RuntimeError as RuntimeError64, RuntimeModelError as RuntimeModelError68 } from "@ibiz-template/core";
+import { clone as clone36, isNil as isNil33 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
-import { clone as clone31 } from "ramda";
+import { clone as clone35 } from "ramda";
 var KanbanService = class extends DataViewControlService {
   /**
    * 更新分组数据
@@ -37851,7 +38347,7 @@ var KanbanService = class extends DataViewControlService {
    */
   async moveOrderItem(context, data, args) {
     const moveAction = this.model.moveControlAction.appDEMethodId;
-    const params = clone31(data.getOrigin());
+    const params = clone35(data.getOrigin());
     Object.assign(params, args);
     let res = await this.exec(moveAction, context, params, {
       srfupdateitem: true
@@ -37937,7 +38433,7 @@ var KanbanController = class extends DataViewControlController {
       } else {
         const toNum = Number(sortValue);
         if (Number.isNaN(toNum)) {
-          throw new RuntimeError63(
+          throw new RuntimeError64(
             ibiz.i18n.t("runtime.controller.control.grid.convertedValue", {
               srfmajortext: item.srfmajortext
             })
@@ -38061,7 +38557,7 @@ var KanbanController = class extends DataViewControlController {
   }
   handleDataGroup() {
     if (!this.model.enableGroup || this.model.groupMode === "NONE") {
-      throw new RuntimeError63(
+      throw new RuntimeError64(
         ibiz.i18n.t("runtime.controller.control.kanban.groupedOn")
       );
     }
@@ -38183,7 +38679,7 @@ var KanbanController = class extends DataViewControlController {
       }
       return moveData;
     };
-    const draggedItem = clone32(fromGroup.children[fromIndex]);
+    const draggedItem = clone36(fromGroup.children[fromIndex]);
     const removeItems = fromGroup.children.splice(fromIndex, 1);
     toGroup.children.splice(toIndex, 0, ...removeItems);
     if (info.from !== info.to) {
@@ -38451,12 +38947,12 @@ var KanbanController = class extends DataViewControlController {
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts
 import {
-  RuntimeError as RuntimeError64,
+  RuntimeError as RuntimeError65,
   RuntimeModelError as RuntimeModelError69,
   awaitTimeout as awaitTimeout3,
   recursiveIterate as recursiveIterate12
 } from "@ibiz-template/core";
-import { clone as clone33 } from "ramda";
+import { clone as clone37 } from "ramda";
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.service.ts
 var TreeGridExService = class extends TreeService {
@@ -38736,13 +39232,13 @@ var TreeGridExController = class extends TreeController {
       return;
     }
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError64(
+      throw new RuntimeError65(
         ibiz.i18n.t("runtime.controller.control.gantt.nonentity")
       );
     }
     const rowState = this.state.rows[nodeData._uuid];
     if (!rowState) {
-      throw new RuntimeError64(
+      throw new RuntimeError65(
         ibiz.i18n.t("runtime.controller.common.md.rowData")
       );
     }
@@ -38758,7 +39254,7 @@ var TreeGridExController = class extends TreeController {
     const { appDataEntityId, updateAppDEActionId } = nodeModel;
     const isCreate = nodeData._deData.srfuf === 0 /* CREATE */;
     if (isCreate) {
-      throw new RuntimeError64(
+      throw new RuntimeError65(
         ibiz.i18n.t("runtime.controller.control.treeGridEx.noSupportCreation")
       );
     }
@@ -38923,12 +39419,12 @@ var TreeGridExController = class extends TreeController {
         (item) => item.showRowEdit
       );
       if (editingRow) {
-        throw new RuntimeError64(
+        throw new RuntimeError65(
           ibiz.i18n.t("runtime.controller.control.grid.lineEditing")
         );
       }
       if (row.data._deData.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone33(row.data);
+        row.cacheData = clone37(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -39038,10 +39534,10 @@ 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 RuntimeError65,
+  RuntimeError as RuntimeError66,
   RuntimeModelError as RuntimeModelError70
 } from "@ibiz-template/core";
-import { clone as clone34 } from "ramda";
+import { clone as clone38 } from "ramda";
 import dayjs7 from "dayjs";
 var TreeGridExNodeColumnController = class {
   /**
@@ -39243,7 +39739,7 @@ var TreeGridExNodeColumnController = class {
     const valueItem = this.nodeColumn.linkValueItem || "srfkey";
     const value = row.data[valueItem];
     if (value == null) {
-      throw new RuntimeError65(
+      throw new RuntimeError66(
         ibiz.i18n.t("runtime.controller.control.treeGridEx.noPickedUp", {
           valueItem
         })
@@ -39258,7 +39754,7 @@ var TreeGridExNodeColumnController = class {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone34(this.params);
+    const tempParams = clone38(this.params);
     const { userParam } = this.nodeColumn;
     if (userParam) {
       const { navigateContexts, navigateParams } = parseUserParams(userParam);
@@ -39672,7 +40168,7 @@ var TreeGridService = class extends GridService {
 };
 
 // src/controller/control/medit-view-panel/medit-view-panel.controller.ts
-import { RuntimeError as RuntimeError66 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError67 } from "@ibiz-template/core";
 import { createUUID as createUUID14 } from "qx-util";
 
 // src/controller/control/medit-view-panel/medit-view-panel.service.ts
@@ -39892,7 +40388,7 @@ var MEditViewPanelController = class extends MDControlController {
       (item) => item.id === id
     );
     if (panelUiItemIndex < 0) {
-      throw new RuntimeError66(
+      throw new RuntimeError67(
         ibiz.i18n.t("runtime.controller.control.meditViewPanel.dataExist")
       );
     }
@@ -40135,15 +40631,14 @@ var ReportPanelBaseGenerator = class {
     this.config = {};
     this.model = model;
     this.reportPanel = reportPanel;
-    this.setConfig();
   }
   /**
-   * 设置配置
+   * 初始化配置
    *
-   * @protected
-   * @memberof ReportPanelBaseGenerator
+   * @author tony001
+   * @date 2024-06-26 16:06:01
    */
-  setConfig() {
+  async initConfig() {
   }
   /**
    * 初始化
@@ -40169,12 +40664,12 @@ var ReportPanelBaseGenerator = class {
 // src/controller/control/report-panel/generator/user-generator.ts
 var UserReportPanelGenerator = class extends ReportPanelBaseGenerator {
   /**
-   * 设置配置，临时使用，后续需更新 todo
+   * 初始化配置
    *
    * @protected
    * @memberof UserReportPanelGenerator
    */
-  setConfig() {
+  async initConfig() {
     this.config = {
       CONFIG: {
         fitView: true,
@@ -40232,32 +40727,20 @@ var User2ReportPanelGenerator = class extends ReportPanelBaseGenerator {
 };
 
 // src/controller/control/report-panel/generator/bi-generator.ts
-import { RuntimeError as RuntimeError67 } from "@ibiz-template/core";
 var BIReportPanelGenerator = class extends ReportPanelBaseGenerator {
   /**
-   * 设置配置
+   * 初始化配置
    *
    * @author tony001
-   * @date 2024-06-18 14:06:38
-   * @protected
+   * @date 2024-06-26 16:06:54
+   * @return {*}  {Promise<void>}
    */
-  setConfig() {
-    var _a;
-    if (!((_a = this.model.appDEReport) == null ? void 0 : _a.reportUIModel)) {
-      throw new RuntimeError67(
-        ibiz.i18n.t("runtime.controller.control.reportPanel.noReportUIModel")
-      );
-    }
-    const sourceModel = ScriptFactory.execScriptFn(
-      {},
-      this.model.appDEReport.reportUIModel,
-      {
-        isAsync: false,
-        singleRowReturn: true
-      }
-    );
-    sourceModel.reportTag = this.model.appDEReport.id;
-    this.config = sourceModel;
+  async initConfig() {
+    const { appDEReport } = this.model;
+    const { appBIReport } = appDEReport;
+    const appBISchemeId = appDEReport.appBISchemeId.split(".").pop();
+    appBIReport.appBISchemeId = appBISchemeId;
+    this.config = appBIReport;
   }
   /**
    * 加载数据
@@ -40363,6 +40846,9 @@ var ReportPanelController = class extends ControlController {
   async onCreated() {
     await super.onCreated();
     this.generator = ReportPanelGeneratorFactory.getInstance(this.model, this);
+    if (this.generator) {
+      await this.generator.initConfig();
+    }
     this.dataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.model.appId
@@ -40497,7 +40983,9 @@ var ReportPanelController = class extends ControlController {
           dismiss: (_data) => modal.dismiss(_data),
           context: this.context,
           viewParams: this.params,
-          config: this.generator.config
+          config: await ibiz.util.biReport.translateReportPanelToConfig(
+            this.model
+          )
         },
         {
           width: "90%",
@@ -41337,83 +41825,6 @@ var GanttController = class extends TreeGridExController {
       }
     }
   }
-  /**
-   * 处理节点拖入事件
-   *
-   * @param {IGanttNodeData} draggingNode 拖动节点
-   * @param {IGanttNodeData} dropNode 目标节点
-   * @param {('inner' | 'prev' | 'next')} dropType 拖放类型
-   * @return {*}  {Promise<void>}
-   * @memberof GanttController
-   */
-  async onNodeDrop(draggingNode, dropNode, dropType) {
-    var _a, _b;
-    if (dropType === "inner" && !dropNode._leaf && dropNode._children === void 0) {
-      await this.expandNodeByKey([dropNode._id]);
-    }
-    const modifiedNodeDatas = [];
-    const draggingNodeModel = this.getNodeModel(draggingNode._nodeId);
-    const dropInNode = dropType === "inner" ? dropNode : dropNode._parent;
-    let orderNodeModel = this.getNodeModel(dropNode._nodeId);
-    if (dropType === "inner" || ((_a = dropNode._parent) == null ? void 0 : _a._id) !== ((_b = draggingNode._parent) == null ? void 0 : _b._id)) {
-      const dropNodeRs = this.findDropNodeRS(
-        dropInNode._nodeId,
-        draggingNodeModel.appDataEntityId
-      );
-      if (dropNodeRs) {
-        draggingNode._deData[dropNodeRs.pickupDEFName] = dropInNode._value;
-        modifiedNodeDatas.push(draggingNode);
-        orderNodeModel = this.getNodeModel(dropNodeRs.childDETreeNodeId);
-      }
-      draggingNode._parent = dropInNode;
-      draggingNode._nodeId = orderNodeModel.id;
-    }
-    const { sortAppDEFieldId, sortDir, allowOrder } = orderNodeModel;
-    if (allowOrder === true) {
-      if (!sortAppDEFieldId) {
-        throw new RuntimeModelError72(
-          orderNodeModel,
-          ibiz.i18n.t("runtime.controller.control.tree.sortAttribute")
-        );
-      }
-      const sortField = sortAppDEFieldId.toLowerCase();
-      const isAsc = sortDir === "ASC";
-      const changedArr = dropInNode._children;
-      if (!isAsc) {
-        changedArr.reverse();
-      }
-      const getNextSort = (num) => {
-        return num + (100 - num % 100);
-      };
-      const getSort = (deData) => {
-        return deData[sortField] || 0;
-      };
-      let lastSort;
-      changedArr.forEach((item, index) => {
-        const deData = item._deData;
-        if (lastSort === void 0) {
-          if (item === draggingNode) {
-            if (index === 0) {
-              lastSort = 100;
-            } else {
-              lastSort = getNextSort(getSort(changedArr[index - 1]._deData));
-            }
-            deData[sortField] = lastSort;
-            if (modifiedNodeDatas.indexOf(item) === -1) {
-              modifiedNodeDatas.push(item);
-            }
-          }
-        } else {
-          if (lastSort >= getSort(deData)) {
-            deData[sortField] = getNextSort(lastSort);
-            modifiedNodeDatas.push(item);
-          }
-          lastSort = getSort(deData);
-        }
-      });
-    }
-    await this.updateDeNodeData(modifiedNodeDatas);
-  }
   onDEDataChange(msg) {
   }
 };
@@ -41527,7 +41938,7 @@ import { QXEvent as QXEvent11 } from "qx-util";
 
 // src/controller/notification/async-action.controller.ts
 import { QXEvent as QXEvent9 } from "qx-util";
-import { clone as clone35 } from "ramda";
+import { clone as clone39 } from "ramda";
 import { isNil as isNil34, isNumber as isNumber2 } from "lodash-es";
 import dayjs8 from "dayjs";
 var AsyncActionController = class {
@@ -41638,7 +42049,7 @@ var AsyncActionController = class {
     } else {
       this.noticeResult(action);
     }
-    this.evt.emit("add", clone35(action));
+    this.evt.emit("add", clone39(action));
     this.evt.emit("dataChange");
   }
   /**
@@ -41660,7 +42071,7 @@ var AsyncActionController = class {
       }
       this.noticeResult(action);
     }
-    this.evt.emit("change", clone35(action));
+    this.evt.emit("change", clone39(action));
     this.evt.emit("dataChange");
   }
   noticeResult(action) {
@@ -42302,6 +42713,11 @@ var AppHub = class {
     const app = await this.getAppAsync(appId2);
     return app.deService.getService(context, entityId);
   }
+  async translationModelToDsl(data, type) {
+    if (this.modelLoaderProvider) {
+      return this.modelLoaderProvider.translationModelToDsl(data, type);
+    }
+  }
   reset() {
     this.appMap.clear();
     this.configCache = void 0;
@@ -42820,7 +43236,7 @@ var ViewEngineBase = class {
 
 // src/engine/md-view.engine.ts
 import { RuntimeModelError as RuntimeModelError73 } from "@ibiz-template/core";
-import { clone as clone36 } from "ramda";
+import { clone as clone40 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
    * 多数据部件名称
@@ -43075,7 +43491,7 @@ var MDViewEngine = class extends ViewEngineBase {
         ibiz.i18n.t("runtime.engine.logicNewdata")
       );
     }
-    const params = clone36(this.view.params);
+    const params = clone40(this.view.params);
     if (copyMode) {
       params.srfcopymode = copyMode;
     }
@@ -43323,6 +43739,13 @@ var GlobalUtil = class {
      * @memberof GlobalUtil
      */
     this.file = new FileUtil();
+    /**
+     * bi报表工具类
+     *
+     * @author tony001
+     * @date 2024-06-30 11:06:13
+     */
+    this.biReport = new BIReportUtil();
     this.error.register(new DefaultErrorHandler());
   }
   /**
@@ -45788,6 +46211,7 @@ export {
   Application,
   AsyncActionService,
   AuthorityService,
+  BIReportUtil,
   BackendUIActionProvider,
   BaseController,
   BrowserPlatformProvider,