@ibiz-template/runtime 0.1.0 → 0.1.1

package/dist/index.esm.js

@@ -2326,7 +2326,7 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
       );
     }
     const { openMode = "INDEXVIEWTAB" } = appView;
-    switch (openMode) {
+    switch (opts.openMode || openMode) {
       case "INDEXVIEWTAB":
         if (opts.noWaitRoute) {
           this.openIndexViewTab(appView, context, params);
@@ -4083,7 +4083,7 @@ var CounterService = class {
 CounterService.counterMap = /* @__PURE__ */ new Map();
 
 // src/service/service/entity/de.service.ts
-import { ModelError as ModelError14, RuntimeError as RuntimeError10 } from "@ibiz-template/core";
+import { ModelError as ModelError15, RuntimeError as RuntimeError10 } from "@ibiz-template/core";
 
 // src/service/service/work-flow/work-flow.service.ts
 import { RuntimeError as RuntimeError9 } from "@ibiz-template/core";
@@ -6157,7 +6157,11 @@ var DEActionMethod = class extends Method {
 };
 
 // src/service/service/entity/method/fetch.ts
-import { HttpResponse as HttpResponse4 } from "@ibiz-template/core";
+import {
+  HttpResponse as HttpResponse4,
+  ModelError as ModelError14,
+  RuntimeModelError as RuntimeModelError19
+} from "@ibiz-template/core";
 import { ascSort, descSort } from "qx-util";
 import { clone as clone9, equals as equals2, isEmpty as isEmpty7, isNil as isNil7, where as where2 } from "ramda";
 var FetchMethod = class extends Method {
@@ -6169,8 +6173,24 @@ var FetchMethod = class extends Method {
       );
       return new HttpResponse4(items2, 200);
     }
-    const path2 = this.calcPath(context);
-    const res = await this.request(path2, context, data, params);
+    let res;
+    switch (this.method.dataSetType) {
+      case "INDEXDE":
+      case "CODELIST":
+        res = await this.fetchCodeListSet(context, params);
+        break;
+      case "REMOTE":
+        {
+          const path2 = this.calcPath(context);
+          res = await this.request(path2, context, data, params);
+        }
+        break;
+      default:
+        throw new ModelError14(
+          this.method,
+          "\u6570\u636E\u6765\u6E90\u7C7B\u578B".concat(this.method.dataSetType, "\u6682\u672A\u652F\u6301")
+        );
+    }
     const items = res.data || [];
     res.data = items.map((item) => this.createEntity(item));
     if (res.data.length) {
@@ -6282,6 +6302,31 @@ var FetchMethod = class extends Method {
     const items = list.slice(start, end).map((item) => clone9(item));
     return items;
   }
+  /**
+   * 获取代码表数据来源的集合
+   * @author lxm
+   * @date 2023-08-03 02:55:00
+   * @param {IParams} context
+   * @param {IParams} params
+   * @return {*}  {Promise<HttpResponse<IData[]>>}
+   */
+  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");
+    }
+    const codeItems = await this.app.codeList.get(
+      appCodeListId,
+      context,
+      params
+    );
+    const { keyAppDEFieldId, majorAppDEFieldId } = this.entity;
+    const dataSet = codeItems.map((item) => ({
+      [keyAppDEFieldId]: item.value,
+      [majorAppDEFieldId]: item.text
+    }));
+    return new HttpResponse4(dataSet, 200);
+  }
 };
 
 // src/service/service/entity/de.service.ts
@@ -6339,7 +6384,7 @@ var DEService = class {
         method = new FetchMethod(this.model, model);
         break;
       default:
-        throw new ModelError14(
+        throw new ModelError15(
           model,
           "\u672A\u652F\u6301\u7684\u670D\u52A1\u65B9\u6CD5\u7C7B\u578B: ".concat(model.methodType)
         );
@@ -7952,18 +7997,19 @@ var ViewEngineBase = class {
       context,
       params
     );
-    if (res.data) {
-      this.view.state.srfactiveviewdata = res.data;
-      evt.emit("onDataChange", { actionType: "LOAD", data: [res.data] });
-      const info = {};
-      info.dataInfo = res.data.srfmajortext || "";
-      evt.emit("onViewInfoChange", info);
+    const { data } = res;
+    if (data) {
+      this.view.state.srfactiveviewdata = data;
+      evt.emit("onDataChange", { actionType: "LOAD", data: [data] });
+      if (data.srfkey) {
+        evt.emit("onViewInfoChange", { dataInfo: data.srfmajortext || "" });
+      }
     }
   }
 };
 
 // src/engine/md-view.engine.ts
-import { RuntimeModelError as RuntimeModelError19 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError20 } from "@ibiz-template/core";
 var MDViewEngine = class extends ViewEngineBase {
   /**
    * 多数据部件名称
@@ -8117,7 +8163,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError19(this.view.model, "\u7F3A\u5C11opendata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError20(this.view.model, "\u7F3A\u5C11opendata\u7684\u89C6\u56FE\u903B\u8F91");
     }
   }
   /**
@@ -8136,7 +8182,7 @@ var MDViewEngine = class extends ViewEngineBase {
       (item) => item.id === "newdata"
     );
     if (!openAppViewLogic) {
-      throw new RuntimeModelError19(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError20(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
     const context = this.view.context.clone();
     if (copyMode) {
@@ -8150,7 +8196,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError19(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError20(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
   }
   /**
@@ -8500,17 +8546,17 @@ async function getPortletProvider(model) {
 }
 
 // src/ui-action/provider/backend-ui-action-provider.ts
-import { RuntimeModelError as RuntimeModelError27 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError28 } from "@ibiz-template/core";
 import { isArray as isArray2 } from "qx-util";
 
 // src/ui-action/provider/ui-action-provider-base.ts
-import { RuntimeModelError as RuntimeModelError26 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError27 } from "@ibiz-template/core";
 
 // src/ui-logic/index.ts
 import { RuntimeError as RuntimeError20 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic.ts
-import { ModelError as ModelError21, RuntimeModelError as RuntimeModelError25 } from "@ibiz-template/core";
+import { ModelError as ModelError22, RuntimeModelError as RuntimeModelError26 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-context.ts
 var UILogicContext = class {
@@ -8611,20 +8657,20 @@ var UILogicContext = class {
 };
 
 // src/ui-logic/ui-logic-node/de-action-node/de-action-node.ts
-import { RuntimeModelError as RuntimeModelError22 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError23 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-link/ui-logic-link.ts
-import { ModelError as ModelError16 } from "@ibiz-template/core";
+import { ModelError as ModelError17 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-link/ui-logic-link-group-cond/ui-logic-link-group-cond.ts
-import { RuntimeModelError as RuntimeModelError21 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError22 } 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 ModelError15, RuntimeModelError as RuntimeModelError20 } from "@ibiz-template/core";
+import { ModelError as ModelError16, RuntimeModelError as RuntimeModelError21 } from "@ibiz-template/core";
 var UILogicLinkSingleCond = class extends UILogicLinkCond {
   constructor(model) {
     super();
@@ -8659,7 +8705,7 @@ var UILogicLinkSingleCond = class extends UILogicLinkCond {
     switch (this.type) {
       case "ENTITYFIELD": {
         if (!this.value) {
-          throw new RuntimeModelError20(
+          throw new RuntimeModelError21(
             this.model,
             "\u5F53\u524D\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u6570\u636E\u5BF9\u8C61\u5C5E\u6027],\u7F3A\u5C11\u914D\u7F6E\u6761\u4EF6\u503C"
           );
@@ -8669,7 +8715,7 @@ var UILogicLinkSingleCond = class extends UILogicLinkCond {
       }
       case "SRCENTITYFIELD": {
         if (!this.value) {
-          throw new RuntimeModelError20(
+          throw new RuntimeModelError21(
             this.model,
             "\u5F53\u524D\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u6E90\u6570\u636E\u5BF9\u8C61\u5C5E\u6027],\u7F3A\u5C11\u914D\u7F6E\u6761\u4EF6\u503C"
           );
@@ -8678,7 +8724,7 @@ var UILogicLinkSingleCond = class extends UILogicLinkCond {
         return testCond(dst[this.dstField], this.op, src[this.value]);
       }
       case "CURTIME":
-        throw new ModelError15(this.model, "\u6682\u672A\u652F\u6301\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u5F53\u524D\u65F6\u95F4]");
+        throw new ModelError16(this.model, "\u6682\u672A\u652F\u6301\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u5F53\u524D\u65F6\u95F4]");
       default:
         return testCond(dst[this.dstField], this.op, this.value);
     }
@@ -8732,7 +8778,7 @@ var UILogicLinkGroupCond = class _UILogicLinkGroupCond extends UILogicLinkCond {
   test(ctx, context, data) {
     let bol = true;
     if (this.conds.length === 0) {
-      throw new RuntimeModelError21(this.model, "\u754C\u9762\u8FDE\u63A5\u6761\u4EF6\u903B\u8F91\u7EC4\u672A\u914D\u7F6E\u903B\u8F91\u9879");
+      throw new RuntimeModelError22(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];
@@ -8820,13 +8866,13 @@ var UILogicLink = class {
       case 1:
         return true;
       case 2:
-        throw new ModelError16(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B: \u5F02\u6B65\u7ED3\u675F");
+        throw new ModelError17(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B: \u5F02\u6B65\u7ED3\u675F");
       case 3:
-        throw new ModelError16(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B: \u5F02\u6B65\u62D2\u7EDD");
+        throw new ModelError17(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B: \u5F02\u6B65\u62D2\u7EDD");
       case 9:
-        throw new ModelError16(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B: \u5F02\u5E38\u5904\u7406");
+        throw new ModelError17(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B: \u5F02\u5E38\u5904\u7406");
       default:
-        throw new ModelError16(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B:".concat(linkMode));
+        throw new ModelError17(this.model, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8FDE\u63A5\u7C7B\u578B:".concat(linkMode));
     }
   }
 };
@@ -8858,10 +8904,10 @@ var DEActionNode2 = class extends UILogicNode {
       retDEUILogicParamId
     } = this.model;
     if (!dstAppDataEntityId) {
-      throw new RuntimeModelError22(this.model, "\u672A\u6307\u5B9A\u5E94\u7528\u5B9E\u4F53");
+      throw new RuntimeModelError23(this.model, "\u672A\u6307\u5B9A\u5E94\u7528\u5B9E\u4F53");
     }
     if (!dstAppDEActionId) {
-      throw new RuntimeModelError22(this.model, "\u672A\u6307\u5B9A\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError23(this.model, "\u672A\u6307\u5B9A\u5B9E\u4F53\u884C\u4E3A");
     }
     const requestData = ctx.params[dstDEUILogicParamId];
     const app = ibiz.hub.getApp(ctx.context.srfappid);
@@ -8879,13 +8925,13 @@ var DEActionNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts
-import { RuntimeModelError as RuntimeModelError23 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError24 } 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 RuntimeModelError23(this.model, "\u672A\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
+      throw new RuntimeModelError24(this.model, "\u672A\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
     }
     let actionData = [data];
     if (dstDEUILogicParamId) {
@@ -8910,7 +8956,7 @@ var StartNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/end-node/end-node.ts
-import { ModelError as ModelError17 } from "@ibiz-template/core";
+import { ModelError as ModelError18 } from "@ibiz-template/core";
 var EndNode2 = class extends UILogicNode {
   async exec(ctx) {
     ctx.isEndNode = true;
@@ -8931,7 +8977,7 @@ var EndNode2 = class extends UILogicNode {
       case "LOGICPARAMFIELD":
       case "BREAK":
       default:
-        throw new ModelError17(
+        throw new ModelError18(
           this.model,
           "\u6682\u672A\u652F\u6301\u7684\u7ED3\u675F\u8282\u70B9\u8FD4\u56DE\u503C\u7C7B\u578B: ".concat(returnType)
         );
@@ -8940,10 +8986,10 @@ var EndNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts
-import { ModelError as ModelError19 } from "@ibiz-template/core";
+import { ModelError as ModelError20 } from "@ibiz-template/core";
 
 // src/ui-logic/utils/handle-src-val.ts
-import { ModelError as ModelError18 } from "@ibiz-template/core";
+import { ModelError as ModelError19 } from "@ibiz-template/core";
 import { clone as clone10 } from "ramda";
 function handleSrcVal2(ctx, srcValParams) {
   const { srcDEUILogicParamId, srcValueType, srcFieldName, srcValue } = srcValParams;
@@ -8971,7 +9017,7 @@ function handleSrcVal2(ctx, srcValParams) {
       value = clone10(ibiz.env);
       break;
     default:
-      throw new ModelError18(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
+      throw new ModelError19(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
   }
   const srcField = srcFieldName == null ? void 0 : srcFieldName.toLowerCase();
   if (value && srcField) {
@@ -8991,7 +9037,7 @@ var PrepareJSParamNode = class extends UILogicNode {
             case "SETPARAMVALUE":
               return this.setParamValue(nodeParam, ctx);
             default:
-              throw new ModelError19(
+              throw new ModelError20(
                 nodeParam,
                 "\u6682\u672A\u652F\u6301\u903B\u8F91\u5904\u7406\u53C2\u6570\u64CD\u4F5C".concat(nodeParam.paramAction)
               );
@@ -9021,20 +9067,20 @@ var PrepareJSParamNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-invoke-node/view-ctrl-invoke-node.ts
-import { RuntimeError as RuntimeError18, RuntimeModelError as RuntimeModelError24 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError18, RuntimeModelError as RuntimeModelError25 } 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 RuntimeModelError24(this.model, "\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u5BF9\u8C61");
+      throw new RuntimeModelError25(this.model, "\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u5BF9\u8C61");
     }
     if (!invokeParamId) {
-      throw new RuntimeModelError24(this.model, "\u6CA1\u6709\u914D\u7F6E\u64CD\u4F5C\u53C2\u6570");
+      throw new RuntimeModelError25(this.model, "\u6CA1\u6709\u914D\u7F6E\u64CD\u4F5C\u53C2\u6570");
     }
     if (!invokeMethod) {
-      throw new RuntimeModelError24(this.model, "\u6CA1\u6709\u914D\u7F6E\u8C03\u7528\u65B9\u6CD5");
+      throw new RuntimeModelError25(this.model, "\u6CA1\u6709\u914D\u7F6E\u8C03\u7528\u65B9\u6CD5");
     }
     const invokeParam = ctx.params[invokeParamId];
     if (!invokeParam) {
@@ -9052,7 +9098,7 @@ var ViewCtrlInvokeNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-param/ui-logic-param.ts
-import { ModelError as ModelError20, RuntimeError as RuntimeError19 } from "@ibiz-template/core";
+import { ModelError as ModelError21, RuntimeError as RuntimeError19 } from "@ibiz-template/core";
 var UILogicParam = class {
   /**
    * Creates an instance of UILogicParam.
@@ -9098,17 +9144,17 @@ var UILogicParam = class {
     } else if (m.entityListParam) {
       ctx.params[tag] = [];
     } else if (m.entityPageParam) {
-      throw new ModelError20(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u5206\u9875\u67E5\u8BE2\u7ED3\u679C");
+      throw new ModelError21(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u5206\u9875\u67E5\u8BE2\u7ED3\u679C");
     } else if (m.entityParam) {
       ctx.params[tag] = {};
     } else if (m.lastReturnParam) {
-      throw new ModelError20(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u4E0A\u6B21\u8C03\u7528\u8FD4\u56DE");
+      throw new ModelError21(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u4E0A\u6B21\u8C03\u7528\u8FD4\u56DE");
     } else if (m.navContextParam) {
       ctx.params[tag] = context;
     } else if (m.navViewParamParam) {
-      throw new ModelError20(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u89C6\u56FE\u8DEF\u7531\u53C2\u6570");
+      throw new ModelError21(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u89C6\u56FE\u8DEF\u7531\u53C2\u6570");
     } else if (m.routeViewSessionParam) {
-      throw new ModelError20(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u8DEF\u7531\u89C6\u56FE\u4F1A\u8BDD");
+      throw new ModelError21(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u8DEF\u7531\u89C6\u56FE\u4F1A\u8BDD");
     } else if (m.simpleListParam) {
       ctx.params[tag] = [];
     } else if (m.simpleParam) {
@@ -9116,7 +9162,7 @@ var UILogicParam = class {
     } else if (m.viewNavDataParam) {
       ctx.params[tag] = viewParams;
     } else if (m.viewSessionParam) {
-      throw new ModelError20(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u5F53\u524D\u89C6\u56FE\u4F1A\u8BDD");
+      throw new ModelError21(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u5F53\u524D\u89C6\u56FE\u4F1A\u8BDD");
     }
   }
   /**
@@ -9133,7 +9179,7 @@ var UILogicParam = class {
     } else if (m.simpleParam || m.entityParam) {
       ctx.params[tag] = {};
     } else {
-      throw new ModelError20(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B\u91CD\u65B0\u5EFA\u7ACB\u53D8\u91CF");
+      throw new ModelError21(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B\u91CD\u65B0\u5EFA\u7ACB\u53D8\u91CF");
     }
   }
 };
@@ -9168,7 +9214,7 @@ var UILogic = class {
     this.params = /* @__PURE__ */ new Map();
     var _a;
     if (!((_a = model.deuilogicNodes) == null ? void 0 : _a.length)) {
-      throw new RuntimeModelError25(model, "\u754C\u9762\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u903B\u8F91\u8282\u70B9");
+      throw new RuntimeModelError26(model, "\u754C\u9762\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u903B\u8F91\u8282\u70B9");
     }
     model.deuilogicNodes.forEach((node) => {
       const { logicNodeType } = node;
@@ -9206,7 +9252,7 @@ var UILogic = class {
         case "THROWEXCEPTION":
         case "DEBUGPARAM":
         default:
-          throw new ModelError21(node, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8282\u70B9\u7C7B\u578B: ".concat(logicNodeType));
+          throw new ModelError22(node, "\u672A\u652F\u6301\u7684\u903B\u8F91\u8282\u70B9\u7C7B\u578B: ".concat(logicNodeType));
       }
       this.nodes.set(node.id, logicNode);
     });
@@ -9259,7 +9305,7 @@ var UILogic = class {
       const start = this.nodes.get(startDEUILogicNodeId);
       await this.deepExec(start, ctx);
     } else {
-      throw new RuntimeModelError25(this.model, "\u672A\u8BBE\u7F6E\u8D77\u59CB\u8282\u70B9");
+      throw new RuntimeModelError26(this.model, "\u672A\u8BBE\u7F6E\u8D77\u59CB\u8282\u70B9");
     }
     if (ctx.isEndNode) {
       return ctx.result;
@@ -9375,7 +9421,7 @@ var UIActionProviderBase = class {
     const { appDEUILogicId, appDataEntityId, uilogicAttachMode } = action;
     if (uilogicAttachMode === "REPLACE") {
       if (!appDEUILogicId) {
-        throw new RuntimeModelError26(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+        throw new RuntimeModelError27(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
       }
       await execUILogic(appDEUILogicId, appDataEntityId, args);
       return result;
@@ -9402,7 +9448,7 @@ var UIActionProviderBase = class {
     }
     if (action.uilogicAttachMode === "AFTER") {
       if (!appDEUILogicId) {
-        throw new RuntimeModelError26(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+        throw new RuntimeModelError27(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
       }
       await execUILogic(appDEUILogicId, appDataEntityId, args);
     }
@@ -9536,7 +9582,7 @@ var BackendUIActionProvider = class extends UIActionProviderBase {
     const entityName = action.appDataEntityId;
     const methodName = action.appDEMethodId;
     if (!entityName || !methodName) {
-      throw new RuntimeModelError27(action, "\u672A\u914D\u7F6E\u5B9E\u4F53\u6216\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError28(action, "\u672A\u914D\u7F6E\u5B9E\u4F53\u6216\u5B9E\u4F53\u884C\u4E3A");
     }
     const { resultContext, resultParams, resultData } = await this.handleParams(
       action,
@@ -9608,7 +9654,7 @@ var SysUIActionProvider = class extends UIActionProviderBase {
 };
 
 // src/ui-action/provider/front-ui-action-provider.ts
-import { StringUtil, RuntimeModelError as RuntimeModelError28, ModelError as ModelError22 } from "@ibiz-template/core";
+import { StringUtil, RuntimeModelError as RuntimeModelError29, ModelError as ModelError23 } from "@ibiz-template/core";
 var FrontUIActionProvider = class extends UIActionProviderBase {
   async execAction(action, args) {
     const { context, params, data, event, noWaitRoute } = args;
@@ -9623,7 +9669,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       case "WIZARD": {
         const frontPSAppView = action.frontAppViewId;
         if (!frontPSAppView) {
-          throw new RuntimeModelError28(action, "\u672A\u914D\u7F6E\u6253\u5F00\u89C6\u56FE");
+          throw new RuntimeModelError29(action, "\u672A\u914D\u7F6E\u6253\u5F00\u89C6\u56FE");
         }
         const { resultContext, resultParams } = await this.handleParams(
           action,
@@ -9652,7 +9698,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
         actionResult = this.doOther(action, args);
         break;
       default:
-        throw new ModelError22(
+        throw new ModelError23(
           action,
           "\u672A\u652F\u6301\u7684\u524D\u53F0\u5904\u7406\u6A21\u5F0F[".concat(action.frontProcessType, "]")
         );
@@ -9679,7 +9725,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       );
       return result || {};
     }
-    throw new RuntimeModelError28(action, "\u81EA\u5B9A\u4E49\u7C7B\u578B\u7F3A\u5C11\u914D\u7F6E\u811A\u672C\u4EE3\u7801");
+    throw new RuntimeModelError29(action, "\u81EA\u5B9A\u4E49\u7C7B\u578B\u7F3A\u5C11\u914D\u7F6E\u811A\u672C\u4EE3\u7801");
   }
 };
 
@@ -9752,7 +9798,7 @@ var LogicExecutor = class {
 };
 
 // src/logic-scheduler/executor/logic-executor-factory.ts
-import { ModelError as ModelError23 } from "@ibiz-template/core";
+import { ModelError as ModelError24 } from "@ibiz-template/core";
 var LogicExecutorFactory = class {
   constructor() {
     /**
@@ -9782,7 +9828,7 @@ var LogicExecutorFactory = class {
   createExecutor(logic, scheduler) {
     const constructor = this.constructorMap.get(logic.logicType);
     if (!constructor) {
-      throw new ModelError23(logic, "\u903B\u8F91\u7C7B\u578B ".concat(logic.logicType, " \u6682\u672A\u652F\u6301\uFF01"));
+      throw new ModelError24(logic, "\u903B\u8F91\u7C7B\u578B ".concat(logic.logicType, " \u6682\u672A\u652F\u6301\uFF01"));
     }
     return constructor(logic, scheduler);
   }
@@ -9836,13 +9882,13 @@ var ScriptExecutor = class extends LogicExecutor {
 };
 
 // src/logic-scheduler/executor/app-de-ui-logic-executor.ts
-import { RuntimeModelError as RuntimeModelError29 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError30 } 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 RuntimeModelError29(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+      throw new RuntimeModelError30(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
     }
     execUILogic(appDEUILogicId, appDataEntityId, executeParams);
   }
@@ -10061,7 +10107,7 @@ var ViewLogicScheduler = class extends LogicScheduler {
 };
 
 // src/logic-scheduler/trigger/logic-trigger-factory.ts
-import { ModelError as ModelError24 } from "@ibiz-template/core";
+import { ModelError as ModelError25 } from "@ibiz-template/core";
 var LogicTriggerFactory = class {
   constructor() {
     /**
@@ -10091,7 +10137,7 @@ var LogicTriggerFactory = class {
   createTrigger(logic, scheduler) {
     const constructor = this.constructorMap.get(logic.triggerType);
     if (!constructor) {
-      throw new ModelError24(logic, "\u89E6\u53D1\u5668\u7C7B\u578B ".concat(logic.triggerType, " \u6682\u672A\u652F\u6301\uFF01"));
+      throw new ModelError25(logic, "\u89E6\u53D1\u5668\u7C7B\u578B ".concat(logic.triggerType, " \u6682\u672A\u652F\u6301\uFF01"));
     }
     return constructor(logic, scheduler);
   }
@@ -10259,7 +10305,11 @@ var TimerTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/executor/app-ui-logic-executor.ts
-import { RuntimeError as RuntimeError27, RuntimeModelError as RuntimeModelError30 } from "@ibiz-template/core";
+import {
+  ModelError as ModelError26,
+  RuntimeError as RuntimeError27,
+  RuntimeModelError as RuntimeModelError31
+} from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty5 } from "qx-util";
 var AppUILogicExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -10290,20 +10340,21 @@ var AppUILogicExecutor = class extends LogicExecutor {
    * @param {IData} [opts] 额外参数，event是js原生事件
    */
   async executeOpenDataAppUILogic(appUILogic, parameters) {
-    const { context, params, data, ...rest } = parameters;
+    const { context, params, ...rest } = parameters;
+    const { data } = parameters;
     if (!(data == null ? void 0 : data[0])) {
       throw new RuntimeError27("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
     }
     const openViewRef = appUILogic.openDataAppView;
     if (!openViewRef) {
-      throw new RuntimeModelError30(
+      throw new RuntimeModelError31(
         appUILogic,
         "opendata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE"
       );
     }
     const openView = openViewRef.refAppViewId;
     if (!openView) {
-      throw new RuntimeModelError30(
+      throw new RuntimeModelError31(
         appUILogic,
         "opendata\u89C6\u56FE\u903B\u8F91\u7684\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE\u6CA1\u6709\u5B9E\u9645\u5F15\u7528\u89C6\u56FE"
       );
@@ -10339,20 +10390,27 @@ var AppUILogicExecutor = class extends LogicExecutor {
    * @param {IData} [opts] 额外参数，event是js原生事件
    */
   async executeNewDataAppUILogic(appUILogic, parameters) {
-    const { context, params, data, ...rest } = parameters;
-    const newViewRef = appUILogic.newDataAppView;
-    if (!newViewRef) {
-      throw new RuntimeModelError30(
-        appUILogic,
-        "newdata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u65B0\u5EFA\u6570\u636E\u89C6\u56FE"
-      );
-    }
-    const newView = newViewRef.refAppViewId;
-    if (!newView) {
-      throw new RuntimeModelError30(
-        appUILogic,
-        "newdata\u89C6\u56FE\u903B\u8F91\u7684\u9ED8\u8BA4\u65B0\u5EFA\u6570\u636E\u89C6\u56FE\u6CA1\u6709\u5B9E\u9645\u5F15\u7528\u89C6\u56FE"
-      );
+    const { context, params, ...rest } = parameters;
+    const { data } = parameters;
+    const { enableWizardAdd, enableBatchAdd, batchAddOnly, newDataAppView } = appUILogic;
+    let newViewRef;
+    if (enableWizardAdd) {
+      newViewRef = await this.getWizardNewViewRef(appUILogic, parameters);
+      if (!newViewRef) {
+        return;
+      }
+    } else if (enableBatchAdd) {
+      throw new ModelError26(appUILogic, "enableBatchAdd\u6682\u672A\u652F\u6301");
+    } else if (batchAddOnly) {
+      throw new ModelError26(appUILogic, "batchAddOnly\u6682\u672A\u652F\u6301");
+    } else {
+      newViewRef = newDataAppView;
+      if (!newViewRef || !newViewRef.refAppViewId) {
+        throw new RuntimeModelError31(
+          appUILogic,
+          "newdata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u65B0\u5EFA\u6570\u636E\u89C6\u56FE"
+        );
+      }
     }
     let tempContext = {};
     let tempParams = {};
@@ -10370,18 +10428,55 @@ var AppUILogicExecutor = class extends LogicExecutor {
       _data.srfkey = void 0;
       tempParams = Object.assign(tempParams, _data.$origin);
     }
-    if (appUILogic.enableWizardAdd) {
-    } else if (appUILogic.enableBatchAdd) {
-    } else if (appUILogic.batchAddOnly) {
-    }
     await ibiz.commands.execute(
       OpenAppViewCommand.TAG,
-      newView,
+      newViewRef.refAppViewId,
       tempContext,
       tempParams,
       rest
     );
   }
+  /**
+   * 获取向导新建视图引用
+   * 返回undefined为取消操作
+   * 找不到会报错
+   * @author lxm
+   * @date 2023-08-03 06:37:22
+   * @protected
+   * @param {IAppUINewDataLogic} appUILogic
+   * @param {IUILogicParams} parameters
+   * @return {*}  {(Promise<IAppUILogicRefViewBase | undefined>)}
+   */
+  async getWizardNewViewRef(appUILogic, parameters) {
+    var _a;
+    const { wizardAppView, newDataAppViews } = appUILogic;
+    const { context, params, ...rest } = parameters;
+    if (!wizardAppView || !wizardAppView.refAppViewId) {
+      throw new RuntimeModelError31(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
+    }
+    const result = await ibiz.commands.execute(
+      OpenAppViewCommand.TAG,
+      wizardAppView.refAppViewId,
+      context,
+      params,
+      { ...rest, openMode: "POPUPMODAL" }
+    );
+    if (!result.ok) {
+      return;
+    }
+    const selectData = (_a = result.data) == null ? void 0 : _a[0];
+    if (!selectData) {
+      throw new RuntimeError27("\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 RuntimeError27(
+        "\u6CA1\u6709\u627E\u5230\u4E0E\u7D22\u5F15\u7C7B\u578B".concat(indexType, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
+      );
+    }
+    return findView;
+  }
 };
 
 // src/logic-scheduler/trigger/view-event-trigger.ts
@@ -11066,11 +11161,12 @@ var QXEventEx = class extends QXEvent3 {
     });
   }
   async asyncEmit(name, ...args) {
-    const result = await super.asyncEmit(name, ...args);
+    const resultPromise1 = super.asyncEmit(name, ...args);
     const all = this.anyEventFns.map((fn) => fn(name, ...args));
-    const resultArr = await Promise.all(all);
-    result.concat(...resultArr);
-    return result;
+    const resultPromise2 = Promise.all(all);
+    const resultArr1 = await resultPromise1;
+    const resultArr2 = await resultPromise2;
+    return resultArr1.concat(...resultArr2);
   }
   reset() {
     super.reset();
@@ -11804,7 +11900,7 @@ var EditorController = class {
 };
 
 // src/controller/common/editor/code-list-editor.controller.ts
-import { RuntimeModelError as RuntimeModelError31 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError32 } from "@ibiz-template/core";
 var CodeListEditorController = class extends EditorController {
   /**
    * 加载代码表数据
@@ -11828,7 +11924,7 @@ var CodeListEditorController = class extends EditorController {
       );
       return dataItems;
     }
-    throw new RuntimeModelError31(this.model, "\u8BF7\u914D\u7F6E\u4EE3\u7801\u8868");
+    throw new RuntimeModelError32(this.model, "\u8BF7\u914D\u7F6E\u4EE3\u7801\u8868");
   }
 };