@ibiz-template/runtime 0.7.26-alpha.1 → 0.7.26

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 {
@@ -1834,6 +1834,24 @@ var ScriptFactory = class {
       args
     );
   }
+  /**
+   * 直接创建并同步执行脚本
+   *
+   * @author tony001
+   * @date 2024-06-25 14:06:25
+   * @static
+   * @param {IParams} args
+   * @param {string} scriptCode
+   * @param {IScriptFunctionOpts} [options={}]
+   * @return {*}  {Promise<unknown>}
+   */
+  static async asyncExecScriptFn(args, scriptCode, options = {}) {
+    const result = await this.createScriptFn(Object.keys(args), scriptCode, {
+      ...options,
+      isAsync: true
+    }).exec(args);
+    return result;
+  }
   /**
    * 执行单行脚本
    * @author lxm
@@ -6708,6 +6726,7 @@ var AppDataEntity = class _AppDataEntity {
   clone() {
     const entity = new _AppDataEntity(this._entity, this._data);
     entity.srfkey = this.srfkey;
+    entity.srfordervalue = this.srfordervalue;
     return entity;
   }
   /**
@@ -6722,6 +6741,7 @@ var AppDataEntity = class _AppDataEntity {
     let _data = {};
     if (data instanceof _AppDataEntity) {
       _data = data._data;
+      this.srfordervalue = data.srfordervalue;
     } else {
       _data = data;
     }
@@ -11443,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 {
@@ -13071,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"));
   }
@@ -13491,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);
@@ -15056,6 +15077,122 @@ 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 = this.translateReportToConfig(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}
+   */
+  translateReportToConfig(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;
+    const biReportItems = {};
+    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()
+          });
+        }
+        if (item.birepitemtype === "DIMENSION") {
+          if (!biReportItems.dimension) {
+            biReportItems.dimension = [];
+          }
+          biReportItems.dimension.push({
+            pssysbischemeid: item.pssysbischemeid,
+            pssysbicubedimensionid: item.pssysbicubedimensionid,
+            pssysbicubeid: item.pssysbicubeid,
+            codename: (_b = item.pssysbicubedimensionid) == null ? void 0 : _b.split(".").pop()
+          });
+        }
+      });
+    }
+    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 });
+    }
+    config.propertyData = propertyData;
+    return config;
+  }
+};
+
 // src/utils/dr-ctrl-util/index.ts
 function calcItemVisibleByCounter(item, counter) {
   const { enableMode, counterId } = item;
@@ -15113,8 +15250,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));
@@ -15131,13 +15268,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
         })
@@ -15260,7 +15397,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
@@ -15318,7 +15455,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
         })
@@ -15362,7 +15499,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
         })
@@ -15400,7 +15537,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 脚本
@@ -15414,7 +15551,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"));
   }
   /**
    * 自定义应用功能
@@ -15428,7 +15565,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"));
   }
 };
 /**
@@ -15449,7 +15586,7 @@ function installCommand() {
 }
 
 // src/app-hub.ts
-import { RuntimeError as RuntimeError68 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError69 } from "@ibiz-template/core";
 
 // src/application.ts
 import { Net, getToken } from "@ibiz-template/core";
@@ -15705,7 +15842,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() {
     /**
@@ -15776,7 +15913,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,
@@ -15846,7 +15983,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";
 
@@ -15854,7 +15991,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.
@@ -15916,7 +16053,7 @@ var Counter = class {
       return;
     }
     if (this.count === 0) {
-      throw new RuntimeError28(
+      throw new RuntimeError29(
         ibiz.i18n.t("runtime.controller.utils.counter.decrement")
       );
     }
@@ -16525,7 +16662,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) {
@@ -16575,7 +16712,7 @@ function generateRules(itemVRs, name, valueItemName) {
             deRule.groupCond
           );
           if (!isPast) {
-            callback(new RuntimeError29(infoMessage || deRule.ruleInfo));
+            callback(new RuntimeError30(infoMessage || deRule.ruleInfo));
           }
           return true;
         },
@@ -16648,7 +16785,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 {
   /**
@@ -16680,7 +16817,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")
         );
       }
@@ -16698,7 +16835,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";
@@ -16739,7 +16876,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")
         );
       }
@@ -16760,7 +16897,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";
@@ -16865,13 +17002,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")
     );
   }
@@ -16901,7 +17038,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")
     );
   }
@@ -17098,7 +17235,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 {
@@ -17133,7 +17270,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
         })
@@ -17151,7 +17288,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(",")
         })
@@ -18039,7 +18176,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
         })
@@ -18528,9 +18665,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 {
   /**
@@ -18594,7 +18731,7 @@ var ControlController = class extends BaseController {
         "".concat(model.controlType, "_DEFAULT")
       );
       if (panelModel) {
-        this.controlPanel = clone19(panelModel);
+        this.controlPanel = clone20(panelModel);
       }
     }
     this.updateContextParams({});
@@ -18955,7 +19092,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
           })
@@ -18996,7 +19133,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";
@@ -19269,7 +19406,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")
       );
     }
@@ -19469,10 +19606,11 @@ var MDControlController = class extends ControlController {
    * @return {*}  {void}
    */
   onDEDataChange(msg) {
+    var _a;
     if (!isNil24(msg.triggerKey) && msg.triggerKey === this.triggerKey) {
       return;
     }
-    if (!msg.data || msg.data.srfdecodename !== this.dataEntity.codeName) {
+    if (!msg.data || msg.data.srfdecodename !== ((_a = this.dataEntity) == null ? void 0 : _a.codeName)) {
       return;
     }
     let isRefresh = false;
@@ -19505,7 +19643,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";
 
@@ -19761,7 +19899,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 })
       );
     }
@@ -19896,7 +20034,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 {
@@ -19906,7 +20044,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 })
       );
     }
