@ibiz-template/runtime 0.7.41-alpha.31 → 0.7.41-alpha.33

package/dist/index.esm.js

@@ -19475,7 +19475,8 @@ var GlobalConfig = class {
       mobGetSignUrl: "",
       mobGetSignMethod: "post",
       mobWeChatDebug: false,
-      showUploadLoading: false
+      showUploadLoading: false,
+      mobShowBackTop: false
     };
     /**
      * @description 图片压缩配置
@@ -24768,8 +24769,9 @@ var ControlVO = class _ControlVO {
     }
     if (Object.prototype.hasOwnProperty.call(this.$origin, "srfuf")) {
       this.$srfuf = this.$origin.srfuf;
+    } else {
+      this.$srfuf = this.srfkey === this.tempsrfkey ? 1 /* UPDATE */ : 0 /* CREATE */;
     }
-    this.$srfuf = this.srfkey === this.tempsrfkey ? 1 /* UPDATE */ : 0 /* CREATE */;
     Object.defineProperty(this, "srfuf", {
       get() {
         return this.$srfuf;
@@ -27681,6 +27683,13 @@ var CodeListService = class {
      * @type {Map<string, CodeListItem[]>}
      */
     this.cache = /* @__PURE__ */ new Map();
+    /**
+     * 已合并子应用代码表标识缓存
+     *
+     * @protected
+     * @type {Map<string, DynamicCodeListCache>}
+     */
+    this.mergedSubCodeListCache = [];
   }
   /**
    * 获取静态代码表
@@ -27727,7 +27736,12 @@ var CodeListService = class {
    * @returns {*}
    */
   getCodeList(tag) {
-    return this.allCodeLists.get(tag);
+    const codelist = this.allCodeLists.get(tag);
+    if (this.appModel.appId === ibiz.env.appId && codelist && !this.mergedSubCodeListCache.includes(codelist.codeListTag)) {
+      ibiz.hub.mergeSubAppCodeList(codelist);
+      this.mergedSubCodeListCache.push(codelist.codeListTag);
+    }
+    return codelist;
   }
   /**
    * 格式化代码表
@@ -30297,7 +30311,7 @@ import {
   HttpError as HttpError6,
   HttpResponse as HttpResponse3,
   RuntimeError as RuntimeError21,
-  RuntimeModelError as RuntimeModelError20
+  RuntimeModelError as RuntimeModelError21
 } from "@ibiz-template/core";
 import { isArray as isArray6, isNil as isNil16 } from "lodash-es";
 import { ascSort } from "qx-util";
@@ -30599,7 +30613,7 @@ import { isArray as isArray5 } from "lodash-es";
 import { clone as clone15 } from "ramda";
 
 // src/de-logic/de-logic.ts
-import { ModelError as ModelError13, RuntimeModelError as RuntimeModelError19 } from "@ibiz-template/core";
+import { ModelError as ModelError13, RuntimeModelError as RuntimeModelError20 } from "@ibiz-template/core";
 
 // src/de-logic/de-logic-context.ts
 import { isArray as isArray4 } from "lodash-es";
@@ -31552,6 +31566,25 @@ var AppendParamNode = class extends DELogicNode {
   }
 };
 
+// src/de-logic/de-logic-node/debug-param-node/debug-param-node.ts
+import { RuntimeModelError as RuntimeModelError19 } from "@ibiz-template/core";
+var DebugParamNode = class extends DELogicNode {
+  async exec(ctx) {
+    const { dstDELogicParamId, name: name2 } = this.model;
+    if (!dstDELogicParamId) {
+      throw new RuntimeModelError19(
+        this.model,
+        ibiz.i18n.t("runtime.deLogic.deLogicNode.missingConfiguration")
+      );
+    }
+    const param = ctx.params[dstDELogicParamId];
+    ibiz.log.info(
+      ibiz.i18n.t("runtime.deLogic.deLogicNode.logicalNodeOperation", { name: name2 }),
+      param
+    );
+  }
+};
+
 // src/de-logic/de-logic-node/throw-exception-node/throw-exception-node.ts
 import { HttpError as HttpError4 } from "@ibiz-template/core";
 var ThrowExceptionNode = class extends DELogicNode {
@@ -31725,7 +31758,7 @@ var DELogic = class {
     var _a3, _b2;
     if (model.customCode) {
       if (!model.scriptCode) {
-        throw new RuntimeModelError19(
+        throw new RuntimeModelError20(
           model,
           ibiz.i18n.t("runtime.deLogic.deLogicNode.noScriptCode")
         );
@@ -31736,7 +31769,7 @@ var DELogic = class {
       return;
     }
     if (!((_a3 = model.delogicNodes) == null ? void 0 : _a3.length)) {
-      throw new RuntimeModelError19(
+      throw new RuntimeModelError20(
         model,
         ibiz.i18n.t("runtime.deLogic.deLogicNode.noConfigurationLogicNode")
       );
@@ -31781,6 +31814,9 @@ var DELogic = class {
         case "SORTPARAM":
           logicNode = new SortParamNode(node);
           break;
+        case "DEBUGPARAM":
+          logicNode = new DebugParamNode(node);
+          break;
         default:
           throw new ModelError13(
             node,
@@ -31843,7 +31879,7 @@ var DELogic = class {
       const start = this.nodes.get(startDELogicNodeId);
       await this.deepExec(start, ctx);
     } else {
-      throw new RuntimeModelError19(
+      throw new RuntimeModelError20(
         this.model,
         ibiz.i18n.t("runtime.deLogic.deLogicNode.noSetStartNode")
       );
@@ -32021,7 +32057,7 @@ var DEActionMethod = class extends Method {
     if (this.method.actionType === "DELOGIC") {
       const deLogic = findDELogic(this.method.appDELogicId, this.entity);
       if (!deLogic) {
-        throw new RuntimeModelError20(
+        throw new RuntimeModelError21(
           this.method,
           ibiz.i18n.t("runtime.service.lackEntityLogic")
         );
@@ -32411,7 +32447,7 @@ var DEActionMethod = class extends Method {
         configs = ascSort(configs, "removeOrder");
         for (const config of configs) {
           if (config.rstype !== "DER1N") {
-            throw new RuntimeModelError20(
+            throw new RuntimeModelError21(
               config,
               ibiz.i18n.t("runtime.service.deletionDeletion")
             );
@@ -32689,7 +32725,7 @@ var DeActionDeMethodProvider = class {
 import {
   HttpResponse as HttpResponse4,
   ModelError as ModelError14,
-  RuntimeModelError as RuntimeModelError21
+  RuntimeModelError as RuntimeModelError22
 } from "@ibiz-template/core";
 import { isArray as isArray7 } from "lodash-es";
 import { clone as clone17, isEmpty as isEmpty8, isNil as isNil17 } from "ramda";
@@ -32822,7 +32858,7 @@ var FetchMethod = class extends Method {
   async fetchCodeListSet(context, params) {
     const { appCodeListId } = this.method;
     if (!appCodeListId) {
-      throw new RuntimeModelError21(
+      throw new RuntimeModelError22(
         this.method,
         ibiz.i18n.t("runtime.service.sourceCodeTable")
       );
@@ -35980,7 +36016,7 @@ async function getEntitySchema(entityId, context, params = {}) {
 }
 
 // src/controller/utils/view-msg/view-msg-controller.ts
-import { RuntimeError as RuntimeError29, RuntimeModelError as RuntimeModelError22 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError29, RuntimeModelError as RuntimeModelError23 } from "@ibiz-template/core";
 import { isNil as isNil23, mergeRight as mergeRight3 } from "ramda";
 var VIEW_MSG_PREFIX = "VIEW_MSG";
 var ViewMsgController = class _ViewMsgController {
@@ -36071,7 +36107,7 @@ var ViewMsgController = class _ViewMsgController {
   static async fetchDataSet(msgModel, context, params) {
     const { appDataEntityId, appDEDataSetId } = msgModel;
     if (!appDEDataSetId) {
-      throw new RuntimeModelError22(
+      throw new RuntimeModelError23(
         msgModel,
         ibiz.i18n.t("runtime.controller.utils.viewMsg.unconfigured")
       );
@@ -36284,7 +36320,7 @@ var ViewMsgController = class _ViewMsgController {
       layoutPanel
     } = msgModel;
     if (!appDataEntityId) {
-      throw new RuntimeModelError22(
+      throw new RuntimeModelError23(
         msgModel,
         ibiz.i18n.t("runtime.controller.utils.viewMsg.unconfiguredEntities")
       );
@@ -37667,7 +37703,7 @@ var EditorController = class {
 };
 
 // src/controller/common/editor/code-list-editor.controller.ts
-import { RuntimeModelError as RuntimeModelError23 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError24 } from "@ibiz-template/core";
 var CodeListEditorController = class extends EditorController {
   constructor() {
     super(...arguments);
@@ -37783,7 +37819,7 @@ var CodeListEditorController = class extends EditorController {
     }
     if (this.editorParams.enumOptions)
       return this.editorParams.enumOptions;
-    throw new RuntimeModelError23(
+    throw new RuntimeModelError24(
       this.model,
       ibiz.i18n.t("runtime.controller.common.editor.editorNoConfigured", {
         editorType: this.model.editorType
@@ -38338,7 +38374,7 @@ var ControlController = class extends BaseController {
 import {
   RuntimeError as RuntimeError32,
   isElementSame,
-  RuntimeModelError as RuntimeModelError24
+  RuntimeModelError as RuntimeModelError25
 } from "@ibiz-template/core";
 import { isNil as isNil26 } from "ramda";
 import { isArray as isArray8 } from "lodash-es";
@@ -39006,7 +39042,7 @@ var MDControlController = class extends ControlController {
   async importData() {
     const { appDataEntityId, dedataImportId } = this.model;
     if (!appDataEntityId || !dedataImportId) {
-      throw new RuntimeModelError24(
+      throw new RuntimeModelError25(
         this.model,
         ibiz.i18n.t("runtime.controller.common.control.noImportModel")
       );
@@ -39216,7 +39252,7 @@ var MDControlController = class extends ControlController {
 import {
   findRecursiveChild,
   RuntimeError as RuntimeError33,
-  RuntimeModelError as RuntimeModelError25
+  RuntimeModelError as RuntimeModelError26
 } from "@ibiz-template/core";
 
 // src/controller/control/app-menu/custom-app-menu.controller.ts
@@ -39522,7 +39558,7 @@ var AppMenuController = class extends ControlController {
       return provider.onClick(menuItem, event, this);
     }
     if (!menuItem.appFuncId) {
-      throw new RuntimeModelError25(
+      throw new RuntimeModelError26(
         menuItem,
         ibiz.i18n.t("runtime.controller.control.menu.noConfigured")
       );
@@ -39672,7 +39708,7 @@ var AppMenuController = class extends ControlController {
 import {
   findRecursiveChild as findRecursiveChild2,
   RuntimeError as RuntimeError34,
-  RuntimeModelError as RuntimeModelError26
+  RuntimeModelError as RuntimeModelError27
 } from "@ibiz-template/core";
 var AppMenuIconViewController = class extends AppMenuController {
   async onClickMenuItem(id, event) {
@@ -39690,7 +39726,7 @@ var AppMenuIconViewController = class extends AppMenuController {
       event
     });
     if (!menuItem.appFuncId) {
-      throw new RuntimeModelError26(
+      throw new RuntimeModelError27(
         menuItem,
         ibiz.i18n.t("runtime.controller.control.menu.noConfigured")
       );
@@ -39712,7 +39748,7 @@ var AppMenuIconViewController = class extends AppMenuController {
 
 // src/controller/control/calendar/calendar.controller.ts
 import dayjs3 from "dayjs";
-import { RuntimeError as RuntimeError45, RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError45, RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
 
 // src/controller/control/calendar/calendar.service.ts
 import { RuntimeError as RuntimeError35 } from "@ibiz-template/core";
@@ -39928,11 +39964,11 @@ var CalendarService = class extends MDControlService {
 import { recursiveIterate as recursiveIterate2, RuntimeError as RuntimeError44 } from "@ibiz-template/core";
 
 // src/ui-action/provider/backend-ui-action-provider.ts
-import { RuntimeModelError as RuntimeModelError45 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError46 } from "@ibiz-template/core";
 import { isArray as isArray9 } from "qx-util";
 
 // src/ui-action/provider/ui-action-provider-base.ts
-import { RuntimeModelError as RuntimeModelError44 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError45 } from "@ibiz-template/core";
 
 // src/ui-logic/index.ts
 import { RuntimeError as RuntimeError41 } from "@ibiz-template/core";
@@ -39941,7 +39977,7 @@ import { RuntimeError as RuntimeError41 } from "@ibiz-template/core";
 import {
   IBizContext as IBizContext6,
   ModelError as ModelError23,
-  RuntimeModelError as RuntimeModelError43
+  RuntimeModelError as RuntimeModelError44
 } from "@ibiz-template/core";
 import { clone as clone25 } from "ramda";
 
@@ -40096,20 +40132,20 @@ var UILogicContext = class {
 };
 
 // src/ui-logic/ui-logic-node/de-action-node/de-action-node.ts
-import { RuntimeModelError as RuntimeModelError29 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError30 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-link/ui-logic-link.ts
 import { ModelError as ModelError18 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-link/ui-logic-link-group-cond/ui-logic-link-group-cond.ts
-import { RuntimeModelError as RuntimeModelError28 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError29 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-link/ui-logic-link-cond/ui-logic-link-cond.ts
 var UILogicLinkCond = class {
 };
 
 // src/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.ts
-import { ModelError as ModelError17, RuntimeModelError as RuntimeModelError27 } from "@ibiz-template/core";
+import { ModelError as ModelError17, RuntimeModelError as RuntimeModelError28 } from "@ibiz-template/core";
 
 // src/ui-logic/utils/handle-src-val.ts
 import { ModelError as ModelError16 } from "@ibiz-template/core";
@@ -40248,7 +40284,7 @@ var UILogicLinkSingleCond = class extends UILogicLinkCond {
       switch (this.type) {
         case "ENTITYFIELD": {
           if (!this.value) {
-            throw new RuntimeModelError27(
+            throw new RuntimeModelError28(
               this.model,
               ibiz.i18n.t("runtime.uiLogic.currentConditionValue")
             );
@@ -40260,7 +40296,7 @@ var UILogicLinkSingleCond = class extends UILogicLinkCond {
         }
         case "SRCENTITYFIELD": {
           if (!this.value) {
-            throw new RuntimeModelError27(
+            throw new RuntimeModelError28(
               this.model,
               ibiz.i18n.t("runtime.uiLogic.sourceDataObjectAttribute")
             );
@@ -40351,7 +40387,7 @@ var UILogicLinkGroupCond = class _UILogicLinkGroupCond extends UILogicLinkCond {
   test(ctx, context, data) {
     let bol = this.op !== "OR";
     if (this.conds.length === 0) {
-      throw new RuntimeModelError28(
+      throw new RuntimeModelError29(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.interfaceConnectionConditional")
       );
@@ -40500,13 +40536,13 @@ var DEActionNode2 = class extends UILogicNode {
       retDEUILogicParamId
     } = this.model;
     if (!dstAppDataEntityId) {
-      throw new RuntimeModelError29(
+      throw new RuntimeModelError30(
         this.model,
         ibiz.i18n.t("runtime.deLogic.deLogicNode.unspecifiedEntity")
       );
     }
     if (!dstAppDEActionId) {
-      throw new RuntimeModelError29(
+      throw new RuntimeModelError30(
         this.model,
         ibiz.i18n.t("runtime.deLogic.deLogicNode.unspecifiedBehavior")
       );
@@ -40537,13 +40573,18 @@ var DEActionNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts
-import { RuntimeModelError as RuntimeModelError30 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError31 } from "@ibiz-template/core";
 var DEUIActionNode = class extends UILogicNode {
   async exec(ctx) {
-    const { dstAppDEUIActionId, dstDEUILogicParamId, dstAppDataEntityId } = this.model;
+    const {
+      dstAppDEUIActionId,
+      dstDEUILogicParamId,
+      dstAppDataEntityId,
+      retDEUILogicParamId
+    } = this.model;
     const { data, parameters } = ctx;
     if (!dstAppDEUIActionId) {
-      throw new RuntimeModelError30(
+      throw new RuntimeModelError31(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.noConfiguredInterfaceBehavior")
       );
@@ -40557,15 +40598,7 @@ var DEUIActionNode = class extends UILogicNode {
         actionData = [param];
       }
     }
-    ibiz.log.debug(
-      ibiz.i18n.t("runtime.uiLogic.interfaceLogicNodeEntityInterfaceAction", {
-        id: this.model.id,
-        dstAppDEUIActionId,
-        dstAppDataEntityId,
-        dstDEUILogicParamId
-      })
-    );
-    await UIActionUtil.execAndResolved(
+    const res = await UIActionUtil.exec(
       dstAppDEUIActionId,
       {
         ...parameters,
@@ -40575,6 +40608,19 @@ var DEUIActionNode = class extends UILogicNode {
       },
       this.model.appId
     );
+    if (!res.cancel) {
+      ctx.params[retDEUILogicParamId] = res.data;
+      ctx.setLastReturn(ctx.params[retDEUILogicParamId]);
+    }
+    ibiz.log.debug(
+      ibiz.i18n.t("runtime.uiLogic.interfaceLogicNodeEntityInterfaceAction", {
+        id: this.model.id,
+        dstAppDEUIActionId,
+        dstAppDataEntityId,
+        dstDEUILogicParamId
+      }),
+      ctx.params[retDEUILogicParamId]
+    );
   }
 };
 
@@ -40813,26 +40859,26 @@ var PrepareJSParamNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-invoke-node/view-ctrl-invoke-node.ts
-import { RuntimeError as RuntimeError37, RuntimeModelError as RuntimeModelError31 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError37, RuntimeModelError as RuntimeModelError32 } from "@ibiz-template/core";
 import { isFunction } from "lodash-es";
 var ViewCtrlInvokeNode = class extends UILogicNode {
   async exec(ctx) {
     ctx.isEndNode = true;
     const { invokeMethod, invokeCtrlId, invokeParamId } = this.model;
     if (!invokeCtrlId) {
-      throw new RuntimeModelError31(
+      throw new RuntimeModelError32(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.noConfiguredInterfaceObject")
       );
     }
     if (!invokeParamId) {
-      throw new RuntimeModelError31(
+      throw new RuntimeModelError32(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.noConfiguredOperatingParameters")
       );
     }
     if (!invokeMethod) {
-      throw new RuntimeModelError31(
+      throw new RuntimeModelError32(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.noConfiguredCallMethod")
       );
@@ -40873,12 +40919,12 @@ var ViewCtrlInvokeNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/bind-param-node/bind-param-node.ts
-import { RuntimeModelError as RuntimeModelError32 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError33 } from "@ibiz-template/core";
 var BindParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
-      throw new RuntimeModelError32(
+      throw new RuntimeModelError33(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.missingTargetParameter")
       );
@@ -40897,7 +40943,7 @@ var BindParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/msg-box-node/msg-box-node.ts
-import { ModelError as ModelError21, RuntimeModelError as RuntimeModelError33 } from "@ibiz-template/core";
+import { ModelError as ModelError21, RuntimeModelError as RuntimeModelError34 } from "@ibiz-template/core";
 var MsgBoxNode = class extends UILogicNode {
   constructor() {
     super(...arguments);
@@ -40911,13 +40957,13 @@ var MsgBoxNode = class extends UILogicNode {
   async exec(ctx) {
     const { msgBoxType, buttonsType, msgBoxParamId } = this.model;
     if (!msgBoxType) {
-      throw new RuntimeModelError33(
+      throw new RuntimeModelError34(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.missingMessageTypeConfiguration")
       );
     }
     if (!buttonsType) {
-      throw new RuntimeModelError33(
+      throw new RuntimeModelError34(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.missingButtonTypeConfiguration")
       );
@@ -41001,12 +41047,12 @@ var PFPluginNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/debug-param-node/debug-param-node.ts
-import { RuntimeModelError as RuntimeModelError34 } from "@ibiz-template/core";
-var DebugParamNode = class extends UILogicNode {
+import { RuntimeModelError as RuntimeModelError35 } from "@ibiz-template/core";
+var DebugParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, name: name2 } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError34(
+      throw new RuntimeModelError35(
         this.model,
         ibiz.i18n.t("runtime.deLogic.deLogicNode.missingConfiguration")
       );
@@ -41020,12 +41066,12 @@ var DebugParamNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/reset-param-node/reset-param-node.ts
-import { RuntimeModelError as RuntimeModelError35 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError36 } from "@ibiz-template/core";
 var ResetParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError35(
+      throw new RuntimeModelError36(
         this.model,
         ibiz.i18n.t("runtime.deLogic.deLogicNode.missingConfiguration")
       );
@@ -41042,13 +41088,13 @@ var ResetParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/copy-param-node/copy-param-node.ts
-import { RuntimeModelError as RuntimeModelError36 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError37 } from "@ibiz-template/core";
 import { clone as clone24 } from "ramda";
 var CopyParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
-      throw new RuntimeModelError36(
+      throw new RuntimeModelError37(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.missingTargetParameter")
       );
@@ -41067,7 +41113,7 @@ var CopyParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/append-param-node/append-param-node.ts
-import { RuntimeModelError as RuntimeModelError37 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError38 } from "@ibiz-template/core";
 var AppendParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -41078,7 +41124,7 @@ var AppendParamNode2 = class extends UILogicNode {
       srcSize
     } = this.model;
     if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
-      throw new RuntimeModelError37(
+      throw new RuntimeModelError38(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.missingTargetParameter")
       );
@@ -41103,12 +41149,12 @@ var AppendParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/sort-param-node/sort-param-node.ts
-import { RuntimeModelError as RuntimeModelError38 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError39 } from "@ibiz-template/core";
 var SortParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, dstSortDir, dstFieldName } = this.model;
     if (!dstDEUILogicParamId || !dstFieldName) {
-      throw new RuntimeModelError38(
+      throw new RuntimeModelError39(
         this.model,
         ibiz.i18n.t("runtime.deLogic.deLogicNode.missingParameterProperty")
       );
@@ -41132,12 +41178,12 @@ var SortParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/renew-param-node/renew-param-node.ts
-import { RuntimeModelError as RuntimeModelError39 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError40 } from "@ibiz-template/core";
 var RenewParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError39(
+      throw new RuntimeModelError40(
         this.model,
         ibiz.i18n.t("runtime.deLogic.deLogicNode.missingConfiguration")
       );
@@ -41154,7 +41200,7 @@ var RenewParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/data-set-node/data-set-node.ts
-import { RuntimeModelError as RuntimeModelError40 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
 var DataSetNode2 = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -41164,7 +41210,7 @@ var DataSetNode2 = class extends UILogicNode {
       retDEUILogicParamId
     } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError40(
+      throw new RuntimeModelError41(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.missingfilter")
       );
@@ -41209,25 +41255,25 @@ var ThrowExceptionNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-fire-event-node/view-ctrl-fire-event-node.ts
-import { RuntimeError as RuntimeError39, RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError39, RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
 var ViewCtrlFireEventNode = class extends UILogicNode {
   async exec(ctx) {
     ctx.isEndNode = true;
     const { eventName, eventParamId, fireCtrlId } = this.model;
     if (!fireCtrlId) {
-      throw new RuntimeModelError41(
+      throw new RuntimeModelError42(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.noConfiguredTriggerObject")
       );
     }
     if (!eventName) {
-      throw new RuntimeModelError41(
+      throw new RuntimeModelError42(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.noConfiguredEvent")
       );
     }
     if (!eventParamId) {
-      throw new RuntimeModelError41(
+      throw new RuntimeModelError42(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.noConfiguredEventParameters")
       );
@@ -41262,7 +41308,7 @@ var ViewCtrlFireEventNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts
-import { RuntimeError as RuntimeError40, RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError40, RuntimeModelError as RuntimeModelError43 } from "@ibiz-template/core";
 var ExecuteDELogicNode = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -41272,19 +41318,19 @@ var ExecuteDELogicNode = class extends UILogicNode {
       retDEUILogicParamId
     } = this.model;
     if (!dstAppDataEntityId) {
-      throw new RuntimeModelError42(
+      throw new RuntimeModelError43(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.noEntityConfigured")
       );
     }
     if (!dstAppDELogicId) {
-      throw new RuntimeModelError42(
+      throw new RuntimeModelError43(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.noEntityLogicConfigured")
       );
     }
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError42(
+      throw new RuntimeModelError43(
         this.model,
         ibiz.i18n.t("runtime.uiLogic.noIncomingLogic")
       );
@@ -41513,7 +41559,7 @@ var UILogic = class {
     this.params = /* @__PURE__ */ new Map();
     var _a3;
     if (!((_a3 = model.deuilogicNodes) == null ? void 0 : _a3.length)) {
-      throw new RuntimeModelError43(
+      throw new RuntimeModelError44(
         model,
         ibiz.i18n.t("runtime.uiLogic.noLogicalNodesConfigured")
       );
@@ -41553,7 +41599,7 @@ var UILogic = class {
           logicNode = new MsgBoxNode(node);
           break;
         case "DEBUGPARAM":
-          logicNode = new DebugParamNode(node);
+          logicNode = new DebugParamNode2(node);
           break;
         case "APPENDPARAM":
           logicNode = new AppendParamNode2(node);
@@ -41643,7 +41689,7 @@ var UILogic = class {
       const start = this.nodes.get(startDEUILogicNodeId);
       await this.deepExec(start, ctx);
     } else {
-      throw new RuntimeModelError43(
+      throw new RuntimeModelError44(
         this.model,
         ibiz.i18n.t("runtime.deLogic.deLogicNode.noSetStartNode")
       );
@@ -41834,7 +41880,7 @@ var UIActionProviderBase = class {
     const { appDEUILogicId, appDataEntityId, uilogicAttachMode } = action;
     if (uilogicAttachMode === "REPLACE") {
       if (!appDEUILogicId) {
-        throw new RuntimeModelError44(
+        throw new RuntimeModelError45(
           action,
           ibiz.i18n.t("runtime.logicScheduler.executor.noConfiguredLogic")
         );
@@ -41862,7 +41908,7 @@ var UIActionProviderBase = class {
     }
     if (action.uilogicAttachMode === "AFTER") {
       if (!appDEUILogicId) {
-        throw new RuntimeModelError44(
+        throw new RuntimeModelError45(
           action,
           ibiz.i18n.t("runtime.logicScheduler.executor.noConfiguredLogic")
         );
@@ -42146,7 +42192,7 @@ var BackendUIActionProvider = class extends UIActionProviderBase {
     const entityName = action.appDataEntityId;
     const methodName = action.appDEMethodId;
     if (!entityName || !methodName) {
-      throw new RuntimeModelError45(
+      throw new RuntimeModelError46(
         action,
         ibiz.i18n.t("runtime.uiAction.noEntityOrBehavior")
       );
@@ -42281,7 +42327,7 @@ var SysUIActionProvider = class extends UIActionProviderBase {
 // src/ui-action/provider/front-ui-action-provider.ts
 import {
   StringUtil as StringUtil4,
-  RuntimeModelError as RuntimeModelError46,
+  RuntimeModelError as RuntimeModelError47,
   ModelError as ModelError24,
   RuntimeError as RuntimeError43
 } from "@ibiz-template/core";
@@ -42305,7 +42351,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       case "WIZARD": {
         const frontPSAppView = action.frontAppViewId;
         if (!frontPSAppView) {
-          throw new RuntimeModelError46(
+          throw new RuntimeModelError47(
             action,
             ibiz.i18n.t("runtime.uiAction.noConfiguredopenView")
           );
@@ -42395,7 +42441,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       );
       return result || {};
     }
-    throw new RuntimeModelError46(
+    throw new RuntimeModelError47(
       action,
       ibiz.i18n.t("runtime.uiAction.missingConfigurationScriptCode")
     );
@@ -42474,7 +42520,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
     const { resultContext, resultParams, presetParams } = await this.handleParams(action, args.context, args.data, args.params);
     const { appDataEntityId, appDEDataImportId, frontAppViewId } = action;
     if (!appDataEntityId || !appDEDataImportId) {
-      throw new RuntimeModelError46(
+      throw new RuntimeModelError47(
         action,
         ibiz.i18n.t("runtime.controller.common.control.noImportModel")
       );
@@ -42619,6 +42665,9 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
             overlay.dismiss();
           }
           hasSave = true;
+        },
+        onFinish: (_eventArgs) => {
+          overlay == null ? void 0 : overlay.dismiss();
         }
       },
       popoverOpts
@@ -42775,7 +42824,7 @@ var LoginOutUIActionProvider = class extends UIActionProviderBase {
 };
 
 // src/ui-action/provider/custom-ui-action-provider.ts
-import { RuntimeModelError as RuntimeModelError47 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
 var CustomUIActionProvider = class extends UIActionProviderBase {
   async execAction(action, args) {
     const { scriptCode } = action;
@@ -42787,7 +42836,7 @@ var CustomUIActionProvider = class extends UIActionProviderBase {
       );
       return result || {};
     }
-    throw new RuntimeModelError47(
+    throw new RuntimeModelError48(
       action,
       ibiz.i18n.t("runtime.uiAction.missingConfigurationScriptCode")
     );
@@ -43400,7 +43449,7 @@ var CalendarController = class extends MDControlController {
       }
     ));
     if (result === -1)
-      throw new RuntimeModelError48(
+      throw new RuntimeModelError49(
         calendarItem,
         ibiz.i18n.t("runtime.controller.common.md.logicOpendata", {
           itemType: calendarItem.itemType.toLowerCase()
@@ -43436,7 +43485,7 @@ var CalendarController = class extends MDControlController {
       }
     ));
     if (result === -1)
-      throw new RuntimeModelError48(
+      throw new RuntimeModelError49(
         calendarItem,
         ibiz.i18n.t("runtime.controller.common.md.logicNewdata", {
           itemType: calendarItem.itemType.toLowerCase()
@@ -43827,10 +43876,10 @@ import { isObject as isObject2, isString as isString2 } from "qx-util";
 import { RuntimeError as RuntimeError46 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/line-series-generator.ts
-import { RuntimeModelError as RuntimeModelError50 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError51 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/base-series-generator.ts
-import { plus, RuntimeModelError as RuntimeModelError49, toNumberOrNil } from "@ibiz-template/core";
+import { plus, RuntimeModelError as RuntimeModelError50, toNumberOrNil } from "@ibiz-template/core";
 import dayjs4 from "dayjs";
 import minMax from "dayjs/plugin/minMax";
 import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
@@ -43912,13 +43961,13 @@ var BaseSeriesGenerator = class {
     var _a3;
     const { chartSeriesEncode, caption, id, userParam } = model;
     if (!model.catalogField) {
-      throw new RuntimeModelError49(
+      throw new RuntimeModelError50(
         model,
         ibiz.i18n.t("runtime.controller.control.chart.missingClassification")
       );
     }
     if (!model.valueField) {
-      throw new RuntimeModelError49(
+      throw new RuntimeModelError50(
         model,
         ibiz.i18n.t("runtime.controller.control.chart.missingValue")
       );
@@ -44665,13 +44714,13 @@ var BaseSeriesGenerator = class {
 var LineSeriesGenerator = class extends BaseSeriesGenerator {
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError50(
+      throw new RuntimeModelError51(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredX")
       );
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError50(
+      throw new RuntimeModelError51(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredY")
       );
@@ -44690,17 +44739,17 @@ var LineSeriesGenerator = class extends BaseSeriesGenerator {
 };
 
 // src/controller/control/chart/generator/bar-series-generator.ts
-import { RuntimeModelError as RuntimeModelError51 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError52 } from "@ibiz-template/core";
 var BarSeriesGenerator = class extends BaseSeriesGenerator {
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError51(
+      throw new RuntimeModelError52(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredX")
       );
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError51(
+      throw new RuntimeModelError52(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredY")
       );
@@ -44756,17 +44805,17 @@ var PieSeriesGenerator = class extends BaseSeriesGenerator {
 };
 
 // src/controller/control/chart/generator/scatter-series-generator.ts
-import { RuntimeModelError as RuntimeModelError52 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError53 } from "@ibiz-template/core";
 var ScatterSeriesGenerator = class extends BaseSeriesGenerator {
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError52(
+      throw new RuntimeModelError53(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredX")
       );
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError52(
+      throw new RuntimeModelError53(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredY")
       );
@@ -44896,7 +44945,7 @@ var RadarSeriesGenerator = class extends BaseSeriesGenerator {
 };
 
 // src/controller/control/chart/generator/area-series-generator.ts
-import { RuntimeModelError as RuntimeModelError53 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError54 } from "@ibiz-template/core";
 var AreaSeriesGenerator = class extends BaseSeriesGenerator {
   /**
    * 计算静态序列的options
@@ -44905,13 +44954,13 @@ var AreaSeriesGenerator = class extends BaseSeriesGenerator {
    */
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError53(
+      throw new RuntimeModelError54(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredX")
       );
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError53(
+      throw new RuntimeModelError54(
         this.model,
         ibiz.i18n.t("runtime.controller.control.chart.noConfiguredY")
       );
@@ -44961,7 +45010,7 @@ var GaugeSeriesGenerator = class extends BaseSeriesGenerator {
 // src/controller/control/chart/generator/candlestick-series-generator.ts
 import { isNil as isNil28 } from "ramda";
 import { isArray as isArray10, isNumber as isNumber4 } from "qx-util";
-import { plus as plus2, RuntimeModelError as RuntimeModelError54, toNumberOrNil as toNumberOrNil2 } from "@ibiz-template/core";
+import { plus as plus2, RuntimeModelError as RuntimeModelError55, toNumberOrNil as toNumberOrNil2 } from "@ibiz-template/core";
 var CandlestickSeriesGenerator = class extends BaseSeriesGenerator {
   /**
    * 初始化参数
@@ -44974,7 +45023,7 @@ var CandlestickSeriesGenerator = class extends BaseSeriesGenerator {
     var _a3;
     const { chartSeriesEncode, caption, id, userParam, navViewParamJO } = model;
     if (!model.catalogField) {
-      throw new RuntimeModelError54(
+      throw new RuntimeModelError55(
         model,
         ibiz.i18n.t("runtime.controller.control.chart.missingClassification")
       );
@@ -46790,6 +46839,24 @@ function filterPortletByConfig(config, items) {
   }
   return effectivePortlets;
 }
+function deepFillSubAppId(model, appId2) {
+  model.appId = appId2;
+  const keys = Object.keys(model);
+  keys.forEach((key) => {
+    const value = model[key];
+    if (value && typeof value === "object") {
+      if (Array.isArray(value)) {
+        value.forEach((item) => {
+          if (item && typeof item === "object") {
+            deepFillSubAppId(item, appId2);
+          }
+        });
+      } else {
+        deepFillSubAppId(value, appId2);
+      }
+    }
+  });
+}
 
 // src/controller/control/dashboard/dashboard.controller.ts
 var DashboardController = class extends ControlController {
@@ -46955,7 +47022,7 @@ var DashboardController = class extends ControlController {
    */
   async loadAllDynaPortlet() {
     var _a3;
-    const app = ibiz.hub.getApp(ibiz.env.appId);
+    const app = ibiz.hub.getApp(this.model.appId);
     const result = [];
     if (this.controlParams.dynamiccodelist) {
       const dynamicCodeListTag = this.controlParams.dynamiccodelist;
@@ -47009,7 +47076,7 @@ var DashboardController = class extends ControlController {
    * @return {*}  {(Promise<IDBPortletPart | undefined>)}
    */
   async loadDynaPortletById(id) {
-    const app = ibiz.hub.getApp(ibiz.env.appId);
+    const app = ibiz.hub.getApp(this.model.appId);
     const tempContext = clone31(this.context);
     Object.assign(tempContext, { psappportlet: id });
     const res = await app.deService.exec(
@@ -47104,7 +47171,7 @@ var DashboardController = class extends ControlController {
     var _a3;
     if (!this.customDashboard)
       return;
-    const app = ibiz.hub.getApp(ibiz.env.appId);
+    const app = ibiz.hub.getApp(this.model.appId);
     if (isNewFilter) {
       const portletCat = (_a3 = app.model.appPortletCats) == null ? void 0 : _a3.find(
         (cat) => {
@@ -47186,7 +47253,7 @@ var DashboardController = class extends ControlController {
             var _a3, _b2;
             const filterParam = this.customDashboard.portletFilter[key];
             const { config, searchconds } = filterParam;
-            const app = ibiz.hub.getApp(ibiz.env.appId);
+            const app = ibiz.hub.getApp(this.model.appId);
             const targetFilter = (_a3 = app.model.appPortlets) == null ? void 0 : _a3.find(
               (portletModel) => {
                 return portletModel.id === key;
@@ -47451,6 +47518,7 @@ var CustomDashboardController = class {
    * @Date: 2023-09-20 16:22:49
    */
   async loadCustomModelData() {
+    var _a3;
     if (this.multiMode && !this.context.srfdynadashboardid) {
       return { model: this.customModelData, config: this.portletConfig };
     }
@@ -47467,6 +47535,7 @@ var CustomDashboardController = class {
     if (res.model) {
       for (let i = 0; i < res.model.length; i++) {
         const item = res.model[i];
+        const mainApp = ibiz.hub.getApp(ibiz.env.appId);
         if (item.orignModel) {
           item.portletModel = await ibiz.hub.translationModelToDsl(
             item.portletModel,
@@ -47474,6 +47543,13 @@ var CustomDashboardController = class {
           );
           delete item.orignModel;
         }
+        const targetApp = (_a3 = mainApp.model.subAppRefs) == null ? void 0 : _a3.find((app) => {
+          var _a4;
+          return (_a4 = app.id) == null ? void 0 : _a4.endsWith(item.appCodeName);
+        });
+        if (targetApp && targetApp.id) {
+          deepFillSubAppId(item.portletModel, targetApp.id);
+        }
       }
       this.customModelData = res.model;
     }
@@ -48145,7 +48221,7 @@ import { clone as clone34 } from "ramda";
 import { isString as isString3 } from "lodash-es";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
-import { RuntimeModelError as RuntimeModelError55 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError56 } from "@ibiz-template/core";
 
 // src/controller/control/search-bar/util.ts
 var ItemsValueOPs = [
@@ -48226,7 +48302,7 @@ var SearchBarFilterController = class {
   async init() {
     if (!this.noEditor) {
       if (!this.model.editor) {
-        throw new RuntimeModelError55(
+        throw new RuntimeModelError56(
           this.model,
           ibiz.i18n.t("runtime.controller.control.searchBar.missingModel")
         );
@@ -50141,7 +50217,7 @@ import {
   clone as clone36,
   DataTypes as DataTypes4,
   isElementSame as isElementSame2,
-  RuntimeModelError as RuntimeModelError56
+  RuntimeModelError as RuntimeModelError57
 } from "@ibiz-template/core";
 import { isNil as isNil30 } from "ramda";
 import { createUUID as createUUID13, isBoolean } from "qx-util";
@@ -50534,7 +50610,7 @@ var DataViewControlController = class extends MDControlController {
     const { enableGroup } = this.state;
     if (enableGroup && groupMode) {
       if (!groupAppDEFieldId) {
-        throw new RuntimeModelError56(
+        throw new RuntimeModelError57(
           this.model,
           ibiz.i18n.t(
             "runtime.controller.control.dataView.propertiesNoConfigured"
@@ -50627,7 +50703,7 @@ var DataViewControlController = class extends MDControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError56(
+      throw new RuntimeModelError57(
         this.model,
         ibiz.i18n.t("runtime.controller.control.dataView.tableNoConfigured")
       );
@@ -50740,7 +50816,7 @@ var DataViewControlController = class extends MDControlController {
         caption = ibiz.i18n.t(item.capLanguageRes.lanResTag, item.caption);
       }
       if (!item.appDEFieldId) {
-        throw new RuntimeModelError56(
+        throw new RuntimeModelError57(
           item,
           ibiz.i18n.t("runtime.controller.control.dataView.sortingItems")
         );
@@ -50961,13 +51037,13 @@ var DataViewControlController = class extends MDControlController {
       await this.updateChangedItems([draggedItem]);
     } else {
       if (!minorSortAppDEFieldId)
-        throw new RuntimeModelError56(
+        throw new RuntimeModelError57(
           this.model,
           ibiz.i18n.t("runtime.controller.common.md.sortingProperties")
         );
       const moveAction = moveControlAction == null ? void 0 : moveControlAction.appDEMethodId;
       if (!moveAction)
-        throw new RuntimeModelError56(
+        throw new RuntimeModelError57(
           this.model,
           ibiz.i18n.t("runtime.controller.common.md.noMoveDataCconfig")
         );
@@ -51009,14 +51085,14 @@ var DataViewControlController = class extends MDControlController {
 };
 
 // src/controller/control/exp-bar/calendar-exp-bar.controller.ts
-import { RuntimeModelError as RuntimeModelError58 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError59 } from "@ibiz-template/core";
 
 // src/controller/control/exp-bar/exp-bar.controller.ts
 import {
   IBizParams as IBizParams3,
   IBizContext as IBizContext8,
   RuntimeError as RuntimeError49,
-  RuntimeModelError as RuntimeModelError57
+  RuntimeModelError as RuntimeModelError58
 } from "@ibiz-template/core";
 var ExpBarControlController = class extends ControlController {
   constructor(model, context, params, ctx) {
@@ -51111,7 +51187,7 @@ var ExpBarControlController = class extends ControlController {
   get xDataController() {
     const controller = this.view.getController(this.model.xdataControlName);
     if (!controller) {
-      throw new RuntimeModelError57(
+      throw new RuntimeModelError58(
         this.model,
         ibiz.i18n.t("runtime.controller.control.expBar.unableMore", {
           xdataControlName: this.model.xdataControlName
@@ -51503,7 +51579,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
   get xDataController() {
     const controller = this.view.getController(this.model.xdataControlName);
     if (!controller)
-      throw new RuntimeModelError58(
+      throw new RuntimeModelError59(
         this.model,
         ibiz.i18n.t("runtime.controller.control.expBar.unableMore", {
           xdataControlName: this.model.xdataControlName
@@ -51588,7 +51664,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/exp-bar/tree-exp-bar.controller.ts
-import { RuntimeError as RuntimeError50, RuntimeModelError as RuntimeModelError59 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError50, RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
 var TreeExpBarController = class extends ExpBarControlController {
   constructor() {
     super(...arguments);
@@ -51611,7 +51687,7 @@ var TreeExpBarController = class extends ExpBarControlController {
   get xDataController() {
     const controller = this.view.getController(this.model.xdataControlName);
     if (!controller) {
-      throw new RuntimeModelError59(
+      throw new RuntimeModelError60(
         this.model,
         ibiz.i18n.t("runtime.controller.control.expBar.unableMore", {
           xdataControlName: this.model.xdataControlName
@@ -51933,7 +52009,7 @@ import { RuntimeError as RuntimeError52 } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.controller.ts
 import {
-  RuntimeModelError as RuntimeModelError60,
+  RuntimeModelError as RuntimeModelError61,
   debounceAndAsyncMerge,
   recursiveIterate as recursiveIterate6,
   EntityError,
@@ -52179,7 +52255,7 @@ var FormController = class extends ControlController {
           return;
         }
         if (form.details[detail.id]) {
-          throw new RuntimeModelError60(
+          throw new RuntimeModelError61(
             detail,
             ibiz.i18n.t(
               "runtime.controller.control.form.initializationException",
@@ -54863,7 +54939,7 @@ var FormMDCtrlController = class extends FormDetailController {
 import {
   ModelError as ModelError25,
   mergeInLeft as mergeInLeft2,
-  RuntimeModelError as RuntimeModelError61
+  RuntimeModelError as RuntimeModelError62
 } from "@ibiz-template/core";
 var FormMDCtrlMDController = class extends FormMDCtrlController {
   constructor() {
@@ -54902,7 +54978,7 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
       if (((_a3 = this.context) == null ? void 0 : _a3.srfrunmode) === "DESIGN") {
         return;
       }
-      throw new RuntimeModelError61(
+      throw new RuntimeModelError62(
         this.model,
         ibiz.i18n.t("runtime.controller.control.form.unconfiguredWidgets")
       );
@@ -55033,7 +55109,7 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts
-import { RuntimeError as RuntimeError53, RuntimeModelError as RuntimeModelError62 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError53, RuntimeModelError as RuntimeModelError63 } from "@ibiz-template/core";
 import { createUUID as createUUID15 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.ts
@@ -55078,7 +55154,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
       if (((_a3 = this.context) == null ? void 0 : _a3.srfrunmode) === "DESIGN") {
         return;
       }
-      throw new RuntimeModelError62(
+      throw new RuntimeModelError63(
         this.model,
         ibiz.i18n.t("runtime.controller.control.form.unconfiguredWidgets")
       );
@@ -56029,7 +56105,7 @@ import { clone as clone41, isNil as isNil33 } from "ramda";
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
   recursiveIterate as recursiveIterate10,
-  RuntimeModelError as RuntimeModelError63
+  RuntimeModelError as RuntimeModelError64
 } from "@ibiz-template/core";
 var EditFormService = class extends FormService {
   /**
@@ -56153,7 +56229,7 @@ var EditFormService = class extends FormService {
     const wizardForm = this.model;
     const methodName = (_a3 = wizardForm.goBackControlAction) == null ? void 0 : _a3.appDEMethodId;
     if (!methodName) {
-      throw new RuntimeModelError63(
+      throw new RuntimeModelError64(
         this.model,
         ibiz.i18n.t("runtime.controller.control.form.lackBehavior")
       );
@@ -57399,7 +57475,7 @@ import {
   awaitTimeout as awaitTimeout2,
   RuntimeError as RuntimeError55,
   recursiveIterate as recursiveIterate11,
-  RuntimeModelError as RuntimeModelError65,
+  RuntimeModelError as RuntimeModelError66,
   mergeDefaultInLeft as mergeDefaultInLeft2,
   debounceAndAsyncMerge as debounceAndAsyncMerge2
 } from "@ibiz-template/core";
@@ -57407,7 +57483,7 @@ import { clone as clone43 } from "ramda";
 import dayjs5 from "dayjs";
 
 // src/controller/control/grid/grid/grid.service.ts
-import { RuntimeModelError as RuntimeModelError64 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError65 } from "@ibiz-template/core";
 var GridService = class extends MDControlService {
   /**
    * 初始化属性映射
@@ -57435,7 +57511,7 @@ var GridService = class extends MDControlService {
               dataType: dataItem.dataType
             });
           } else {
-            throw new RuntimeModelError64(
+            throw new RuntimeModelError65(
               column,
               ibiz.i18n.t("runtime.controller.control.grid.corresponding", {
                 deField
@@ -58331,7 +58407,7 @@ var GridController = class extends MDControlController {
       (item) => item.model.appDEFieldId === groupAppDEFieldId
     );
     if (!this.groupFieldColumn) {
-      throw new RuntimeModelError65(
+      throw new RuntimeModelError66(
         this.model,
         ibiz.i18n.t("runtime.controller.control.grid.attributeColumns")
       );
@@ -58342,7 +58418,7 @@ var GridController = class extends MDControlController {
     );
     if (index !== -1 && index !== 0) {
       if (this.isMultistageHeader) {
-        throw new RuntimeModelError65(
+        throw new RuntimeModelError66(
           this.model,
           ibiz.i18n.t("runtime.controller.control.grid.configureFirstColumn", {
             groupFieldName
@@ -58354,13 +58430,13 @@ var GridController = class extends MDControlController {
     }
     if (groupMode === "CODELIST") {
       if (!groupCodeListId) {
-        throw new RuntimeModelError65(
+        throw new RuntimeModelError66(
           this.model,
           ibiz.i18n.t("runtime.controller.control.grid.requiresCodeTable")
         );
       }
       if (this.groupFieldColumn.model.appCodeListId !== groupCodeListId) {
-        throw new RuntimeModelError65(
+        throw new RuntimeModelError66(
           this.model,
           ibiz.i18n.t("runtime.controller.control.grid.noMatchCodeTable", {
             groupFieldName
@@ -58519,7 +58595,7 @@ var GridController = class extends MDControlController {
       return;
     }
     if (!aggAppDEDataSetId || !aggAppDataEntityId) {
-      throw new RuntimeModelError65(
+      throw new RuntimeModelError66(
         this.model,
         ibiz.i18n.t("runtime.controller.control.grid.missingConfiguration")
       );
@@ -59566,7 +59642,7 @@ var GridController = class extends MDControlController {
     var _a3;
     const moveAction = (_a3 = this.model.moveControlAction) == null ? void 0 : _a3.appDEMethodId;
     if (!moveAction) {
-      throw new RuntimeModelError65(
+      throw new RuntimeModelError66(
         this.model,
         ibiz.i18n.t("runtime.controller.common.md.noMoveDataCconfig")
       );
@@ -60091,7 +60167,7 @@ var GridFieldColumnController = class extends GridColumnController {
 };
 
 // src/controller/control/grid/grid-column/grid-ua-column/grid-ua-column.controller.ts
-import { RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError67 } from "@ibiz-template/core";
 var GridUAColumnController = class extends GridColumnController {
   /**
    * 给rowController初始化操作列的状态
@@ -60104,7 +60180,7 @@ var GridUAColumnController = class extends GridColumnController {
     var _a3;
     const { deuiactionGroup } = this.model;
     if (!deuiactionGroup) {
-      throw new RuntimeModelError66(
+      throw new RuntimeModelError67(
         this.model,
         ibiz.i18n.t("runtime.controller.control.grid.behaviorGroup")
       );
@@ -60438,7 +60514,7 @@ import {
   clone as clone46,
   DataTypes as DataTypes7,
   isElementSame as isElementSame4,
-  RuntimeModelError as RuntimeModelError67
+  RuntimeModelError as RuntimeModelError68
 } from "@ibiz-template/core";
 import dayjs7 from "dayjs";
 
@@ -61125,13 +61201,13 @@ var ListController = class extends MDControlController {
       await this.updateChangedItems([draggedItem]);
     } else {
       if (!minorSortAppDEFieldId)
-        throw new RuntimeModelError67(
+        throw new RuntimeModelError68(
           this.model,
           ibiz.i18n.t("runtime.controller.common.md.sortingProperties")
         );
       const moveAction = moveControlAction == null ? void 0 : moveControlAction.appDEMethodId;
       if (!moveAction)
-        throw new RuntimeModelError67(
+        throw new RuntimeModelError68(
           this.model,
           ibiz.i18n.t("runtime.controller.common.md.noMoveDataCconfig")
         );
@@ -62484,7 +62560,7 @@ var TabExpPanelController = class extends ControlController {
 import {
   RuntimeError as RuntimeError58,
   recursiveIterate as recursiveIterate13,
-  RuntimeModelError as RuntimeModelError68
+  RuntimeModelError as RuntimeModelError69
 } from "@ibiz-template/core";
 import { isNil as isNil36 } from "ramda";
 import { isBoolean as isBoolean4 } from "qx-util";
@@ -64005,7 +64081,7 @@ var TreeController = class extends MDControlController {
       const { moveAppDEActionId, appDataEntityId, allowOrder } = orderNodeModel;
       if (allowOrder) {
         if (!moveAppDEActionId) {
-          throw new RuntimeModelError68(
+          throw new RuntimeModelError69(
             this.model,
             ibiz.i18n.t("runtime.controller.common.md.noMoveDataCconfig")
           );
@@ -64087,7 +64163,7 @@ var TreeController = class extends MDControlController {
   async modifyNodeText(nodeData, text) {
     const model = this.getNodeModel(nodeData._nodeId);
     if (!model.allowEditText) {
-      throw new RuntimeModelError68(
+      throw new RuntimeModelError69(
         model,
         ibiz.i18n.t("runtime.controller.control.tree.editMode")
       );
@@ -64200,7 +64276,7 @@ var TreeController = class extends MDControlController {
     const nodeModel = this.getNodeModel(nodeType);
     const parentNodeData = this.getNodeData(parentKey);
     if (!nodeModel) {
-      throw new RuntimeModelError68(
+      throw new RuntimeModelError69(
         this.model,
         ibiz.i18n.t("runtime.controller.control.tree.noFoundTreeNode")
       );
@@ -64332,7 +64408,7 @@ var TreeController = class extends MDControlController {
       }
     ));
     if (result === -1)
-      throw new RuntimeModelError68(
+      throw new RuntimeModelError69(
         nodeModel,
         ibiz.i18n.t("runtime.controller.common.md.logicOpendata", {
           itemType: nodeModel.id.toLowerCase()
@@ -64371,7 +64447,7 @@ var TreeController = class extends MDControlController {
       }
     ));
     if (result === -1)
-      throw new RuntimeModelError68(
+      throw new RuntimeModelError69(
         nodeModel,
         ibiz.i18n.t("runtime.controller.common.md.logicNewdata", {
           itemType: nodeModel.id.toLowerCase()
@@ -64906,8 +64982,9 @@ var WizardPanelController = class extends ControlController {
 };
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
-import { RuntimeModelError as RuntimeModelError69 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError70 } from "@ibiz-template/core";
 import { isNil as isNil37 } from "ramda";
+import { createUUID as createUUID19 } from "qx-util";
 
 // src/controller/control/md-ctrl/md-ctrl.service.ts
 var MDCtrlService = class extends MDControlService {
@@ -64965,12 +65042,54 @@ var MobMDCtrlRowState = class {
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
 var MDCtrlController = class extends MDControlController {
+  /**
+   * @description 启用分组
+   * @readonly
+   * @type {boolean}
+   * @memberof MDCtrlController
+   */
+  get enableGroup() {
+    return this.model.groupMode !== "NONE";
+  }
+  /**
+   * @description 分组时是否显示分组锚点导航
+   * @readonly
+   * @type {boolean}
+   * @memberof MDCtrlController
+   */
+  get showGroupAnchor() {
+    return this.enableGroup && this.controlParams.showgroupanchor === "true";
+  }
   initState() {
     super.initState();
     this.state.rows = [];
     this.state.noSort = this.model.noSort === true;
     this.state.singleSelect = this.model.singleSelect === true;
     this.state.mdctrlActiveMode = 1;
+    this.state.size = this.model.pagingSize || 20;
+    this.initSortDelistItems();
+  }
+  /**
+   * @description 初始化排序配置项集合
+   * @protected
+   * @memberof MDCtrlController
+   */
+  initSortDelistItems() {
+    var _a3;
+    const sortDelistItems = [];
+    (_a3 = this.model.delistItems) == null ? void 0 : _a3.forEach((item) => {
+      var _a4, _b2;
+      if (item.enableSort) {
+        sortDelistItems.push({
+          value: item.id,
+          label: ibiz.i18n.t(
+            ((_a4 = item == null ? void 0 : item.capLanguageRes) == null ? void 0 : _a4.lanResTag) || "",
+            item.caption || ((_b2 = item == null ? void 0 : item.capLanguageRes) == null ? void 0 : _b2.defaultContent)
+          )
+        });
+      }
+    });
+    this.state.sortDelistItems = sortDelistItems;
   }
   async onCreated() {
     await super.onCreated();
@@ -65134,7 +65253,7 @@ var MDCtrlController = class extends MDControlController {
     const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
     if (enableGroup && groupMode) {
       if (!groupAppDEFieldId) {
-        throw new RuntimeModelError69(
+        throw new RuntimeModelError70(
           this.model,
           ibiz.i18n.t(
             "runtime.controller.control.dataView.propertiesNoConfigured"
@@ -65167,9 +65286,17 @@ var MDCtrlController = class extends MDControlController {
     if (groupAppDEFieldId) {
       const { items } = this.state;
       const groupMap = /* @__PURE__ */ new Map();
+      const unclassified = {
+        key: createUUID19(),
+        caption: ibiz.i18n.t("runtime.controller.common.md.unclassified"),
+        children: []
+      };
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
         if (isNil37(groupVal)) {
+          unclassified.children.push(
+            new MobMDCtrlRowState(item, this)
+          );
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -65186,6 +65313,8 @@ var MDCtrlController = class extends MDControlController {
           children: [...value]
         });
       });
+      if (unclassified.children.length)
+        groups.push(unclassified);
       this.state.groups = groups;
     }
   }
@@ -65216,13 +65345,18 @@ var MDCtrlController = class extends MDControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError69(
+      throw new RuntimeModelError70(
         this.model,
         ibiz.i18n.t("runtime.controller.control.dataView.tableNoConfigured")
       );
     }
     const { items } = this.state;
     const groupMap = /* @__PURE__ */ new Map();
+    const unclassified = {
+      key: createUUID19(),
+      caption: ibiz.i18n.t("runtime.controller.common.md.unclassified"),
+      children: []
+    };
     this.groupCodeListItems.forEach((item) => {
       groupMap.set(item.value, []);
     });
@@ -65231,6 +65365,10 @@ var MDCtrlController = class extends MDControlController {
       const groupArr = groupMap.get(groupVal);
       if (groupArr) {
         groupArr.push(new MobMDCtrlRowState(item, this));
+      } else {
+        unclassified.children.push(
+          new MobMDCtrlRowState(item, this)
+        );
       }
     });
     const groups = [];
@@ -65244,6 +65382,8 @@ var MDCtrlController = class extends MDControlController {
         children: arr
       });
     });
+    if (unclassified.children.length)
+      groups.push(unclassified);
     this.state.groups = groups;
   }
   changeCollapse(params = {}) {
@@ -65270,6 +65410,20 @@ var MDCtrlController = class extends MDControlController {
   scrollToTop() {
     throw new Error("Method not implemented.");
   }
+  /**
+   * @description 获取部件默认排序模型
+   * @returns {*}  {({
+   *     minorSortAppDEFieldId: string | undefined;
+   *     minorSortDir: string | undefined;
+   *   })}
+   * @memberof MDCtrlController
+   */
+  getSortModel() {
+    return {
+      minorSortAppDEFieldId: this.model.minorSortAppDEFieldId,
+      minorSortDir: this.model.minorSortDir
+    };
+  }
 };
 
 // src/controller/control/kanban/kanban.controller.ts
@@ -65277,7 +65431,7 @@ import {
   clone as clone47,
   RuntimeError as RuntimeError60,
   isElementSame as isElementSame5,
-  RuntimeModelError as RuntimeModelError70
+  RuntimeModelError as RuntimeModelError71
 } from "@ibiz-template/core";
 
 // src/controller/control/kanban/kanban.service.ts
@@ -65562,7 +65716,7 @@ var KanbanController = class extends DataViewControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError70(
+      throw new RuntimeModelError71(
         this.model,
         ibiz.i18n.t("runtime.controller.control.dataView.tableNoConfigured")
       );
@@ -65626,13 +65780,13 @@ var KanbanController = class extends DataViewControlController {
       await this.updateChangedItems([draggedItem]);
     } else {
       if (!minorSortAppDEFieldId)
-        throw new RuntimeModelError70(
+        throw new RuntimeModelError71(
           this.model,
           ibiz.i18n.t("runtime.controller.common.md.sortingProperties")
         );
       const moveAction = moveControlAction == null ? void 0 : moveControlAction.appDEMethodId;
       if (!moveAction)
-        throw new RuntimeModelError70(
+        throw new RuntimeModelError71(
           this.model,
           ibiz.i18n.t("runtime.controller.common.md.noMoveDataCconfig")
         );
@@ -65833,7 +65987,7 @@ import {
   RuntimeError as RuntimeError61,
   awaitTimeout as awaitTimeout3,
   recursiveIterate as recursiveIterate14,
-  RuntimeModelError as RuntimeModelError71
+  RuntimeModelError as RuntimeModelError72
 } from "@ibiz-template/core";
 import { clone as clone48 } from "ramda";
 
@@ -66218,7 +66372,7 @@ var TreeGridExController = class extends TreeController {
       );
     }
     if (!updateAppDEActionId) {
-      throw new RuntimeModelError71(
+      throw new RuntimeModelError72(
         nodeModel,
         ibiz.i18n.t("runtime.controller.control.treeGridEx.updateBehavior")
       );
@@ -66544,7 +66698,7 @@ var TreeGridExColumnController = class {
 import {
   DataTypes as DataTypes8,
   RuntimeError as RuntimeError62,
-  RuntimeModelError as RuntimeModelError72
+  RuntimeModelError as RuntimeModelError73
 } from "@ibiz-template/core";
 import { clone as clone49 } from "ramda";
 import dayjs8 from "dayjs";
@@ -66575,7 +66729,7 @@ var TreeGridExNodeColumnController = class {
       }
     );
     if (!nodeColumn || !nodeDataItem) {
-      throw new RuntimeModelError72(
+      throw new RuntimeModelError73(
         nodeModel,
         ibiz.i18n.t("runtime.controller.control.treeGridEx.noConfigured", {
           name: this.fieldColumn.name
@@ -66591,7 +66745,7 @@ var TreeGridExNodeColumnController = class {
         }
       );
       if (!nodeEditItem) {
-        throw new RuntimeModelError72(
+        throw new RuntimeModelError73(
           nodeModel,
           ibiz.i18n.t("runtime.controller.control.treeGridEx.editItem", {
             name: this.fieldColumn.name
@@ -67100,8 +67254,8 @@ var TreeGridExUAColumnController = class extends TreeGridExColumnController {
 };
 
 // src/controller/control/tree-grid/tree-grid.controller.ts
-import { RuntimeModelError as RuntimeModelError73 } from "@ibiz-template/core";
-import { createUUID as createUUID19 } from "qx-util";
+import { RuntimeModelError as RuntimeModelError74 } from "@ibiz-template/core";
+import { createUUID as createUUID20 } from "qx-util";
 var TreeGridController = class extends GridController {
   constructor() {
     super(...arguments);
@@ -67145,7 +67299,7 @@ var TreeGridController = class extends GridController {
       return item.treeColumnMode === 4 || item.treeColumnMode === 12;
     });
     if (!treeGridParent)
-      throw new RuntimeModelError73(
+      throw new RuntimeModelError74(
         this.model,
         ibiz.i18n.t("runtime.controller.control.treeGrid.columnMode")
       );
@@ -67153,7 +67307,7 @@ var TreeGridController = class extends GridController {
       return item.treeColumnMode === 2 || item.treeColumnMode === 3;
     });
     if (!treeGridValue)
-      throw new RuntimeModelError73(
+      throw new RuntimeModelError74(
         this.model,
         ibiz.i18n.t("runtime.controller.control.treeGrid.columnsSchema")
       );
@@ -67172,7 +67326,7 @@ var TreeGridController = class extends GridController {
       this.state.expandRowKeys = this.state.expandRowKeys.filter(
         (key) => this.state.items.some((item) => item.srfkey === key)
       );
-    this.state.tableKey = createUUID19();
+    this.state.tableKey = createUUID20();
   }
   async afterLoad(args, items) {
     this.calcTreeGridData(this.state.items);
@@ -67250,7 +67404,7 @@ var TreeGridService = class extends GridService {
 
 // src/controller/control/medit-view-panel/medit-view-panel.controller.ts
 import { RuntimeError as RuntimeError63 } from "@ibiz-template/core";
-import { createUUID as createUUID20 } from "qx-util";
+import { createUUID as createUUID21 } from "qx-util";
 
 // src/controller/control/medit-view-panel/medit-view-panel.service.ts
 var MEditViewPanelService = class extends MDControlService {
@@ -67343,7 +67497,7 @@ var MEditViewPanelController = class extends MDControlController {
    */
   handlePanelItemParams(arg) {
     const [{ parameterName }] = this.parameters;
-    const id = arg[parameterName] ? arg[parameterName] : "mockId:".concat(createUUID20());
+    const id = arg[parameterName] ? arg[parameterName] : "mockId:".concat(createUUID21());
     const item = {
       id,
       context: this.context.clone(),
@@ -68836,6 +68990,28 @@ var GridConverterBase = class extends ConverterBase {
     }
     return result;
   }
+  /**
+   * @description 初始化
+   * - 处理列顺序
+   * @protected
+   * @returns {*}  {Promise<void>}
+   * @memberof GridConverterBase
+   */
+  async onInit() {
+    const { appBIReportDimensions } = this.appBIReport;
+    const { grid_col_sort } = this.reportUIModel;
+    this.dimensions = [];
+    grid_col_sort.forEach((col) => {
+      const dimension = appBIReportDimensions == null ? void 0 : appBIReportDimensions.find(
+        (d) => {
+          var _a3;
+          return ((_a3 = d.dimensionTag) == null ? void 0 : _a3.toLowerCase()) === col.codename.toLowerCase();
+        }
+      );
+      if (dimension)
+        this.dimensions.push(dimension);
+    });
+  }
 };
 
 // src/controller/control/report-panel/generator/bi-converter/stack-col-converter.ts
@@ -69081,13 +69257,6 @@ var GaugeConverter = class extends EchartConverterBase {
     const seriesModels = [];
     measures.forEach((item, index) => {
       const seriesModel = clone52(this.mockSerieModel);
-      const seriesInput = {
-        caption: item.measureName,
-        serieText: item.measureName,
-        catalogName: item.measureName,
-        value: item.measureTag.toLowerCase(),
-        catalogField: item.measureTag.toLowerCase()
-      };
       Object.assign(seriesModel, {
         id: "".concat(seriesModel.seriesType, "_").concat(index),
         caption: item.measureName,
@@ -70249,6 +70418,7 @@ var CrossTableConverter = class extends GridConverterBase {
   }
   /**
    * @description 初始化
+   * - 处理列顺序
    * @protected
    * @returns {*}  {Promise<void>}
    * @memberof CrossTableConverter
@@ -70256,9 +70426,20 @@ var CrossTableConverter = class extends GridConverterBase {
   async onInit() {
     var _a3;
     const { appBIReportDimensions } = this.appBIReport;
-    this.dimensions = (appBIReportDimensions == null ? void 0 : appBIReportDimensions.filter((dimension) => !dimension.placement)) || [];
+    const { grid_col_sort } = this.reportUIModel;
+    this.dimensions = [];
+    grid_col_sort.forEach((col) => {
+      const dimension = appBIReportDimensions == null ? void 0 : appBIReportDimensions.find(
+        (d) => {
+          var _a4;
+          return ((_a4 = d.dimensionTag) == null ? void 0 : _a4.toLowerCase()) === col.codename.toLowerCase();
+        }
+      );
+      if (dimension)
+        this.dimensions.push(dimension);
+    });
     this.dimensionCol = appBIReportDimensions == null ? void 0 : appBIReportDimensions.find(
-      (dimension) => dimension.placement === "COLHEADER"
+      (d) => d.placement === "COLHEADER"
     );
     if ((_a3 = this.dimensionCol) == null ? void 0 : _a3.appCodeListId) {
       const app = ibiz.hub.getApp(this.appBIReport.appId);
@@ -72129,6 +72310,12 @@ var ThemeUtil = class {
      * @memberof ThemeUtil
      */
     this.evt = new QXEventEx();
+    /**
+     * @description 插件主题
+     * @type {IAppUITheme[]}
+     * @memberof ThemeUtil
+     */
+    this.pluginTheme = [];
   }
   /**
    * @description 加载主题插件
@@ -72150,6 +72337,7 @@ var ThemeUtil = class {
     if (type === "COLOR") {
       this.setThemeParams(theme, data);
       this.setTheme(theme.themeTag);
+      this.pluginTheme.push(theme);
     } else {
       this.html.classList.add(theme.themeTag);
     }
@@ -72324,7 +72512,7 @@ var ThemeUtil = class {
 };
 
 // src/utils/ui-domain/ui-domain.ts
-import { QXEvent as QXEvent9, createUUID as createUUID21 } from "qx-util";
+import { QXEvent as QXEvent9, createUUID as createUUID22 } from "qx-util";
 
 // src/utils/ui-domain/transaction.ts
 var Transaction = class {
@@ -72475,7 +72663,7 @@ var UIDomain = class {
     if (id) {
       this.id = id;
     } else {
-      this.id = createUUID21();
+      this.id = createUUID22();
     }
     this.appDataEntityId = appDataEntityId;
   }
@@ -75563,7 +75751,7 @@ var BIReportUtil = class {
 
 // src/utils/record-nav-util/record-nav-util.ts
 import { RuntimeError as RuntimeError67 } from "@ibiz-template/core";
-import { createUUID as createUUID22 } from "qx-util";
+import { createUUID as createUUID23 } from "qx-util";
 var RecordNavUtil = class {
   constructor() {
     /**
@@ -75606,7 +75794,7 @@ var RecordNavUtil = class {
    * @param {IData} tempContext
    */
   addTriggerLogic(viewId, data, tempContext) {
-    const triggerLogicId = "".concat(viewId, ":").concat(createUUID22());
+    const triggerLogicId = "".concat(viewId, ":").concat(createUUID23());
     this.triggerLogicMap.set(triggerLogicId, data);
     tempContext.srfnavlogicid = triggerLogicId;
   }
@@ -82548,6 +82736,14 @@ var AppHub = class {
      * @type {Map<string, Map<string, IModel>>}
      */
     this.plugins = /* @__PURE__ */ new Map();
+    /**
+     * 子应用代码表清单，key为应用标识，值为key为代码表标识，value为代码表模型对象MAP
+     *
+     * @author tony001
+     * @protected
+     * @type {Map<string, Map<string, IAppCodeList>>}
+     */
+    this.codeLists = /* @__PURE__ */ new Map();
     /**
      * hub配置信息服务
      * @author lxm
@@ -82780,6 +82976,20 @@ var AppHub = class {
     }
     return [];
   }
+  /**
+   * 注册子应用代码表
+   *
+   * @author tony001
+   * @param {string} appId
+   * @param {IAppCodeList} model
+   */
+  registerSubAppCodeList(appId2, model) {
+    if (!this.codeLists.has(appId2)) {
+      this.codeLists.set(appId2, /* @__PURE__ */ new Map());
+    }
+    const map = this.codeLists.get(appId2);
+    map.set(model.codeListTag, model);
+  }
   /**
    * 设置应用视图所属应用
    *
@@ -83037,6 +83247,18 @@ var AppHub = class {
     }
     throw new RuntimeError72(ibiz.i18n.t("runtime.service.noFound", { id }));
   }
+  /**
+   * 根据代码表标识获取子应用代码表
+   *
+   * @author tony001
+   * @param {string} id
+   * @param {string} [appId=ibiz.env.appId]
+   * @return {*}  {Promise<IAppCodeList>}
+   */
+  getSubAppCodeList(id, appId2 = ibiz.env.appId) {
+    const targetCodeListMap = this.codeLists.get(appId2);
+    return targetCodeListMap == null ? void 0 : targetCodeListMap.get(id);
+  }
   /**
    * 新建 hub 应用
    *
@@ -83184,6 +83406,16 @@ var AppHub = class {
       app.destroy();
     });
   }
+  /**
+   * 合并子应用代码表
+   * @param codeList
+   */
+  mergeSubAppCodeList(codeList) {
+    if (!this.modelLoaderProvider) {
+      throw new RuntimeError72(ibiz.i18n.t("runtime.utils.firstregister"));
+    }
+    this.modelLoaderProvider.mergeSubAppCodeList(codeList);
+  }
 };
 
 // src/engine/engine-factory.ts
@@ -83831,7 +84063,7 @@ var ViewEngineBase = class {
 };
 
 // src/engine/md-view.engine.ts
-import { RuntimeModelError as RuntimeModelError74 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError75 } from "@ibiz-template/core";
 import { clone as clone60 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
@@ -84083,7 +84315,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError74(
+      throw new RuntimeModelError75(
         this.view.model,
         ibiz.i18n.t("runtime.engine.logicOpendata")
       );
@@ -84115,7 +84347,7 @@ var MDViewEngine = class extends ViewEngineBase {
       (item) => item.id === "newdata"
     );
     if (!openAppViewLogic) {
-      throw new RuntimeModelError74(
+      throw new RuntimeModelError75(
         this.view.model,
         ibiz.i18n.t("runtime.engine.logicNewdata")
       );
@@ -84135,7 +84367,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError74(
+      throw new RuntimeModelError75(
         this.view.model,
         ibiz.i18n.t("runtime.engine.logicNewdata")
       );
@@ -85150,13 +85382,13 @@ var ScriptExecutor = class extends LogicExecutor {
 };
 
 // src/logic-scheduler/executor/app-de-ui-logic-executor.ts
-import { RuntimeModelError as RuntimeModelError75 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError76 } from "@ibiz-template/core";
 var AppDEUILogicExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
     const { appDEUILogicId, appDataEntityId } = this.logic;
     if (!appDEUILogicId) {
-      throw new RuntimeModelError75(
+      throw new RuntimeModelError76(
         this.logic,
         ibiz.i18n.t("runtime.logicScheduler.executor.noConfiguredLogic")
       );
@@ -85647,7 +85879,7 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError78, RuntimeModelError as RuntimeModelError76 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError78, RuntimeModelError as RuntimeModelError77 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -85655,7 +85887,7 @@ var TimerTrigger = class extends LogicTrigger {
   }
   start() {
     if (!this.logic.timer) {
-      throw new RuntimeModelError76(
+      throw new RuntimeModelError77(
         this.logic,
         ibiz.i18n.t("runtime.logicScheduler.trigger.timerLacks")
       );
@@ -85695,7 +85927,7 @@ var TimerTrigger = class extends LogicTrigger {
 import {
   ModelError as ModelError34,
   RuntimeError as RuntimeError79,
-  RuntimeModelError as RuntimeModelError77
+  RuntimeModelError as RuntimeModelError78
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty11 } from "qx-util";
 var AppUILogicExecutor = class extends LogicExecutor {
@@ -85743,7 +85975,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       openViewRef = appUILogic.openDataAppView;
       if (!openViewRef) {
-        throw new RuntimeModelError77(
+        throw new RuntimeModelError78(
           appUILogic,
           ibiz.i18n.t(
             "runtime.logicScheduler.executor.defaultOpendataViewLogic"
@@ -85753,7 +85985,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const openView = openViewRef.refAppViewId;
     if (!openView) {
-      throw new RuntimeModelError77(
+      throw new RuntimeModelError78(
         appUILogic,
         ibiz.i18n.t("runtime.logicScheduler.executor.noActuallyReference")
       );
@@ -85791,7 +86023,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     );
     const typeFileName = appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
     if (!typeFileName) {
-      throw new RuntimeModelError77(
+      throw new RuntimeModelError78(
         appUILogic,
         ibiz.i18n.t("runtime.logicScheduler.executor.attributeConfiguration", {
           codeName: appDataEntity.codeName
@@ -85801,7 +86033,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { data } = parameters;
     const formTypeValue = data[0][typeFileName];
     if (!formTypeValue) {
-      throw new RuntimeModelError77(
+      throw new RuntimeModelError78(
         appUILogic,
         ibiz.i18n.t("runtime.logicScheduler.executor.entityAttributeValues")
       );
@@ -85848,7 +86080,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         return viewRef.refMode.toLowerCase() !== parentDeName;
       });
       if (!newViewRef) {
-        throw new RuntimeModelError77(
+        throw new RuntimeModelError78(
           appUILogic,
           ibiz.i18n.t("runtime.logicScheduler.executor.selectionView")
         );
@@ -85861,7 +86093,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       newViewRef = newDataAppView;
       if (!newViewRef || !newViewRef.refAppViewId) {
-        throw new RuntimeModelError77(
+        throw new RuntimeModelError78(
           appUILogic,
           ibiz.i18n.t("runtime.logicScheduler.executor.newdataViewLogic")
         );
@@ -85934,7 +86166,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { context, params, ...rest } = parameters;
     const { view } = parameters;
     if (!wizardAppView || !wizardAppView.refAppViewId) {
-      throw new RuntimeModelError77(
+      throw new RuntimeModelError78(
         appUILogic,
         ibiz.i18n.t("runtime.logicScheduler.executor.indexEntity")
       );
@@ -85992,7 +86224,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       const minorDERs = selfDe.minorAppDERSs;
       const pickParentDeName = newViewRef.refMode.toLowerCase();
       if (!minorDERs) {
-        throw new RuntimeModelError77(
+        throw new RuntimeModelError78(
           selfDe,
           ibiz.i18n.t("runtime.logicScheduler.executor.relationships")
         );
@@ -86103,12 +86335,12 @@ var ControlEventTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/executor/app-ui-action-executor.ts
-import { RuntimeModelError as RuntimeModelError78 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError79 } from "@ibiz-template/core";
 var AppDEUIActionExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
     if (!this.logic.appDEUIActionId) {
-      throw new RuntimeModelError78(
+      throw new RuntimeModelError79(
         this.logic,
         ibiz.i18n.t("runtime.logicScheduler.executor.missingTrigger")
       );
@@ -86610,7 +86842,8 @@ var en = {
         noSetStartNode: "No start node set",
         startExecuting: "Start executing entity logic, logic identifier: {id} - logic name: {name}",
         endExecution: "End execution entity logic, logic identifier: {id} - logic name: {name}",
-        noFoundEntityLogic: "{dataEntityId} entity logic not found {deDELogicId}"
+        noFoundEntityLogic: "{dataEntityId} entity logic not found {deDELogicId}",
+        logicalNodeOperation: "Logical node {name} operation parameter value:"
       }
     },
     engine: {
@@ -87267,7 +87500,8 @@ var zhCn = {
         noSetStartNode: "\u672A\u8BBE\u7F6E\u8D77\u59CB\u8282\u70B9",
         startExecuting: "\u5F00\u59CB\u6267\u884C\u5B9E\u4F53\u903B\u8F91\uFF0C\u903B\u8F91\u6807\u8BC6\uFF1A{id}-\u903B\u8F91\u540D\u79F0\uFF1A{name}",
         endExecution: "\u7ED3\u675F\u6267\u884C\u5B9E\u4F53\u903B\u8F91\uFF0C\u903B\u8F91\u6807\u8BC6\uFF1A{id}-\u903B\u8F91\u540D\u79F0\uFF1A{name}",
-        noFoundEntityLogic: "{dataEntityId}\u627E\u4E0D\u5230\u5B9E\u4F53\u903B\u8F91{deDELogicId}"
+        noFoundEntityLogic: "{dataEntityId}\u627E\u4E0D\u5230\u5B9E\u4F53\u903B\u8F91{deDELogicId}",
+        logicalNodeOperation: "\u903B\u8F91\u8282\u70B9{name}\u64CD\u4F5C\u53C2\u6570\u503C:"
       }
     },
     engine: {
@@ -87943,6 +88177,7 @@ export {
   convertNavDataByArray,
   convertObjectToNavParams,
   createImportSchema,
+  deepFillSubAppId,
   deleteImportSchema,
   downloadImportTemplate,
   en,