@ibiz-template/runtime 0.1.18 → 0.1.20

package/dist/index.esm.js

@@ -6398,8 +6398,18 @@ var HelperEqPropertyValue = class extends HelperBase {
   }
 };
 
-// src/utils/handlebars/helpers/json/json.ts
-var HelperJson = class extends HelperBase {
+// src/utils/handlebars/helpers/json/json-parse.ts
+var HelperJsonParse = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "jsonParse");
+  }
+  onExecute(obj) {
+    return JSON.parse(obj);
+  }
+};
+
+// src/utils/handlebars/helpers/json/json-stringify.ts
+var HelperJsonStringify = class extends HelperBase {
   constructor(hbs) {
     super(hbs, "jsonStringify");
   }
@@ -6553,7 +6563,8 @@ function installHelpers(hsb) {
   new HelperEq(hsb);
   new HelperGt(hsb);
   new HelperGte(hsb);
-  new HelperJson(hsb);
+  new HelperJsonParse(hsb);
+  new HelperJsonStringify(hsb);
   new HelperLowerCase(hsb);
   new HelperLt(hsb);
   new HelperLte(hsb);
@@ -6980,6 +6991,10 @@ async function getDeACMode(appDEACModeId, entityId, srfappid) {
   });
   return deACMode;
 }
+async function getFormTypeFieldName(entityId) {
+  const appDataEntity = await ibiz.hub.getAppDataEntity(entityId);
+  return appDataEntity.formTypeAppDEFieldId;
+}
 function findDELogic(appDELogicId, entity) {
   var _a;
   return (_a = entity.appDELogics) == null ? void 0 : _a.find((item) => item.id === appDELogicId);
@@ -7081,6 +7096,13 @@ function getViewEngines(view) {
   return appViewEngines;
 }
 
+// src/model/panel/data-container.ts
+function isDataContainer(panelItem) {
+  return panelItem.itemType === "CONTAINER" && ["CONTAINER_MULTIDATA", "CONTAINER_SINGLEDATA"].includes(
+    panelItem.predefinedType
+  );
+}
+
 // src/utils/open-redirect-view/open-redirect-view.ts
 async function openRedirectView(appView, context, params = {}, opts = {}) {
   return openDERedirectView(
@@ -11156,6 +11178,14 @@ var AppDataEntity = class _AppDataEntity {
           return this._data[key] || _srfkey;
         }
       });
+      Object.defineProperty(this, "srfsourcekey", {
+        set(val) {
+          this._data[key] = val;
+        },
+        get() {
+          return this._data[key];
+        }
+      });
     } else {
       ibiz.log.warn("\u5B9E\u4F53[".concat(entity.codeName, "]\u672A\u914D\u7F6E\u4E3B\u952E\u5B57\u6BB5"));
     }