@@ -19937,11 +20075,11 @@ var AppMenuIconViewController = class extends AppMenuController {
 
 // src/controller/control/calendar/calendar.controller.ts
 import dayjs3 from "dayjs";
-import { RuntimeModelError as RuntimeModelError29 } from "@ibiz-template/core";
+import { RuntimeError as 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 {
   /**
    * 执行查询多条数据的方法
@@ -19962,7 +20100,7 @@ var CalendarService = class extends MDControlService {
       async (item) => {
         const fetchAction = item.appDEDataSetId || "fetchdefault";
         const tempContext = context.clone();
-        const tempParams = clone20(params);
+        const tempParams = this.handleRequestParams(item, params);
         if (item.maxSize) {
           tempParams.size = item.maxSize;
         }
@@ -19996,13 +20134,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")
       );
     }
@@ -20033,6 +20171,26 @@ var CalendarService = class extends MDControlService {
     );
     return res;
   }
+  /**
+   * 处理请求参数
+   *
+   * @private
+   * @param {ISysCalendarItem} item
+   * @param {IParams} params
+   * @return {*}  {IParams}
+   * @memberof CalendarService
+   */
+  handleRequestParams(item, params) {
+    const tempParams = clone21(params);
+    const { srfstartdate, srfenddate } = tempParams;
+    Object.assign(tempParams, {
+      ["n_".concat(item.beginTimeAppDEFieldId, "_gtandeq")]: srfstartdate,
+      ["n_".concat(item.endTimeAppDEFieldId, "_ltandeq")]: srfenddate
+    });
+    delete tempParams.srfstartdate;
+    delete tempParams.srfenddate;
+    return tempParams;
+  }
 };
 
 // src/controller/control/calendar/calendar.controller.ts
@@ -20046,9 +20204,13 @@ var CalendarController = class extends MDControlController {
    * @memberof CalendarController
    */
   initState() {
+    var _a, _b;
     super.initState();
     this.state.selectedDate = /* @__PURE__ */ new Date();
     this.state.size = 1e3;
+    this.state.legends = [];
+    this.state.calendarTitle = this.model.logicName || "";
+    this.state.showDetail = ((_b = (_a = this.model.controlParam) == null ? void 0 : _a.ctrlParams) == null ? void 0 : _b.SHOWDETAIL) || false;
   }
   /**
    * 生命周期-创建完成
@@ -20064,6 +20226,30 @@ var CalendarController = class extends MDControlController {
     this.service = new CalendarService(this.model);
     await this.service.init(this.context);
     this.initViewScheduler();
+    this.initCalendarLegends();
+  }
+  /**
+   * 初始化日历图例
+   *
+   * @protected
+   * @memberof CalendarController
+   */
+  initCalendarLegends() {
+    const { sysCalendarItems } = this.model;
+    if (!sysCalendarItems) {
+      throw new RuntimeError41(
+        ibiz.i18n.t("runtime.controller.control.calendar.noFoundModel")
+      );
+    }
+    sysCalendarItems.forEach((calendarItem) => {
+      const { id, name, bkcolor, color } = calendarItem;
+      this.state.legends.push({
+        id,
+        name,
+        bkcolor,
+        color
+      });
+    });
   }
   /**
    * 初始化视图触发器
@@ -20072,7 +20258,7 @@ var CalendarController = class extends MDControlController {
    * @memberof CalendarService
    */
   initViewScheduler() {
-    const viewLogics = this.model.appViewLogics || [];
+    const viewLogics = getViewLogics(this.model);
     if (viewLogics.length !== 0) {
       this.viewScheduler = ibiz.scheduler.createViewScheduler(viewLogics);
       this.viewScheduler.defaultParamsCb = () => {
@@ -20085,6 +20271,19 @@ var CalendarController = class extends MDControlController {
       }
     }
   }
+  /**
+   * 销毁
+   *
+   * @protected
+   * @return {*}  {Promise<void>}
+   * @memberof LightCalendarController
+   */
+  async onDestroyed() {
+    await super.onDestroyed();
+    if (this.viewScheduler) {
+      this.viewScheduler.destroy();
+    }
+  }
   /**
    * 设置激活数据
    *
@@ -20093,10 +20292,13 @@ var CalendarController = class extends MDControlController {
    * @memberof CalendarService
    */
   async setActive(item) {
-    this.openData(item);
-    return this._evt.emit("onActive", {
-      data: [item]
+    this._evt.emit("onActive", {
+      data: item ? [item] : []
     });
+    if (!item) {
+      return;
+    }
+    await this.openData(item);
   }
   /**
    * 打开编辑数据视图
@@ -20105,11 +20307,11 @@ var CalendarController = class extends MDControlController {
    * @memberof CalendarService
    */
   async openData(item) {
-    var _a, _b;
+    var _a, _b, _c;
     const context = this.context.clone();
-    const deName = ((_a = item.deData.srfdecodename) == null ? void 0 : _a.toLowerCase()) || calcDeCodeNameById(this.model.appDataEntityId);
+    const deName = ((_b = (_a = item.deData) == null ? void 0 : _a.srfdecodename) == null ? void 0 : _b.toLowerCase()) || calcDeCodeNameById(this.model.appDataEntityId);
     context[deName.toLowerCase()] = item.deData.srfkey;
-    const result = await ((_b = this.viewScheduler) == null ? void 0 : _b.triggerCustom(
+    const result = await ((_c = this.viewScheduler) == null ? void 0 : _c.triggerCustom(
       "".concat(item.itemType.toLowerCase(), "_opendata"),
       {
         context,
@@ -20216,21 +20418,61 @@ var CalendarController = class extends MDControlController {
    */
   getCurSelectDate(param) {
     const { selectedDate } = this.state;
-    const { srfstartdate, srfenddate } = param;
+    const { calendarStyle } = this.model;
+    let { srfstartdate, srfenddate } = param;
     if (!srfstartdate || !srfenddate) {
-      const firstDayOfMonth = new Date(
-        selectedDate.getFullYear(),
-        selectedDate.getMonth(),
-        1
-      );
-      const lastDayOfMonth = new Date(
-        selectedDate.getFullYear(),
-        selectedDate.getMonth() + 1,
-        1
-      );
+      switch (calendarStyle) {
+        case "DAY":
+          srfstartdate = new Date(
+            selectedDate.getFullYear(),
+            selectedDate.getMonth(),
+            selectedDate.getDate()
+          );
+          srfenddate = new Date(
+            new Date(
+              selectedDate.getFullYear(),
+              selectedDate.getMonth(),
+              selectedDate.getDate() + 1
+            ).getTime() - 1
+          );
+          break;
+        case "WEEK":
+          const currentDayOfWeek = selectedDate.getDay();
+          const offset = currentDayOfWeek > 0 ? -currentDayOfWeek + 1 : -6;
+          srfstartdate = new Date(
+            selectedDate.getFullYear(),
+            selectedDate.getMonth(),
+            selectedDate.getDate() + offset
+          );
+          srfenddate = new Date(
+            new Date(
+              srfstartdate.getFullYear(),
+              srfstartdate.getMonth(),
+              srfstartdate.getDate() + 7
+            ).getTime() - 1
+          );
+          break;
+        case "MONTH":
+          srfstartdate = new Date(
+            selectedDate.getFullYear(),
+            selectedDate.getMonth(),
+            1
+          );
+          srfenddate = new Date(
+            new Date(
+              selectedDate.getFullYear(),
+              selectedDate.getMonth() + 1,
+              1
+            ).getTime() - 1
+          );
+          break;
+        default:
+          ibiz.log.warn("\u65E5\u5386".concat(calendarStyle, "\u6837\u5F0F\u6682\u672A\u652F\u6301"));
+          break;
+      }
       return {
-        srfstartdate: dayjs3(firstDayOfMonth).format("YYYY-MM-DD HH:mm:ss"),
-        srfenddate: dayjs3(lastDayOfMonth).format("YYYY-MM-DD HH:mm:ss")
+        srfstartdate: dayjs3(srfstartdate).format("YYYY-MM-DD HH:mm:ss"),
+        srfenddate: dayjs3(srfenddate).format("YYYY-MM-DD HH:mm:ss")
       };
     }
     return { srfstartdate, srfenddate };
@@ -20279,6 +20521,10 @@ var CalendarController = class extends MDControlController {
    * @memberof CalendarController
    */
   async onRowClick(data) {
+    if (!data) {
+      this.setSelection([]);
+      return;
+    }
     const { selectedData } = this.state;
     const filterArr = selectedData.filter(
       (item) => item.deData.srfkey !== data.deData.srfkey
@@ -20308,12 +20554,12 @@ var CalendarController = class extends MDControlController {
 };
 
 // src/controller/control/chart/chart.controller.ts
-import { RuntimeError as RuntimeError41 } 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 RuntimeError40 } 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";
@@ -20326,7 +20572,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);
@@ -20560,7 +20806,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++) {
@@ -20637,10 +20883,9 @@ var BaseSeriesGenerator = class {
       } else {
         this.prepareChartData(
           groupData,
-          {
-            ...item,
+          Object.assign(item, {
             [this.valueField]: groupData[group].get(catalog).value
-          },
+          }),
           catalog,
           group
         );
@@ -20727,7 +20972,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) {
@@ -21035,7 +21280,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 {
@@ -21110,7 +21355,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,
@@ -21370,6 +21618,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轴配置
    *
@@ -21377,27 +21731,58 @@ var ChartOptionsGenerator2 = class {
    * @memberof ChartOptionsGenerator
    */
   async initMultiCatalogxAxis(context, params) {
-    var _a, _b, _c, _d, _e;
+    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
         );
         const tempaxis = [];
         let titleshow = true;
-        let labelshoww = true;
+        let labelshow = true;
         let gridIndex = 0;
         if (Array.isArray(tempCatalogFields)) {
           const app = ibiz.hub.getApp(context.srfappid);
-          if (this.chartUserParam && this.chartUserParam.xAxis) {
-            if (Array.isArray(this.chartUserParam.xAxis)) {
-              const tempconfig = this.chartUserParam.xAxis[this.chartUserParam.xAxis.length - 1];
-              titleshow = tempconfig.name === void 0 ? true : !!tempconfig.name;
-              labelshoww = ((_b = tempconfig.axisLabel) == null ? void 0 : _b.show) === void 0 ? true : (_c = tempconfig.axisLabel) == null ? void 0 : _c.show;
+          if (this.chartUserParam) {
+            let tempconfig = {};
+            if (((_f = controlParam.ctrlParams) == null ? void 0 : _f.MODE) === "ROW") {
+              if (Array.isArray(this.chartUserParam.yAxis)) {
+                tempconfig = this.chartUserParam.yAxis[this.chartUserParam.yAxis.length - 1];
+              } else {
+                tempconfig = this.chartUserParam.yAxis;
+              }
+            } else if (Array.isArray(this.chartUserParam.xAxis)) {
+              tempconfig = this.chartUserParam.xAxis[this.chartUserParam.xAxis.length - 1];
             } else {
-              titleshow = this.chartUserParam.xAxis.name === void 0 ? true : !!this.chartUserParam.xAxis.name;
-              labelshoww = ((_d = this.chartUserParam.xAxis.axisLabel) == null ? void 0 : _d.show) === void 0 ? true : (_e = this.chartUserParam.xAxis.axisLabel) == null ? void 0 : _e.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)) {
@@ -21405,6 +21790,7 @@ var ChartOptionsGenerator2 = class {
           }
           await Promise.all(
             tempCatalogFields.slice(0, -1).map(async (catalog, index) => {
+              var _a2;
               if (catalog.mode === "codelist" && catalog.codelistId) {
                 const codeListItems = await app.codeList.get(
                   catalog.codelistId,
@@ -21412,33 +21798,40 @@ var ChartOptionsGenerator2 = class {
                   params
                 );
                 if (codeListItems) {
-                  const tempxAxisData = [];
-                  const xAxisData = codeListItems.map((code) => {
-                    return {
-                      value: code.text,
-                      textStyle: {
-                        lineHeight: 45 * (tempCatalogFields.length - 1 - index)
-                      }
-                    };
-                  });
-                  if (index === 0) {
+                  if (((_a2 = controlParam.ctrlParams) == null ? void 0 : _a2.MODE) === "ROW") {
+                    const yAxisData = this.handleAxisLayout(
+                      codeListItems,
+                      40,
+                      tempCatalogFields.length,
+                      index
+                    );
+                    const tempxAxisData = this.handleAxisLevel(
+                      tempaxis,
+                      index,
+                      yAxisData
+                    );
                     tempaxis.push({
-                      show: labelshoww,
+                      show: labelshow,
                       gridIndex,
                       type: "category",
-                      data: xAxisData,
-                      position: "bottom"
+                      data: tempxAxisData,
+                      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(...xAxisData);
-                    }
+                    const xAxisData = this.handleAxisLayout(
+                      codeListItems,
+                      24,
+                      tempCatalogFields.length,
+                      index,
+                      false
+                    );
+                    const tempxAxisData = this.handleAxisLevel(
+                      tempaxis,
+                      index,
+                      xAxisData
+                    );
                     tempaxis.push({
-                      show: labelshoww,
+                      show: labelshow,
                       gridIndex,
                       type: "category",
                       data: tempxAxisData,
@@ -21452,50 +21845,77 @@ var ChartOptionsGenerator2 = class {
           const mergeName = tempCatalogFields.map((catalog) => {
             return catalog.name;
           }).join("/");
-          tempaxis.push({
-            type: "category",
-            gridIndex,
-            show: titleshow,
-            data: [
-              {
-                value: mergeName,
-                textStyle: {
-                  lineHeight: labelshoww ? 45 * tempCatalogFields.length : 45
-                }
-              }
-            ],
-            position: "bottom"
-          });
+          let catalogLength = tempCatalogFields.length;
+          if (!labelshow) {
+            catalogLength = 1;
+          }
+          if (!titleshow) {
+            catalogLength -= 1;
+          }
           if (this.chartUserParam) {
-            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 (!labelshoww) {
-              length = 1;
-            }
-            if (!titleshow) {
-              length -= 1;
-            }
-            if (length === 0) {
-              Object.assign(this.chartUserParam.grid, {
-                bottom: 45
+            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: (catalogLength + 1) * 40
+                });
+              }
+              tempaxis.push({
+                type: "category",
+                gridIndex,
+                show: titleshow,
+                data: [
+                  {
+                    value: mergeName.split("").join("\n"),
+                    textStyle: {
+                      padding: [0, catalogLength * 40, 0, 0]
+                    }
+                  }
+                ],
+                position: "left"
               });
+              if (this.chartUserParam.yAxis) {
+                this.chartUserParam.yAxis = this.mergeAxisData(
+                  this.chartUserParam.yAxis,
+                  tempaxis
+                );
+              }
             } else {
-              Object.assign(this.chartUserParam.grid, {
-                bottom: (length > 2 ? length - 1 : length) * 45
+              if (catalogLength === 0) {
+                Object.assign(this.chartUserParam.grid, {
+                  bottom: 30
+                });
+              } else {
+                Object.assign(this.chartUserParam.grid, {
+                  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
+                );
+              }
             }
           }
         }
@@ -21645,7 +22065,7 @@ var ChartOptionsGenerator2 = class {
   getChartDataByParams(params) {
     const generator = this.seriesGeneratorIndexMap.get(params.seriesIndex);
     if (!generator) {
-      throw new RuntimeError40(
+      throw new RuntimeError42(
         ibiz.i18n.t("runtime.controller.control.chart.noFindSequence", {
           seriesIndex: params.seriesIndex
         })
@@ -21929,12 +22349,12 @@ var ChartController = class extends MDControlController {
    */
   updateChart() {
     if (!this.chart) {
-      throw new RuntimeError41(
+      throw new RuntimeError43(
         ibiz.i18n.t("runtime.controller.control.chart.noInitialised")
       );
     }
     if (!this.options) {
-      throw new RuntimeError41(
+      throw new RuntimeError43(
         ibiz.i18n.t("runtime.controller.control.chart.noCalculated")
       );
     }
@@ -21986,7 +22406,7 @@ var CaptionBarController = class extends ControlController {
 };
 
 // src/controller/control/toolbar/toolbar.controllerr.ts
-import { recursiveIterate as recursiveIterate2, RuntimeError as RuntimeError50 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate2, RuntimeError as RuntimeError52 } from "@ibiz-template/core";
 
 // src/ui-action/provider/backend-ui-action-provider.ts
 import { RuntimeModelError as RuntimeModelError52 } from "@ibiz-template/core";
@@ -21996,7 +22416,7 @@ import { isArray as isArray8 } from "qx-util";
 import { RuntimeModelError as RuntimeModelError51 } from "@ibiz-template/core";
 
 // src/ui-logic/index.ts
-import { RuntimeError as RuntimeError47 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError49 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic.ts
 import { ModelError as ModelError25, RuntimeModelError as RuntimeModelError50 } from "@ibiz-template/core";
@@ -22169,7 +22589,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";
@@ -22196,7 +22616,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(
@@ -22652,8 +23072,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 RuntimeError42 } 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;
@@ -22663,7 +23083,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":
@@ -22718,7 +23138,7 @@ var PrepareJSParamNode = class extends UILogicNode {
   setParamValue(nodeParam, ctx) {
     const { dstFieldName, dstDEUILogicParamId } = nodeParam;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeError42(ibiz.i18n.t("runtime.uiLogic.noTargetParameter"));
+      throw new RuntimeError44(ibiz.i18n.t("runtime.uiLogic.noTargetParameter"));
     }
     let dstField = dstFieldName;
     if (ctx.isEntityParam(dstDEUILogicParamId)) {
@@ -22758,7 +23178,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);
   }
   /**
    * 绑定参数
@@ -22835,7 +23255,7 @@ var PrepareJSParamNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-invoke-node/view-ctrl-invoke-node.ts
-import { RuntimeError as RuntimeError43, RuntimeModelError as RuntimeModelError38 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError45, RuntimeModelError as RuntimeModelError38 } from "@ibiz-template/core";
 import { isFunction } from "lodash-es";
 var ViewCtrlInvokeNode = class extends UILogicNode {
   async exec(ctx) {
@@ -22861,7 +23281,7 @@ var ViewCtrlInvokeNode = class extends UILogicNode {
     }
     const invokeParam = ctx.params[invokeParamId];
     if (!invokeParam) {
-      throw new RuntimeError43(
+      throw new RuntimeError45(
         ibiz.i18n.t("runtime.uiLogic.noFoundOperationParameter", {
           invokeParamId
         })
@@ -22869,14 +23289,14 @@ var ViewCtrlInvokeNode = class extends UILogicNode {
     }
     const invokeCtrl = ctx.params[invokeCtrlId];
     if (!invokeCtrl) {
-      throw new RuntimeError43(
+      throw new RuntimeError45(
         ibiz.i18n.t("runtime.uiLogic.noFoundInterfaceObject", {
           invokeCtrlId
         })
       );
     }
     if (!invokeCtrl[invokeMethod] || !isFunction(invokeCtrl[invokeMethod])) {
-      throw new RuntimeError43(
+      throw new RuntimeError45(
         ibiz.i18n.t("runtime.uiLogic.noFoundInvokeMethod", {
           invokeMethod
         })
@@ -23065,7 +23485,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;
@@ -23076,7 +23496,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", {
@@ -23216,7 +23636,7 @@ var DataSetNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/throw-exception-node/throw-exception-node.ts
-import { RuntimeError as RuntimeError44 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError46 } from "@ibiz-template/core";
 var ThrowExceptionNode2 = class extends UILogicNode {
   async exec(_ctx) {
     const { errorInfo } = this.model;
@@ -23226,12 +23646,12 @@ var ThrowExceptionNode2 = class extends UILogicNode {
         errorInfo
       })
     );
-    throw new RuntimeError44(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 RuntimeError45, 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;
@@ -23256,13 +23676,13 @@ var ViewCtrlFireEventNode = class extends UILogicNode {
     }
     const invokeCtrl = ctx.params[fireCtrlId];
     if (!invokeCtrl) {
-      throw new RuntimeError45(
+      throw new RuntimeError47(
         ibiz.i18n.t("runtime.uiLogic.noFoundTriggerObject", { fireCtrlId })
       );
     }
     const eventParam = ctx.params[eventParamId];
     if (!eventParam) {
-      throw new RuntimeError45(
+      throw new RuntimeError47(
         ibiz.i18n.t("runtime.uiLogic.noFoundEventParameterObject", {
           eventParamId
         })
@@ -23284,7 +23704,7 @@ var ViewCtrlFireEventNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts
-import { RuntimeError as RuntimeError46, RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError48, RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
 var ExecuteDELogicNode = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -23313,7 +23733,7 @@ var ExecuteDELogicNode = class extends UILogicNode {
     }
     const dstParam = ctx.params[dstDEUILogicParamId];
     if (!dstParam) {
-      throw new RuntimeError46(
+      throw new RuntimeError48(
         ibiz.i18n.t("runtime.uiLogic.passedParameter", { dstDEUILogicParamId })
       );
     }
@@ -23349,15 +23769,14 @@ var RawJSCodeNode = class extends UILogicNode {
       }),
       this.model.code
     );
-    ScriptFactory.execScriptFn(
+    await ScriptFactory.asyncExecScriptFn(
       {
         view: ctx.view,
         context: ctx.context,
         params: ctx.viewParam,
         uiLogic: ctx.params
       },
-      this.model.code || "",
-      { isAsync: false }
+      this.model.code || ""
     );
   }
 };
@@ -23713,7 +24132,7 @@ async function execUILogic(deUILogicId, appDataEntityId, parameters) {
   const app = ibiz.hub.getApp(parameters.context.srfappid);
   const deUILogic = await app.getDEUILogic(deUILogicId, appDataEntityId);
   if (!deUILogic) {
-    throw new RuntimeError47(
+    throw new RuntimeError49(
       ibiz.i18n.t("runtime.uiLogic.interfaceLogic", {
         appDataEntityId,
         deUILogicId
@@ -23741,7 +24160,7 @@ async function execUILogic(deUILogicId, appDataEntityId, parameters) {
 }
 
 // src/ui-action/uiaction-util.ts
-import { RuntimeError as RuntimeError48 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError50 } from "@ibiz-template/core";
 var UIActionUtil = class {
   /**
    * 执行界面行为
@@ -23756,7 +24175,7 @@ var UIActionUtil = class {
   static async exec(actionId, params, appId2) {
     const action = await getUIActionById(actionId, appId2);
     if (!action) {
-      throw new RuntimeError48(
+      throw new RuntimeError50(
         ibiz.i18n.t("runtime.uiAction.noFoundBehaviorModel", { actionId })
       );
     }
@@ -24264,7 +24683,7 @@ import {
   StringUtil,
   RuntimeModelError as RuntimeModelError53,
   ModelError as ModelError26,
-  RuntimeError as RuntimeError49
+  RuntimeError as RuntimeError51
 } from "@ibiz-template/core";
 import { mergeRight as mergeRight4 } from "ramda";
 var FrontUIActionProvider = class extends UIActionProviderBase {
@@ -24352,7 +24771,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
       );
@@ -24390,7 +24809,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       if (resultContext && resultContext[appDataEntity.codeName.toLowerCase()]) {
         requestUrl += "/".concat(appDataEntity.deapicodeName2, "/printdata/").concat(resultContext[appDataEntity.codeName.toLowerCase()]);
       } else {
-        throw new RuntimeError49(ibiz.i18n.t("runtime.uiAction.dataPrimaryKey"));
+        throw new RuntimeError51(ibiz.i18n.t("runtime.uiAction.dataPrimaryKey"));
       }
       const res = await ibiz.net.request(requestUrl, {
         method: "get",
@@ -24416,10 +24835,10 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
           window.open(link, "_blank");
         }
       } else {
-        throw new RuntimeError49(ibiz.i18n.t("runtime.uiAction.printFailure"));
+        throw new RuntimeError51(ibiz.i18n.t("runtime.uiAction.printFailure"));
       }
     } else {
-      throw new RuntimeError49(ibiz.i18n.t("runtime.uiAction.physicalPrint"));
+      throw new RuntimeError51(ibiz.i18n.t("runtime.uiAction.physicalPrint"));
     }
   }
   /**
@@ -24504,12 +24923,12 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
         URL.revokeObjectURL(elink.href);
         document.body.removeChild(elink);
       } else {
-        throw new RuntimeError49(
+        throw new RuntimeError51(
           ibiz.i18n.t("runtime.uiAction.exportRequestFailed")
         );
       }
     } else {
-      throw new RuntimeError49(
+      throw new RuntimeError51(
         ibiz.i18n.t("runtime.uiAction.noEntityExportsFound")
       );
     }
@@ -24527,7 +24946,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
     const actionResult = {};
     const { context, params, data, event } = args;
     if (!event) {
-      throw new RuntimeError49(ibiz.i18n.t("runtime.uiAction.lackNativeEvent"));
+      throw new RuntimeError51(ibiz.i18n.t("runtime.uiAction.lackNativeEvent"));
     }
     const { resultContext, resultParams } = await this.handleParams(
       action,
@@ -24666,7 +25085,7 @@ var ToolbarController = class extends ControlController {
       const actionId = item.uiactionId;
       const uiAction = await getUIActionById(actionId, item.appId);
       if (!uiAction) {
-        throw new RuntimeError50(
+        throw new RuntimeError52(
           ibiz.i18n.t("runtime.controller.control.toolbar.noFound", {
             actionId
           })
@@ -24779,6 +25198,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) {
@@ -24871,6 +25296,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);
@@ -24890,13 +25316,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) => {
@@ -24982,6 +25420,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"
+      );
+    }
+  }
   /**
    * 通知所有表单成员表单操作过程中的数据变更
    *
@@ -25038,7 +25527,7 @@ var CustomDashboardController = class {
      */
     this.portletConfig = {};
     /**
-     * 自定义定制范围类型（public：公开，personal：个人，data：数据，默认是按照个人区分，配置了应用功能组件才生效）
+     * 自定义定制范围类型（public：公开，personal：个人，data：数据，dynamic: 自定义动态,默认是按照个人区分，配置了应用功能组件才生效）
      *
      * @author tony001
      * @date 2024-04-24 19:04:47
@@ -25061,13 +25550,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);
@@ -25093,7 +25575,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) {
@@ -26107,7 +26588,7 @@ var DataViewControlController = class extends MDControlController {
 import { RuntimeModelError as RuntimeModelError56 } from "@ibiz-template/core";
 
 // src/controller/control/exp-bar/exp-bar.controller.ts
-import { RuntimeError as RuntimeError51, RuntimeModelError as RuntimeModelError55 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError53, RuntimeModelError as RuntimeModelError55 } from "@ibiz-template/core";
 var ExpBarControlController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -26440,7 +26921,7 @@ var ExpBarControlController = class extends ControlController {
     if (["GRID", "DATAVIEW", "LIST"].includes(((_a = this.XDataModel) == null ? void 0 : _a.controlType) || "")) {
       return this.XDataModel.navAppViewId;
     }
-    throw new RuntimeError51(
+    throw new RuntimeError53(
       ibiz.i18n.t("runtime.controller.control.expBar.multiNode")
     );
   }
@@ -26587,7 +27068,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/exp-bar/tree-exp-bar.controller.ts
-import { RuntimeError as RuntimeError52, RuntimeModelError as RuntimeModelError57 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError54, RuntimeModelError as RuntimeModelError57 } from "@ibiz-template/core";
 var TreeExpBarController = class extends ExpBarControlController {
   constructor() {
     super(...arguments);
@@ -26678,7 +27159,7 @@ var TreeExpBarController = class extends ExpBarControlController {
     const deData = node._deData || node;
     const nodeModel = this.getNodeModel(node._nodeId);
     if (!nodeModel) {
-      throw new RuntimeError52(
+      throw new RuntimeError54(
         ibiz.i18n.t("runtime.controller.control.expBar.noFindNodeModel", {
           nodeId: node._nodeId
         })
@@ -26873,7 +27354,7 @@ var ChartExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/form/search-form/search-form.controller.ts
-import { RuntimeError as RuntimeError53 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError55 } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.controller.ts
 import {
@@ -27519,7 +28000,7 @@ var SearchFormController = class extends FormController {
   applyStoredFilter(index) {
     const filter = this.state.storedFilters[index];
     if (!filter) {
-      throw new RuntimeError53(
+      throw new RuntimeError55(
         ibiz.i18n.t("runtime.controller.control.form.searchTerms")
       );
     }
@@ -27537,7 +28018,7 @@ var SearchFormController = class extends FormController {
   async removeStoredFilter(index) {
     const filter = this.state.storedFilters[index];
     if (!filter) {
-      throw new RuntimeError53(
+      throw new RuntimeError55(
         ibiz.i18n.t("runtime.controller.control.form.saveSearch")
       );
     }
@@ -29027,7 +29508,7 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts
-import { RuntimeError as RuntimeError54, RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
+import { RuntimeError as 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
@@ -29050,6 +29531,13 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
      * @date 2023-11-11 08:03:56
      */
     this.formMap = /* @__PURE__ */ new Map();
+    /**
+     * 数据集合
+     *
+     * @type {IData[]}
+     * @memberof FormMDCtrlFormController
+     */
+    this.items = [];
   }
   createState() {
     var _a;
@@ -29092,7 +29580,8 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
     const fetchAction = "fetchdefault";
     const res = await ibiz.hub.getApp(this.model.appId).deService.exec(appDataEntityId, fetchAction, this.context, this.params);
     if (res.ok) {
-      this.state.items = res.data.map((item) => {
+      this.items = res.data;
+      this.state.items = this.items.map((item) => {
         const context = this.context.clone();
         context[this.deName] = item.srfkey;
         const params = { ...this.params };
@@ -29104,6 +29593,30 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
       });
     }
   }
+  /**
+   * 更新数据
+   * - 仅支持更新临时数据
+   * @return {*}  {Promise<void>}
+   * @memberof FormMDCtrlFormController
+   */
+  async updateData() {
+    var _a;
+    const { appDataEntityId } = this.model.contentControl;
+    const fetchAction = "update";
+    const deService = await ibiz.hub.getAppDEService(
+      this.model.appId,
+      appDataEntityId,
+      this.context
+    );
+    const data = (_a = this.state.items) == null ? void 0 : _a.map((item, index) => {
+      const _item = this.items.find((v) => v.srfkey === item.id);
+      _item.srfordervalue = index + 1;
+      return _item;
+    });
+    if (deService.isLocalMode && data) {
+      await deService.exec(fetchAction, this.context, data);
+    }
+  }
   /**
    * 表单状态变更通知
    *
@@ -29168,7 +29681,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
   async remove(id) {
     const controller = this.formMap.get(id);
     if (!controller) {
-      throw new RuntimeError54(
+      throw new RuntimeError56(
         ibiz.i18n.t("runtime.controller.control.form.noFoundFormController", {
           id
         })
@@ -29231,7 +29744,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);
@@ -29323,7 +29836,7 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
     copyFields.forEach((key) => {
       tempForm[key] = this.form.model[key];
     });
-    this.repeatedForm = clone25(tempForm);
+    this.repeatedForm = clone29(tempForm);
   }
   /**
    * 设置重复器控制器
@@ -29520,11 +30033,11 @@ import {
   IBizContext as IBizContext6,
   isElementSame as isElementSame2,
   mergeInLeft as mergeInLeft2,
-  RuntimeError as RuntimeError55
+  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 {
@@ -29893,8 +30406,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
@@ -29951,7 +30464,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();
@@ -29989,7 +30502,7 @@ var EditFormController = class extends FormController {
     }
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError55(
+      throw new RuntimeError57(
         ibiz.i18n.t("runtime.controller.control.form.formCompletion")
       );
     }
@@ -30125,7 +30638,7 @@ var EditFormController = class extends FormController {
       (item) => item.id === formItemUpdateId
     );
     if (!formItemUpdate) {
-      throw new RuntimeError55(
+      throw new RuntimeError57(
         ibiz.i18n.t("runtime.controller.control.form.itemUpdate", {
           formItemUpdateId
         })
@@ -30188,7 +30701,7 @@ var EditFormController = class extends FormController {
   async wfStart(args) {
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError55(
+      throw new RuntimeError57(
         ibiz.i18n.t("runtime.controller.control.form.formCompletion")
       );
     }
@@ -30221,7 +30734,7 @@ var EditFormController = class extends FormController {
   async wfSubmit(args) {
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError55(
+      throw new RuntimeError57(
         ibiz.i18n.t("runtime.controller.control.form.formCompletion")
       );
     }
@@ -30633,11 +31146,12 @@ import {
   debounceAndAsyncMerge as debounceAndAsyncMerge2,
   EntityError as EntityError2,
   mergeDefaultInLeft,
+  plus as plus2,
   recursiveIterate as recursiveIterate7,
-  RuntimeError as RuntimeError56,
+  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
@@ -30774,6 +31288,7 @@ async function calcColumnModelBySchema(json, c) {
       widthUnit: "PX",
       valueType: "SIMPLE",
       caption: item.description,
+      hideDefault: true,
       dataItemName: item.key
     });
     addDataItems.push({
@@ -30812,6 +31327,13 @@ var GridController = class extends MDControlController {
      * @type {boolean}
      */
     this.addSchemaColumn = false;
+    /**
+     * 是否显示百分比
+     *
+     * @type {boolean}
+     * @memberof GridController
+     */
+    this.showPercent = false;
     /**
      * 所有表格列控制器集合
      *
@@ -30974,6 +31496,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);
@@ -31037,7 +31560,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
@@ -31205,7 +31728,7 @@ var GridController = class extends MDControlController {
       } else {
         const toNum = Number(sortValue);
         if (Number.isNaN(toNum)) {
-          throw new RuntimeError56(
+          throw new RuntimeError58(
             ibiz.i18n.t("runtime.controller.control.grid.convertedValue", {
               srfmajortext: item.srfmajortext
             })
@@ -31239,6 +31762,7 @@ var GridController = class extends MDControlController {
     await this.loadRemoteAgg();
     this.calcAggResult(this.state.items);
     this.calcShowMode(this.state.items);
+    this.calcTotalData();
     return items;
   }
   /**
@@ -31347,7 +31871,6 @@ var GridController = class extends MDControlController {
    * 计算当前页的聚合数据
    * @author lxm
    * @date 2023-08-07 04:22:09
-   * @protected
    * @param {IData[]} items
    */
   calcAggResult(items) {
@@ -31396,7 +31919,7 @@ var GridController = class extends MDControlController {
     if (editShowMode === "row") {
       const editingRow = this.state.rows.find((item) => item.showRowEdit);
       if (editingRow) {
-        throw new RuntimeError56(
+        throw new RuntimeError58(
           ibiz.i18n.t("runtime.controller.common.md.firstComplete")
         );
       }
@@ -31439,7 +31962,7 @@ var GridController = class extends MDControlController {
     const isCreate = data.srfuf === 0 /* CREATE */;
     const rowState = this.findRowState(data);
     if (!rowState) {
-      throw new RuntimeError56(
+      throw new RuntimeError58(
         ibiz.i18n.t("runtime.controller.common.md.rowData")
       );
     }
@@ -31453,7 +31976,7 @@ var GridController = class extends MDControlController {
     }
     const isValid = await this.validate(rowState);
     if (!isValid) {
-      throw new RuntimeError56(
+      throw new RuntimeError58(
         ibiz.i18n.t("runtime.controller.control.grid.saveCancel")
       );
     }
@@ -31709,7 +32232,7 @@ var GridController = class extends MDControlController {
   }
   async toggleRowEdit() {
     if (!this.model.enableRowNew) {
-      throw new RuntimeError56(
+      throw new RuntimeError58(
         ibiz.i18n.t("runtime.controller.control.grid.noSupportRowEditing")
       );
     }
@@ -31744,12 +32267,12 @@ var GridController = class extends MDControlController {
     } else {
       const editingRow = this.state.rows.find((item) => item.showRowEdit);
       if (editingRow) {
-        throw new RuntimeError56(
+        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);
       }
@@ -31801,7 +32324,7 @@ var GridController = class extends MDControlController {
       (item) => item.id === updateId
     );
     if (!findUpdate) {
-      throw new RuntimeError56(
+      throw new RuntimeError58(
         ibiz.i18n.t("runtime.controller.control.grid.updateColumns", {
           updateId
         })
@@ -31892,7 +32415,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];
@@ -31945,7 +32468,7 @@ var GridController = class extends MDControlController {
       data = this.getData();
     }
     if (data.length === 0) {
-      throw new RuntimeError56(
+      throw new RuntimeError58(
         ibiz.i18n.t("runtime.controller.control.grid.exported")
       );
     }
@@ -31961,7 +32484,7 @@ var GridController = class extends MDControlController {
   async exportData(args) {
     const { header } = this.dataExportParam;
     if (!header) {
-      throw new RuntimeError56(
+      throw new RuntimeError58(
         ibiz.i18n.t("runtime.controller.control.grid.tabularColumns")
       );
     }
@@ -32218,13 +32741,34 @@ 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 } 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);
@@ -32367,7 +32911,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,
@@ -32456,10 +33000,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(
@@ -32516,7 +33060,7 @@ 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 (!this.valueFormat) {
       return strVal;
     }
@@ -32621,9 +33165,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 RuntimeError57 } 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);
@@ -32761,7 +33305,7 @@ var GridFieldEditColumnController = class extends GridFieldColumnController {
     if (requiredChanged || names.includes(this.fieldName) || names.includes(this.valueItemName)) {
       const result = await this.validate(row);
       if (!result) {
-        throw new RuntimeError57(
+        throw new RuntimeError59(
           ibiz.i18n.t("runtime.controller.control.grid.checksumErrors", {
             codeName: this.editItem.codeName,
             fieldName: row.errors[this.fieldName]
@@ -32867,7 +33411,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",
         {
@@ -33085,7 +33629,7 @@ var ListController = class extends MDControlController {
 };
 
 // src/controller/control/panel/panel/panel.controller.ts
-import { recursiveIterate as recursiveIterate8, RuntimeError as RuntimeError58 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate8, RuntimeError as RuntimeError60 } from "@ibiz-template/core";
 import { AsyncSeriesHook as AsyncSeriesHook2 } from "qx-util";
 var PanelController = class extends ControlController {
   constructor(model, context, params, ctx, container) {
@@ -33242,7 +33786,7 @@ var PanelController = class extends ControlController {
     var _a, _b;
     const data = await this.prepareData();
     if (!data) {
-      throw new RuntimeError58(
+      throw new RuntimeError60(
         ibiz.i18n.t("runtime.controller.control.panel.panelData")
       );
     }
@@ -33888,7 +34432,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
@@ -34376,8 +34920,8 @@ async function calcFilterModelBySchema(json, appDataEntityId, modelAppId) {
 }
 
 // src/controller/control/search-bar/search-bar-filter-items.controller.ts
-import { RuntimeError as RuntimeError59 } from "@ibiz-template/core";
-import { 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) {
@@ -34435,7 +34979,7 @@ var SearchBarFilterItemsController = class extends SearchBarFilterController {
       return false;
     });
     if (!minorDEId) {
-      throw new RuntimeError59(
+      throw new RuntimeError61(
         ibiz.i18n.t("runtime.controller.control.searchBar.noFoundEntity", {
           targetField
         })
@@ -34462,7 +35006,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(
@@ -34914,7 +35458,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;
     }
@@ -35634,7 +36178,7 @@ var TabExpPanelController = class extends ControlController {
 
 // src/controller/control/tree/tree.controller.ts
 import {
-  RuntimeError as RuntimeError60,
+  RuntimeError as RuntimeError62,
   RuntimeModelError as RuntimeModelError66,
   recursiveIterate as recursiveIterate11
 } from "@ibiz-template/core";
@@ -36720,7 +37264,7 @@ var TreeController = class extends MDControlController {
       );
     }
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError60(
+      throw new RuntimeError62(
         ibiz.i18n.t("runtime.controller.control.tree.nodeData")
       );
     }
@@ -36738,7 +37282,7 @@ var TreeController = class extends MDControlController {
     let needRefresh = false;
     const treeNode = this.getNodeModel(item._nodeId);
     if (!treeNode) {
-      throw new RuntimeError60(
+      throw new RuntimeError62(
         ibiz.i18n.t("runtime.controller.control.tree.noFoundTreeNode")
       );
     }
@@ -36784,7 +37328,7 @@ var TreeController = class extends MDControlController {
 };
 
 // src/controller/control/wizard-panel/wizard-panel.controller.ts
-import { RuntimeError as RuntimeError61 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError63 } from "@ibiz-template/core";
 
 // src/controller/control/wizard-panel/wizard-panel.service.ts
 var WizardPanelService = class extends ControlService {
@@ -36972,7 +37516,7 @@ var WizardPanelController = class extends ControlController {
     const { activeFormTag } = this.state;
     const controller = this.formControllers.get(activeFormTag);
     if (!controller) {
-      throw new RuntimeError61(
+      throw new RuntimeError63(
         ibiz.i18n.t("runtime.controller.control.wizardPanel.formController", {
           activeFormTag
         })
@@ -37022,7 +37566,7 @@ var WizardPanelController = class extends ControlController {
   getWizardFormByTag(tag) {
     var _a;
     if (!((_a = this.model.dewizard) == null ? void 0 : _a.dewizardForms)) {
-      throw new RuntimeError61(
+      throw new RuntimeError63(
         ibiz.i18n.t("runtime.controller.control.wizardPanel.noConfiguration")
       );
       return;
@@ -37033,7 +37577,7 @@ var WizardPanelController = class extends ControlController {
       }
     );
     if (!wizardForm) {
-      throw new RuntimeError61(
+      throw new RuntimeError63(
         ibiz.i18n.t(
           "runtime.controller.control.wizardPanel.wizardFormIdentifier",
           { tag }
@@ -37125,7 +37669,7 @@ var WizardPanelController = class extends ControlController {
       prevTag = this.tagHistory[this.tagHistory.length - 1];
     }
     if (!prevTag) {
-      throw new RuntimeError61(
+      throw new RuntimeError63(
         ibiz.i18n.t("runtime.controller.control.wizardPanel.noPreviousForm")
       );
     }
@@ -37163,7 +37707,7 @@ var WizardPanelController = class extends ControlController {
         });
         const nextWizardStep = wizardSteps[index + 1];
         if (!nextWizardStep) {
-          throw new RuntimeError61(
+          throw new RuntimeError63(
             ibiz.i18n.t("runtime.controller.control.wizardPanel.nextStep")
           );
         }
@@ -37174,7 +37718,7 @@ var WizardPanelController = class extends ControlController {
       }
     }
     if (!nextTag) {
-      throw new RuntimeError61(
+      throw new RuntimeError63(
         ibiz.i18n.t("runtime.controller.control.wizardPanel.nextForm")
       );
     }
@@ -37560,11 +38104,11 @@ var MDCtrlController = class extends MDControlController {
 };
 
 // src/controller/control/kanban/kanban.controller.ts
-import { RuntimeError as RuntimeError62, 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 {
   /**
    * 更新分组数据
@@ -37593,7 +38137,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
@@ -37679,7 +38223,7 @@ var KanbanController = class extends DataViewControlController {
       } else {
         const toNum = Number(sortValue);
         if (Number.isNaN(toNum)) {
-          throw new RuntimeError62(
+          throw new RuntimeError64(
             ibiz.i18n.t("runtime.controller.control.grid.convertedValue", {
               srfmajortext: item.srfmajortext
             })
@@ -37803,7 +38347,7 @@ var KanbanController = class extends DataViewControlController {
   }
   handleDataGroup() {
     if (!this.model.enableGroup || this.model.groupMode === "NONE") {
-      throw new RuntimeError62(
+      throw new RuntimeError64(
         ibiz.i18n.t("runtime.controller.control.kanban.groupedOn")
       );
     }
@@ -37925,7 +38469,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) {
@@ -38193,12 +38737,12 @@ var KanbanController = class extends DataViewControlController {
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts
 import {
-  RuntimeError as RuntimeError63,
+  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 {
@@ -38478,13 +39022,13 @@ var TreeGridExController = class extends TreeController {
       return;
     }
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError63(
+      throw new RuntimeError65(
         ibiz.i18n.t("runtime.controller.control.gantt.nonentity")
       );
     }
     const rowState = this.state.rows[nodeData._uuid];
     if (!rowState) {
-      throw new RuntimeError63(
+      throw new RuntimeError65(
         ibiz.i18n.t("runtime.controller.common.md.rowData")
       );
     }
@@ -38500,7 +39044,7 @@ var TreeGridExController = class extends TreeController {
     const { appDataEntityId, updateAppDEActionId } = nodeModel;
     const isCreate = nodeData._deData.srfuf === 0 /* CREATE */;
     if (isCreate) {
-      throw new RuntimeError63(
+      throw new RuntimeError65(
         ibiz.i18n.t("runtime.controller.control.treeGridEx.noSupportCreation")
       );
     }
@@ -38665,12 +39209,12 @@ var TreeGridExController = class extends TreeController {
         (item) => item.showRowEdit
       );
       if (editingRow) {
-        throw new RuntimeError63(
+        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);
       }
@@ -38780,10 +39324,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 RuntimeError64,
+  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 {
   /**
@@ -38985,7 +39529,7 @@ var TreeGridExNodeColumnController = class {
     const valueItem = this.nodeColumn.linkValueItem || "srfkey";
     const value = row.data[valueItem];
     if (value == null) {
-      throw new RuntimeError64(
+      throw new RuntimeError66(
         ibiz.i18n.t("runtime.controller.control.treeGridEx.noPickedUp", {
           valueItem
         })
@@ -39000,7 +39544,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);
@@ -39414,7 +39958,7 @@ var TreeGridService = class extends GridService {
 };
 
 // src/controller/control/medit-view-panel/medit-view-panel.controller.ts
-import { RuntimeError as RuntimeError65 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError67 } from "@ibiz-template/core";
 import { createUUID as createUUID14 } from "qx-util";
 
 // src/controller/control/medit-view-panel/medit-view-panel.service.ts
@@ -39634,7 +40178,7 @@ var MEditViewPanelController = class extends MDControlController {
       (item) => item.id === id
     );
     if (panelUiItemIndex < 0) {
-      throw new RuntimeError65(
+      throw new RuntimeError67(
         ibiz.i18n.t("runtime.controller.control.meditViewPanel.dataExist")
       );
     }
@@ -39877,15 +40421,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() {
   }
   /**
    * 初始化
@@ -39911,12 +40454,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,
@@ -39974,32 +40517,16 @@ var User2ReportPanelGenerator = class extends ReportPanelBaseGenerator {
 };
 
 // src/controller/control/report-panel/generator/bi-generator.ts
-import { RuntimeError as RuntimeError66 } 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 RuntimeError66(
-        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() {
+    this.config = this.translateReportToConfig(this.model);
   }
   /**
    * 加载数据
@@ -40015,6 +40542,71 @@ var BIReportPanelGenerator = class extends ReportPanelBaseGenerator {
     }
     return Promise.resolve(data);
   }
+  /**
+   * 转化报表数据到配置数据
+   *
+   * @author tony001
+   * @date 2024-06-28 14:06:43
+   * @private
+   * @param {IModel} model
+   * @return {*}  {IData}
+   */
+  translateReportToConfig(model) {
+    const config = {};
+    const biReportDatas = {};
+    const propertyData = {
+      caption: model.logicName,
+      data: biReportDatas
+    };
+    const { appDEReport } = model;
+    console.log(appDEReport);
+    config.reportTag = appDEReport.id;
+    const tempAppBISchemeId = appDEReport.appBISchemeId.split(".").pop();
+    config.selectedSchemeId = tempAppBISchemeId;
+    const {
+      appBICubeId,
+      appBIReportDimensions,
+      appBIReportMeasures,
+      reportUIModel
+    } = appDEReport.appBIReport;
+    config.selectCubeId = "".concat(tempAppBISchemeId, ".").concat(appBICubeId);
+    if (reportUIModel) {
+      const reportUIModelObj = JSON.parse(reportUIModel);
+      config.selectChartType = reportUIModelObj.selectChartType;
+      propertyData.style = reportUIModelObj.style;
+    } 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),
+          pssysbicubeid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId),
+          codename: measure.measureTag
+        });
+      });
+    }
+    if (appBIReportDimensions && appBIReportDimensions.length > 0) {
+      appBIReportDimensions.forEach((dimension) => {
+        if (!biReportDatas.dimension) {
+          biReportDatas.dimension = [];
+        }
+        biReportDatas.dimension.push({
+          pssysbischemeid: tempAppBISchemeId,
+          pssysbicubedimensionid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId, ".").concat(dimension.dimensionTag),
+          pssysbicubeid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId),
+          codename: dimension.dimensionTag,
+          pscodelistid: dimension.appCodeListId
+        });
+      });
+    }
+    config.propertyData = propertyData;
+    return config;
+  }
 };
 
 // src/controller/control/report-panel/generator/generator-factory.ts
@@ -40105,6 +40697,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
@@ -40258,7 +40853,7 @@ var ReportPanelController = class extends ControlController {
 // src/controller/control/gantt/gantt.controller.ts
 import {
   awaitTimeout as awaitTimeout4,
-  RuntimeError as RuntimeError67,
+  RuntimeError as RuntimeError68,
   RuntimeModelError as RuntimeModelError72
 } from "@ibiz-template/core";
 
@@ -40804,13 +41399,13 @@ var GanttController = class extends TreeGridExController {
    */
   async modifyNodeTime(nodeData, { begin, end }) {
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError67(
+      throw new RuntimeError68(
         ibiz.i18n.t("runtime.controller.control.gantt.noNode")
       );
     }
     const rowState = this.getRowState(nodeData._id);
     if (!rowState) {
-      throw new RuntimeError67(
+      throw new RuntimeError68(
         ibiz.i18n.t("runtime.controller.common.md.rowData")
       );
     }
@@ -40832,13 +41427,13 @@ var GanttController = class extends TreeGridExController {
       return;
     }
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError67(
+      throw new RuntimeError68(
         ibiz.i18n.t("runtime.controller.control.gantt.nonentity")
       );
     }
     const rowState = this.state.rows[nodeData._uuid];
     if (!rowState) {
-      throw new RuntimeError67(
+      throw new RuntimeError68(
         ibiz.i18n.t("runtime.controller.common.md.rowData")
       );
     }
@@ -40888,7 +41483,7 @@ var GanttController = class extends TreeGridExController {
   async remove(args) {
     const { context, params, data } = this.handlerAbilityParams(args);
     if (!(data == null ? void 0 : data.length)) {
-      throw new RuntimeError67(
+      throw new RuntimeError68(
         ibiz.i18n.t("runtime.controller.common.control.uncheckedData")
       );
     }
@@ -41011,7 +41606,7 @@ var GanttController = class extends TreeGridExController {
         (item) => item.showRowEdit
       );
       if (editingRow) {
-        throw new RuntimeError67(
+        throw new RuntimeError68(
           ibiz.i18n.t("runtime.controller.common.md.firstComplete")
         );
       }
@@ -41269,7 +41864,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 {
@@ -41380,7 +41975,7 @@ var AsyncActionController = class {
     } else {
       this.noticeResult(action);
     }
-    this.evt.emit("add", clone35(action));
+    this.evt.emit("add", clone39(action));
     this.evt.emit("dataChange");
   }
   /**
@@ -41402,7 +41997,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) {
@@ -41550,7 +42145,11 @@ var InternalMessageController = class {
     find.status = "READ";
     this.unreadCount -= 1;
     this.evt.emit("unreadCountChange", this.unreadCount);
-    this.evt.emit("dataChange");
+    if (this.unreadOnly) {
+      this.load();
+    } else {
+      this.evt.emit("dataChange");
+    }
   }
   /**
    * 把所有未读消息标记为已读
@@ -41870,7 +42469,7 @@ var AppHub = class {
       this.registerAppView(appView);
       return appView;
     }
-    throw new RuntimeError68(ibiz.i18n.t("runtime.hub.noExist", { id }));
+    throw new RuntimeError69(ibiz.i18n.t("runtime.hub.noExist", { id }));
   }
   /**
    * 根据DrControl的名称和子应用标识获取模型
@@ -41909,7 +42508,7 @@ var AppHub = class {
       );
       return model;
     }
-    throw new RuntimeError68(
+    throw new RuntimeError69(
       ibiz.i18n.t("runtime.hub.noExist", { id: modelPath })
     );
   }
@@ -41949,7 +42548,7 @@ var AppHub = class {
       this.registerAppDataEntity(entity, appId2);
       return entity;
     }
-    throw new RuntimeError68(ibiz.i18n.t("runtime.service.noFound", { id }));
+    throw new RuntimeError69(ibiz.i18n.t("runtime.service.noFound", { id }));
   }
   /**
    * 新建 hub 应用
@@ -41964,7 +42563,7 @@ var AppHub = class {
       return this.appMap.get(id);
     }
     if (!this.modelLoaderProvider) {
-      throw new RuntimeError68(ibiz.i18n.t("runtime.utils.firstregister"));
+      throw new RuntimeError69(ibiz.i18n.t("runtime.utils.firstregister"));
     }
     const appModel = await this.modelLoaderProvider.getApp(id);
     const subAppRef = await this.modelLoaderProvider.getSubAppRef(id);
@@ -42040,6 +42639,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;
@@ -42111,7 +42715,7 @@ var EngineFactory = class {
 
 // src/engine/view-base.engine.ts
 import {
-  RuntimeError as RuntimeError69,
+  RuntimeError as RuntimeError70,
   findRecursiveChild as findRecursiveChild3,
   IBizContext as IBizContext7
 } from "@ibiz-template/core";
@@ -42496,7 +43100,7 @@ var ViewEngineBase = class {
     const { appDataEntityId } = this.view.model;
     const { evt, context, params } = this.view;
     if (!appDataEntityId) {
-      throw new RuntimeError69(ibiz.i18n.t("runtime.engine.loadEntityData"));
+      throw new RuntimeError70(ibiz.i18n.t("runtime.engine.loadEntityData"));
     }
     const app = ibiz.hub.getApp(context.srfappid);
     const res = await app.deService.exec(
@@ -42558,7 +43162,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 {
   /**
    * 多数据部件名称
@@ -42813,7 +43417,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;
     }
@@ -42978,7 +43582,7 @@ var MDViewEngine = class extends ViewEngineBase {
 };
 
 // src/global/global-util/global-util.ts
-import { RuntimeError as RuntimeError70 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError71 } from "@ibiz-template/core";
 var sourceTitle = document.title;
 var GlobalUtil = class {
   constructor() {
@@ -43061,6 +43665,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());
   }
   /**
@@ -43119,7 +43730,7 @@ var GlobalUtil = class {
    * @return {*}  {IParams}
    */
   getGlobalParam() {
-    throw new RuntimeError70(ibiz.i18n.t("runtime.global.noImplemented"));
+    throw new RuntimeError71(ibiz.i18n.t("runtime.global.noImplemented"));
   }
   /**
    * 获取视图路由参数变量，数组类型，基于路由解析出来的，每一个对象里面都有context和params
@@ -43128,12 +43739,12 @@ var GlobalUtil = class {
    * @return {*}  {IParams}
    */
   getRouterParams() {
-    throw new RuntimeError70(ibiz.i18n.t("runtime.global.noImplementedRouting"));
+    throw new RuntimeError71(ibiz.i18n.t("runtime.global.noImplementedRouting"));
   }
 };
 
 // src/logic-scheduler/executor/logic-executor.ts
-import { RuntimeError as RuntimeError71 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError72 } from "@ibiz-template/core";
 var LogicExecutor = class {
   /**
    * @author lxm
@@ -43154,7 +43765,7 @@ var LogicExecutor = class {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(_executeParams) {
-    throw new RuntimeError71(
+    throw new RuntimeError72(
       ibiz.i18n.t("runtime.logicScheduler.executor.noImplementedMethod")
     );
   }
@@ -43606,7 +44217,7 @@ var LogicSchedulerCenter = class {
 };
 
 // src/logic-scheduler/trigger/logic-trigger.ts
-import { RuntimeError as RuntimeError72 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError73 } from "@ibiz-template/core";
 var LogicTrigger = class {
   /**
    * @author lxm
@@ -43666,7 +44277,7 @@ var LogicTrigger = class {
     if (this.executor) {
       return this.executor.execute(executeParams);
     }
-    throw new RuntimeError72(
+    throw new RuntimeError73(
       ibiz.i18n.t("runtime.logicScheduler.trigger.noExecutorBound", {
         id: this.logic.id
       })
@@ -43687,12 +44298,12 @@ var CustomTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/item-dyna-logic-trigger.ts
-import { RuntimeError as RuntimeError73 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError74 } from "@ibiz-template/core";
 var ItemDynaLogicTrigger = class extends LogicTrigger {
   bindExecutor(executor) {
     super.bindExecutor(executor);
     if (this.executor.type !== "SCRIPT") {
-      throw new RuntimeError73(
+      throw new RuntimeError74(
         ibiz.i18n.t("runtime.logicScheduler.trigger.triggerType")
       );
     }
@@ -43729,7 +44340,7 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError74, RuntimeModelError as RuntimeModelError75 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError75, RuntimeModelError as RuntimeModelError75 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -43744,7 +44355,7 @@ var TimerTrigger = class extends LogicTrigger {
     }
     this.timer = setInterval(() => {
       if (!this.scheduler.defaultParamsCb) {
-        throw new RuntimeError74(
+        throw new RuntimeError75(
           ibiz.i18n.t("runtime.logicScheduler.trigger.parameterCallback")
         );
       }
@@ -43763,7 +44374,7 @@ var TimerTrigger = class extends LogicTrigger {
 // src/logic-scheduler/executor/app-ui-logic-executor.ts
 import {
   ModelError as ModelError34,
-  RuntimeError as RuntimeError75,
+  RuntimeError as RuntimeError76,
   RuntimeModelError as RuntimeModelError76
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty11 } from "qx-util";
@@ -43801,7 +44412,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { context, params, ...rest } = parameters;
     const { data } = parameters;
     if (!(data == null ? void 0 : data[0])) {
-      throw new RuntimeError75(
+      throw new RuntimeError76(
         ibiz.i18n.t("runtime.logicScheduler.executor.noActionableData")
       );
     }
@@ -43870,7 +44481,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const openViewRefs = appUILogic.openDataAppViews;
     const findView = openViewRefs == null ? void 0 : openViewRefs.find((item) => item.refMode === formTypeValue);
     if (!findView) {
-      throw new RuntimeError75(
+      throw new RuntimeError76(
         ibiz.i18n.t("runtime.logicScheduler.executor.editViews", {
           formTypeValue
         })
@@ -44003,7 +44614,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const selectData = (_a = result.data) == null ? void 0 : _a[0];
     if (!selectData) {
-      throw new RuntimeError75(
+      throw new RuntimeError76(
         ibiz.i18n.t("runtime.logicScheduler.executor.checkOne")
       );
     }
@@ -44015,7 +44626,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       }
     );
     if (!findView) {
-      throw new RuntimeError75(
+      throw new RuntimeError76(
         ibiz.i18n.t("runtime.logicScheduler.executor.entitiesAssociated", {
           indexType
         })
@@ -44057,7 +44668,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         }
       });
       if (pickParentFieldName === void 0) {
-        throw new RuntimeError75(
+        throw new RuntimeError76(
           ibiz.i18n.t("runtime.logicScheduler.executor.foreignKey", {
             pickParentDeName
           })
@@ -45526,6 +46137,7 @@ export {
   Application,
   AsyncActionService,
   AuthorityService,
+  BIReportUtil,
   BackendUIActionProvider,
   BaseController,
   BrowserPlatformProvider,