@ibiz-template/runtime 0.3.2 → 0.3.4

package/dist/index.esm.js

@@ -618,11 +618,12 @@ function calcNavParams(model, originParams) {
 }
 
 // src/utils/open-redirect-view/open-redirect-view.ts
-import { RuntimeError, RuntimeModelError } from "@ibiz-template/core";
+import { RuntimeError, RuntimeModelError as RuntimeModelError2 } from "@ibiz-template/core";
 import { isNilOrEmpty as isNilOrEmpty2, notNilEmpty as notNilEmpty3 } from "qx-util";
 import qs from "qs";
 
 // src/model/utils/util.ts
+import { RuntimeModelError } from "@ibiz-template/core";
 function findModelChild(models, id) {
   if (models && id) {
     const model = models.find((item) => {
@@ -682,9 +683,18 @@ function parseUserParams(userParams) {
   }
   return { navigateContexts, navigateParams, other };
 }
-function getPFPlugin(app, id) {
-  var _a;
-  const plugin = (_a = app.appPFPluginRefs) == null ? void 0 : _a.find((item) => item.id === id);
+function getPFPlugin(id, appId) {
+  const app = ibiz.hub.getApp(appId);
+  if (!app) {
+    throw new RuntimeModelError(app, "\u672A\u627E\u5230\u5E94\u7528");
+  }
+  const { model } = app;
+  if (!model.appPFPluginRefs) {
+    throw new RuntimeModelError(model, "\u5E94\u7528\u672A\u914D\u7F6E\u63D2\u4EF6");
+  }
+  const plugin = model.appPFPluginRefs.find(
+    (item) => item.pluginCode.toLowerCase() === id.toLowerCase()
+  );
   if (!plugin) {
     throw new Error("\u672A\u627E\u5230\u63D2\u4EF6".concat(id));
   }
@@ -1121,7 +1131,7 @@ async function openDERedirectView(appView, context, params = {}, opts = {}) {
         return result;
       }
     } else {
-      throw new RuntimeModelError(refView, "\u672A\u914D\u7F6E\u5B9E\u9645\u5F15\u7528\u89C6\u56FE");
+      throw new RuntimeModelError2(refView, "\u672A\u914D\u7F6E\u5B9E\u9645\u5F15\u7528\u89C6\u56FE");
     }
   } else {
     ibiz.log.error(
@@ -1132,7 +1142,7 @@ async function openDERedirectView(appView, context, params = {}, opts = {}) {
         title: realTitle
       }))
     );
-    throw new RuntimeModelError(
+    throw new RuntimeModelError2(
       appView,
       "\u672A\u627E\u5230\u91CD\u5B9A\u5411\u6807\u8BC6[".concat(rdTag, "]\u6216[").concat(deRdTag, "]\u6216\u5DE5\u4F5C\u6D41[").concat(wfRdTag, "]\u5BF9\u5E94\u89C6\u56FE")
     );
@@ -1804,7 +1814,7 @@ function checkFieldScriptRule(value, data, scriptCode, errorInfo, primaryModel)
 }
 
 // src/utils/verify/form-dynamic-logic.ts
-import { ModelError, RuntimeModelError as RuntimeModelError2 } from "@ibiz-template/core";
+import { ModelError, RuntimeModelError as RuntimeModelError3 } from "@ibiz-template/core";
 function isGroupLogic(logic) {
   return logic.logicType === "GROUP";
 }
@@ -1815,7 +1825,7 @@ function verifyFormGroupLogic(data, logic) {
   if (isGroupLogic(logic)) {
     const children = logic.defdlogics;
     if (!children || children.length === 0) {
-      throw new RuntimeModelError2(logic, "\u53D1\u73B0\u7A7A\u903B\u8F91\u7EC4\uFF0C\u903B\u8F91\u65E0\u6CD5\u6B63\u5E38\u6267\u884C\uFF01");
+      throw new RuntimeModelError3(logic, "\u53D1\u73B0\u7A7A\u903B\u8F91\u7EC4\uFF0C\u903B\u8F91\u65E0\u6CD5\u6B63\u5E38\u6267\u884C\uFF01");
     }
     let result = true;
     if (logic.groupOP === "AND") {
@@ -1844,7 +1854,7 @@ function verifyFormGroupLogic(data, logic) {
 }
 
 // src/utils/verify/panel-dynamic-logic.ts
-import { ModelError as ModelError2, RuntimeModelError as RuntimeModelError3 } from "@ibiz-template/core";
+import { ModelError as ModelError2, RuntimeModelError as RuntimeModelError4 } from "@ibiz-template/core";
 function isGroupLogic2(logic) {
   return logic.logicType === "GROUP";
 }
@@ -1855,7 +1865,7 @@ function verifyPanelGroupLogic(data, logic) {
   if (isGroupLogic2(logic)) {
     const children = logic.panelItemLogics;
     if (!children || children.length === 0) {
-      throw new RuntimeModelError3(logic, "\u53D1\u73B0\u7A7A\u903B\u8F91\u7EC4\uFF0C\u903B\u8F91\u65E0\u6CD5\u6B63\u5E38\u6267\u884C\uFF01");
+      throw new RuntimeModelError4(logic, "\u53D1\u73B0\u7A7A\u903B\u8F91\u7EC4\uFF0C\u903B\u8F91\u65E0\u6CD5\u6B63\u5E38\u6267\u884C\uFF01");
     }
     let result = true;
     if (logic.groupOP === "AND") {
@@ -2270,6 +2280,7 @@ var SysUIActionTag = /* @__PURE__ */ ((SysUIActionTag2) => {
   SysUIActionTag2["CANCEL"] = "Cancel";
   SysUIActionTag2["OK"] = "Ok";
   SysUIActionTag2["SEARCH"] = "Search";
+  SysUIActionTag2["RESET"] = "Reset";
   SysUIActionTag2["FINISH"] = "Finish";
   SysUIActionTag2["NEXT_STEP"] = "NextStep";
   SysUIActionTag2["PREV_STEP"] = "PrevStep";
@@ -3582,7 +3593,7 @@ var AppCounter = class {
 };
 
 // src/service/utils/app-counter/app-de-counter.ts
-import { RuntimeModelError as RuntimeModelError4 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError5 } from "@ibiz-template/core";
 var AppDECounter = class extends AppCounter {
   /**
    * 计数器初始化
@@ -3596,7 +3607,7 @@ var AppDECounter = class extends AppCounter {
     this.appDataEntityId = this.model.appDataEntityId;
     const action = this.model.getAppDEActionId;
     if (!action) {
-      throw new RuntimeModelError4(this.model, "\u672A\u627E\u5230\u83B7\u53D6\u8BA1\u6570\u5668\u884C\u4E3A!");
+      throw new RuntimeModelError5(this.model, "\u672A\u627E\u5230\u83B7\u53D6\u8BA1\u6570\u5668\u884C\u4E3A!");
     }
     this.action = action;
     await super.init(context, params);
@@ -3714,7 +3725,7 @@ var DEDQCondUtil = class {
 DEDQCondUtil.map = /* @__PURE__ */ new WeakMap();
 
 // src/service/utils/dynamic-code-list/dynamic-code-list.ts
-import { ModelError as ModelError4, RuntimeModelError as RuntimeModelError5 } from "@ibiz-template/core";
+import { ModelError as ModelError4, RuntimeModelError as RuntimeModelError6 } from "@ibiz-template/core";
 import { isNil as isNil3 } from "ramda";
 var DynamicCodeListCache = class {
   constructor(codeList) {
@@ -3853,10 +3864,10 @@ var DynamicCodeListCache = class {
       return Object.freeze(res2.data.items);
     }
     if (!appDataEntityId) {
-      throw new RuntimeModelError5(this.codeList, "\u672A\u914D\u7F6E\u5E94\u7528\u5B9E\u4F53");
+      throw new RuntimeModelError6(this.codeList, "\u672A\u914D\u7F6E\u5E94\u7528\u5B9E\u4F53");
     }
     if (!appDEDataSetId) {
-      throw new RuntimeModelError5(this.codeList, "\u672A\u914D\u7F6E\u6570\u636E\u96C6");
+      throw new RuntimeModelError6(this.codeList, "\u672A\u914D\u7F6E\u6570\u636E\u96C6");
     }
     const res = await app.deService.exec(
       appDataEntityId,
@@ -4668,7 +4679,7 @@ var ConfigService = class {
 };
 
 // src/service/service/counter/counter.service.ts
-import { RuntimeModelError as RuntimeModelError6 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError7 } from "@ibiz-template/core";
 var CounterService = class {
   /**
    * 获取计数器
@@ -4707,7 +4718,7 @@ var CounterService = class {
   static async getCounterByRef(model, context, params) {
     const { appCounter } = model;
     if (!appCounter) {
-      throw new RuntimeModelError6(model, "\u672A\u914D\u7F6E\u5E94\u7528\u8BA1\u6570\u5668!");
+      throw new RuntimeModelError7(model, "\u672A\u914D\u7F6E\u5E94\u7528\u8BA1\u6570\u5668!");
     }
     return this.getCounter(appCounter, context, params);
   }
@@ -5093,12 +5104,12 @@ var FileService = class {
 import {
   HttpResponse as HttpResponse3,
   RuntimeError as RuntimeError14,
-  RuntimeModelError as RuntimeModelError18
+  RuntimeModelError as RuntimeModelError19
 } from "@ibiz-template/core";
 import { isArray as isArray6, isNil as isNil8 } from "lodash-es";
 
 // src/service/service/entity/method/method.ts
-import { RuntimeModelError as RuntimeModelError7 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError8 } from "@ibiz-template/core";
 import { isArray as isArray3 } from "lodash-es";
 
 // src/service/app-data-entity/app-data-entity.ts
@@ -5350,7 +5361,9 @@ var MethodDto = class _MethodDto {
       const field = this.fields[i];
       const key = field.codeName.toLowerCase();
       switch (field.type) {
-        case "SIMPLE": {
+        case "SIMPLE":
+        case "SIMPLES":
+        case "DTO": {
           break;
         }
         case "DTOS": {
@@ -5618,17 +5631,17 @@ var Method = class {
           break;
         default:
           if (requestMethod) {
-            throw new RuntimeModelError7(
+            throw new RuntimeModelError8(
               this.method,
               "\u672A\u652F\u6301\u7684\u8BF7\u6C42\u65B9\u5F0F: ".concat(requestMethod)
             );
           } else {
-            throw new RuntimeModelError7(this.method, "\u672A\u914D\u7F6E\u8BF7\u6C42\u65B9\u5F0F");
+            throw new RuntimeModelError8(this.method, "\u672A\u914D\u7F6E\u8BF7\u6C42\u65B9\u5F0F");
           }
       }
       return res;
     }
-    throw new RuntimeModelError7(this.method, "\u672A\u652F\u6301\u7684\u884C\u4E3A\u7C7B\u578B[".concat(actionType, "]"));
+    throw new RuntimeModelError8(this.method, "\u672A\u652F\u6301\u7684\u884C\u4E3A\u7C7B\u578B[".concat(actionType, "]"));
   }
   mergeRequestPath(path2, methodName) {
     return "".concat(path2, "/").concat(methodName);
@@ -5689,7 +5702,7 @@ import { isArray as isArray5 } from "lodash-es";
 import { clone as clone9 } from "ramda";
 
 // src/de-logic/de-logic.ts
-import { ModelError as ModelError11, RuntimeModelError as RuntimeModelError17 } from "@ibiz-template/core";
+import { ModelError as ModelError11, RuntimeModelError as RuntimeModelError18 } from "@ibiz-template/core";
 
 // src/de-logic/de-logic-context.ts
 import { isArray as isArray4 } from "lodash-es";
@@ -5821,17 +5834,17 @@ var DELogicContext = class {
 };
 
 // src/de-logic/de-logic-node/de-action-node/de-action-node.ts
-import { RuntimeModelError as RuntimeModelError10 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError11 } from "@ibiz-template/core";
 
 // src/de-logic/de-logic-link/de-logic-link-group-cond/de-logic-link-group-cond.ts
-import { RuntimeModelError as RuntimeModelError9 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError10 } from "@ibiz-template/core";
 
 // src/de-logic/de-logic-link/de-logic-link-cond/de-logic-link-cond.ts
 var DELogicLinkCond = class {
 };
 
 // src/de-logic/de-logic-link/de-logic-link-single-cond/de-logic-link-single-cond.ts
-import { ModelError as ModelError6, RuntimeModelError as RuntimeModelError8 } from "@ibiz-template/core";
+import { ModelError as ModelError6, RuntimeModelError as RuntimeModelError9 } from "@ibiz-template/core";
 var DELogicLinkSingleCond = class extends DELogicLinkCond {
   constructor(model) {
     super();
@@ -5878,7 +5891,7 @@ var DELogicLinkSingleCond = class extends DELogicLinkCond {
     switch (this.type) {
       case "ENTITYFIELD": {
         if (!this.value) {
-          throw new RuntimeModelError8(
+          throw new RuntimeModelError9(
             this.model,
             "\u5F53\u524D\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u6570\u636E\u5BF9\u8C61\u5C5E\u6027],\u7F3A\u5C11\u914D\u7F6E\u6761\u4EF6\u503C"
           );
@@ -5888,7 +5901,7 @@ var DELogicLinkSingleCond = class extends DELogicLinkCond {
       }
       case "SRCENTITYFIELD": {
         if (!this.value) {
-          throw new RuntimeModelError8(
+          throw new RuntimeModelError9(
             this.model,
             "\u5F53\u524D\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u6E90\u6570\u636E\u5BF9\u8C61\u5C5E\u6027],\u7F3A\u5C11\u914D\u7F6E\u6761\u4EF6\u503C"
           );
@@ -5951,7 +5964,7 @@ var DELogicLinkGroupCond = class _DELogicLinkGroupCond extends DELogicLinkCond {
   test(ctx, context, data) {
     let bol = true;
     if (this.conds.length === 0) {
-      throw new RuntimeModelError9(this.model, "\u754C\u9762\u8FDE\u63A5\u6761\u4EF6\u903B\u8F91\u7EC4\u672A\u914D\u7F6E\u903B\u8F91\u9879");
+      throw new RuntimeModelError10(this.model, "\u754C\u9762\u8FDE\u63A5\u6761\u4EF6\u903B\u8F91\u7EC4\u672A\u914D\u7F6E\u903B\u8F91\u9879");
     }
     for (let i = 0; i < this.conds.length; i++) {
       const cond = this.conds[i];
@@ -6054,10 +6067,10 @@ var DEActionNode = class extends DELogicNode {
       retDELogicParamId
     } = this.model;
     if (!dstAppDataEntityId) {
-      throw new RuntimeModelError10(this.model, "\u672A\u6307\u5B9A\u5E94\u7528\u5B9E\u4F53");
+      throw new RuntimeModelError11(this.model, "\u672A\u6307\u5B9A\u5E94\u7528\u5B9E\u4F53");
     }
     if (!dstAppDEActionId) {
-      throw new RuntimeModelError10(this.model, "\u672A\u6307\u5B9A\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError11(this.model, "\u672A\u6307\u5B9A\u5B9E\u4F53\u884C\u4E3A");
     }
     const requestData = ctx.params[dstDELogicParamId];
     const app = ibiz.hub.getApp(ctx.context.srfappid);
@@ -6341,12 +6354,12 @@ var DataSetNode = class extends DELogicNode {
 };
 
 // src/de-logic/de-logic-node/bind-param-node/bind-param-node.ts
-import { RuntimeModelError as RuntimeModelError11 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError12 } from "@ibiz-template/core";
 var BindParamNode = class extends DELogicNode {
   async exec(ctx) {
     const { dstDELogicParamId, srcDELogicParamId } = this.model;
     if (!dstDELogicParamId || !srcDELogicParamId) {
-      throw new RuntimeModelError11(
+      throw new RuntimeModelError12(
         this.model,
         "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u8005\u6E90\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E"
       );
@@ -6357,37 +6370,37 @@ var BindParamNode = class extends DELogicNode {
 };
 
 // src/de-logic/de-logic-node/reset-param-node/reset-param-node.ts
-import { RuntimeModelError as RuntimeModelError12 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError13 } from "@ibiz-template/core";
 var ResetParamNode = class extends DELogicNode {
   async exec(ctx) {
     const { dstDELogicParamId } = this.model;
     if (!dstDELogicParamId) {
-      throw new RuntimeModelError12(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
+      throw new RuntimeModelError13(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     ctx.resetParam(dstDELogicParamId);
   }
 };
 
 // src/de-logic/de-logic-node/renew-param-node/renew-param-node.ts
-import { RuntimeModelError as RuntimeModelError13 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError14 } from "@ibiz-template/core";
 var RenewParamNode = class extends DELogicNode {
   async exec(ctx) {
     const { dstDELogicParamId } = this.model;
     if (!dstDELogicParamId) {
-      throw new RuntimeModelError13(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
+      throw new RuntimeModelError14(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     ctx.renewParam(dstDELogicParamId);
   }
 };
 
 // src/de-logic/de-logic-node/copy-param-node/copy-param-node.ts
-import { RuntimeModelError as RuntimeModelError14 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError15 } from "@ibiz-template/core";
 import { clone as clone7 } from "ramda";
 var CopyParamNode = class extends DELogicNode {
   async exec(ctx) {
     const { dstDELogicParamId, srcDELogicParamId } = this.model;
     if (!dstDELogicParamId || !srcDELogicParamId) {
-      throw new RuntimeModelError14(
+      throw new RuntimeModelError15(
         this.model,
         "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u8005\u6E90\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E"
       );
@@ -6398,12 +6411,12 @@ var CopyParamNode = class extends DELogicNode {
 };
 
 // src/de-logic/de-logic-node/sort-param-node/sort-param-node.ts
-import { RuntimeModelError as RuntimeModelError15 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError16 } from "@ibiz-template/core";
 var SortParamNode = class extends DELogicNode {
   async exec(ctx) {
     const { dstDELogicParamId, dstSortDir, dstFieldName } = this.model;
     if (!dstDELogicParamId || !dstFieldName) {
-      throw new RuntimeModelError15(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u76EE\u6807\u5C5E\u6027\u914D\u7F6E");
+      throw new RuntimeModelError16(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u76EE\u6807\u5C5E\u6027\u914D\u7F6E");
     }
     const key = dstFieldName.toLowerCase();
     const arr = ctx.params[dstDELogicParamId];
@@ -6414,7 +6427,7 @@ var SortParamNode = class extends DELogicNode {
 };
 
 // src/de-logic/de-logic-node/append-param-node/append-param-node.ts
-import { RuntimeModelError as RuntimeModelError16 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError17 } from "@ibiz-template/core";
 var AppendParamNode = class extends DELogicNode {
   async exec(ctx) {
     const {
@@ -6425,7 +6438,7 @@ var AppendParamNode = class extends DELogicNode {
       srcSize
     } = this.model;
     if (!dstDELogicParamId || !srcDELogicParamId) {
-      throw new RuntimeModelError16(
+      throw new RuntimeModelError17(
         this.model,
         "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u8005\u6E90\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E"
       );
@@ -6574,7 +6587,7 @@ var DELogic = class {
     var _a, _b;
     if (model.customCode) {
       if (!model.scriptCode) {
-        throw new RuntimeModelError17(model, "\u811A\u672C\u4EE3\u7801\u6A21\u5F0F\u6CA1\u6709\u914D\u7F6E\u811A\u672C\u4EE3\u7801");
+        throw new RuntimeModelError18(model, "\u811A\u672C\u4EE3\u7801\u6A21\u5F0F\u6CA1\u6709\u914D\u7F6E\u811A\u672C\u4EE3\u7801");
       }
       this.scriptFn = ScriptFactory.createScriptFn([], model.scriptCode, {
         isAsync: true
@@ -6582,7 +6595,7 @@ var DELogic = class {
       return;
     }
     if (!((_a = model.delogicNodes) == null ? void 0 : _a.length)) {
-      throw new RuntimeModelError17(model, "\u5B9E\u4F53\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u903B\u8F91\u8282\u70B9");
+      throw new RuntimeModelError18(model, "\u5B9E\u4F53\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u903B\u8F91\u8282\u70B9");
     }
     model.delogicNodes.forEach((node) => {
       const { logicNodeType } = node;
@@ -6681,7 +6694,7 @@ var DELogic = class {
       const start = this.nodes.get(startDELogicNodeId);
       await this.deepExec(start, ctx);
     } else {
-      throw new RuntimeModelError17(this.model, "\u672A\u8BBE\u7F6E\u8D77\u59CB\u8282\u70B9");
+      throw new RuntimeModelError18(this.model, "\u672A\u8BBE\u7F6E\u8D77\u59CB\u8282\u70B9");
     }
     if (ctx.isEndNode) {
       return ctx.result;
@@ -6818,7 +6831,7 @@ var DEActionMethod = class extends Method {
     if (this.method.actionType === "DELOGIC") {
       const deLogic = findDELogic(this.method.appDELogicId, this.entity);
       if (!deLogic) {
-        throw new RuntimeModelError18(this.method, "\u7F3A\u5C11\u5B9E\u4F53\u5904\u7406\u903B\u8F91");
+        throw new RuntimeModelError19(this.method, "\u7F3A\u5C11\u5B9E\u4F53\u5904\u7406\u903B\u8F91");
       }
       return execDELogicAction(deLogic, context, data, params);
     }
@@ -7136,7 +7149,7 @@ var DEActionMethod = class extends Method {
 import {
   HttpResponse as HttpResponse4,
   ModelError as ModelError12,
-  RuntimeModelError as RuntimeModelError19
+  RuntimeModelError as RuntimeModelError20
 } from "@ibiz-template/core";
 import { ascSort, descSort } from "qx-util";
 import { clone as clone10, equals as equals2, isEmpty as isEmpty7, isNil as isNil9, where as where2 } from "ramda";
@@ -7297,7 +7310,7 @@ var FetchMethod = class extends Method {
   async fetchCodeListSet(context, params) {
     const { appCodeListId } = this.method;
     if (!appCodeListId) {
-      throw new RuntimeModelError19(this.method, "\u6CA1\u6709\u6307\u5B9A\u6570\u636E\u6765\u6E90\u4EE3\u7801\u8868");
+      throw new RuntimeModelError20(this.method, "\u6CA1\u6709\u6307\u5B9A\u6570\u636E\u6765\u6E90\u4EE3\u7801\u8868");
     }
     const codeItems = await this.app.codeList.get(
       appCodeListId,
@@ -7412,6 +7425,24 @@ var DEService = class {
     }
     throw new RuntimeError15("".concat(this.model.codeName, "\u672A\u652F\u6301\u300C").concat(id, "\u300D\u65B9\u6CD5"));
   }
+  getDraft(context, params, params2) {
+    return this.exec("GetDraft", context, params, params2);
+  }
+  create(context, params, params2) {
+    return this.exec("Create", context, params, params2);
+  }
+  get(context, params, params2) {
+    return this.exec("Get", context, params, params2);
+  }
+  update(context, params, params2) {
+    return this.exec("Update", context, params, params2);
+  }
+  remove(context, params, params2) {
+    return this.exec("Remove", context, params, params2);
+  }
+  fetchDefault(context, params, params2) {
+    return this.exec("FetchDefault", context, params, params2);
+  }
   /**
    * 执行服务方法 ac 模式
    *
@@ -8649,8 +8680,56 @@ var PanelData = class {
   }
 };
 
+// src/service/vo/chart-data/chart-data.ts
+import { createUUID as createUUID4 } from "qx-util";
+function updateKeyDefine3(target, keys) {
+  keys.forEach((key) => {
+    if (!Object.prototype.hasOwnProperty.call(target, key)) {
+      Object.defineProperty(target, key, {
+        enumerable: true,
+        configurable: true,
+        writable: true,
+        value: void 0
+      });
+    }
+  });
+}
+var ChartData = class {
+  constructor(deData, seriesModel, catalog, groupName) {
+    this._seriesModelId = seriesModel == null ? void 0 : seriesModel.id;
+    this._catalog = catalog;
+    this._groupName = groupName;
+    this._uuid = createUUID4();
+    return new Proxy(this, {
+      set(target, p, value) {
+        if (Object.prototype.hasOwnProperty.call(deData, p)) {
+          deData[p] = value;
+        } else {
+          target[p] = value;
+        }
+        return true;
+      },
+      get(target, p, _receiver) {
+        if (target[p] !== void 0) {
+          return target[p];
+        }
+        if (deData[p] !== void 0) {
+          return deData[p];
+        }
+      },
+      ownKeys(target) {
+        const allKeys = [
+          .../* @__PURE__ */ new Set([...Object.keys(target), ...Object.keys(deData)])
+        ];
+        updateKeyDefine3(target, allKeys);
+        return allKeys;
+      }
+    });
+  }
+};
+
 // src/service/mqtt/mqtt.service.ts
-import { QXEvent as QXEvent3, createUUID as createUUID4, isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
+import { QXEvent as QXEvent3, createUUID as createUUID5, isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
 var MqttService = class {
   /**
    * Creates an instance of MqttService.
@@ -8684,7 +8763,7 @@ var MqttService = class {
       // 超时时间
       connectTimeout: 6e3,
       // 认证信息
-      clientId: createUUID4(),
+      clientId: createUUID5(),
       username: "",
       password: "",
       // 心跳时间
@@ -9122,7 +9201,7 @@ function installCommand() {
 }
 
 // src/app-hub.ts
-import { RuntimeError as RuntimeError54 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError55 } from "@ibiz-template/core";
 
 // src/application.ts
 import { Net, getToken } from "@ibiz-template/core";
@@ -9389,7 +9468,7 @@ var PanelNotifyState = /* @__PURE__ */ ((PanelNotifyState2) => {
 })(PanelNotifyState || {});
 
 // src/controller/common/view/view.controller.ts
-import { createUUID as createUUID6, notNilEmpty as notNilEmpty6 } from "qx-util";
+import { createUUID as createUUID7, notNilEmpty as notNilEmpty6 } from "qx-util";
 import { IBizContext as IBizContext2, RuntimeError as RuntimeError28 } from "@ibiz-template/core";
 import { isEmpty as isEmpty8, isNil as isNil18, isNotNil as isNotNil2 } from "ramda";
 
@@ -10189,7 +10268,7 @@ var ValueExUtil = class {
 // src/controller/utils/value-default/value-default.ts
 import { RuntimeError as RuntimeError25, ModelError as ModelError16 } from "@ibiz-template/core";
 import dayjs from "dayjs";
-import { createUUID as createUUID5 } from "qx-util";
+import { createUUID as createUUID6 } from "qx-util";
 import { isNil as isNil16, isNotNil } from "ramda";
 function getDefaultValue(opts, origins) {
   var _a;
@@ -10234,7 +10313,7 @@ function getDefaultValue(opts, origins) {
     case "CONTEXT":
       return params[defaultValue];
     case "UNIQUEID":
-      return createUUID5();
+      return createUUID6();
     default:
       throw new ModelError16({}, "\u9ED8\u8BA4\u503C\u7C7B\u578B[".concat(valueType, "]\u672A\u652F\u6301"));
   }
@@ -10262,10 +10341,13 @@ function listenAsyncAction(id) {
     ibiz.mc.command.asyncAction.on(callBack);
   });
 }
-async function asyncImportData(file, appDataEntity) {
+async function asyncImportData(file, appDataEntity, dataImport) {
   const data = new FormData();
   data.append("file", file);
-  const url = "".concat(appDataEntity.codeName2.toLowerCase(), "/").concat(asyncImportUrl);
+  let url = "".concat(appDataEntity.codeName2.toLowerCase(), "/").concat(asyncImportUrl);
+  if (dataImport == null ? void 0 : dataImport.codeName) {
+    url += "?srfimporttag=".concat(dataImport.codeName);
+  }
   const res = await ibiz.net.request(url, {
     method: "post",
     data,
@@ -10277,10 +10359,13 @@ async function asyncImportData(file, appDataEntity) {
     "OBJECTCREATED"
   );
 }
-async function importData(file, appDataEntity) {
+async function importData(file, appDataEntity, dataImport) {
   const data = new FormData();
   data.append("file", file);
-  const url = "".concat(appDataEntity.codeName2.toLowerCase(), "/").concat(importUrl);
+  let url = "".concat(appDataEntity.codeName2.toLowerCase(), "/").concat(importUrl);
+  if (dataImport == null ? void 0 : dataImport.codeName) {
+    url += "?srfimporttag=".concat(dataImport.codeName);
+  }
   const res = await ibiz.net.request(url, {
     method: "post",
     data,
@@ -10520,7 +10605,7 @@ var BaseController = class {
 };
 
 // src/controller/utils/view-msg/view-msg-controller.ts
-import { RuntimeError as RuntimeError27, RuntimeModelError as RuntimeModelError20 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError27, RuntimeModelError as RuntimeModelError21 } from "@ibiz-template/core";
 import { isNil as isNil17, mergeRight as mergeRight2 } from "ramda";
 var ViewMsgController = class _ViewMsgController {
   constructor(msgGroupId) {
@@ -10585,7 +10670,7 @@ var ViewMsgController = class _ViewMsgController {
   static async fetchDataSet(msgModel, context, params) {
     const { appDataEntityId, appDEDataSetId } = msgModel;
     if (!appDEDataSetId) {
-      throw new RuntimeModelError20(msgModel, "\u672A\u914D\u7F6E\u5B9E\u4F53\u6570\u636E\u96C6");
+      throw new RuntimeModelError21(msgModel, "\u672A\u914D\u7F6E\u5B9E\u4F53\u6570\u636E\u96C6");
     }
     const res = await ibiz.hub.getApp(context.srfappid).deService.exec(appDataEntityId, appDEDataSetId, context, params);
     if (res.data.length) {
@@ -10679,7 +10764,7 @@ var ViewMsgController = class _ViewMsgController {
       msgPosAppDEFieldId
     } = msgModel;
     if (!appDataEntityId) {
-      throw new RuntimeModelError20(msgModel, "\u672A\u914D\u7F6E\u5E94\u7528\u5B9E\u4F53");
+      throw new RuntimeModelError21(msgModel, "\u672A\u914D\u7F6E\u5E94\u7528\u5B9E\u4F53");
     }
     const entity = await ibiz.hub.getAppDataEntity(
       appDataEntityId,
@@ -10941,7 +11026,7 @@ var ViewController = class extends BaseController {
   handleContextParams() {
     this.context.srfappid = this.model.appId;
     if (isNil18(this.context.srfsessionid) || isEmpty8(this.context.srfsessionid)) {
-      this.context.srfsessionid = createUUID6();
+      this.context.srfsessionid = createUUID7();
     }
     const navContexts = this.model.appViewNavContexts;
     let context = {};
@@ -11227,7 +11312,7 @@ var EditorController = class {
 };
 
 // src/controller/common/editor/code-list-editor.controller.ts
-import { RuntimeModelError as RuntimeModelError21 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError22 } from "@ibiz-template/core";
 var CodeListEditorController = class extends EditorController {
   /**
    * 加载代码表数据
@@ -11251,7 +11336,7 @@ var CodeListEditorController = class extends EditorController {
       );
       return dataItems;
     }
-    throw new RuntimeModelError21(
+    throw new RuntimeModelError22(
       this.model,
       "\u7F16\u8F91\u5668\u7C7B\u578B[".concat(this.model.editorType, "]\uFF0C\u672A\u914D\u7F6E\u4EE3\u7801\u8868")
     );
@@ -11260,7 +11345,7 @@ var CodeListEditorController = class extends EditorController {
 
 // src/controller/common/control/control.controller.ts
 import { IBizContext as IBizContext3, IBizParams, NoticeError } from "@ibiz-template/core";
-import { isNil as isNil19 } from "ramda";
+import { clone as clone14, isNil as isNil19 } from "ramda";
 import { notNilEmpty as notNilEmpty7 } from "qx-util";
 var ControlController = class extends BaseController {
   /**
@@ -11300,7 +11385,7 @@ var ControlController = class extends BaseController {
       "".concat(model.controlType, "_DEFAULT")
     );
     if (panelModel) {
-      this.controlPanel = panelModel;
+      this.controlPanel = clone14(panelModel);
     }
     this.updateContextParams({});
   }
@@ -11922,7 +12007,7 @@ var MDControlController = class extends ControlController {
 import {
   findRecursiveChild,
   RuntimeError as RuntimeError30,
-  RuntimeModelError as RuntimeModelError22
+  RuntimeModelError as RuntimeModelError23
 } from "@ibiz-template/core";
 var AppMenuController = class extends ControlController {
   initState() {
@@ -11968,7 +12053,7 @@ var AppMenuController = class extends ControlController {
       event
     });
     if (!menuItem.appFuncId) {
-      throw new RuntimeModelError22(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
+      throw new RuntimeModelError23(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
     }
     const tempContext = this.context.clone();
     if (this.routeDepth && useDepth) {
@@ -12052,7 +12137,7 @@ var AppMenuController = class extends ControlController {
 import {
   findRecursiveChild as findRecursiveChild2,
   RuntimeError as RuntimeError31,
-  RuntimeModelError as RuntimeModelError23
+  RuntimeModelError as RuntimeModelError24
 } from "@ibiz-template/core";
 var AppMenuIconViewController = class extends AppMenuController {
   async onClickMenuItem(id, event) {
@@ -12068,7 +12153,7 @@ var AppMenuIconViewController = class extends AppMenuController {
       event
     });
     if (!menuItem.appFuncId) {
-      throw new RuntimeModelError23(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
+      throw new RuntimeModelError24(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
     }
     const tempContext = this.context.clone();
     if (this.routeDepth === 1) {
@@ -12226,11 +12311,33 @@ var CalendarController = class extends MDControlController {
     await this.afterLoad(args, items);
     this.state.isLoaded = true;
     this.state.items = items;
+    this.sortItems();
     await this.evt.emit("onLoadSuccess", {
       isInitialLoad
     });
     return items;
   }
+  /**
+   * 前台排序（时间轴类型）
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-22 15:16:43
+   */
+  sortItems() {
+    if (this.model.calendarStyle === "TIMELINE") {
+      this.state.items.sort((a, b) => {
+        const x = a.beginTime;
+        const y = b.beginTime;
+        let result = 0;
+        if (dayjs2(x).isAfter(y)) {
+          result = -1;
+        } else if (dayjs2(x).isBefore(y)) {
+          result = 1;
+        }
+        return result;
+      });
+    }
+  }
   /**
    * 获取当前选中的日期
    *
@@ -12290,8 +12397,10 @@ var CalendarController = class extends MDControlController {
     if (extraParams) {
       Object.assign(resultParams, extraParams);
     }
-    const timeParam = this.getCurSelectDate(resultParams);
-    Object.assign(resultParams, timeParam);
+    if (this.model.calendarStyle !== "TIMELINE") {
+      const timeParam = this.getCurSelectDate(resultParams);
+      Object.assign(resultParams, timeParam);
+    }
     return resultParams;
   }
   /**
@@ -12340,17 +12449,17 @@ import { mergeDeepRight as mergeDeepRight3 } from "ramda";
 import { RuntimeError as RuntimeError33 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/line-series-generator.ts
-import { RuntimeModelError as RuntimeModelError25 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError26 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/base-series-generator.ts
-import { plus, RuntimeModelError as RuntimeModelError24, toNumberOrNil } from "@ibiz-template/core";
+import { plus, RuntimeModelError as RuntimeModelError25, toNumberOrNil } from "@ibiz-template/core";
 import dayjs3 from "dayjs";
 import minMax from "dayjs/plugin/minMax";
 import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
 import quarterOfYear from "dayjs/plugin/quarterOfYear";
 import weekOfYear from "dayjs/plugin/weekOfYear";
 import isoWeek from "dayjs/plugin/isoWeek";
-import { clone as clone14, isNil as isNil20, mergeDeepRight } from "ramda";
+import { clone as clone15, isNil as isNil20, mergeDeepRight } from "ramda";
 dayjs3.extend(minMax);
 dayjs3.extend(isSameOrBefore);
 dayjs3.extend(quarterOfYear);
@@ -12368,6 +12477,13 @@ var BaseSeriesGenerator = class {
   constructor(model, chartGenerator) {
     this.model = model;
     this.chartGenerator = chartGenerator;
+    /**
+     * 根据分组处理出来的图表数据数组
+     * @author lxm
+     * @date 2023-06-09 02:58:28
+     * @type {GroupData}
+     */
+    this.chartDataArr = [];
     /**
      * 静态的序列options
      * @author lxm
@@ -12386,10 +12502,10 @@ var BaseSeriesGenerator = class {
     this.chartGenerator = chartGenerator;
     const { chartSeriesEncode, caption, id, userParam } = model;
     if (!model.catalogField) {
-      throw new RuntimeModelError24(model, "\u7F3A\u5C11\u5206\u7C7B\u5C5E\u6027\u914D\u7F6E");
+      throw new RuntimeModelError25(model, "\u7F3A\u5C11\u5206\u7C7B\u5C5E\u6027\u914D\u7F6E");
     }
     if (!model.valueField) {
-      throw new RuntimeModelError24(model, "\u7F3A\u5C11\u503C\u5C5E\u6027\u914D\u7F6E");
+      throw new RuntimeModelError25(model, "\u7F3A\u5C11\u503C\u5C5E\u6027\u914D\u7F6E");
     }
     this.catalogField = chartGenerator.getFieldKey(model.catalogField);
     this.valueField = chartGenerator.getFieldKey(model.valueField);
@@ -12454,6 +12570,24 @@ var BaseSeriesGenerator = class {
     }
     return isExclude ? void 0 : val;
   }
+  /**
+   * 准备图表数据
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-23 15:24:12
+   */
+  prepareChartData(groupData, deData, catalog, group) {
+    var _a;
+    if (this.groupField) {
+      Object.assign(deData, { [this.groupField]: group });
+    }
+    if (this.catalogField) {
+      Object.assign(deData, { [this.catalogField]: catalog });
+    }
+    const tempChartData = new ChartData(deData, this.model, catalog, group);
+    groupData[group].get(catalog).chartData = tempChartData;
+    (_a = this.chartDataArr) == null ? void 0 : _a.push(tempChartData);
+  }
   /**
    * 计算分组数据
    * @author lxm
@@ -12463,6 +12597,7 @@ var BaseSeriesGenerator = class {
    */
   calcGroupData(data) {
     this.groupData = {};
+    this.chartDataArr = [];
     const groupData = this.groupData;
     const { seriesCodeListId, catalogCodeListId } = this.model;
     data.forEach((item) => {
@@ -12492,6 +12627,17 @@ var BaseSeriesGenerator = class {
         true
       );
       if (!catalog) {
+        if (catalogCodeListId && this.autoCompleteCategory) {
+          const codeListItems = this.chartGenerator.codeListMap.get(catalogCodeListId);
+          codeListItems.forEach((x) => {
+            this.prepareChartData(
+              groupData,
+              { [this.valueField]: 0 },
+              x.text,
+              group
+            );
+          });
+        }
         return;
       }
       if (!groupData[group].get(catalog)) {
@@ -12501,7 +12647,16 @@ var BaseSeriesGenerator = class {
         groupData[group].get(catalog).value,
         item[this.valueField]
       );
-      groupData[group].get(catalog).deData = item;
+      if (!groupData[group].get(catalog).chartData) {
+        this.prepareChartData(groupData, item, catalog, group);
+      } else {
+        this.prepareChartData(
+          groupData,
+          { [this.valueField]: groupData[group].get(catalog).value },
+          catalog,
+          group
+        );
+      }
     });
     return groupData;
   }
@@ -12529,7 +12684,7 @@ var BaseSeriesGenerator = class {
   }
   /**
    * 生成每条序列的data,由于不同图表类型格式不同所以为any
-   * 默认提供的是二维数组，按[X轴，y轴]格式
+   * 默认提供的是二维数组，按[x轴, y轴, 图表数据]格式
    * @author lxm
    * @date 2023-06-09 03:38:07
    * @param {CatalogData} catalogData
@@ -12539,8 +12694,7 @@ var BaseSeriesGenerator = class {
   calcSeriesData(catalogData) {
     const temData = [];
     catalogData.forEach((catalog, key) => {
-      var _a;
-      temData.push([key, catalog.value, (_a = catalog.deData) == null ? void 0 : _a.srfkey]);
+      temData.push([key, catalog.value, catalog.chartData]);
     });
     return temData;
   }
@@ -12558,14 +12712,18 @@ var BaseSeriesGenerator = class {
     return this.calcGroupSeries(groupData);
   }
   /**
-   * 通过事件的params获取主键
+   * 通过echarts事件的params获取封装好的图表数据
    * @author lxm
    * @date 2023-06-09 10:56:25
    * @param {ECElementEvent} params
    * @return {*}  {string}
    */
-  getSrfkeyByParams(params) {
-    return params.value[2];
+  getChartDataByParams(params) {
+    var _a, _b, _c;
+    if (this.groupData && Object.keys(this.groupData).length === 1) {
+      return (_a = this.groupData[DEFAULT_GROUP].get(params.name)) == null ? void 0 : _a.chartData;
+    }
+    return (_c = (_b = this.groupData) == null ? void 0 : _b[params.seriesName].get(params.name)) == null ? void 0 : _c.chartData;
   }
   /**
    * 数据预处理
@@ -12576,7 +12734,7 @@ var BaseSeriesGenerator = class {
   dataPreprocess(data) {
     const tempData = [];
     data.forEach((singleData) => {
-      tempData.push(clone14(singleData));
+      tempData.push(clone15(singleData));
     });
     const { groupMode } = this.model;
     if (groupMode) {
@@ -12770,10 +12928,10 @@ var BaseSeriesGenerator = class {
 var LineSeriesGenerator = class extends BaseSeriesGenerator {
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError25(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
+      throw new RuntimeModelError26(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError25(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
+      throw new RuntimeModelError26(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
     }
     const options = super.calcStaticOptions();
     options.xAxisIndex = this.xAxisIndex;
@@ -12789,14 +12947,14 @@ var LineSeriesGenerator = class extends BaseSeriesGenerator {
 };
 
 // src/controller/control/chart/generator/bar-series-generator.ts
-import { RuntimeModelError as RuntimeModelError26 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError27 } from "@ibiz-template/core";
 var BarSeriesGenerator = class extends BaseSeriesGenerator {
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError26(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
+      throw new RuntimeModelError27(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError26(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
+      throw new RuntimeModelError27(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
     }
     const options = super.calcStaticOptions();
     options.xAxisIndex = this.xAxisIndex;
@@ -12819,17 +12977,13 @@ var FunnelSeriesGenerator = class extends BaseSeriesGenerator {
   calcSeriesData(catalogData) {
     const temData = [];
     catalogData.forEach((catalog, key) => {
-      var _a;
       temData.push({
         name: key,
-        value: [catalog.value, (_a = catalog.deData) == null ? void 0 : _a.srfkey]
+        value: [catalog.value, catalog.chartData]
       });
     });
     return temData;
   }
-  getSrfkeyByParams(params) {
-    return params.value[1];
-  }
 };
 
 // src/controller/control/chart/generator/pie-series-generator.ts
@@ -12843,28 +12997,24 @@ var PieSeriesGenerator = class extends BaseSeriesGenerator {
   calcSeriesData(catalogData) {
     const temData = [];
     catalogData.forEach((catalog, key) => {
-      var _a;
       temData.push({
         name: key,
-        value: [catalog.value, (_a = catalog.deData) == null ? void 0 : _a.srfkey]
+        value: [catalog.value, catalog.chartData]
       });
     });
     return temData;
   }
-  getSrfkeyByParams(params) {
-    return params.value[1];
-  }
 };
 
 // src/controller/control/chart/generator/scatter-series-generator.ts
-import { RuntimeModelError as RuntimeModelError27 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError28 } from "@ibiz-template/core";
 var ScatterSeriesGenerator = class extends BaseSeriesGenerator {
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError27(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
+      throw new RuntimeModelError28(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError27(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
+      throw new RuntimeModelError28(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
     }
     const options = super.calcStaticOptions();
     options.xAxisIndex = this.xAxisIndex;
@@ -12970,7 +13120,7 @@ var RadarSeriesGenerator = class extends BaseSeriesGenerator {
       const catalogData = groupData[group];
       const value = radar.indicatorKeys.map((key) => {
         if (catalogData.has(key)) {
-          return catalogData.get(key);
+          return catalogData.get(key).value;
         }
         return 0;
       });
@@ -12985,9 +13135,6 @@ var RadarSeriesGenerator = class extends BaseSeriesGenerator {
     }
     return options;
   }
-  getSrfkeyByParams(params) {
-    return params.value[1];
-  }
 };
 
 // src/controller/control/chart/generator/chart-options-generator.ts
@@ -13052,6 +13199,13 @@ var ChartOptionsGenerator2 = class {
      * @date 2023-06-09 07:47:35
      */
     this.codeListMap = /* @__PURE__ */ new Map();
+    /**
+     * 维护图表序列index对应序列生成器Map
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-11-22 17:27:15
+     */
+    this.seriesGeneratorIndexMap = /* @__PURE__ */ new Map();
     const {
       dechartTitle,
       dechartLegend,
@@ -13257,12 +13411,17 @@ var ChartOptionsGenerator2 = class {
     }
     const seriesOption = [];
     this.seriesGenerators.forEach((generator) => {
+      const startIndex = seriesOption.length;
       const series = generator.calcByData(data);
       if (series instanceof Array) {
         seriesOption.push(...series);
       } else {
         seriesOption.push(series);
       }
+      const endIndex = seriesOption.length - 1;
+      for (let i = startIndex; i <= endIndex; i++) {
+        this.seriesGeneratorIndexMap.set(i, generator);
+      }
     });
     this.options.series = seriesOption;
     if (this.seriesGenerators.length === 1 && this.seriesGenerators[0].groupData && Object.keys(this.seriesGenerators[0].groupData).length === 1 && seriesOption[0].type && ["bar", "line", "scatter"].includes(seriesOption[0].type) && this.staticOptions.legend) {
@@ -13280,12 +13439,19 @@ var ChartOptionsGenerator2 = class {
     }
     return this.options;
   }
-  getSrfkeyByParams(params) {
-    const generator = this.seriesGenerators[params.seriesIndex];
+  /**
+   * 根据echarts给的params得到图表数据
+   * @param {ECElementEvent} params
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-22 16:11:50
+   */
+  getChartDataByParams(params) {
+    const generator = this.seriesGeneratorIndexMap.get(params.seriesIndex);
     if (!generator) {
       throw new RuntimeError33("\u627E\u4E0D\u5230".concat(params.seriesIndex, "\u5E8F\u5217\u7684generator\uFF01"));
     }
-    return generator.getSrfkeyByParams(params);
+    return generator.getChartDataByParams(params);
   }
   // protected calcRadarSeries(data: IData[], series: IChartSeriesFunnel) {
   //   // 初始化radarMap
@@ -13372,9 +13538,11 @@ var ChartController = class extends MDControlController {
   initChart(chart) {
     this.chart = chart;
     this.chart.on("click", (params) => {
-      const srfkey = this.generator.getSrfkeyByParams(params);
-      const activeData = this.state.items.find((item) => item.srfkey === srfkey);
-      console.log("\u5B9E\u4F53\u6570\u636E", activeData);
+      const activeData = this.generator.getChartDataByParams(params);
+      console.log("\u6FC0\u6D3B\u6570\u636E", activeData);
+      if (activeData) {
+        this.setActive(activeData);
+      }
     });
   }
   /**
@@ -13443,20 +13611,20 @@ var CaptionBarController = class extends ControlController {
 };
 
 // src/controller/control/toolbar/toolbar.controllerr.ts
-import { recursiveIterate, RuntimeError as RuntimeError42 } from "@ibiz-template/core";
+import { recursiveIterate, RuntimeError as RuntimeError43 } from "@ibiz-template/core";
 
 // src/ui-action/provider/backend-ui-action-provider.ts
-import { RuntimeModelError as RuntimeModelError46 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError47 } from "@ibiz-template/core";
 import { isArray as isArray9 } from "qx-util";
 
 // src/ui-action/provider/ui-action-provider-base.ts
-import { RuntimeModelError as RuntimeModelError45 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError46 } from "@ibiz-template/core";
 
 // src/ui-logic/index.ts
 import { RuntimeError as RuntimeError40 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic.ts
-import { ModelError as ModelError24, RuntimeModelError as RuntimeModelError44 } from "@ibiz-template/core";
+import { ModelError as ModelError24, RuntimeModelError as RuntimeModelError45 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-context.ts
 var UILogicContext = class {
@@ -13591,24 +13759,24 @@ var UILogicContext = class {
 };
 
 // src/ui-logic/ui-logic-node/de-action-node/de-action-node.ts
-import { RuntimeModelError as RuntimeModelError30 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError31 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-link/ui-logic-link.ts
 import { ModelError as ModelError19 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-link/ui-logic-link-group-cond/ui-logic-link-group-cond.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-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 ModelError18, RuntimeModelError as RuntimeModelError28 } from "@ibiz-template/core";
+import { ModelError as ModelError18, RuntimeModelError as RuntimeModelError29 } from "@ibiz-template/core";
 
 // src/ui-logic/utils/handle-src-val.ts
 import { ModelError as ModelError17 } from "@ibiz-template/core";
-import { clone as clone15 } from "ramda";
+import { clone as clone16 } from "ramda";
 function handleSrcVal2(ctx, srcValParams) {
   const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
@@ -13635,7 +13803,7 @@ function handleSrcVal2(ctx, srcValParams) {
       value = ctx.parameters.context;
       break;
     case "ENVPARAM":
-      value = clone15(ibiz.env);
+      value = clone16(ibiz.env);
       break;
     default:
       throw new ModelError17(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
@@ -13700,7 +13868,7 @@ var UILogicLinkSingleCond = class extends UILogicLinkCond {
     switch (this.type) {
       case "ENTITYFIELD": {
         if (!this.value) {
-          throw new RuntimeModelError28(
+          throw new RuntimeModelError29(
             this.model,
             "\u5F53\u524D\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u6570\u636E\u5BF9\u8C61\u5C5E\u6027],\u7F3A\u5C11\u914D\u7F6E\u6761\u4EF6\u503C"
           );
@@ -13710,7 +13878,7 @@ var UILogicLinkSingleCond = class extends UILogicLinkCond {
       }
       case "SRCENTITYFIELD": {
         if (!this.value) {
-          throw new RuntimeModelError28(
+          throw new RuntimeModelError29(
             this.model,
             "\u5F53\u524D\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u6E90\u6570\u636E\u5BF9\u8C61\u5C5E\u6027],\u7F3A\u5C11\u914D\u7F6E\u6761\u4EF6\u503C"
           );
@@ -13776,7 +13944,7 @@ var UILogicLinkGroupCond = class _UILogicLinkGroupCond extends UILogicLinkCond {
   test(ctx, context, data) {
     let bol = true;
     if (this.conds.length === 0) {
-      throw new RuntimeModelError29(this.model, "\u754C\u9762\u8FDE\u63A5\u6761\u4EF6\u903B\u8F91\u7EC4\u672A\u914D\u7F6E\u903B\u8F91\u9879");
+      throw new RuntimeModelError30(this.model, "\u754C\u9762\u8FDE\u63A5\u6761\u4EF6\u903B\u8F91\u7EC4\u672A\u914D\u7F6E\u903B\u8F91\u9879");
     }
     for (let i = 0; i < this.conds.length; i++) {
       const cond = this.conds[i];
@@ -13902,10 +14070,10 @@ var DEActionNode2 = class extends UILogicNode {
       retDEUILogicParamId
     } = this.model;
     if (!dstAppDataEntityId) {
-      throw new RuntimeModelError30(this.model, "\u672A\u6307\u5B9A\u5E94\u7528\u5B9E\u4F53");
+      throw new RuntimeModelError31(this.model, "\u672A\u6307\u5B9A\u5E94\u7528\u5B9E\u4F53");
     }
     if (!dstAppDEActionId) {
-      throw new RuntimeModelError30(this.model, "\u672A\u6307\u5B9A\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError31(this.model, "\u672A\u6307\u5B9A\u5B9E\u4F53\u884C\u4E3A");
     }
     const requestData = ctx.params[dstDEUILogicParamId];
     const app = ibiz.hub.getApp(ctx.context.srfappid);
@@ -13923,13 +14091,13 @@ var DEActionNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts
-import { RuntimeModelError as RuntimeModelError31 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError32 } from "@ibiz-template/core";
 var DEUIActionNode = class extends UILogicNode {
   async exec(ctx) {
     const { dstAppDEUIActionId, dstDEUILogicParamId } = this.model;
     const { data, parameters } = ctx;
     if (!dstAppDEUIActionId) {
-      throw new RuntimeModelError31(this.model, "\u672A\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
+      throw new RuntimeModelError32(this.model, "\u672A\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
     }
     let actionData = [data];
     if (dstDEUILogicParamId) {
@@ -13990,7 +14158,7 @@ var EndNode2 = class extends UILogicNode {
 
 // src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts
 import { ModelError as ModelError21, RuntimeError as RuntimeError35 } from "@ibiz-template/core";
-import { clone as clone16 } from "ramda";
+import { clone as clone17 } from "ramda";
 var PrepareJSParamNode = class extends UILogicNode {
   async exec(ctx) {
     const nodeParams = this.model.deuilogicNodeParams;
@@ -14079,7 +14247,7 @@ var PrepareJSParamNode = class extends UILogicNode {
   copyParam(nodeParam, ctx) {
     const { dstDEUILogicParamId } = nodeParam;
     const srcVal = handleSrcVal2(ctx, nodeParam);
-    ctx.params[dstDEUILogicParamId] = clone16(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone17(srcVal);
   }
   /**
    * 绑定参数
@@ -14156,20 +14324,20 @@ var PrepareJSParamNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-invoke-node/view-ctrl-invoke-node.ts
-import { RuntimeError as RuntimeError36, RuntimeModelError as RuntimeModelError32 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError36, RuntimeModelError as RuntimeModelError33 } 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 RuntimeModelError32(this.model, "\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u5BF9\u8C61");
+      throw new RuntimeModelError33(this.model, "\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u5BF9\u8C61");
     }
     if (!invokeParamId) {
-      throw new RuntimeModelError32(this.model, "\u6CA1\u6709\u914D\u7F6E\u64CD\u4F5C\u53C2\u6570");
+      throw new RuntimeModelError33(this.model, "\u6CA1\u6709\u914D\u7F6E\u64CD\u4F5C\u53C2\u6570");
     }
     if (!invokeMethod) {
-      throw new RuntimeModelError32(this.model, "\u6CA1\u6709\u914D\u7F6E\u8C03\u7528\u65B9\u6CD5");
+      throw new RuntimeModelError33(this.model, "\u6CA1\u6709\u914D\u7F6E\u8C03\u7528\u65B9\u6CD5");
     }
     const invokeParam = ctx.params[invokeParamId];
     if (!invokeParam) {
@@ -14187,12 +14355,12 @@ var ViewCtrlInvokeNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/bind-param-node/bind-param-node.ts
-import { RuntimeModelError as RuntimeModelError33 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError34 } from "@ibiz-template/core";
 var BindParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
-      throw new RuntimeModelError33(
+      throw new RuntimeModelError34(
         this.model,
         "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u8005\u6E90\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E"
       );
@@ -14203,7 +14371,7 @@ var BindParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/msg-box-node/msg-box-node.ts
-import { ModelError as ModelError22, RuntimeModelError as RuntimeModelError34 } from "@ibiz-template/core";
+import { ModelError as ModelError22, RuntimeModelError as RuntimeModelError35 } from "@ibiz-template/core";
 var MsgBoxNode = class extends UILogicNode {
   constructor() {
     super(...arguments);
@@ -14217,10 +14385,10 @@ var MsgBoxNode = class extends UILogicNode {
   async exec(ctx) {
     const { msgBoxType, buttonsType, msgBoxParamId } = this.model;
     if (!msgBoxType) {
-      throw new RuntimeModelError34(this.model, "\u7F3A\u5C11\u6D88\u606F\u7C7B\u578B\u7684\u914D\u7F6E");
+      throw new RuntimeModelError35(this.model, "\u7F3A\u5C11\u6D88\u606F\u7C7B\u578B\u7684\u914D\u7F6E");
     }
     if (!buttonsType) {
-      throw new RuntimeModelError34(this.model, "\u7F3A\u5C11\u6309\u94AE\u7C7B\u578B\u7684\u914D\u7F6E");
+      throw new RuntimeModelError35(this.model, "\u7F3A\u5C11\u6309\u94AE\u7C7B\u578B\u7684\u914D\u7F6E");
     }
     let { title } = this.model;
     let { message } = this.model;
@@ -14280,12 +14448,12 @@ var PFPluginNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/debug-param-node/debug-param-node.ts
-import { RuntimeModelError as RuntimeModelError35 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError36 } from "@ibiz-template/core";
 var DebugParamNode = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, name } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError35(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
+      throw new RuntimeModelError36(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     const param = ctx.params[dstDEUILogicParamId];
     console.log("\u903B\u8F91\u8282\u70B9".concat(name, "\u64CD\u4F5C\u53C2\u6570\u503C:"), param);
@@ -14293,36 +14461,36 @@ var DebugParamNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/reset-param-node/reset-param-node.ts
-import { RuntimeModelError as RuntimeModelError36 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError37 } from "@ibiz-template/core";
 var ResetParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError36(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
+      throw new RuntimeModelError37(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     ctx.resetParam(dstDEUILogicParamId);
   }
 };
 
 // src/ui-logic/ui-logic-node/copy-param-node/copy-param-node.ts
-import { RuntimeModelError as RuntimeModelError37 } from "@ibiz-template/core";
-import { clone as clone17 } from "ramda";
+import { RuntimeModelError as RuntimeModelError38 } from "@ibiz-template/core";
+import { clone as clone18 } from "ramda";
 var CopyParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
-      throw new RuntimeModelError37(
+      throw new RuntimeModelError38(
         this.model,
         "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u8005\u6E90\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E"
       );
     }
     const srcVal = handleSrcVal2(ctx, this.model);
-    ctx.params[dstDEUILogicParamId] = clone17(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone18(srcVal);
   }
 };
 
 // src/ui-logic/ui-logic-node/append-param-node/append-param-node.ts
-import { RuntimeModelError as RuntimeModelError38 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError39 } from "@ibiz-template/core";
 var AppendParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -14333,7 +14501,7 @@ var AppendParamNode2 = class extends UILogicNode {
       srcSize
     } = this.model;
     if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
-      throw new RuntimeModelError38(
+      throw new RuntimeModelError39(
         this.model,
         "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u8005\u6E90\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E"
       );
@@ -14351,12 +14519,12 @@ var AppendParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/sort-param-node/sort-param-node.ts
-import { RuntimeModelError as RuntimeModelError39 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError40 } from "@ibiz-template/core";
 var SortParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, dstSortDir, dstFieldName } = this.model;
     if (!dstDEUILogicParamId || !dstFieldName) {
-      throw new RuntimeModelError39(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u76EE\u6807\u5C5E\u6027\u914D\u7F6E");
+      throw new RuntimeModelError40(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u76EE\u6807\u5C5E\u6027\u914D\u7F6E");
     }
     const key = dstFieldName;
     const arr = ctx.params[dstDEUILogicParamId];
@@ -14367,19 +14535,19 @@ var SortParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/renew-param-node/renew-param-node.ts
-import { RuntimeModelError as RuntimeModelError40 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
 var RenewParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError40(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
+      throw new RuntimeModelError41(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     ctx.renewParam(dstDEUILogicParamId);
   }
 };
 
 // src/ui-logic/ui-logic-node/data-set-node/data-set-node.ts
-import { RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
 var DataSetNode2 = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -14389,7 +14557,7 @@ var DataSetNode2 = class extends UILogicNode {
       retDEUILogicParamId
     } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError41(this.model, "\u7F3A\u5C11\u914D\u7F6E\u8FC7\u6EE4\u53C2\u6570");
+      throw new RuntimeModelError42(this.model, "\u7F3A\u5C11\u914D\u7F6E\u8FC7\u6EE4\u53C2\u6570");
     }
     const queryParams = ctx.params[dstDEUILogicParamId];
     const app = ibiz.hub.getApp(ctx.context.srfappid);
@@ -14415,19 +14583,19 @@ 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 RuntimeError38, RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError38, RuntimeModelError as RuntimeModelError43 } 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 RuntimeModelError42(this.model, "\u6CA1\u6709\u914D\u7F6E\u89E6\u53D1\u5BF9\u8C61");
+      throw new RuntimeModelError43(this.model, "\u6CA1\u6709\u914D\u7F6E\u89E6\u53D1\u5BF9\u8C61");
     }
     if (!eventName) {
-      throw new RuntimeModelError42(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u540D\u79F0\u53C2\u6570");
+      throw new RuntimeModelError43(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u540D\u79F0\u53C2\u6570");
     }
     if (!eventParamId) {
-      throw new RuntimeModelError42(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u53C2\u6570");
+      throw new RuntimeModelError43(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u53C2\u6570");
     }
     const invokeCtrl = ctx.params[fireCtrlId];
     if (!invokeCtrl) {
@@ -14442,7 +14610,7 @@ var ViewCtrlFireEventNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts
-import { RuntimeError as RuntimeError39, RuntimeModelError as RuntimeModelError43 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError39, RuntimeModelError as RuntimeModelError44 } from "@ibiz-template/core";
 var ExecuteDELogicNode = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -14452,13 +14620,13 @@ var ExecuteDELogicNode = class extends UILogicNode {
       retDEUILogicParamId
     } = this.model;
     if (!dstAppDataEntityId) {
-      throw new RuntimeModelError43(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53");
+      throw new RuntimeModelError44(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53");
     }
     if (!dstAppDELogicId) {
-      throw new RuntimeModelError43(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u903B\u8F91");
+      throw new RuntimeModelError44(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u903B\u8F91");
     }
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError43(this.model, "\u6CA1\u6709\u914D\u7F6E\u4F20\u5165\u903B\u8F91\u53C2\u6570");
+      throw new RuntimeModelError44(this.model, "\u6CA1\u6709\u914D\u7F6E\u4F20\u5165\u903B\u8F91\u53C2\u6570");
     }
     const dstParam = ctx.params[dstDEUILogicParamId];
     if (!dstParam) {
@@ -14603,7 +14771,7 @@ var UILogic = class {
     this.params = /* @__PURE__ */ new Map();
     var _a;
     if (!((_a = model.deuilogicNodes) == null ? void 0 : _a.length)) {
-      throw new RuntimeModelError44(model, "\u754C\u9762\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u903B\u8F91\u8282\u70B9");
+      throw new RuntimeModelError45(model, "\u754C\u9762\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u903B\u8F91\u8282\u70B9");
     }
     model.deuilogicNodes.forEach((node) => {
       const { logicNodeType } = node;
@@ -14720,7 +14888,7 @@ var UILogic = class {
       const start = this.nodes.get(startDEUILogicNodeId);
       await this.deepExec(start, ctx);
     } else {
-      throw new RuntimeModelError44(this.model, "\u672A\u8BBE\u7F6E\u8D77\u59CB\u8282\u70B9");
+      throw new RuntimeModelError45(this.model, "\u672A\u8BBE\u7F6E\u8D77\u59CB\u8282\u70B9");
     }
     if (ctx.isEndNode) {
       return ctx.result;
@@ -14856,7 +15024,7 @@ var UIActionProviderBase = class {
     const { appDEUILogicId, appDataEntityId, uilogicAttachMode } = action;
     if (uilogicAttachMode === "REPLACE") {
       if (!appDEUILogicId) {
-        throw new RuntimeModelError45(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+        throw new RuntimeModelError46(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
       }
       await execUILogic(appDEUILogicId, appDataEntityId, args);
       return result;
@@ -14888,7 +15056,7 @@ var UIActionProviderBase = class {
     }
     if (action.uilogicAttachMode === "AFTER") {
       if (!appDEUILogicId) {
-        throw new RuntimeModelError45(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+        throw new RuntimeModelError46(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
       }
       await execUILogic(appDEUILogicId, appDataEntityId, args);
     }
@@ -15076,7 +15244,7 @@ var BackendUIActionProvider = class extends UIActionProviderBase {
     const entityName = action.appDataEntityId;
     const methodName = action.appDEMethodId;
     if (!entityName || !methodName) {
-      throw new RuntimeModelError46(action, "\u672A\u914D\u7F6E\u5B9E\u4F53\u6216\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError47(action, "\u672A\u914D\u7F6E\u5B9E\u4F53\u6216\u5B9E\u4F53\u884C\u4E3A");
     }
     const { resultContext, resultParams, resultData } = await this.handleParams(
       action,
@@ -15182,7 +15350,9 @@ var SysUIActionProvider = class extends UIActionProviderBase {
       ["GRIDVIEW_VIEWACTION", "View"],
       ["GRIDVIEW_SAVEROWACTION", "SaveRow"],
       ["APP_LOGIN", "Login"],
-      ["APP_LOGOUT", "logout"]
+      ["APP_LOGOUT", "logout"],
+      ["UTIL_RESET", "Reset"],
+      ["UTIL_SEARCH", "Search"]
     ]);
   }
   async execAction(action, args) {
@@ -15197,7 +15367,12 @@ var SysUIActionProvider = class extends UIActionProviderBase {
 };
 
 // src/ui-action/provider/front-ui-action-provider.ts
-import { StringUtil, RuntimeModelError as RuntimeModelError47, ModelError as ModelError25 } from "@ibiz-template/core";
+import {
+  StringUtil,
+  RuntimeModelError as RuntimeModelError48,
+  ModelError as ModelError25,
+  RuntimeError as RuntimeError42
+} from "@ibiz-template/core";
 var FrontUIActionProvider = class extends UIActionProviderBase {
   async execAction(action, args) {
     const { context, params, data, event, noWaitRoute } = args;
@@ -15212,7 +15387,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       case "WIZARD": {
         const frontPSAppView = action.frontAppViewId;
         if (!frontPSAppView) {
-          throw new RuntimeModelError47(action, "\u672A\u914D\u7F6E\u6253\u5F00\u89C6\u56FE");
+          throw new RuntimeModelError48(action, "\u672A\u914D\u7F6E\u6253\u5F00\u89C6\u56FE");
         }
         const { resultContext, resultParams } = await this.handleParams(
           action,
@@ -15237,6 +15412,15 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
         }
         break;
       }
+      case "PRINT":
+        await this.executePrint(action, args);
+        break;
+      case "DATAIMP":
+        actionResult = await this.executeDataImport(action, args);
+        break;
+      case "DATAEXP":
+        await this.executeDataExport(action, args);
+        break;
       case "OTHER":
         actionResult = this.doOther(action, args);
         break;
@@ -15268,7 +15452,129 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       );
       return result || {};
     }
-    throw new RuntimeModelError47(action, "\u81EA\u5B9A\u4E49\u7C7B\u578B\u7F3A\u5C11\u914D\u7F6E\u811A\u672C\u4EE3\u7801");
+    throw new RuntimeModelError48(action, "\u81EA\u5B9A\u4E49\u7C7B\u578B\u7F3A\u5C11\u914D\u7F6E\u811A\u672C\u4EE3\u7801");
+  }
+  /**
+   * 执行打印行为
+   * @protected
+   * @param {IAppDEUIAction} action
+   * @param {IUILogicParams} args
+   * @return {*}
+   */
+  async executePrint(action, args) {
+    var _a, _b;
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      action.appDataEntityId
+    );
+    const appDEPrint = (_a = appDataEntity.appDEPrints) == null ? void 0 : _a.find((print) => {
+      return print.id === action.appDEPrintId;
+    });
+    if (appDEPrint) {
+      let requestUrl = "";
+      const { context } = args;
+      if (context && context[appDataEntity.codeName.toLowerCase()]) {
+        requestUrl += "/".concat((_b = appDataEntity.codeName2) == null ? void 0 : _b.toLowerCase(), "/printdata/").concat(context[appDataEntity.codeName.toLowerCase()], "?srfprinttag=").concat(appDEPrint.codeName);
+      } else {
+        throw new RuntimeError42("\u6CA1\u6709\u627E\u5230\u6570\u636E\u4E3B\u952E");
+      }
+      const res = await ibiz.net.request(requestUrl, {
+        method: "get",
+        responseType: "blob"
+      });
+      if (res.ok) {
+        const link = window.URL.createObjectURL(res.data);
+        window.open(link, "_blank");
+      } else {
+        throw new RuntimeError42("\u6253\u5370\u5931\u8D25");
+      }
+    } else {
+      throw new RuntimeError42("\u6CA1\u6709\u627E\u5230\u5B9E\u4F53\u6253\u5370\u9879");
+    }
+  }
+  /**
+   * 执行导入行为
+   * @protected
+   * @param {IAppDEUIAction} action
+   * @param {IUILogicParams} args
+   * @return {*}
+   */
+  async executeDataImport(action, _args) {
+    var _a;
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      action.appDataEntityId
+    );
+    const appDEDataImport = (_a = appDataEntity.appDEDataImports) == null ? void 0 : _a.find(
+      (dataImport) => dataImport.id === action.appDEDataImportId
+    );
+    if (appDEDataImport) {
+      const modal = ibiz.overlay.createModal(
+        "DataImport",
+        {
+          dismiss: () => modal.dismiss(),
+          appDataEntity,
+          dataImport: appDEDataImport
+        },
+        {
+          width: "auto",
+          placement: "center"
+        }
+      );
+      modal.present();
+      await modal.onWillDismiss();
+      return {
+        refresh: true,
+        refreshMode: 1
+      };
+    }
+    throw new RuntimeError42("\u6CA1\u6709\u627E\u5230\u5B9E\u4F53\u5BFC\u5165\u9879");
+  }
+  /**
+   * 执行导出行为
+   * @protected
+   * @param {IAppDEUIAction} action
+   * @param {IUILogicParams} args
+   * @return {*}
+   */
+  async executeDataExport(action, _args) {
+    var _a, _b;
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      action.appDataEntityId
+    );
+    const appDEDataExport = (_a = appDataEntity.appDEDataExports) == null ? void 0 : _a.find((dataExport) => {
+      return dataExport.id === action.appDEDataExportId;
+    });
+    if (appDEDataExport) {
+      const url = "/".concat((_b = appDataEntity.codeName2) == null ? void 0 : _b.toLowerCase(), "/exportdata/fetchdefault?srfexporttag=").concat(appDEDataExport.codeName);
+      const params = {
+        page: 0,
+        size: appDEDataExport.maxRowCount ? appDEDataExport.maxRowCount : 1e3,
+        responseType: "blob"
+      };
+      const res = await ibiz.net.request(url, {
+        method: "post",
+        data: params,
+        responseType: "blob"
+      });
+      if (res.status === 200) {
+        let fileName = "".concat(appDataEntity.logicName, "\u8868.xlsx");
+        fileName = decodeURIComponent(fileName);
+        const blob = new Blob([res.data], {
+          type: "application/vnd.ms-excel"
+        });
+        const elink = document.createElement("a");
+        elink.download = fileName;
+        elink.style.display = "none";
+        elink.href = URL.createObjectURL(blob);
+        document.body.appendChild(elink);
+        elink.click();
+        URL.revokeObjectURL(elink.href);
+        document.body.removeChild(elink);
+      } else {
+        throw new RuntimeError42("\u5BFC\u51FA\u8BF7\u6C42\u5931\u8D25");
+      }
+    } else {
+      throw new RuntimeError42("\u6CA1\u6709\u627E\u5230\u5B9E\u4F53\u5BFC\u51FA\u9879");
+    }
   }
 };
 
@@ -15335,7 +15641,7 @@ var ToolbarController = class extends ControlController {
       const actionId = item.uiactionId;
       const uiAction = await getUIActionById(actionId);
       if (!uiAction) {
-        throw new RuntimeError42("\u6CA1\u6709\u627E\u5230\u754C\u9762\u884C\u4E3A\u6A21\u578B".concat(actionId));
+        throw new RuntimeError43("\u6CA1\u6709\u627E\u5230\u754C\u9762\u884C\u4E3A\u6A21\u578B".concat(actionId));
       }
       const enableLoading = ["SYS", "BACKEND", "WFBACKEND"].includes(uiAction.uiactionMode) && uiAction.showBusyIndicator !== false;
       if (enableLoading) {
@@ -15898,7 +16204,7 @@ var RawItemPortletController = class extends PortletPartController {
 };
 
 // src/controller/control/data-view/data-view.controller.ts
-import { RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
 import { isNil as isNil21 } from "ramda";
 
 // src/controller/control/data-view/data-view.service.ts
@@ -16113,7 +16419,7 @@ var DataViewControlController = class extends MDControlController {
     const optItemModel = this.getOptItemModel();
     if (optItemModel) {
       if (!optItemModel.deuiactionGroup) {
-        throw new RuntimeModelError48(this.model, "\u64CD\u4F5C\u9879\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
+        throw new RuntimeModelError49(this.model, "\u64CD\u4F5C\u9879\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
       }
       if (!((_a = optItemModel.deuiactionGroup.uiactionGroupDetails) == null ? void 0 : _a.length)) {
         ibiz.log.debug("\u64CD\u4F5C\u9879\u754C\u9762\u884C\u4E3A\u7EC4\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
@@ -16162,7 +16468,7 @@ var DataViewControlController = class extends MDControlController {
     const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
     if (enableGroup && groupMode) {
       if (!groupAppDEFieldId) {
-        throw new RuntimeModelError48(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
+        throw new RuntimeModelError49(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
       }
       if (groupMode === "AUTO") {
         this.handleAutoGroup();
@@ -16229,7 +16535,7 @@ var DataViewControlController = class extends MDControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError48(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
+      throw new RuntimeModelError49(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
     }
     const { items } = this.state;
     const groupMap = /* @__PURE__ */ new Map();
@@ -16336,7 +16642,7 @@ var DataViewControlController = class extends MDControlController {
         caption = ibiz.i18n.t(item.capLanguageRes.lanResTag, item.caption);
       }
       if (!item.appDEFieldId) {
-        throw new RuntimeModelError48(item, "\u542F\u7528\u6392\u5E8F\u7684\u9879\u5FC5\u987B\u5173\u8054\u5B9E\u4F53\u5C5E\u6027");
+        throw new RuntimeModelError49(item, "\u542F\u7528\u6392\u5E8F\u7684\u9879\u5FC5\u987B\u5173\u8054\u5B9E\u4F53\u5C5E\u6027");
       }
       const tempItem = {
         caption,
@@ -16354,10 +16660,10 @@ var DataViewControlController = class extends MDControlController {
 };
 
 // src/controller/control/exp-bar/calendar-exp-bar.controller.ts
-import { RuntimeModelError as RuntimeModelError50 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError51 } from "@ibiz-template/core";
 
 // src/controller/control/exp-bar/exp-bar.controller.ts
-import { RuntimeError as RuntimeError43, RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError44, RuntimeModelError as RuntimeModelError50 } from "@ibiz-template/core";
 var ExpBarControlController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -16412,7 +16718,7 @@ var ExpBarControlController = class extends ControlController {
   get xDataController() {
     const controller = this.view.getController(this.model.xdataControlName);
     if (!controller) {
-      throw new RuntimeModelError49(
+      throw new RuntimeModelError50(
         this.model,
         "\u65E0\u6CD5\u83B7\u53D6\u591A\u6570\u636E\u90E8\u4EF6[".concat(this.model.xdataControlName, "]\u63A7\u5236\u5668")
       );
@@ -16683,7 +16989,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 RuntimeError43("\u591A\u8282\u70B9\u89C6\u56FE\u7531\u5B50\u7C7B\u5B9E\u73B0");
+    throw new RuntimeError44("\u591A\u8282\u70B9\u89C6\u56FE\u7531\u5B50\u7C7B\u5B9E\u73B0");
   }
   /**
    * 获取导航视图
@@ -16771,7 +17077,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
   get xDataController() {
     const controller = this.view.getController(this.model.xdataControlName);
     if (!controller) {
-      throw new RuntimeModelError50(
+      throw new RuntimeModelError51(
         this.model,
         "\u65E0\u6CD5\u83B7\u53D6\u591A\u6570\u636E\u90E8\u4EF6[".concat(this.model.xdataControlName, "]\u63A7\u5236\u5668")
       );
@@ -16826,7 +17132,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/exp-bar/tree-exp-bar.controller.ts
-import { RuntimeError as RuntimeError44, RuntimeModelError as RuntimeModelError51 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError45, RuntimeModelError as RuntimeModelError52 } from "@ibiz-template/core";
 var TreeExpBarController = class extends ExpBarControlController {
   constructor() {
     super(...arguments);
@@ -16849,7 +17155,7 @@ var TreeExpBarController = class extends ExpBarControlController {
   get xDataController() {
     const controller = this.view.getController(this.model.xdataControlName);
     if (!controller) {
-      throw new RuntimeModelError51(
+      throw new RuntimeModelError52(
         this.model,
         "\u65E0\u6CD5\u83B7\u53D6\u591A\u6570\u636E\u90E8\u4EF6[".concat(this.model.xdataControlName, "]\u63A7\u5236\u5668")
       );
@@ -16901,7 +17207,7 @@ var TreeExpBarController = class extends ExpBarControlController {
     const deData = node.deData || node;
     const nodeModel = this.getNodeModel(node.nodeId);
     if (!nodeModel) {
-      throw new RuntimeError44("\u627E\u4E0D\u5230".concat(node.nodeId, "\u7684\u8282\u70B9\u6A21\u578B"));
+      throw new RuntimeError45("\u627E\u4E0D\u5230".concat(node.nodeId, "\u7684\u8282\u70B9\u6A21\u578B"));
     }
     const result = this.prepareParams(nodeModel, deData, context, params);
     result.context.currentSrfNav = nodeId;
@@ -16971,6 +17277,78 @@ var TreeExpBarController = class extends ExpBarControlController {
 
 // src/controller/control/exp-bar/chart-exp-bar.controller.ts
 var ChartExpBarController = class extends ExpBarControlController {
+  /**
+   * 导航页面首次打开且没有回显时，
+   * 默认取第一条数据进行导航
+   * 对于不同的导航，第一条可导航的数据可能定义不同，可以重写改方法。
+   * @author lxm
+   * @date 2023-08-10 03:58:15
+   * @protected
+   */
+  navByFirstItem() {
+    const data = this.xDataController.state.items[0];
+    if (!data) {
+      this.state.srfnav = "";
+      this._evt.emit("onNavViewChange", {
+        navViewMsg: {
+          key: "",
+          isCache: this.isCache
+        }
+      });
+      return;
+    }
+    const activeSeriesGenerator = this.xDataController.generator.seriesGenerators.find((generator) => {
+      return generator.chartDataArr.length > 0 && generator.model.navAppViewId;
+    });
+    if (activeSeriesGenerator) {
+      this.xDataController.setActive(activeSeriesGenerator.chartDataArr[0]);
+    }
+  }
+  /**
+   * 解析参数
+   *
+   * @author zk
+   * @date 2023-05-29 04:05:52
+   * @param {IDETabViewPanel} tabViewPanel
+   * @return {*}
+   * @memberof ExpBarControlController
+   */
+  prepareParams(XDataModel, data, context, params) {
+    var _a;
+    const { context: tempContext, params: tempParams } = super.prepareParams(
+      XDataModel,
+      data,
+      context,
+      params
+    );
+    if (data._seriesModelId) {
+      const seriesModel = (_a = XDataModel.dechartSerieses) == null ? void 0 : _a.find(
+        (series) => {
+          return series.id === data._seriesModelId;
+        }
+      );
+      if (seriesModel) {
+        const { navigateContexts, navigateParams } = seriesModel;
+        const tempContext2 = convertNavData(
+          navigateContexts,
+          data,
+          params,
+          tempContext
+        );
+        const tempParams2 = convertNavData(
+          navigateParams,
+          data,
+          params,
+          tempParams
+        );
+        return {
+          context: Object.assign(tempContext.clone(), tempContext2),
+          params: tempParams2
+        };
+      }
+    }
+    return { context: tempContext, params: tempParams };
+  }
   /**
    * 获取导航视图
    *
@@ -16982,10 +17360,18 @@ var ChartExpBarController = class extends ExpBarControlController {
    */
   getNavViewMsg(data, context, params) {
     var _a;
-    const viewModelId = (_a = this.XDataModel.dechartSerieses) == null ? void 0 : _a[0].navAppViewId;
+    let viewModelId;
+    if (data._seriesModelId) {
+      const seriesModel = (_a = this.XDataModel.dechartSerieses) == null ? void 0 : _a.find(
+        (series) => {
+          return series.id === data._seriesModelId;
+        }
+      );
+      viewModelId = seriesModel == null ? void 0 : seriesModel.navAppViewId;
+    }
     const result = this.prepareParams(this.XDataModel, data, context, params);
     return {
-      key: data[this.navKeyName],
+      key: data._uuid,
       context: result.context,
       params: result.params,
       viewId: viewModelId,
@@ -17295,6 +17681,7 @@ var SearchFormService = class extends ControlService {
 var SearchFormController = class extends FormController {
   async onCreated() {
     await super.onCreated();
+    this.preprocessLayoutPanel();
     this.service = new SearchFormService(this.model);
     await this.service.init(this.context);
     await this.load();
@@ -17404,6 +17791,57 @@ var SearchFormController = class extends FormController {
       await this.onSearchButtonClick();
     }
   }
+  /**
+   * 根据搜索表单的按钮位置和按钮样式
+   * 预处理部件布局面板模型
+   * @author lxm
+   * @date 2023-11-21 04:17:43
+   * @protected
+   * @return {*}
+   */
+  preprocessLayoutPanel() {
+    if (!this.controlPanel) {
+      return;
+    }
+    const { searchButtonStyle } = this.model;
+    let deleteRight = false;
+    let deleteBottom = false;
+    const searchButtonPos = this.model.searchButtonPos || "RIGHT";
+    deleteRight = searchButtonPos === "BOTTOM";
+    deleteBottom = searchButtonPos !== "BOTTOM";
+    if (searchButtonStyle === "NONE") {
+      deleteRight = true;
+      deleteBottom = true;
+    }
+    const recursivePanelItems = (parent) => {
+      let children;
+      let childrenKey = "";
+      ["rootPanelItems", "panelItems"].find((key) => {
+        if (parent[key]) {
+          children = parent[key];
+          childrenKey = key;
+          return true;
+        }
+        return false;
+      });
+      if (children && children.length > 0) {
+        const newArr = [];
+        children.forEach((item) => {
+          const isDelete = deleteRight && item.id === "control_buttons_right" || deleteBottom && item.id === "control_buttons_bottom";
+          if (!isDelete) {
+            newArr.push(item);
+            recursivePanelItems(item);
+          }
+        });
+        if (newArr.length < children.length) {
+          parent[childrenKey] = newArr;
+        }
+      }
+    };
+    if (deleteBottom || deleteRight) {
+      recursivePanelItems(this.controlPanel);
+    }
+  }
 };
 
 // src/controller/control/form/form-detail/form-detail/form-detail.state.ts
@@ -17853,7 +18291,7 @@ var FormButtonController = class extends FormDetailController {
 
 // src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts
 import { isOverlap as isOverlap2 } from "@ibiz-template/core";
-import { createUUID as createUUID7, notNilEmpty as notNilEmpty8 } from "qx-util";
+import { createUUID as createUUID8, notNilEmpty as notNilEmpty8 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-druipart/form-druipart.state.ts
 var FormDruipartState = class extends FormDetailState {
@@ -17966,7 +18404,7 @@ var FormDRUIPartController = class extends FormDetailController {
       this.form.context
     );
     if (!this.state.viewComponentKey) {
-      this.state.viewComponentKey = createUUID7();
+      this.state.viewComponentKey = createUUID8();
       this.navContext = newContext;
       this.navParams = newParams;
     } else if (JSON.stringify(this.navContext) !== JSON.stringify(newContext) || JSON.stringify(this.navParams) !== JSON.stringify(newParams)) {
@@ -18582,10 +19020,10 @@ var FormMDCtrlContentTypeController = class {
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.ts
-import { clone as clone19 } from "ramda";
+import { clone as clone20 } from "ramda";
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-control/form-mdctrl-control.controller.ts
-import { RuntimeError as RuntimeError45 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError46 } from "@ibiz-template/core";
 var FormMDCtrlControlController = class extends FormMDCtrlContentTypeController {
   /**
    * 初始化
@@ -18600,7 +19038,7 @@ var FormMDCtrlControlController = class extends FormMDCtrlContentTypeController
     const { model } = this.parent;
     const { contentControl } = model;
     if (!contentControl) {
-      throw new RuntimeError45("\u8868\u5355\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5D4C\u5165\u90E8\u4EF6");
+      throw new RuntimeError46("\u8868\u5355\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5D4C\u5165\u90E8\u4EF6");
     }
     this.controlModel = contentControl;
     const controlProvider = await getControlProvider(this.controlModel);
@@ -18718,17 +19156,17 @@ import { isArray as isArray10 } from "lodash-es";
 import {
   awaitTimeout,
   mergeInLeft,
-  RuntimeError as RuntimeError46,
+  RuntimeError as RuntimeError47,
   mergeDefaultInLeft as mergeDefaultInLeft2
 } from "@ibiz-template/core";
 import { debounce as debounce2 } from "lodash-es";
-import { createUUID as createUUID8 } from "qx-util";
-import { clone as clone18 } from "ramda";
+import { createUUID as createUUID9 } from "qx-util";
+import { clone as clone19 } from "ramda";
 
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
   recursiveIterate as recursiveIterate4,
-  RuntimeModelError as RuntimeModelError52
+  RuntimeModelError as RuntimeModelError53
 } from "@ibiz-template/core";
 var EditFormService = class extends ControlService {
   /**
@@ -18846,7 +19284,7 @@ var EditFormService = class extends ControlService {
     const wizardForm = this.model;
     const methodName = (_a = wizardForm.goBackControlAction) == null ? void 0 : _a.appDEMethodId;
     if (!methodName) {
-      throw new RuntimeModelError52(this.model, "\u7F3A\u5C11\u8FD4\u56DE\u64CD\u4F5C\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError53(this.model, "\u7F3A\u5C11\u8FD4\u56DE\u64CD\u4F5C\u5B9E\u4F53\u884C\u4E3A");
     }
     let res = await this.exec(
       methodName,
@@ -19070,8 +19508,8 @@ var EditFormController = class extends FormController {
    * @return {*}  {Promise<IData>}
    */
   async copy() {
-    const context = clone18(this.context);
-    const queryParams = clone18(this.params);
+    const context = clone19(this.context);
+    const queryParams = clone19(this.params);
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId
     );
@@ -19099,7 +19537,7 @@ var EditFormController = class extends FormController {
       await this.endLoading();
     }
     res.data.srfkey = void 0;
-    res.data.tempsrfkey = createUUID8();
+    res.data.tempsrfkey = createUUID9();
     this.state.modified = false;
     this.state.data = res.data;
     this.formStateNotify("LOAD" /* LOAD */);
@@ -19127,7 +19565,7 @@ var EditFormController = class extends FormController {
       return this.loadDraft();
     }
     const { context, params } = this.handlerAbilityParams(args);
-    const queryParams = clone18(params);
+    const queryParams = clone19(params);
     let res;
     try {
       await this.startLoading();
@@ -19164,7 +19602,7 @@ var EditFormController = class extends FormController {
     }
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError46("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
+      throw new RuntimeError47("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
     }
     if (!silent) {
       await this.startLoading();
@@ -19290,7 +19728,7 @@ var EditFormController = class extends FormController {
       (item) => item.id === formItemUpdateId
     );
     if (!formItemUpdate) {
-      throw new RuntimeError46("\u6CA1\u627E\u5230".concat(formItemUpdateId, "\u8868\u5355\u9879\u66F4\u65B0"));
+      throw new RuntimeError47("\u6CA1\u627E\u5230".concat(formItemUpdateId, "\u8868\u5355\u9879\u66F4\u65B0"));
     }
     const { appDEMethodId, defiupdateDetails, customCode, scriptCode } = formItemUpdate;
     const updateItems = defiupdateDetails == null ? void 0 : defiupdateDetails.map((item) => item.id);
@@ -19334,7 +19772,7 @@ var EditFormController = class extends FormController {
   async wfStart(args) {
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError46("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
+      throw new RuntimeError47("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
     }
     await this.startLoading();
     const { context, params } = this.handlerAbilityParams(args);
@@ -19365,7 +19803,7 @@ var EditFormController = class extends FormController {
   async wfSubmit(args) {
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError46("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
+      throw new RuntimeError47("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
     }
     await this.startLoading();
     const { context, params } = this.handlerAbilityParams(args);
@@ -19597,7 +20035,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlControlController {
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-grid/form-mdctrl-grid.controller.ts
-import { RuntimeError as RuntimeError47, mergeInLeft as mergeInLeft3 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError48, mergeInLeft as mergeInLeft3 } from "@ibiz-template/core";
 var FormMDCtrlGridController = class extends FormMDCtrlControlController {
   constructor() {
     super(...arguments);
@@ -19709,7 +20147,7 @@ var FormMDCtrlGridController = class extends FormMDCtrlControlController {
     const { model } = this.parent;
     const { contentControl } = model;
     if (!contentControl) {
-      throw new RuntimeError47("\u8868\u5355\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5D4C\u5165\u90E8\u4EF6");
+      throw new RuntimeError48("\u8868\u5355\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5D4C\u5165\u90E8\u4EF6");
     }
     mergeInLeft3(contentControl, { enableRowEdit: true, enableRowNew: true });
     this.controlModel = contentControl;
@@ -20132,7 +20570,7 @@ var FormMDCtrlController = class extends FormDetailController {
   setFormDataValue() {
     const name = this.model.appDEFieldId || this.model.fieldName || this.model.id;
     if (name) {
-      this.form.setDataValue(name, clone19(this.state.contentCtrlData));
+      this.form.setDataValue(name, clone20(this.state.contentCtrlData));
     }
   }
   /**
@@ -20200,10 +20638,10 @@ var FormMDCtrlController = class extends FormDetailController {
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.ts
-import { clone as clone20 } from "ramda";
+import { clone as clone21 } from "ramda";
 var FormMDCtrlItemController = class extends EditFormController {
   constructor(model, context, params, ctx, data, form) {
-    const tempModel = clone20(form.model);
+    const tempModel = clone21(form.model);
     Object.assign(tempModel, model, { name: void 0 });
     super(tempModel, context, params, ctx);
     this.state.data = data;
@@ -20503,10 +20941,10 @@ import {
   debounceAndAsyncMerge as debounceAndAsyncMerge2,
   mergeDefaultInLeft as mergeDefaultInLeft3,
   recursiveIterate as recursiveIterate5,
-  RuntimeError as RuntimeError48,
-  RuntimeModelError as RuntimeModelError53
+  RuntimeError as RuntimeError49,
+  RuntimeModelError as RuntimeModelError54
 } from "@ibiz-template/core";
-import { clone as clone21 } from "ramda";
+import { clone as clone22 } from "ramda";
 
 // src/controller/control/grid/grid/grid.service.ts
 var GridService = class extends MDControlService {
@@ -20710,11 +21148,11 @@ var GridController = class extends MDControlController {
       (item) => item.model.appDEFieldId === groupAppDEFieldId
     );
     if (!this.groupFieldColumn) {
-      throw new RuntimeModelError53(this.model, "\u6CA1\u6709\u914D\u7F6E\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217");
+      throw new RuntimeModelError54(this.model, "\u6CA1\u6709\u914D\u7F6E\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217");
     }
     const groupFieldName = this.groupFieldColumn.model.id;
     if (!this.groupFieldColumn.model.appCodeListId) {
-      throw new RuntimeModelError53(
+      throw new RuntimeModelError54(
         this.groupFieldColumn.model,
         "\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217".concat(groupFieldName, "\u6CA1\u6709\u914D\u7F6E\u4EE3\u7801\u8868")
       );
@@ -20724,7 +21162,7 @@ var GridController = class extends MDControlController {
     );
     if (index !== -1 && index !== 0) {
       if (this.isMultistageHeader) {
-        throw new RuntimeModelError53(
+        throw new RuntimeModelError54(
           this.model,
           "\u8BF7\u5C06\u5206\u7EC4\u5C5E\u6027\u5217".concat(groupFieldName, "\u914D\u7F6E\u4E3A\u7B2C\u4E00\u5217")
         );
@@ -20734,10 +21172,10 @@ var GridController = class extends MDControlController {
     }
     if (groupMode === "CODELIST") {
       if (!groupCodeListId) {
-        throw new RuntimeModelError53(this.model, "\u4EE3\u7801\u8868\u5206\u7EC4\u6A21\u5F0F\u9700\u8981\u914D\u7F6E\u4EE3\u7801\u8868");
+        throw new RuntimeModelError54(this.model, "\u4EE3\u7801\u8868\u5206\u7EC4\u6A21\u5F0F\u9700\u8981\u914D\u7F6E\u4EE3\u7801\u8868");
       }
       if (this.groupFieldColumn.model.appCodeListId !== groupCodeListId) {
-        throw new RuntimeModelError53(
+        throw new RuntimeModelError54(
           this.model,
           "\u5206\u7EC4\u4EE3\u7801\u8868\u4E0E\u5C5E\u6027\u5217".concat(groupFieldName, "\u7684\u4EE3\u7801\u8868\u4E0D\u4E00\u81F4")
         );
@@ -20819,7 +21257,7 @@ var GridController = class extends MDControlController {
       return;
     }
     if (!aggAppDEDataSetId || !aggAppDataEntityId) {
-      throw new RuntimeModelError53(this.model, "\u7F3A\u5C11\u914D\u7F6E\u805A\u5408\u5B9E\u4F53\u6216\u805A\u5408\u6570\u636E\u96C6");
+      throw new RuntimeModelError54(this.model, "\u7F3A\u5C11\u914D\u7F6E\u805A\u5408\u5B9E\u4F53\u6216\u805A\u5408\u6570\u636E\u96C6");
     }
     const params = await this.getFetchParams();
     const app = ibiz.hub.getApp(this.context.srfappid);
@@ -20887,7 +21325,7 @@ var GridController = class extends MDControlController {
     if (editShowMode === "row") {
       const editingRow = this.state.rows.find((item) => item.showRowEdit);
       if (editingRow) {
-        throw new RuntimeError48("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
+        throw new RuntimeError49("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
       }
     }
     const queryParams = { ...this.params };
@@ -20928,7 +21366,7 @@ var GridController = class extends MDControlController {
     const isCreate = data.srfuf === 0 /* CREATE */;
     const rowState = this.findRowState(data);
     if (!rowState) {
-      throw new RuntimeError48("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
+      throw new RuntimeError49("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
     }
     if (!rowState.modified) {
       ibiz.log.debug("\u503C\u6CA1\u6709\u53D1\u751F\u6539\u53D8");
@@ -20940,7 +21378,7 @@ var GridController = class extends MDControlController {
     }
     const isValid = await this.validate(rowState);
     if (!isValid) {
-      throw new RuntimeError48("\u884C\u6570\u636E\u6821\u9A8C\u4E0D\u901A\u8FC7\uFF0C\u4FDD\u5B58\u53D6\u6D88");
+      throw new RuntimeError49("\u884C\u6570\u636E\u6821\u9A8C\u4E0D\u901A\u8FC7\uFF0C\u4FDD\u5B58\u53D6\u6D88");
     }
     let res;
     const deName = calcDeCodeNameById(this.model.appDataEntityId);
@@ -21137,7 +21575,7 @@ var GridController = class extends MDControlController {
   }
   async toggleRowEdit() {
     if (!this.model.enableRowNew) {
-      throw new RuntimeError48("\u5F53\u524D\u8868\u683C\u4E0D\u652F\u6301\u884C\u7F16\u8F91\uFF0C\u65E0\u6CD5\u5207\u6362\u5F00\u542F\u884C\u7F16\u8F91");
+      throw new RuntimeError49("\u5F53\u524D\u8868\u683C\u4E0D\u652F\u6301\u884C\u7F16\u8F91\uFF0C\u65E0\u6CD5\u5207\u6362\u5F00\u542F\u884C\u7F16\u8F91");
     }
     this.state.rowEditOpen = !this.state.rowEditOpen;
   }
@@ -21170,10 +21608,10 @@ var GridController = class extends MDControlController {
     } else {
       const editingRow = this.state.rows.find((item) => item.showRowEdit);
       if (editingRow) {
-        throw new RuntimeError48("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
+        throw new RuntimeError49("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
       }
       if (row.data.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone21(row.data);
+        row.cacheData = clone22(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -21220,7 +21658,7 @@ var GridController = class extends MDControlController {
       (item) => item.id === updateId
     );
     if (!findUpdate) {
-      throw new RuntimeError48("\u6CA1\u627E\u5230".concat(updateId, "\u7F16\u8F91\u5217\u66F4\u65B0"));
+      throw new RuntimeError49("\u6CA1\u627E\u5230".concat(updateId, "\u7F16\u8F91\u5217\u66F4\u65B0"));
     }
     const { appDEMethodId, degeiupdateDetails, customCode, scriptCode } = findUpdate;
     const updateItems = degeiupdateDetails.map((item) => item.id);
@@ -21274,6 +21712,30 @@ var GridController = class extends MDControlController {
     }
     return res.data;
   }
+  /**
+   * 初始化数据导出列
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-21 18:54:16
+   */
+  async findAllExportColumns(dataExport) {
+    var _a;
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    const exportColumnsPromises = (_a = dataExport.dedataExportItems) == null ? void 0 : _a.map(async (item) => {
+      const tempExportColumn = { ...item };
+      if (item.codeListId) {
+        tempExportColumn.codeList = app.codeList.getCodeList(item.codeListId);
+        tempExportColumn.codeListItems = await app.codeList.get(
+          item.codeListId
+        );
+      }
+      return tempExportColumn;
+    });
+    if (exportColumnsPromises) {
+      return Promise.all(exportColumnsPromises);
+    }
+    return void 0;
+  }
   /**
    * 数据导出
    *
@@ -21282,18 +21744,57 @@ var GridController = class extends MDControlController {
    * @memberof MDControlController
    */
   async exportData(_args) {
-    const items = this.fieldColumns;
+    var _a;
+    if (this.model.dedataExportId && !this.dataExport) {
+      this.dataExport = (_a = this.dataEntity.appDEDataExports) == null ? void 0 : _a.find((dataExport) => {
+        return dataExport.id === this.model.dedataExportId;
+      });
+      if (this.dataExport) {
+        this.allExportColumns = await this.findAllExportColumns(
+          this.dataExport
+        );
+      }
+    }
     const formatExcelData = (data2) => {
-      const cloneData = clone21(
+      var _a2;
+      const codeListMap = /* @__PURE__ */ new Map();
+      if (this.allExportColumns && this.allExportColumns.length > 0) {
+        (_a2 = this.allExportColumns) == null ? void 0 : _a2.forEach((exportColumn) => {
+          if (exportColumn.codeListItems) {
+            codeListMap.set(
+              exportColumn.appDEFieldId,
+              exportColumn.codeListItems
+            );
+          }
+        });
+      } else {
+        Object.keys(this.fieldColumns).forEach((key) => {
+          if (this.fieldColumns[key].codeList) {
+            codeListMap.set(key, this.fieldColumns[key].codeListItems);
+          }
+        });
+      }
+      const cloneData = clone22(
         data2.map((item) => {
           return item.getOrigin();
         })
       );
+      cloneData.forEach((item) => {
+        const fields = Object.keys(item);
+        fields.forEach((key) => {
+          var _a3;
+          if (codeListMap.get(key)) {
+            item[key] = ((_a3 = codeListMap.get(key).find((_item) => {
+              return _item.value === item[key];
+            })) == null ? void 0 : _a3.text) || item[key];
+          }
+        });
+      });
       return cloneData;
     };
     const getExportData = async () => {
-      var _a;
-      const type = (_a = _args.params) == null ? void 0 : _a.type;
+      var _a2;
+      const type = (_a2 = _args.params) == null ? void 0 : _a2.type;
       let data2 = [];
       if (type === "activatedPage") {
         data2 = this.state.rows.map((row) => row.data);
@@ -21312,7 +21813,7 @@ var GridController = class extends MDControlController {
         data2 = this.getData();
       }
       if (data2.length === 0) {
-        throw new RuntimeError48("\u65E0\u5BFC\u51FA\u6570\u636E");
+        throw new RuntimeError49("\u65E0\u5BFC\u51FA\u6570\u636E");
       }
       return formatExcelData(data2);
     };
@@ -21323,12 +21824,23 @@ var GridController = class extends MDControlController {
         });
       });
     };
-    const filterVal = Object.keys(items).map(
-      (key) => items[key].model.id
-    );
-    const header = Object.keys(items).map(
-      (key) => items[key].model.caption
-    );
+    let filterVal = [];
+    let header = [];
+    if (this.allExportColumns && this.allExportColumns.length > 0) {
+      filterVal = this.allExportColumns.map(
+        (column) => column.appDEFieldId
+      );
+      header = this.allExportColumns.map(
+        (column) => column.caption
+      );
+    } else {
+      filterVal = Object.keys(this.fieldColumns).map(
+        (key) => this.fieldColumns[key].model.id
+      );
+      header = Object.keys(this.fieldColumns).map(
+        (key) => this.fieldColumns[key].model.caption
+      );
+    }
     const data = formatArrayData(filterVal, await getExportData());
     await exportData(header, data, this.model.logicName);
   }
@@ -21393,7 +21905,7 @@ var GridController = class extends MDControlController {
 import { DataTypes as DataTypes3, ModelError as ModelError26, plus as plus2 } from "@ibiz-template/core";
 import dayjs4 from "dayjs";
 import { debounce as debounce3 } from "lodash-es";
-import { clone as clone22, isNil as isNil22 } from "ramda";
+import { clone as clone23, isNil as isNil22 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
     super(...arguments);
@@ -21497,7 +22009,7 @@ var GridFieldColumnController = class extends GridColumnController {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone22(this.params);
+    const tempParams = clone23(this.params);
     const { context: newContext, params: newParams } = this.handlePublicParams(
       row.data,
       tempContext,
@@ -21639,7 +22151,7 @@ var GridFieldColumnController = class extends GridColumnController {
 };
 
 // src/controller/control/grid/grid-column/grid-ua-column/grid-ua-column.controller.ts
-import { RuntimeModelError as RuntimeModelError54 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError55 } from "@ibiz-template/core";
 var GridUAColumnController = class extends GridColumnController {
   /**
    * 给rowController初始化操作列的状态
@@ -21652,7 +22164,7 @@ var GridUAColumnController = class extends GridColumnController {
     var _a;
     const { deuiactionGroup } = this.model;
     if (!deuiactionGroup) {
-      throw new RuntimeModelError54(this.model, "\u64CD\u4F5C\u5217\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
+      throw new RuntimeModelError55(this.model, "\u64CD\u4F5C\u5217\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
     }
     if (!((_a = deuiactionGroup.uiactionGroupDetails) == null ? void 0 : _a.length)) {
       ibiz.log.debug("\u64CD\u4F5C\u5217\u754C\u9762\u884C\u4E3A\u7EC4\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
@@ -21693,7 +22205,7 @@ var GridUAColumnController = class extends GridColumnController {
 };
 
 // src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts
-import { RuntimeError as RuntimeError49 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError50 } from "@ibiz-template/core";
 import Schema2 from "async-validator";
 import { isNilOrEmpty as isNilOrEmpty9 } from "qx-util";
 var GridFieldEditColumnController = class extends GridFieldColumnController {
@@ -21830,7 +22342,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 RuntimeError49(
+        throw new RuntimeError50(
           "".concat(this.editItem.codeName, "\u6821\u9A8C\u62A5\u9519,").concat(row.errors[this.fieldName])
         );
       }
@@ -22188,10 +22700,10 @@ var ListController = class extends MDControlController {
 };
 
 // src/controller/control/panel/panel/panel.controller.ts
-import { recursiveIterate as recursiveIterate6, RuntimeError as RuntimeError50 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate6, RuntimeError as RuntimeError51 } from "@ibiz-template/core";
 var PanelController = class extends ControlController {
-  constructor() {
-    super(...arguments);
+  constructor(model, context, params, ctx, container) {
+    super(model, context, params, ctx);
     /**
      * 所有面板成员的控制器
      *
@@ -22208,6 +22720,7 @@ var PanelController = class extends ControlController {
      * @type {{ [key: string]: IPanelItemProvider  | IControlProvider}}
      */
     this.providers = {};
+    this.container = container;
   }
   get _evt() {
     return this.evt;
@@ -22311,7 +22824,7 @@ var PanelController = class extends ControlController {
     var _a, _b;
     const data = await this.prepareData();
     if (!data) {
-      throw new RuntimeError50("\u672A\u83B7\u53D6\u5230\u9762\u677F\u6570\u636E");
+      throw new RuntimeError51("\u672A\u83B7\u53D6\u5230\u9762\u677F\u6570\u636E");
     }
     const panelData = this.convertData(data);
     (_b = (_a = this.data).destroy) == null ? void 0 : _b.call(_a);
@@ -22910,7 +23423,7 @@ import { recursiveIterate as recursiveIterate7 } from "@ibiz-template/core";
 import { isNil as isNil23 } from "ramda";
 
 // 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";
 var SearchBarFilterController = class {
   constructor(model, searchBar) {
     this.model = model;
@@ -22938,7 +23451,7 @@ var SearchBarFilterController = class {
    */
   async init() {
     if (!this.model.editor) {
-      throw new RuntimeModelError55(this.model, "\u7F3A\u5C11\u7F16\u8F91\u5668\u6A21\u578B");
+      throw new RuntimeModelError56(this.model, "\u7F3A\u5C11\u7F16\u8F91\u5668\u6A21\u578B");
     }
     this.editorProvider = await getEditorProvider(this.model.editor);
     if (this.editorProvider) {
@@ -23968,7 +24481,7 @@ var TreeController = class extends MDControlController {
 };
 
 // src/controller/control/wizard-panel/wizard-panel.controller.ts
-import { RuntimeError as RuntimeError51 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError52 } from "@ibiz-template/core";
 
 // src/controller/control/wizard-panel/wizard-panel.service.ts
 var WizardPanelService = class extends ControlService {
@@ -24127,7 +24640,7 @@ var WizardPanelController = class extends ControlController {
     const { activeFormTag } = this.state;
     const controller = this.formControllers.get(activeFormTag);
     if (!controller) {
-      throw new RuntimeError51("\u627E\u4E0D\u5230".concat(activeFormTag, "\u7684\u8868\u5355\u63A7\u5236\u5668"));
+      throw new RuntimeError52("\u627E\u4E0D\u5230".concat(activeFormTag, "\u7684\u8868\u5355\u63A7\u5236\u5668"));
     }
     return controller;
   }
@@ -24167,7 +24680,7 @@ var WizardPanelController = class extends ControlController {
   getWizardFormByTag(tag) {
     var _a;
     if (!((_a = this.model.dewizard) == null ? void 0 : _a.dewizardForms)) {
-      throw new RuntimeError51("\u6CA1\u6709\u914D\u7F6E\u5411\u5BFC\u8868\u5355\u96C6\u5408");
+      throw new RuntimeError52("\u6CA1\u6709\u914D\u7F6E\u5411\u5BFC\u8868\u5355\u96C6\u5408");
       return;
     }
     const wizardForm = this.model.dewizard.dewizardForms.find(
@@ -24176,7 +24689,7 @@ var WizardPanelController = class extends ControlController {
       }
     );
     if (!wizardForm) {
-      throw new RuntimeError51("\u627E\u4E0D\u5230\u6807\u8BC6\u4E3A".concat(tag, "\u7684\u5411\u5BFC\u8868\u5355"));
+      throw new RuntimeError52("\u627E\u4E0D\u5230\u6807\u8BC6\u4E3A".concat(tag, "\u7684\u5411\u5BFC\u8868\u5355"));
     }
     return wizardForm;
   }
@@ -24243,7 +24756,7 @@ var WizardPanelController = class extends ControlController {
       this.tagHistory.pop();
     }
     if (!prevTag) {
-      throw new RuntimeError51("\u6CA1\u6709\u4E0A\u4E00\u4E2A\u8868\u5355");
+      throw new RuntimeError52("\u6CA1\u6709\u4E0A\u4E00\u4E2A\u8868\u5355");
     }
     this.state.activeFormTag = prevTag;
   }
@@ -24279,7 +24792,7 @@ var WizardPanelController = class extends ControlController {
         });
         const nextWizardStep = wizardSteps[index + 1];
         if (!nextWizardStep) {
-          throw new RuntimeError51("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u6B65\u9AA4");
+          throw new RuntimeError52("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u6B65\u9AA4");
         }
         const nextWizardForm = this.getWizardFormByTag(nextWizardStep.stepTag);
         if (nextWizardForm && nextWizardForm.formTag) {
@@ -24288,7 +24801,7 @@ var WizardPanelController = class extends ControlController {
       }
     }
     if (!nextTag) {
-      throw new RuntimeError51("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u8868\u5355");
+      throw new RuntimeError52("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u8868\u5355");
     }
     this.state.activeFormTag = nextTag;
     this.tagHistory.push(nextTag);
@@ -24307,7 +24820,7 @@ var WizardPanelController = class extends ControlController {
 };
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
-import { RuntimeModelError as RuntimeModelError56 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError57 } from "@ibiz-template/core";
 import { isNil as isNil24 } from "ramda";
 
 // src/controller/control/md-ctrl/md-ctrl.service.ts
@@ -24530,7 +25043,7 @@ var MDCtrlController = class extends MDControlController {
     const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
     if (enableGroup && groupMode) {
       if (!groupAppDEFieldId) {
-        throw new RuntimeModelError56(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
+        throw new RuntimeModelError57(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
       }
       if (groupMode === "AUTO") {
         this.handleAutoGroup();
@@ -24597,7 +25110,7 @@ var MDCtrlController = class extends MDControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError56(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
+      throw new RuntimeModelError57(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
     }
     const { items } = this.state;
     const groupMap = /* @__PURE__ */ new Map();
@@ -24627,7 +25140,7 @@ var MDCtrlController = class extends MDControlController {
 };
 
 // src/controller/control/kanban/kanban.controller.ts
-import { RuntimeError as RuntimeError52, RuntimeModelError as RuntimeModelError57 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError53, RuntimeModelError as RuntimeModelError58 } from "@ibiz-template/core";
 import { isNil as isNil25 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
@@ -24702,10 +25215,10 @@ var KanbanController = class extends DataViewControlController {
     const sortField = this.model.minorSortAppDEFieldId;
     const { minorSortDir } = this.model;
     if (!sortField) {
-      throw new RuntimeModelError57(this.model, "\u6392\u5E8F\u5C5E\u6027\u6CA1\u914D\u7F6E");
+      throw new RuntimeModelError58(this.model, "\u6392\u5E8F\u5C5E\u6027\u6CA1\u914D\u7F6E");
     }
     if (!minorSortDir) {
-      throw new RuntimeModelError57(this.model, "\u6392\u5E8F\u65B9\u5411\u6CA1\u914D\u7F6E");
+      throw new RuntimeModelError58(this.model, "\u6392\u5E8F\u65B9\u5411\u6CA1\u914D\u7F6E");
     }
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
@@ -24715,7 +25228,7 @@ var KanbanController = class extends DataViewControlController {
       } else {
         const toNum = Number(sortValue);
         if (Number.isNaN(toNum)) {
-          throw new RuntimeError52(
+          throw new RuntimeError53(
             "".concat(item.srfmajortext, "\u7684\u6392\u5E8F\u5C5E\u6027\u65E0\u6CD5\u8F6C\u6362\u6210\u6570\u503C")
           );
         }
@@ -24731,7 +25244,7 @@ var KanbanController = class extends DataViewControlController {
   }
   handleDataGroup() {
     if (!this.model.enableGroup || this.model.groupMode === "NONE") {
-      throw new RuntimeError52("\u770B\u677F\u90E8\u4EF6\u5FC5\u987B\u5F00\u542F\u5206\u7EC4");
+      throw new RuntimeError53("\u770B\u677F\u90E8\u4EF6\u5FC5\u987B\u5F00\u542F\u5206\u7EC4");
     }
     return super.handleDataGroup();
   }
@@ -25225,8 +25738,8 @@ var TreeGridService = class extends GridService {
 };
 
 // src/controller/control/medit-view-panel/medit-view-panel.controller.ts
-import { RuntimeError as RuntimeError53 } from "@ibiz-template/core";
-import { createUUID as createUUID9 } from "qx-util";
+import { RuntimeError as RuntimeError54 } from "@ibiz-template/core";
+import { createUUID as createUUID10 } from "qx-util";
 
 // src/controller/control/medit-view-panel/medit-view-panel.service.ts
 var MEditViewPanelService = class extends MDControlService {
@@ -25312,7 +25825,7 @@ var MEditViewPanelController = class extends MDControlController {
    */
   handlePanelItemParams(arg) {
     const [{ parameterName }] = this.parameters;
-    const id = arg[parameterName] ? arg[parameterName] : "mockId:".concat(createUUID9());
+    const id = arg[parameterName] ? arg[parameterName] : "mockId:".concat(createUUID10());
     const item = {
       id,
       context: this.context.clone(),
@@ -25440,7 +25953,7 @@ var MEditViewPanelController = class extends MDControlController {
       (item) => item.id === id
     );
     if (panelUiItemIndex < 0) {
-      throw new RuntimeError53("\u7F16\u8F91\u89C6\u56FE\u9762\u677F\u90E8\u4EF6UI\u6570\u636E\u4E0D\u5B58\u5728");
+      throw new RuntimeError54("\u7F16\u8F91\u89C6\u56FE\u9762\u677F\u90E8\u4EF6UI\u6570\u636E\u4E0D\u5B58\u5728");
     }
     const tempUiItem = this.state.panelUiItems[panelUiItemIndex];
     if (tempUiItem.id.startsWith("mockId:")) {
@@ -25855,7 +26368,7 @@ var AppHub = class {
       this.registerAppView(appView);
       return appView;
     }
-    throw new RuntimeError54("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
+    throw new RuntimeError55("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
   }
   /**
    * 根据应用实体代码名称查找应用视图
@@ -25886,7 +26399,7 @@ var AppHub = class {
       this.registerAppDataEntity(entity, appId);
       return entity;
     }
-    throw new RuntimeError54("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
+    throw new RuntimeError55("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
   }
   /**
    * 新建 hub 应用
@@ -25907,7 +26420,7 @@ var AppHub = class {
       appModel = await this.modelLoaderProvider.getApp(id);
       this.registerApp(appModel);
     } else {
-      throw new RuntimeError54("\u672A\u627E\u5230\u5E94\u7528[".concat(id, "]\u6A21\u578B"));
+      throw new RuntimeError55("\u672A\u627E\u5230\u5E94\u7528[".concat(id, "]\u6A21\u578B"));
     }
     const app = new Application(appModel);
     this.appMap.set(id, app);
@@ -25927,7 +26440,7 @@ var AppHub = class {
    * @author chitanda
    * @date 2023-04-17 21:04:41
    * @param {string} [key=ibiz.env.appId]
-   * @return {*}  {Promise<Application>}
+   * @return {*}  {Promise<IAppService>}
    */
   async getAppAsync(key = ibiz.env.appId) {
     return this.createApp(key);
@@ -25938,7 +26451,7 @@ var AppHub = class {
    * @author chitanda
    * @date 2023-04-17 22:04:42
    * @param {(string | IApplication)} [app]
-   * @return {*}  {Application}
+   * @return {*}  {IAppService}
    */
   getApp(app) {
     let key = null;
@@ -26005,7 +26518,7 @@ var EngineFactory = class {
 };
 
 // src/engine/view-base.engine.ts
-import { RuntimeError as RuntimeError55 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError56 } from "@ibiz-template/core";
 var ViewEngineBase = class {
   /**
    * 构造函数在视图控制器的构造函数逻辑内部执行
@@ -26193,7 +26706,7 @@ var ViewEngineBase = class {
     const { appDataEntityId } = this.view.model;
     const { evt, context, params } = this.view;
     if (!appDataEntityId) {
-      throw new RuntimeError55("\u8BE5\u89C6\u56FE\u6CA1\u6709\u5B9E\u4F53\uFF0C\u65E0\u6CD5\u52A0\u8F7D\u5B9E\u4F53\u6570\u636E");
+      throw new RuntimeError56("\u8BE5\u89C6\u56FE\u6CA1\u6709\u5B9E\u4F53\uFF0C\u65E0\u6CD5\u52A0\u8F7D\u5B9E\u4F53\u6570\u636E");
     }
     const app = ibiz.hub.getApp(context.srfappid);
     const res = await app.deService.exec(
@@ -26214,8 +26727,8 @@ var ViewEngineBase = class {
 };
 
 // src/engine/md-view.engine.ts
-import { RuntimeModelError as RuntimeModelError58 } from "@ibiz-template/core";
-import { clone as clone23 } from "ramda";
+import { RuntimeModelError as RuntimeModelError59 } from "@ibiz-template/core";
+import { clone as clone24 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
    * 多数据部件名称
@@ -26353,6 +26866,14 @@ var MDViewEngine = class extends ViewEngineBase {
       await this.exportData(args);
       return null;
     }
+    if (key === "Search" /* SEARCH */) {
+      await this.searchForm.search();
+      return null;
+    }
+    if (key === "Reset" /* RESET */) {
+      await this.searchForm.reset();
+      return null;
+    }
     if (key === "Copy" /* COPY */) {
       this.copy(args);
       return null;
@@ -26390,7 +26911,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError58(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError59(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     } else {
       return {
         cancel: !result.ok
@@ -26413,9 +26934,9 @@ var MDViewEngine = class extends ViewEngineBase {
       (item) => item.id === "newdata"
     );
     if (!openAppViewLogic) {
-      throw new RuntimeModelError58(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError59(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
-    const params = clone23(this.view.params);
+    const params = clone24(this.view.params);
     if (copyMode) {
       params.srfcopymode = copyMode;
     }
@@ -26427,7 +26948,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError58(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError59(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     } else {
       return {
         cancel: !result.ok
@@ -26546,15 +27067,15 @@ var MDViewEngine = class extends ViewEngineBase {
 
 // src/utils/error-handler/default-error-handler.ts
 import {
-  RuntimeModelError as RuntimeModelError59,
+  RuntimeModelError as RuntimeModelError60,
   ModelError as ModelError28,
   HttpError as HttpError4,
   NoticeError as NoticeError2,
-  RuntimeError as RuntimeError56
+  RuntimeError as RuntimeError57
 } from "@ibiz-template/core";
 var DefaultErrorHandler = class {
   handle(error) {
-    if (error instanceof RuntimeModelError59 || error instanceof ModelError28) {
+    if (error instanceof RuntimeModelError60 || error instanceof ModelError28) {
       ibiz.message.error(error.message, 10, true);
     } else if (error instanceof HttpError4) {
       if (error.status === 401) {
@@ -26568,7 +27089,7 @@ var DefaultErrorHandler = class {
       }
     } else if (error instanceof NoticeError2) {
       ibiz.message.error(error.message, error.duration, error.duration === 0);
-    } else if (error instanceof RuntimeError56) {
+    } else if (error instanceof RuntimeError57) {
       ibiz.message.error(error.message, 10, true);
     }
     ibiz.log.error(error);
@@ -26696,7 +27217,7 @@ var GlobalUtil = class {
 };
 
 // src/logic-scheduler/executor/logic-executor.ts
-import { RuntimeError as RuntimeError57 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError58 } from "@ibiz-template/core";
 var LogicExecutor = class {
   /**
    * @author lxm
@@ -26717,7 +27238,7 @@ var LogicExecutor = class {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(_executeParams) {
-    throw new RuntimeError57("Method not implemented.");
+    throw new RuntimeError58("Method not implemented.");
   }
   /**
    * 销毁方法
@@ -26808,13 +27329,13 @@ var ScriptExecutor = class extends LogicExecutor {
 };
 
 // src/logic-scheduler/executor/app-de-ui-logic-executor.ts
-import { RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError61 } 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 RuntimeModelError60(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+      throw new RuntimeModelError61(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
     }
     execUILogic(appDEUILogicId, appDataEntityId, executeParams);
   }
@@ -27154,7 +27675,7 @@ var LogicSchedulerCenter = class {
 };
 
 // src/logic-scheduler/trigger/logic-trigger.ts
-import { RuntimeError as RuntimeError58 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError59 } from "@ibiz-template/core";
 var LogicTrigger = class {
   /**
    * @author lxm
@@ -27214,7 +27735,7 @@ var LogicTrigger = class {
     if (this.executor) {
       return this.executor.execute(executeParams);
     }
-    throw new RuntimeError58("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
+    throw new RuntimeError59("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
   }
   /**
    * 销毁方法
@@ -27231,12 +27752,12 @@ var CustomTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/item-dyna-logic-trigger.ts
-import { RuntimeError as RuntimeError59 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError60 } from "@ibiz-template/core";
 var ItemDynaLogicTrigger = class extends LogicTrigger {
   bindExecutor(executor) {
     super.bindExecutor(executor);
     if (this.executor.type !== "SCRIPT") {
-      throw new RuntimeError59(
+      throw new RuntimeError60(
         "\u9884\u5B9A\u4E49\u903B\u8F91\u7C7B\u578B".concat(this.type, "\u7684\u89E6\u53D1\u5668\u7C7B\u578B\u53EA\u80FD\u662F\u811A\u672C")
       );
     }
@@ -27272,7 +27793,7 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError60, RuntimeModelError as RuntimeModelError61 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError61, RuntimeModelError as RuntimeModelError62 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -27280,11 +27801,11 @@ var TimerTrigger = class extends LogicTrigger {
   }
   start() {
     if (!this.logic.timer) {
-      throw new RuntimeModelError61(this.logic, "\u5B9A\u65F6\u5668\u7F3A\u5C11\u5B9A\u65F6\u95F4\u9694");
+      throw new RuntimeModelError62(this.logic, "\u5B9A\u65F6\u5668\u7F3A\u5C11\u5B9A\u65F6\u95F4\u9694");
     }
     this.timer = setInterval(() => {
       if (!this.scheduler.defaultParamsCb) {
-        throw new RuntimeError60("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
+        throw new RuntimeError61("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
       }
       const params = this.scheduler.defaultParamsCb();
       this.executor.execute(params);
@@ -27301,8 +27822,8 @@ var TimerTrigger = class extends LogicTrigger {
 // src/logic-scheduler/executor/app-ui-logic-executor.ts
 import {
   ModelError as ModelError31,
-  RuntimeError as RuntimeError61,
-  RuntimeModelError as RuntimeModelError62
+  RuntimeError as RuntimeError62,
+  RuntimeModelError as RuntimeModelError63
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty9 } from "qx-util";
 var AppUILogicExecutor = class extends LogicExecutor {
@@ -27334,7 +27855,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { context, params, ...rest } = parameters;
     const { data } = parameters;
     if (!(data == null ? void 0 : data[0])) {
-      throw new RuntimeError61("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
+      throw new RuntimeError62("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
     }
     const openViewRefs = appUILogic.openDataAppViews;
     let openViewRef;
@@ -27343,7 +27864,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       openViewRef = appUILogic.openDataAppView;
       if (!openViewRef) {
-        throw new RuntimeModelError62(
+        throw new RuntimeModelError63(
           appUILogic,
           "opendata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE"
         );
@@ -27351,7 +27872,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const openView = openViewRef.refAppViewId;
     if (!openView) {
-      throw new RuntimeModelError62(
+      throw new RuntimeModelError63(
         appUILogic,
         "opendata\u89C6\u56FE\u903B\u8F91\u7684\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE\u6CA1\u6709\u5B9E\u9645\u5F15\u7528\u89C6\u56FE"
       );
@@ -27380,7 +27901,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     );
     const typeFileName = appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
     if (!typeFileName) {
-      throw new RuntimeModelError62(
+      throw new RuntimeModelError63(
         appUILogic,
         "".concat(appDataEntity.codeName, "[\u591A\u8868\u5355\u5B9E\u4F53] or [\u7D22\u5F15\u5B9E\u4F53]\u7F3A\u5C11\u7C7B\u578B\u5C5E\u6027\u914D\u7F6E")
       );
@@ -27388,12 +27909,12 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { data } = parameters;
     const formTypeValue = data[0][typeFileName];
     if (!formTypeValue) {
-      throw new RuntimeModelError62(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
+      throw new RuntimeModelError63(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
     }
     const openViewRefs = appUILogic.openDataAppViews;
     const findView = openViewRefs == null ? void 0 : openViewRefs.find((item) => item.refMode === formTypeValue);
     if (!findView) {
-      throw new RuntimeError61(
+      throw new RuntimeError62(
         "\u6CA1\u6709\u627E\u5230\u4E0E\u8868\u5355\u7C7B\u578B".concat(formTypeValue, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
       );
     }
@@ -27430,7 +27951,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         return viewRef.refMode.toLowerCase() !== parentDeName;
       });
       if (!newViewRef) {
-        throw new RuntimeModelError62(
+        throw new RuntimeModelError63(
           appUILogic,
           "\u6CA1\u6709\u627E\u5230\u6279\u6DFB\u52A0\u9700\u8981\u6253\u5F00\u7684\u9009\u62E9\u89C6\u56FE"
         );
@@ -27440,7 +27961,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       newViewRef = newDataAppView;
       if (!newViewRef || !newViewRef.refAppViewId) {
-        throw new RuntimeModelError62(
+        throw new RuntimeModelError63(
           appUILogic,
           "newdata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u65B0\u5EFA\u6570\u636E\u89C6\u56FE"
         );
@@ -27497,7 +28018,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { wizardAppView, newDataAppViews } = appUILogic;
     const { context, params, ...rest } = parameters;
     if (!wizardAppView || !wizardAppView.refAppViewId) {
-      throw new RuntimeModelError62(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
+      throw new RuntimeModelError63(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
     }
     const result = await ibiz.commands.execute(
       OpenAppViewCommand.TAG,
@@ -27511,12 +28032,12 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const selectData = (_a = result.data) == null ? void 0 : _a[0];
     if (!selectData) {
-      throw new RuntimeError61("\u8BF7\u9009\u4E2D\u4E00\u6761\u6570\u636E");
+      throw new RuntimeError62("\u8BF7\u9009\u4E2D\u4E00\u6761\u6570\u636E");
     }
     const indexType = selectData.srfkey;
     const findView = newDataAppViews == null ? void 0 : newDataAppViews.find((item) => item.refMode === indexType);
     if (!findView) {
-      throw new RuntimeError61(
+      throw new RuntimeError62(
         "\u6CA1\u6709\u627E\u5230\u4E0E\u7D22\u5F15\u7C7B\u578B".concat(indexType, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
       );
     }
@@ -27543,7 +28064,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       const minorDERs = selfDe.minorAppDERSs;
       const pickParentDeName = newViewRef.refMode.toLowerCase();
       if (!minorDERs) {
-        throw new RuntimeModelError62(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
+        throw new RuntimeModelError63(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
       }
       let pickParentFieldName;
       minorDERs == null ? void 0 : minorDERs.forEach((item) => {
@@ -27642,12 +28163,12 @@ var ControlEventTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/executor/app-ui-action-executor.ts
-import { RuntimeModelError as RuntimeModelError63 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError64 } 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 RuntimeModelError63(
+      throw new RuntimeModelError64(
         this.logic,
         "\u903B\u8F91\u4E2D\u7F3A\u5C11\u89E6\u53D1\u5E94\u7528\u5B9E\u4F53\u754C\u9762\u884C\u4E3Aid"
       );
@@ -27837,6 +28358,7 @@ export {
   CalendarService,
   CaptionBarController,
   ChartController,
+  ChartData,
   ChartExpBarController,
   ChartPortletController,
   ChartService,