@ibiz-template/runtime 0.1.19 → 0.1.20

package/dist/index.esm.js

@@ -6991,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);
@@ -7092,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(
@@ -11249,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;
   }
   /**
    * 合并参数
@@ -11599,6 +11612,9 @@ var Method = class {
    * @return {*}  {IDataEntity}
    */
   createEntity(data) {
+    if (data instanceof AppDataEntity) {
+      return data.clone();
+    }
     return new AppDataEntity(this.entity, data);
   }
 };
@@ -13282,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)) {
@@ -15770,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.
@@ -15931,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;
   }
@@ -15955,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();
   }
   /**
@@ -16034,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;
   }
   /**
@@ -16098,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) {
@@ -16107,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();
@@ -16638,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);
@@ -16727,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);
@@ -16760,7 +16854,7 @@ var BaseSeriesGenerator = class {
           seriesCodeListId,
           item[this.groupField]
         );
-        if (isNil13(groupVal)) {
+        if (isNil14(groupVal)) {
           return;
         }
         group = groupVal;
@@ -18373,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]);
   }
@@ -19799,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 = "";
       }
@@ -20537,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
@@ -20613,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;
   }
   /**
@@ -22164,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();
@@ -22172,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;
   }
@@ -22197,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();
@@ -22205,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;
   }
@@ -22225,11 +22339,15 @@ var EditFormController = class extends FormController {
     }
     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();
@@ -22240,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;
   }
   /**
@@ -22267,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();
@@ -22276,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;
   }
   /**
@@ -22367,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" });
   }
   /**
    * 工作流提交(调用前先确保调用保存)
@@ -22395,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);
@@ -23798,12 +23932,21 @@ var GridController = class extends MDControlController {
     if (editingRow) {
       throw new RuntimeError38("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
     }
-    const res = await this.service.getDraft(this.context, this.params);
+    let res;
+    try {
+      res = await this.service.getDraft(this.context, this.params);
+    } catch (error) {
+      this.actionNotification("GETDRAFTERROR", {
+        error
+      });
+      throw error;
+    }
     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 });
   }
   /**
    * 保存
@@ -23843,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();
     }
@@ -23853,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);
   }
@@ -24085,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 = "";
       }
@@ -24859,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 = "";
       }
@@ -28434,12 +28591,18 @@ var AppUILogicExecutor = class extends LogicExecutor {
     if (!(data == null ? void 0 : data[0])) {
       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) {
@@ -28566,6 +28729,29 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     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
@@ -28582,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
     );
@@ -28607,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
     );
@@ -28970,6 +29156,7 @@ export {
   getDeACMode,
   getEditorProvider,
   getFormDetailProvider,
+  getFormTypeFieldName,
   getGridColumnProvider,
   getMatchResPath,
   getOriginData,
@@ -28987,6 +29174,7 @@ export {
   hasDeCodeName,
   install,
   installCommand,
+  isDataContainer,
   isValueChange,
   matchMainState,
   openRedirectView,