@@ -11230,7 +11260,9 @@ var AppDataEntity = class _AppDataEntity {
    * @return {*}  {AppDataEntity}
    */
   clone() {
-    return new _AppDataEntity(this._entity, this._data);
+    const entity = new _AppDataEntity(this._entity, this._data);
+    entity.srfkey = this.srfkey;
+    return entity;
   }
   /**
    * 合并参数
@@ -11254,8 +11286,9 @@ var AppDataEntity = class _AppDataEntity {
 import { ModelError as ModelError7 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty5 } from "qx-util";
 var MethodDto = class _MethodDto {
-  constructor(entity, dto) {
+  constructor(entity, isLocalMode2, dto) {
     this.entity = entity;
+    this.isLocalMode = isLocalMode2;
     this.dto = dto;
     this.dtoMap = /* @__PURE__ */ new Map();
     if (dto) {
@@ -11326,7 +11359,9 @@ var MethodDto = class _MethodDto {
    */
   async sets(context, data) {
     const service = await this.app.deService.getService(this.entity.id);
-    service.local.clear(context);
+    if (this.isLocalMode) {
+      service.local.clear(context);
+    }
     return Promise.all(
       data.map(async (datum) => {
         const all = this.fields.filter((field) => field.type === "DTOS").map(async (field) => {
@@ -11344,7 +11379,9 @@ var MethodDto = class _MethodDto {
           await all[i];
         }
         const entityData = new AppDataEntity(this.entity, datum);
-        await service.local.add(context, entityData);
+        if (this.isLocalMode) {
+          await service.local.add(context, entityData);
+        }
         return entityData;
       })
     );
@@ -11370,35 +11407,43 @@ var MethodDto = class _MethodDto {
       entity.appDEMethodDTOs || [],
       field.refAppDEMethodDTOId
     );
-    const dto = new _MethodDto(entity, methodDto);
+    const dto = new _MethodDto(entity, this.isLocalMode, methodDto);
     this.dtoMap.set(field.codeName, dto);
     return dto;
   }
 };
 
+// src/service/service/entity/util/util.ts
+function isLocalMode(method) {
+  return method.actionType === "BUILTIN" || method.dataSetType === "DATAQUERY";
+}
+
 // src/service/service/entity/method/method-input.ts
 var MethodInput = class {
   /**
    * Creates an instance of MethodInput.
-   *
    * @author chitanda
-   * @date 2022-10-11 17:10:59
+   * @date 2023-09-06 16:09:26
    * @param {IAppDataEntity} entity
-   * @param {IAppDEMethodInput} [input]
+   * @param {IAppDEMethod} method
    */
-  constructor(entity, input) {
+  constructor(entity, method) {
     this.entity = entity;
-    this.input = input;
+    this.method = method;
+    const input = method.appDEMethodInput;
     if (input) {
       const methodDto = findModelChild(
         entity.appDEMethodDTOs || [],
         input.appDEMethodDTOId
       );
       if (methodDto) {
-        this.dto = new MethodDto(entity, methodDto);
+        this.dto = new MethodDto(entity, this.isLocalMode, methodDto);
       }
     }
   }
+  get isLocalMode() {
+    return isLocalMode(this.method);
+  }
   /**
    * 处理请求发送参数
    *
@@ -11420,25 +11465,29 @@ var MethodInput = class {
 var MethodReturn = class {
   /**
    * Creates an instance of MethodReturn.
-   *
    * @author chitanda
-   * @date 2022-10-11 17:10:47
+   * @date 2023-09-06 16:09:45
    * @param {IAppDataEntity} entity
+   * @param {IAppDEMethod} method
    * @param {IAppDEMethodReturn} [output]
    */
-  constructor(entity, output) {
+  constructor(entity, method) {
     this.entity = entity;
-    this.output = output;
+    this.method = method;
+    const output = method.appDEMethodReturn;
     if (output) {
       const methodDto = findModelChild(
         entity.appDEMethodDTOs || [],
         output.appDEMethodDTOId
       );
       if (methodDto) {
-        this.dto = new MethodDto(entity, methodDto);
+        this.dto = new MethodDto(entity, this.isLocalMode, methodDto);
       }
     }
   }
+  get isLocalMode() {
+    return isLocalMode(this.method);
+  }
   /**
    * 处理请求返回参数
    *
@@ -11472,8 +11521,8 @@ var Method = class {
     this.entity = entity;
     this.method = method;
     this.app = ibiz.hub.getApp(entity.appId);
-    this.input = new MethodInput(entity, method.appDEMethodInput);
-    this.result = new MethodReturn(entity, method.appDEMethodReturn);
+    this.input = new MethodInput(entity, method);
+    this.result = new MethodReturn(entity, method);
   }
   /**
    * 发送请求
@@ -11563,6 +11612,9 @@ var Method = class {
    * @return {*}  {IDataEntity}
    */
   createEntity(data) {
+    if (data instanceof AppDataEntity) {
+      return data.clone();
+    }
     return new AppDataEntity(this.entity, data);
   }
 };
@@ -12584,7 +12636,7 @@ var DEActionMethod = class extends Method {
    * @type {boolean}
    */
   get isLocalMode() {
-    return this.method.actionType === "BUILTIN";
+    return isLocalMode(this.method);
   }
   async exec(context, data, params) {
     if (this.method.actionType === "DELOGIC") {
@@ -12880,7 +12932,7 @@ 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 {
   get isLocalMode() {
-    return this.method.dataSetType === "DATAQUERY";
+    return isLocalMode(this.method);
   }
   async exec(context, data, params) {
     if (this.isLocalMode) {
@@ -13246,7 +13298,7 @@ var ControlVO = class _ControlVO {
    * @returns {*}
    */
   linkProperty(uiKey, dataKey, isOriginField = true) {
-    if (uiKey === "srfuf") {
+    if (uiKey === "srfuf" || uiKey === "srfkey") {
       return;
     }
     if (isOriginField || Object.prototype.hasOwnProperty.call(this.$origin, uiKey)) {
@@ -13693,7 +13745,7 @@ var AuthorityService = class {
    */
   async init(appData = ibiz.appData) {
     if (!appData) {
-      throw new RuntimeError16("\u6CA1\u6709appData\u6570\u636E");
+      return;
     }
     if (appData.unires) {
       this.resCodes = appData.unires;
@@ -14130,7 +14182,7 @@ var DEServiceUtil = class {
 };
 
 // src/app-hub.ts
-import { RuntimeError as RuntimeError44 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError42 } from "@ibiz-template/core";
 
 // src/application.ts
 import { Net } from "@ibiz-template/core";
@@ -14190,20 +14242,14 @@ var Application = class {
    * @return {*}  {Promise<void>}
    */
   async loadAppModelStyle() {
-    await this.net.get("".concat(ibiz.env.remoteModelUrl, "/PSSYSAPP.json.css")).then((res) => {
+    const style = await ibiz.hub.getAppStyle(this.appId);
+    if (style) {
       const dom = document.createElement("style");
       dom.setAttribute("type", "text/css");
-      if (res.request && res.request.responseURL) {
-        const url = new URL(res.request.responseURL);
-        dom.id = url.pathname;
-      }
-      dom.innerHTML = res.data;
+      dom.id = this.appId;
+      dom.innerHTML = style;
       document.head.appendChild(dom);
-    }).catch((err) => {
-      ibiz.log.error(
-        "\u5E94\u7528[".concat(this.appId, "]\u6A21\u578B\u5168\u5C40\u6837\u5F0F\u52A0\u8F7D\u5931\u8D25\uFF1A").concat(err.message)
-      );
-    });
+    }
   }
   /**
    * 根据 id 查找应用功能
@@ -15740,6 +15786,8 @@ var CodeListEditorController = class extends EditorController {
 };
 
 // src/controller/common/control/control.controller.ts
+import { NoticeError } from "@ibiz-template/core";
+import { isNil as isNil13 } from "ramda";
 var ControlController = class extends BaseController {
   /**
    * Creates an instance of ControlController.
@@ -15901,11 +15949,71 @@ var ControlController = class extends BaseController {
       return this.getEventArgs();
     };
   }
+  /**
+   * 执行对应部件行为消息提示
+   * @author lxm
+   * @date 2023-09-07 04:51:21
+   * @param {string} tag
+   * @param {({ default?: string; data?: IData | IData[]; error?: Error })} [opts]
+   * @return {*}  {void}
+   */
+  actionNotification(tag, opts) {
+    var _a;
+    const { ctrlMsg } = this.model;
+    const msgItem = (_a = ctrlMsg == null ? void 0 : ctrlMsg.ctrlMsgItems) == null ? void 0 : _a.find((item) => item.name === tag);
+    let message;
+    let duration;
+    if (msgItem && msgItem.content) {
+      duration = isNil13(msgItem.timeout) ? void 0 : msgItem.timeout / 1e3;
+      const scriptParams = { ...this.getEventArgs() };
+      if (opts == null ? void 0 : opts.data) {
+        scriptParams.data = opts.data;
+      }
+      message = ScriptFactory.execScriptFn(
+        scriptParams,
+        "`".concat(msgItem.content, "`"),
+        {
+          isAsync: false,
+          singleRowReturn: true
+        }
+      );
+    } else {
+      const resTag = "CONTROL.".concat(this.model.controlType, ".").concat(tag).toUpperCase();
+      message = ibiz.i18n.t(resTag, "");
+      if (message === resTag) {
+        message = "";
+      }
+    }
+    if (!message && (opts == null ? void 0 : opts.default)) {
+      message = opts.default;
+    }
+    if (!message && (opts == null ? void 0 : opts.error)) {
+      message = message || opts.error.message;
+    }
+    if (!message) {
+      return;
+    }
+    if (opts == null ? void 0 : opts.error) {
+      throw new NoticeError(message, duration);
+    } else {
+      ibiz.message.success(message, duration, duration === 0);
+    }
+  }
 };
 
 // src/controller/common/control/md-control.controller.ts
 import { isElementSame, RuntimeError as RuntimeError23 } from "@ibiz-template/core";
 var MDControlController = class extends ControlController {
+  constructor() {
+    super(...arguments);
+    /**
+     * 实体属性映射，key是id，value是name
+     * @author lxm
+     * @date 2023-09-07 03:16:56
+     * @protected
+     */
+    this.fieldIdNameMap = /* @__PURE__ */ new Map();
+  }
   get _evt() {
     return this.evt;
   }
@@ -15925,7 +16033,14 @@ var MDControlController = class extends ControlController {
     this.state.groups = [];
   }
   async onCreated() {
+    var _a;
     await super.onCreated();
+    const dataEntity = await ibiz.hub.getAppDataEntity(
+      this.model.appDataEntityId
+    );
+    (_a = dataEntity.appDEFields) == null ? void 0 : _a.forEach((field) => {
+      this.fieldIdNameMap.set(field.id, field.name);
+    });
     this.setSort();
   }
   /**
@@ -16004,10 +16119,14 @@ var MDControlController = class extends ControlController {
       });
     } catch (error) {
       await this._evt.emit("onLoadError", void 0);
+      this.actionNotification("FETCHERROR", {
+        error
+      });
       throw error;
     } finally {
       await this.endLoading();
     }
+    this.actionNotification("FETCHSUCCESS");
     return this.state.items;
   }
   /**
@@ -16068,8 +16187,9 @@ var MDControlController = class extends ControlController {
         })
       );
       if ((args == null ? void 0 : args.silent) !== true) {
-        ibiz.notification.success({
-          desc: "\u6570\u636E[".concat(data.map((item) => item.srfmajortext).join("\u3001"), "]\u5220\u9664\u6210\u529F!")
+        this.actionNotification("REMOVESUCCESS", {
+          data,
+          default: "\u6570\u636E[".concat(data.map((item) => item.srfmajortext).join("\u3001"), "]\u5220\u9664\u6210\u529F!")
         });
       }
       if (needRefresh) {
@@ -16077,6 +16197,10 @@ var MDControlController = class extends ControlController {
       }
     } catch (error) {
       await this._evt.emit("onRemoveError", void 0);
+      this.actionNotification("REMOVEERROR", {
+        error,
+        data
+      });
       throw error;
     } finally {
       await this.endLoading();
@@ -16608,7 +16732,7 @@ import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
 import quarterOfYear from "dayjs/plugin/quarterOfYear";
 import weekOfYear from "dayjs/plugin/weekOfYear";
 import isoWeek from "dayjs/plugin/isoWeek";
-import { clone as clone11, isNil as isNil13, mergeDeepRight } from "ramda";
+import { clone as clone11, isNil as isNil14, mergeDeepRight } from "ramda";
 dayjs2.extend(minMax);
 dayjs2.extend(isSameOrBefore);
 dayjs2.extend(quarterOfYear);
@@ -16697,10 +16821,10 @@ var BaseSeriesGenerator = class {
    * @return {*}  {(string | undefined)}
    */
   translateVal(codeListKey, val, isExclude = false) {
-    if (isNil13(val)) {
+    if (isNil14(val)) {
       return void 0;
     }
-    if (isNil13(codeListKey)) {
+    if (isNil14(codeListKey)) {
       return val;
     }
     const codeListItems = this.chartGenerator.codeListMap.get(codeListKey);
@@ -16730,7 +16854,7 @@ var BaseSeriesGenerator = class {
           seriesCodeListId,
           item[this.groupField]
         );
-        if (isNil13(groupVal)) {
+        if (isNil14(groupVal)) {
           return;
         }
         group = groupVal;
@@ -18343,7 +18467,6 @@ var MsgBoxNode = class extends UILogicNode {
       default:
         throw new ModelError21(this.model, "".concat(buttonsType, "\u6682\u672A\u652F\u6301"));
     }
-    console.log(this.model, modalParams);
     const result = await ibiz.modal.confirm(modalParams);
     ctx.setLastReturn(resultTags[result ? 0 : 1]);
   }
@@ -19241,7 +19364,6 @@ var ContextMenuController = class extends ToolbarController {
 };
 
 // src/controller/control/dashboard/dashboard.controller.ts
-import { RuntimeError as RuntimeError32 } from "@ibiz-template/core";
 var DashboardController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -19326,9 +19448,10 @@ var DashboardController = class extends ControlController {
         return portlet.dataChangeNotify(data);
       })
     );
-    if (values.find((item) => item.status === "rejected")) {
+    const rejectedValue = values.find((item) => item.status === "rejected");
+    if (rejectedValue) {
       ibiz.log.error("dataChangeNotify\u62A5\u9519", values);
-      throw new RuntimeError32("\u6570\u636E\u53D8\u66F4\u540E\u6709\u9519\u8BEF");
+      throw rejectedValue.reason;
     }
   }
 };
@@ -19769,7 +19892,8 @@ var DataViewControlController = class extends MDControlController {
     } else {
       const { minorSortAppDEFieldId, minorSortDir } = this.model;
       if (minorSortAppDEFieldId && minorSortDir) {
-        this.state.sortQuery = "".concat(minorSortAppDEFieldId.toLowerCase(), ",").concat(minorSortDir.toLowerCase());
+        const fieldName = this.fieldIdNameMap.get(minorSortAppDEFieldId);
+        this.state.sortQuery = "".concat(fieldName.toLowerCase(), ",").concat(minorSortDir.toLowerCase());
       } else {
         this.state.sortQuery = "";
       }
@@ -19781,7 +19905,7 @@ var DataViewControlController = class extends MDControlController {
 import { RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
 
 // src/controller/control/exp-bar/exp-bar.controller.ts
-import { RuntimeError as RuntimeError33, RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError32, RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
 var ExpBarControlController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -20058,7 +20182,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 RuntimeError33("\u591A\u8282\u70B9\u89C6\u56FE\u7531\u5B50\u7C7B\u5B9E\u73B0");
+    throw new RuntimeError32("\u591A\u8282\u70B9\u89C6\u56FE\u7531\u5B50\u7C7B\u5B9E\u73B0");
   }
   /**
    * 获取导航视图
@@ -20187,7 +20311,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/exp-bar/tree-exp-bar.controller.ts
-import { RuntimeError as RuntimeError34, RuntimeModelError as RuntimeModelError43 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError33, RuntimeModelError as RuntimeModelError43 } from "@ibiz-template/core";
 var TreeExpBarController = class extends ExpBarControlController {
   constructor() {
     super(...arguments);
@@ -20262,7 +20386,7 @@ var TreeExpBarController = class extends ExpBarControlController {
     const deData = node.deData || node;
     const nodeModel = this.getNodeModel(node.nodeId);
     if (!nodeModel) {
-      throw new RuntimeError34("\u627E\u4E0D\u5230".concat(node.nodeId, "\u7684\u8282\u70B9\u6A21\u578B"));
+      throw new RuntimeError33("\u627E\u4E0D\u5230".concat(node.nodeId, "\u7684\u8282\u70B9\u6A21\u578B"));
     }
     const result = this.prepareParams(nodeModel, deData, context, params);
     result.context.currentSrfNav = nodeId;
@@ -20315,7 +20439,7 @@ var TreeExpBarController = class extends ExpBarControlController {
 import { mergeDefaultInLeft } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.controller.ts
-import { RuntimeError as RuntimeError35, debounceAndAsyncMerge } from "@ibiz-template/core";
+import { debounceAndAsyncMerge } from "@ibiz-template/core";
 var FormController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -20378,9 +20502,10 @@ var FormController = class extends ControlController {
         return detail.dataChangeNotify(names);
       })
     );
-    if (values.find((item) => item.status === "rejected")) {
+    const rejectedValue = values.find((item) => item.status === "rejected");
+    if (rejectedValue) {
       ibiz.log.error("dataChangeNotify\u62A5\u9519", values);
-      throw new RuntimeError35("\u6570\u636E\u53D8\u66F4\u540E\u6709\u9519\u8BEF");
+      throw rejectedValue.reason;
     }
   }
   /**
@@ -20506,6 +20631,9 @@ var FormController = class extends ControlController {
     );
     return values.findIndex((value) => !value) === -1;
   }
+  actionNotification(tag, opts) {
+    super.actionNotification(tag, { data: this.data, ...opts || {} });
+  }
 };
 
 // src/controller/control/form/search-form/search-form.service.ts
@@ -20582,11 +20710,20 @@ var SearchFormController = class extends FormController {
     const params = await this.getDraftParams();
     Object.assign(queryParams, params);
     await this.evt.emit("onBeforeLoadDraft", { params: queryParams });
-    const res = await this.service.getDraft(this.context, queryParams);
+    let res;
+    try {
+      res = await this.service.getDraft(this.context, queryParams);
+    } catch (error) {
+      this.actionNotification("GETDRAFTERROR", {
+        error
+      });
+      throw error;
+    }
     this.state.data = res.data;
     mergeDefaultInLeft(this.data, params);
     this.state.isLoaded = true;
     this.formStateNotify("DRAFT" /* DRAFT */);
+    this.actionNotification("GETDRAFTSUCCESS");
     return this.data;
   }
   /**
@@ -21250,7 +21387,7 @@ var FormGroupPanelController = class extends FormDetailController {
 // src/controller/control/form/form-detail/form-item/form-item.controller.ts
 import Schema from "async-validator";
 import { createUUID as createUUID4, isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
-import { ModelError as ModelError25, RuntimeError as RuntimeError36 } from "@ibiz-template/core";
+import { ModelError as ModelError25, RuntimeError as RuntimeError34 } from "@ibiz-template/core";
 import dayjs3 from "dayjs";
 
 // src/controller/control/form/form-detail/form-item/form-item.state.ts
@@ -21566,7 +21703,7 @@ var FormItemController = class extends FormDetailController {
       case "SESSION":
       case "APPLICATION":
         if (!((_a = ibiz.appData) == null ? void 0 : _a.context)) {
-          throw new RuntimeError36("appdata.context\u4E0D\u5B58\u5728");
+          throw new RuntimeError34("appdata.context\u4E0D\u5B58\u5728");
         }
         data[this.name] = ibiz.appData.context[defaultValue];
         break;
@@ -21691,7 +21828,7 @@ var FormMDCtrlContentTypeController = class {
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-control/form-mdctrl-control.controller.ts
-import { RuntimeError as RuntimeError37 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError35 } from "@ibiz-template/core";
 var FormMDCtrlControlController = class extends FormMDCtrlContentTypeController {
   /**
    * 初始化
@@ -21706,7 +21843,7 @@ var FormMDCtrlControlController = class extends FormMDCtrlContentTypeController
     const { model } = this.parent;
     const { contentControl } = model;
     if (!contentControl) {
-      throw new RuntimeError37("\u8868\u5355\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5D4C\u5165\u90E8\u4EF6");
+      throw new RuntimeError35("\u8868\u5355\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5D4C\u5165\u90E8\u4EF6");
     }
     this.controlModel = contentControl;
     const controlProvider = await getControlProvider(this.controlModel);
@@ -21816,7 +21953,7 @@ import { isArray as isArray4 } from "lodash-es";
 import {
   awaitTimeout,
   mergeInLeft,
-  RuntimeError as RuntimeError38,
+  RuntimeError as RuntimeError36,
   mergeDefaultInLeft as mergeDefaultInLeft2
 } from "@ibiz-template/core";
 import { debounce } from "lodash-es";
@@ -22133,6 +22270,9 @@ var EditFormController = class extends FormController {
       res = await this.service.getDraft(this.context, queryParams);
     } catch (error) {
       await this.evt.emit("onLoadDraftError", void 0);
+      this.actionNotification("GETDRAFTERROR", {
+        error
+      });
       throw error;
     } finally {
       await this.endLoading();
@@ -22141,6 +22281,7 @@ var EditFormController = class extends FormController {
     mergeDefaultInLeft2(this.data, params);
     this.formStateNotify("DRAFT" /* DRAFT */);
     await this.evt.emit("onLoadDraftSuccess", void 0);
+    this.actionNotification("GETDRAFTSUCCESS");
     this.state.isLoaded = true;
     return this.data;
   }
@@ -22166,6 +22307,9 @@ var EditFormController = class extends FormController {
       res = await this.service.get(this.context, queryParams);
     } catch (error) {
       await this.evt.emit("onLoadError", void 0);
+      this.actionNotification("GETERROR", {
+        error
+      });
       throw error;
     } finally {
       await this.endLoading();
@@ -22174,6 +22318,7 @@ var EditFormController = class extends FormController {
     this.state.data = res.data;
     this.formStateNotify("LOAD" /* LOAD */);
     await this.evt.emit("onLoadSuccess", void 0);
+    this.actionNotification("GETSUCCESS");
     this.state.isLoaded = true;
     return this.data;
   }
@@ -22190,15 +22335,19 @@ var EditFormController = class extends FormController {
     }
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError38("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
+      throw new RuntimeError36("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
     }
     await this.startLoading();
     await this.evt.emit("onBeforeSave", void 0);
+    const isCreate = this.data.srfuf === 0 /* CREATE */;
     let res;
     try {
-      res = this.data.srfuf === 0 /* CREATE */ ? await this.service.create(this.context, this.data) : await this.service.update(this.context, this.data);
+      res = isCreate ? await this.service.create(this.context, this.data) : await this.service.update(this.context, this.data);
     } catch (error) {
       await this.evt.emit("onSaveError", void 0);
+      this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "ERROR"), {
+        error
+      });
       throw error;
     } finally {
       await this.endLoading();
@@ -22209,7 +22358,9 @@ var EditFormController = class extends FormController {
     this.state.modified = false;
     await this.evt.emit("onSaveSuccess", void 0);
     this.formStateNotify("SAVE" /* SAVE */);
-    ibiz.message.success("".concat(this.data.srfmajortext || "", "\u4FDD\u5B58\u6210\u529F"));
+    this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "SUCCESS"), {
+      default: "".concat(this.data.srfmajortext || "", "\u4FDD\u5B58\u6210\u529F")
+    });
     return this.data;
   }
   /**
@@ -22236,6 +22387,9 @@ var EditFormController = class extends FormController {
         res = await this.service.remove(this.context, this.params);
       } catch (error) {
         await this.evt.emit("onRemoveError", void 0);
+        this.actionNotification("REMOVEERROR", {
+          error
+        });
         throw error;
       } finally {
         await this.endLoading();
@@ -22245,6 +22399,7 @@ var EditFormController = class extends FormController {
     this.state.data = new ControlVO();
     this.state.modified = false;
     await this.evt.emit("onRemoveSuccess", void 0);
+    this.actionNotification("REMOVESUCCESS");
     return ok;
   }
   /**
@@ -22280,21 +22435,35 @@ var EditFormController = class extends FormController {
       (item) => item.id === formItemUpdateId
     );
     if (!formItemUpdate) {
-      throw new RuntimeError38("\u6CA1\u627E\u5230".concat(formItemUpdateId, "\u8868\u5355\u9879\u66F4\u65B0"));
+      throw new RuntimeError36("\u6CA1\u627E\u5230".concat(formItemUpdateId, "\u8868\u5355\u9879\u66F4\u65B0"));
     }
-    const { appDEMethodId, defiupdateDetails } = formItemUpdate;
+    const { appDEMethodId, defiupdateDetails, customCode, scriptCode } = formItemUpdate;
     const updateItems = defiupdateDetails.map((item) => item.id);
-    const params = { ...this.params, ...this.data.getOrigin() };
-    const res = await this.service.updateFormItem(
-      appDEMethodId,
-      this.context,
-      params
-    );
-    const result = res.data;
-    if (result && (updateItems == null ? void 0 : updateItems.length)) {
+    let updateData;
+    if (customCode && scriptCode) {
+      updateData = ScriptFactory.execScriptFn(
+        {
+          ...this.getEventArgs(),
+          data: this.data
+        },
+        scriptCode,
+        {
+          isAsync: false
+        }
+      );
+    } else {
+      const params = { ...this.params, ...this.data.getOrigin() };
+      const res = await this.service.updateFormItem(
+        appDEMethodId,
+        this.context,
+        params
+      );
+      updateData = res.data;
+    }
+    if (updateData && (updateItems == null ? void 0 : updateItems.length)) {
       await Promise.all(
         updateItems.map(
-          (itemName) => this.setDataValue(itemName, result[itemName])
+          (itemName) => this.setDataValue(itemName, updateData[itemName])
         )
       );
     }
@@ -22310,7 +22479,7 @@ var EditFormController = class extends FormController {
   async wfStart(extraParams = {}) {
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError38("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
+      throw new RuntimeError36("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
     }
     await this.startLoading();
     try {
@@ -22322,10 +22491,15 @@ var EditFormController = class extends FormController {
         },
         this.data
       );
+    } catch (error) {
+      this.actionNotification("WFSTARTERROR", {
+        error
+      });
+      throw error;
     } finally {
       await this.endLoading();
     }
-    ibiz.message.success("\u6D41\u7A0B\u542F\u52A8\u6210\u529F");
+    this.actionNotification("WFSTARTSUCCESS", { default: "\u6D41\u7A0B\u542F\u52A8\u6210\u529F" });
   }
   /**
    * 工作流提交(调用前先确保调用保存)
@@ -22338,7 +22512,7 @@ var EditFormController = class extends FormController {
   async wfSubmit(extraParams = {}) {
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError38("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
+      throw new RuntimeError36("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
     }
     await this.startLoading();
     try {
@@ -22350,10 +22524,15 @@ var EditFormController = class extends FormController {
         },
         this.data
       );
+    } catch (error) {
+      this.actionNotification("WFSUBMITERROR", {
+        error
+      });
+      throw error;
     } finally {
       await this.endLoading();
     }
-    ibiz.message.success("\u6D41\u7A0B\u63D0\u4EA4\u6210\u529F");
+    this.actionNotification("WFSUBMITSUCCESS", { default: "\u6D41\u7A0B\u63D0\u4EA4\u6210\u529F" });
   }
   async dataChangeNotify(names) {
     await super.dataChangeNotify(names);
@@ -22564,7 +22743,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 RuntimeError39, mergeInLeft as mergeInLeft3 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError37, mergeInLeft as mergeInLeft3 } from "@ibiz-template/core";
 var FormMDCtrlGridController = class extends FormMDCtrlControlController {
   constructor() {
     super(...arguments);
@@ -22669,7 +22848,7 @@ var FormMDCtrlGridController = class extends FormMDCtrlControlController {
     const { model } = this.parent;
     const { contentControl } = model;
     if (!contentControl) {
-      throw new RuntimeError39("\u8868\u5355\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5D4C\u5165\u90E8\u4EF6");
+      throw new RuntimeError37("\u8868\u5355\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5D4C\u5165\u90E8\u4EF6");
     }
     mergeInLeft3(contentControl, { enableRowEdit: true, enableRowNew: true });
     this.controlModel = contentControl;
@@ -23380,7 +23559,7 @@ import {
   awaitTimeout as awaitTimeout2,
   debounceAndAsyncMerge as debounceAndAsyncMerge2,
   recursiveIterate as recursiveIterate4,
-  RuntimeError as RuntimeError40,
+  RuntimeError as RuntimeError38,
   RuntimeModelError as RuntimeModelError45
 } from "@ibiz-template/core";
 import { clone as clone13 } from "ramda";
@@ -23751,14 +23930,23 @@ var GridController = class extends MDControlController {
     }
     const editingRow = this.state.rows.find((item) => item.showRowEdit);
     if (editingRow) {
-      throw new RuntimeError40("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
+      throw new RuntimeError38("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
+    }
+    let res;
+    try {
+      res = await this.service.getDraft(this.context, this.params);
+    } catch (error) {
+      this.actionNotification("GETDRAFTERROR", {
+        error
+      });
+      throw error;
     }
-    const res = await this.service.getDraft(this.context, this.params);
     this.state.items.unshift(res.data);
     const newRow = new GridRowState(res.data, this);
     this.state.rows.unshift(newRow);
     this.gridStateNotify(newRow, "DRAFT" /* DRAFT */);
     this.switchRowEdit(this.state.rows[0], true);
+    this.actionNotification("GETDRAFTSUCCESS", { data: res.data });
   }
   /**
    * 保存
@@ -23776,7 +23964,7 @@ var GridController = class extends MDControlController {
       (item) => item.data.srfkey === data.srfkey
     );
     if (!rowState) {
-      throw new RuntimeError40("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
+      throw new RuntimeError38("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
     }
     if (!rowState.modified) {
       ibiz.log.debug("\u503C\u6CA1\u6709\u53D1\u751F\u6539\u53D8");
@@ -23788,7 +23976,7 @@ var GridController = class extends MDControlController {
     }
     const isValid = await this.validate(rowState);
     if (!isValid) {
-      throw new RuntimeError40("\u884C\u6570\u636E\u6821\u9A8C\u4E0D\u901A\u8FC7\uFF0C\u4FDD\u5B58\u53D6\u6D88");
+      throw new RuntimeError38("\u884C\u6570\u636E\u6821\u9A8C\u4E0D\u901A\u8FC7\uFF0C\u4FDD\u5B58\u53D6\u6D88");
     }
     await this.startLoading();
     let res;
@@ -23798,6 +23986,13 @@ var GridController = class extends MDControlController {
     tempContext[deName] = data.srfkey;
     try {
       res = isCreate ? await this.service.create(tempContext, data) : await this.service.update(tempContext, data);
+    } catch (error) {
+      await this.evt.emit("onSaveError", void 0);
+      this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "ERROR"), {
+        error,
+        data: rowState.data
+      });
+      throw error;
     } finally {
       await this.endLoading();
     }
@@ -23808,6 +24003,10 @@ var GridController = class extends MDControlController {
     rowState.data = res.data;
     rowState.modified = false;
     ibiz.message.success("".concat(res.data.srfmajortext || "", "\u4FDD\u5B58\u6210\u529F"));
+    this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "SUCCESS"), {
+      default: "".concat(res.data.srfmajortext || "", "\u4FDD\u5B58\u6210\u529F"),
+      data: res.data
+    });
     this.gridStateNotify(rowState, "SAVE" /* SAVE */);
     await this.evt.emit("onSaveSuccess", void 0);
   }
@@ -23957,9 +24156,10 @@ var GridController = class extends MDControlController {
         return column.dataChangeNotify(row, names);
       })
     );
-    if (values.find((item) => item.status === "rejected")) {
+    const rejectedValue = values.find((item) => item.status === "rejected");
+    if (rejectedValue) {
       ibiz.log.error("dataChangeNotify\u62A5\u9519", values);
-      throw new RuntimeError40("\u6570\u636E\u53D8\u66F4\u540E\u6709\u9519\u8BEF");
+      throw rejectedValue.reason;
     }
   }
   /**
@@ -23989,7 +24189,7 @@ var GridController = class extends MDControlController {
   }
   async toggleRowEdit() {
     if (!this.model.enableRowNew) {
-      throw new RuntimeError40("\u5F53\u524D\u8868\u683C\u4E0D\u652F\u6301\u884C\u7F16\u8F91\uFF0C\u65E0\u6CD5\u5207\u6362\u5F00\u542F\u884C\u7F16\u8F91");
+      throw new RuntimeError38("\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;
   }
@@ -24022,7 +24222,7 @@ var GridController = class extends MDControlController {
     if (toState === true) {
       const editingRow = this.state.rows.find((item) => item.showRowEdit);
       if (editingRow) {
-        throw new RuntimeError40("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
+        throw new RuntimeError38("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
       }
     }
     row.showRowEdit = toState;
@@ -24039,13 +24239,15 @@ var GridController = class extends MDControlController {
    * @param {string} key 排序字段
    * @param {string} order 排序顺序
    */
-  setSort(key, order) {
-    if (key && order) {
-      super.setSort(key, order);
+  setSort(fieldId, order) {
+    if (fieldId && order) {
+      const fieldName = this.fieldIdNameMap.get(fieldId).toLowerCase();
+      super.setSort(fieldName, order);
     } else {
       const { minorSortAppDEFieldId, minorSortDir } = this.model;
       if (minorSortAppDEFieldId && minorSortDir) {
-        this.state.sortQuery = "".concat(minorSortAppDEFieldId.toLowerCase(), ",").concat(minorSortDir.toLowerCase());
+        const fieldName = this.fieldIdNameMap.get(minorSortAppDEFieldId);
+        this.state.sortQuery = "".concat(fieldName.toLowerCase(), ",").concat(minorSortDir.toLowerCase());
       } else {
         this.state.sortQuery = "";
       }
@@ -24065,14 +24267,22 @@ var GridController = class extends MDControlController {
       (item) => item.id === updateId
     );
     if (!findUpdate) {
-      throw new RuntimeError40("\u6CA1\u627E\u5230".concat(updateId, "\u7F16\u8F91\u5217\u66F4\u65B0"));
+      throw new RuntimeError38("\u6CA1\u627E\u5230".concat(updateId, "\u7F16\u8F91\u5217\u66F4\u65B0"));
     }
     const { appDEMethodId, degeiupdateDetails, customCode, scriptCode } = findUpdate;
     const updateItems = degeiupdateDetails.map((item) => item.id);
+    let updateData;
     if (customCode && scriptCode) {
-      ScriptFactory.execScriptFn({ data: row.data }, scriptCode, {
-        isAsync: false
-      });
+      updateData = ScriptFactory.execScriptFn(
+        {
+          ...this.getEventArgs(),
+          data: row.data
+        },
+        scriptCode,
+        {
+          isAsync: false
+        }
+      );
     } else {
       const params = { ...this.params, ...row.data.getOrigin() };
       const res = await this.service.updateGridEditItem(
@@ -24080,14 +24290,14 @@ var GridController = class extends MDControlController {
         this.context,
         params
       );
-      const result = res.data;
-      if (result && (updateItems == null ? void 0 : updateItems.length)) {
-        await Promise.all(
-          updateItems.map((itemName) => {
-            return this.setRowValue(row, itemName, result[itemName]);
-          })
-        );
-      }
+      updateData = res.data;
+    }
+    if (updateData && (updateItems == null ? void 0 : updateItems.length)) {
+      await Promise.all(
+        updateItems.map((itemName) => {
+          return this.setRowValue(row, itemName, updateData[itemName]);
+        })
+      );
     }
   }
   /**
@@ -24166,7 +24376,7 @@ var GridController = class extends MDControlController {
         data2 = this.getData();
       }
       if (data2.length === 0) {
-        throw new RuntimeError40("\u65E0\u5BFC\u51FA\u6570\u636E");
+        throw new RuntimeError38("\u65E0\u5BFC\u51FA\u6570\u636E");
       }
       return formatExcelData(data2);
     };
@@ -24185,11 +24395,11 @@ var GridController = class extends MDControlController {
     );
     const data = formatArrayData(filterVal, await getExportData());
     if (!ibiz.util.getExportExcel) {
-      throw new RuntimeError40("ibiz.util.getExportExcel\u4E0D\u5B58\u5728");
+      throw new RuntimeError38("ibiz.util.getExportExcel\u4E0D\u5B58\u5728");
     }
     const exportExcel = await ibiz.util.getExportExcel();
     if (!exportExcel) {
-      throw new RuntimeError40("\u5BFC\u51FA\u6A21\u5757\u52A0\u8F7D\u9519\u8BEF");
+      throw new RuntimeError38("\u5BFC\u51FA\u6A21\u5757\u52A0\u8F7D\u9519\u8BEF");
     }
     exportExcel.exportJsonToExcel({
       header,
@@ -24494,7 +24704,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 RuntimeError41 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError39 } from "@ibiz-template/core";
 import Schema2 from "async-validator";
 import { isNilOrEmpty as isNilOrEmpty7 } from "qx-util";
 var GridFieldEditColumnController = class extends GridFieldColumnController {
@@ -24628,7 +24838,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 RuntimeError41(
+        throw new RuntimeError39(
           "".concat(this.editItem.codeName, "\u6821\u9A8C\u62A5\u9519,").concat(row.errors[this.fieldName])
         );
       }
@@ -24805,7 +25015,8 @@ var ListController = class extends MDControlController {
     } else {
       const { minorSortAppDEFieldId, minorSortDir } = this.model;
       if (minorSortAppDEFieldId && minorSortDir) {
-        this.state.sortQuery = "".concat(minorSortAppDEFieldId.toLowerCase(), ",").concat(minorSortDir.toLowerCase());
+        const fieldName = this.fieldIdNameMap.get(minorSortAppDEFieldId);
+        this.state.sortQuery = "".concat(fieldName.toLowerCase(), ",").concat(minorSortDir.toLowerCase());
       } else {
         this.state.sortQuery = "";
       }
@@ -24981,7 +25192,7 @@ var ListController = class extends MDControlController {
 };
 
 // src/controller/control/panel/panel/panel.controller.ts
-import { RuntimeError as RuntimeError42 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError40 } from "@ibiz-template/core";
 var PanelController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -25079,7 +25290,7 @@ var PanelController = class extends ControlController {
   async load() {
     const data = await this.prepareData();
     if (!data) {
-      throw new RuntimeError42("\u672A\u83B7\u53D6\u5230\u9762\u677F\u6570\u636E");
+      throw new RuntimeError40("\u672A\u83B7\u53D6\u5230\u9762\u677F\u6570\u636E");
     }
     const panelData = this.convertData(data);
     this.state.data = panelData;
@@ -26179,7 +26390,11 @@ var TreeController = class extends MDControlController {
     return this.evt.emit("onActive", { ...nodeParams, nodeData: item });
   }
   setSelection(selection) {
-    super.setSelection(selection);
+    const selectionIds = selection.map((item) => item.id);
+    const filterArr = this.state.items.filter(
+      (item) => selectionIds.includes(item.id)
+    );
+    super.setSelection(filterArr);
   }
   /**
    * 获取节点模型
@@ -26296,7 +26511,7 @@ var TreeController = class extends MDControlController {
 };
 
 // src/controller/control/wizard-panel/wizard-panel.controller.ts
-import { RuntimeError as RuntimeError43 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError41 } from "@ibiz-template/core";
 
 // src/controller/control/wizard-panel/wizard-panel.service.ts
 var WizardPanelService = class extends ControlService {
@@ -26455,7 +26670,7 @@ var WizardPanelController = class extends ControlController {
     const { activeFormTag } = this.state;
     const controller = this.formControllers.get(activeFormTag);
     if (!controller) {
-      throw new RuntimeError43("\u627E\u4E0D\u5230".concat(activeFormTag, "\u7684\u8868\u5355\u63A7\u5236\u5668"));
+      throw new RuntimeError41("\u627E\u4E0D\u5230".concat(activeFormTag, "\u7684\u8868\u5355\u63A7\u5236\u5668"));
     }
     return controller;
   }
@@ -26530,7 +26745,7 @@ var WizardPanelController = class extends ControlController {
     this.tagHistory.pop();
     const prevTag = this.tagHistory[this.tagHistory.length - 1];
     if (!prevTag) {
-      throw new RuntimeError43("\u6CA1\u6709\u4E0A\u4E00\u4E2A\u8868\u5355");
+      throw new RuntimeError41("\u6CA1\u6709\u4E0A\u4E00\u4E2A\u8868\u5355");
     }
     this.state.activeFormTag = prevTag;
   }
@@ -26551,7 +26766,7 @@ var WizardPanelController = class extends ControlController {
         }
       );
       if (!wizardForm) {
-        throw new RuntimeError43("\u627E\u4E0D\u5230\u6807\u8BC6\u4E3A".concat(data.srfnextform, "\u7684\u5411\u5BFC\u8868\u5355"));
+        throw new RuntimeError41("\u627E\u4E0D\u5230\u6807\u8BC6\u4E3A".concat(data.srfnextform, "\u7684\u5411\u5BFC\u8868\u5355"));
       }
       nextTag = data.srfnextform;
     } else {
@@ -26563,7 +26778,7 @@ var WizardPanelController = class extends ControlController {
         });
         const nextWizardStep = wizardSteps[index + 1];
         if (!nextWizardStep) {
-          throw new RuntimeError43("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u6B65\u9AA4");
+          throw new RuntimeError41("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u6B65\u9AA4");
         }
         const nextWizardForm = this.model.dewizard.dewizardForms.find(
           (wizardForm) => {
@@ -26576,7 +26791,7 @@ var WizardPanelController = class extends ControlController {
       }
     }
     if (!nextTag) {
-      throw new RuntimeError43("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u8868\u5355");
+      throw new RuntimeError41("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u8868\u5355");
     }
     this.state.activeFormTag = nextTag;
     this.tagHistory.push(nextTag);
@@ -26983,6 +27198,20 @@ var AppHub = class {
     const id = this.calcAppViewId(tag);
     return this.view2appMap.has(id);
   }
+  /**
+   * 获取应用样式
+   *
+   * @author chitanda
+   * @date 2023-09-06 10:09:22
+   * @param {string} appId
+   * @return {*}  {(Promise<string | null>)}
+   */
+  async getAppStyle(appId) {
+    if (this.modelLoaderProvider) {
+      return this.modelLoaderProvider.getAppStyle(appId);
+    }
+    return null;
+  }
   /**
    * 根据视图代码名称查找视图
    *
@@ -27005,7 +27234,7 @@ var AppHub = class {
       this.registerAppView(appView);
       return appView;
     }
-    throw new RuntimeError44("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
+    throw new RuntimeError42("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
   }
   /**
    * 根据应用实体代码名称查找应用视图
@@ -27036,7 +27265,7 @@ var AppHub = class {
       this.registerAppDataEntity(entity, appId);
       return entity;
     }
-    throw new RuntimeError44("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
+    throw new RuntimeError42("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
   }
   /**
    * 新建 hub 应用
@@ -27057,7 +27286,7 @@ var AppHub = class {
       appModel = await this.modelLoaderProvider.getApp(id);
       this.registerApp(appModel);
     } else {
-      throw new RuntimeError44("\u672A\u627E\u5230\u5E94\u7528[".concat(id, "]\u6A21\u578B"));
+      throw new RuntimeError42("\u672A\u627E\u5230\u5E94\u7528[".concat(id, "]\u6A21\u578B"));
     }
     const app = new Application(appModel);
     this.appMap.set(id, app);
@@ -27148,7 +27377,7 @@ var EngineFactory = class {
 };
 
 // src/engine/view-base.engine.ts
-import { RuntimeError as RuntimeError45 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError43 } from "@ibiz-template/core";
 var ViewEngineBase = class {
   /**
    * 构造函数在视图控制器的构造函数逻辑内部执行
@@ -27336,7 +27565,7 @@ var ViewEngineBase = class {
     const { appDataEntityId } = this.view.model;
     const { evt, context, params } = this.view;
     if (!appDataEntityId) {
-      throw new RuntimeError45("\u8BE5\u89C6\u56FE\u6CA1\u6709\u5B9E\u4F53\uFF0C\u65E0\u6CD5\u52A0\u8F7D\u5B9E\u4F53\u6570\u636E");
+      throw new RuntimeError43("\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(
@@ -27726,7 +27955,7 @@ var GlobalUtil = class {
 };
 
 // src/logic-scheduler/executor/logic-executor.ts
-import { RuntimeError as RuntimeError46 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError44 } from "@ibiz-template/core";
 var LogicExecutor = class {
   /**
    * @author lxm
@@ -27747,7 +27976,7 @@ var LogicExecutor = class {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(_executeParams) {
-    throw new RuntimeError46("Method not implemented.");
+    throw new RuntimeError44("Method not implemented.");
   }
   /**
    * 销毁方法
@@ -28179,7 +28408,7 @@ var LogicSchedulerCenter = class {
 };
 
 // src/logic-scheduler/trigger/logic-trigger.ts
-import { RuntimeError as RuntimeError47 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError45 } from "@ibiz-template/core";
 var LogicTrigger = class {
   /**
    * @author lxm
@@ -28239,7 +28468,7 @@ var LogicTrigger = class {
     if (this.executor) {
       return this.executor.execute(executeParams);
     }
-    throw new RuntimeError47("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
+    throw new RuntimeError45("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
   }
   /**
    * 销毁方法
@@ -28256,12 +28485,12 @@ var CustomTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/item-dyna-logic-trigger.ts
-import { RuntimeError as RuntimeError48 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError46 } from "@ibiz-template/core";
 var ItemDynaLogicTrigger = class extends LogicTrigger {
   bindExecutor(executor) {
     super.bindExecutor(executor);
     if (this.executor.type !== "SCRIPT") {
-      throw new RuntimeError48(
+      throw new RuntimeError46(
         "\u9884\u5B9A\u4E49\u903B\u8F91\u7C7B\u578B".concat(this.type, "\u7684\u89E6\u53D1\u5668\u7C7B\u578B\u53EA\u80FD\u662F\u811A\u672C")
       );
     }
@@ -28293,12 +28522,12 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
     if (typeof result === "boolean") {
       return result;
     }
-    throw new RuntimeError48("".concat(this.logic.id, "\u903B\u8F91\u8FD4\u56DE\u503C\u4E0D\u662F\u5E03\u5C14\u503C"));
+    throw new RuntimeError46("".concat(this.logic.id, "\u903B\u8F91\u8FD4\u56DE\u503C\u4E0D\u662F\u5E03\u5C14\u503C"));
   }
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError49 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError47 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -28307,7 +28536,7 @@ var TimerTrigger = class extends LogicTrigger {
   start() {
     this.timer = setInterval(() => {
       if (!this.scheduler.defaultParamsCb) {
-        throw new RuntimeError49("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
+        throw new RuntimeError47("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
       }
       const params = this.scheduler.defaultParamsCb();
       this.executor.execute(params);
@@ -28324,7 +28553,7 @@ var TimerTrigger = class extends LogicTrigger {
 // src/logic-scheduler/executor/app-ui-logic-executor.ts
 import {
   ModelError as ModelError30,
-  RuntimeError as RuntimeError50,
+  RuntimeError as RuntimeError48,
   RuntimeModelError as RuntimeModelError49
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty9 } from "qx-util";
@@ -28360,14 +28589,20 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { context, params, ...rest } = parameters;
     const { data } = parameters;
     if (!(data == null ? void 0 : data[0])) {
-      throw new RuntimeError50("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
+      throw new RuntimeError48("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
     }
-    const openViewRef = appUILogic.openDataAppView;
-    if (!openViewRef) {
-      throw new RuntimeModelError49(
-        appUILogic,
-        "opendata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE"
-      );
+    const openViewRefs = appUILogic.openDataAppViews;
+    let openViewRef;
+    if (openViewRefs) {
+      openViewRef = await this.calcOpenViewRef(appUILogic, parameters);
+    } else {
+      openViewRef = appUILogic.openDataAppView;
+      if (!openViewRef) {
+        throw new RuntimeModelError49(
+          appUILogic,
+          "opendata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE"
+        );
+      }
     }
     const openView = openViewRef.refAppViewId;
     if (!openView) {
@@ -28483,17 +28718,40 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const selectData = (_a = result.data) == null ? void 0 : _a[0];
     if (!selectData) {
-      throw new RuntimeError50("\u8BF7\u9009\u4E2D\u4E00\u6761\u6570\u636E");
+      throw new RuntimeError48("\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 RuntimeError50(
+      throw new RuntimeError48(
         "\u6CA1\u6709\u627E\u5230\u4E0E\u7D22\u5F15\u7C7B\u578B".concat(indexType, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
       );
     }
     return findView;
   }
+  async calcOpenViewRef(appUILogic, parameters) {
+    const appDataEntityId = parameters.view.model.appDataEntityId;
+    const formTypeName = await getFormTypeFieldName(appDataEntityId);
+    if (!formTypeName) {
+      throw new RuntimeModelError49(
+        appUILogic,
+        "".concat(appDataEntityId, "\u5B9E\u4F53\u7F3A\u5C11\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027")
+      );
+    }
+    const { data } = parameters;
+    const formTypeValue = data[0][formTypeName];
+    if (!formTypeValue) {
+      throw new RuntimeModelError49(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 RuntimeError48(
+        "\u6CA1\u6709\u627E\u5230\u4E0E\u8868\u5355\u7C7B\u578B".concat(formTypeValue, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
+      );
+    }
+    return findView;
+  }
 };
 
 // src/logic-scheduler/trigger/view-event-trigger.ts
@@ -28510,7 +28768,7 @@ var ViewEventTrigger = class extends LogicTrigger {
      * @type {string[]}
      */
     this.listenEventNames = [];
-    const names = logic.eventNames.split(",");
+    const names = logic.eventNames.split(";");
     this.listenEventNames = names.map(
       (name) => StudioViewEvents[name] || name
     );
@@ -28535,7 +28793,7 @@ var ControlEventTrigger = class extends LogicTrigger {
      * @type {string[]}
      */
     this.listenEventNames = [];
-    const names = logic.eventNames.split(",");
+    const names = logic.eventNames.split(";");
     this.listenEventNames = names.map(
       (name) => StudioControlEvents[name] || name
     );
@@ -28898,6 +29156,7 @@ export {
   getDeACMode,
   getEditorProvider,
   getFormDetailProvider,
+  getFormTypeFieldName,
   getGridColumnProvider,
   getMatchResPath,
   getOriginData,
@@ -28915,6 +29174,7 @@ export {
   hasDeCodeName,
   install,
   installCommand,
+  isDataContainer,
   isValueChange,
   matchMainState,
   openRedirectView,