@ibiz-template/runtime 0.2.13 → 0.2.16

package/dist/index.esm.js

@@ -29644,7 +29644,7 @@ var MDControlController = class extends ControlController {
           default: "\u6570\u636E[".concat(data.map((item) => item.srfmajortext).join("\u3001"), "]\u5220\u9664\u6210\u529F!")
         });
       }
-      if (needRefresh) {
+      if (needRefresh && !(args == null ? void 0 : args.notRefresh)) {
         await this.refresh();
       }
     } catch (error) {
@@ -36914,15 +36914,18 @@ var EditFormController = class extends FormController {
    * @date 2022-08-31 22:08:40
    */
   async save(args) {
+    const silent = (args == null ? void 0 : args.silent) === true;
     if (this.state.processing) {
-      const data2 = await awaitTimeout(500, this.save.bind(this));
+      const data2 = await awaitTimeout(500, this.save.bind(this), [args]);
       return data2;
     }
     const isValid = await this.validate();
     if (!isValid) {
       throw new RuntimeError45("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
     }
-    await this.startLoading();
+    if (!silent) {
+      await this.startLoading();
+    }
     await this.evt.emit("onBeforeSave", void 0);
     const { context, data } = this.handlerAbilityParams(args);
     const saveData = data[0];
@@ -36937,18 +36940,27 @@ var EditFormController = class extends FormController {
       });
       throw error;
     } finally {
-      await this.endLoading();
+      if (!silent) {
+        await this.endLoading();
+      }
     }
+    const noFillBack = (args == null ? void 0 : args.noFillBack) === true;
     if (res.data) {
-      mergeInLeft(this.data, res.data);
+      if (noFillBack) {
+        this.data.updatedate = res.data.updatedate;
+      } else {
+        mergeInLeft(this.data, res.data);
+      }
       this.data.tempsrfkey = this.data.srfkey;
     }
     this.state.modified = false;
     await this.evt.emit("onSaveSuccess", void 0);
     this.formStateNotify("SAVE" /* SAVE */);
-    this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "SUCCESS"), {
-      default: "".concat(this.data.srfmajortext || "", "\u4FDD\u5B58\u6210\u529F")
-    });
+    if (!silent) {
+      this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "SUCCESS"), {
+        default: "".concat(this.data.srfmajortext || "", "\u4FDD\u5B58\u6210\u529F")
+      });
+    }
     if (this.view.modal.mode === "ROUTE") {
       ibiz.mc.command.send(
         this.data.$origin,
@@ -37018,6 +37030,7 @@ var EditFormController = class extends FormController {
     if (res.data) {
       mergeInLeft(this.data, res.data);
     }
+    return this.data;
   }
   /**
    * 表单项更新
@@ -37141,7 +37154,7 @@ var EditFormController = class extends FormController {
   async autoSave() {
     if (this.model.enableAutoSave) {
       try {
-        await this.save();
+        await this.save({ silent: true, noFillBack: true });
       } catch (error) {
         ibiz.log.error(error);
       }
@@ -38653,7 +38666,6 @@ var GridController = class extends MDControlController {
     if (!isValid) {
       throw new RuntimeError47("\u884C\u6570\u636E\u6821\u9A8C\u4E0D\u901A\u8FC7\uFF0C\u4FDD\u5B58\u53D6\u6D88");
     }
-    await this.startLoading();
     let res;
     const deName = calcDeCodeNameById(this.model.appDataEntityId);
     const tempContext = this.context.clone();
@@ -38667,8 +38679,6 @@ var GridController = class extends MDControlController {
         data: rowState.data
       });
       throw error;
-    } finally {
-      await this.endLoading();
     }
     const index = this.findRowStateIndex(data);
     this.state.items.splice(index, 1, res.data);
@@ -40245,8 +40255,8 @@ var PanelItemController = class {
    * @author lxm
    * @date 2023-04-27 06:37:12
    * @param {T} model 面板成员模型
-   * @param {PanelController} panel 面板控制器
-   * @param {PanelItemController} [parent] 父容器控制器
+   * @param {IPanelController} panel 面板控制器
+   * @param {IPanelItemController} [parent] 父容器控制器
    */
   constructor(model, panel, parent) {
     this.model = model;
@@ -41871,6 +41881,29 @@ var WizardPanelController = class extends ControlController {
       this.context[deName] = data.srfkey;
     }
   }
+  /**
+   * 根据tag获取应该激活的向导表单
+   * @param {string} tag
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-10 18:35:37
+   */
+  getWizardFormByTag(tag) {
+    var _a;
+    if (!((_a = this.model.dewizard) == null ? void 0 : _a.dewizardForms)) {
+      throw new RuntimeError50("\u6CA1\u6709\u914D\u7F6E\u5411\u5BFC\u8868\u5355\u96C6\u5408");
+      return;
+    }
+    const wizardForm = this.model.dewizard.dewizardForms.find(
+      (form) => {
+        return form.formTag === tag;
+      }
+    );
+    if (!wizardForm) {
+      throw new RuntimeError50("\u627E\u4E0D\u5230\u6807\u8BC6\u4E3A".concat(tag, "\u7684\u5411\u5BFC\u8868\u5355"));
+    }
+    return wizardForm;
+  }
   /**
    * 执行初始化操作，存在初始化实体行为的时候加载数据并把主键放入上下文
    *
@@ -41886,8 +41919,16 @@ var WizardPanelController = class extends ControlController {
       if (res.data && res.data.srfkey) {
         this.context[deName] = res.data.srfkey;
       }
+      if (res.data && this.model.stateAppDEFieldId && res.data[this.model.stateAppDEFieldId]) {
+        const activeForm = this.getWizardFormByTag(
+          res.data[this.model.stateAppDEFieldId]
+        );
+        if (activeForm) {
+          this.state.activeFormTag = activeForm.formTag;
+        }
+      }
     }
-    if (this.firstForm) {
+    if (!this.state.activeFormTag && this.firstForm) {
       this.state.activeFormTag = this.firstForm.formTag;
       this.tagHistory.push(this.firstForm.formTag);
     }
@@ -41912,9 +41953,19 @@ var WizardPanelController = class extends ControlController {
    * @memberof WizardPanelController
    */
   async onPrevClick() {
-    await this.activeFormController.goBack();
-    this.tagHistory.pop();
-    const prevTag = this.tagHistory[this.tagHistory.length - 1];
+    const data = await this.activeFormController.goBack();
+    let prevTag;
+    if (this.model.stateAppDEFieldId && data[this.model.stateAppDEFieldId]) {
+      const wizardForm = this.getWizardFormByTag(
+        data[this.model.stateAppDEFieldId]
+      );
+      if (wizardForm) {
+        prevTag = data[this.model.stateAppDEFieldId];
+      }
+    } else {
+      prevTag = this.tagHistory[this.tagHistory.length - 1];
+      this.tagHistory.pop();
+    }
     if (!prevTag) {
       throw new RuntimeError50("\u6CA1\u6709\u4E0A\u4E00\u4E2A\u8868\u5355");
     }
@@ -41931,15 +41982,18 @@ var WizardPanelController = class extends ControlController {
     const data = await this.activeFormController.save();
     let nextTag;
     if (data.srfnextform) {
-      const wizardForm = this.model.dewizard.dewizardForms.find(
-        (_wizardForm) => {
-          return _wizardForm.formTag === data.srfnextform;
-        }
+      const wizardForm = this.getWizardFormByTag(data.srfnextform);
+      if (wizardForm) {
+        nextTag = data.srfnextform;
+        this.tagHistory.push(nextTag);
+      }
+    } else if (this.model.stateAppDEFieldId && data[this.model.stateAppDEFieldId]) {
+      const wizardForm = this.getWizardFormByTag(
+        data[this.model.stateAppDEFieldId]
       );
-      if (!wizardForm) {
-        throw new RuntimeError50("\u627E\u4E0D\u5230\u6807\u8BC6\u4E3A".concat(data.srfnextform, "\u7684\u5411\u5BFC\u8868\u5355"));
+      if (wizardForm) {
+        nextTag = data[this.model.stateAppDEFieldId];
       }
-      nextTag = data.srfnextform;
     } else {
       const { formTag } = this.activeWizardForm;
       const wizardSteps = this.model.dewizard.dewizardSteps;
@@ -41951,12 +42005,8 @@ var WizardPanelController = class extends ControlController {
         if (!nextWizardStep) {
           throw new RuntimeError50("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u6B65\u9AA4");
         }
-        const nextWizardForm = this.model.dewizard.dewizardForms.find(
-          (wizardForm) => {
-            return wizardForm.formTag === nextWizardStep.stepTag;
-          }
-        );
-        if (nextWizardForm) {
+        const nextWizardForm = this.getWizardFormByTag(nextWizardStep.stepTag);
+        if (nextWizardForm && nextWizardForm.formTag) {
           nextTag = nextWizardForm.formTag;
         }
       }
@@ -42910,11 +42960,6 @@ var MEditViewPanelService = class extends MDControlService {
 var MEditViewPanelController = class extends MDControlController {
   constructor() {
     super(...arguments);
-    /**
-     * 是否显示底部按钮
-     *
-     */
-    this.showButton = true;
     /**
      * 当前应用视图参数对象
      *
@@ -42932,6 +42977,7 @@ var MEditViewPanelController = class extends MDControlController {
     this.state.panelUiItems = [];
     this.state.activeTab = "";
     this.state.size = 1e3;
+    this.state.isNeedScroll = false;
   }
   /**
    * 初始化嵌入应用视图及实体参数对象
@@ -42971,9 +43017,12 @@ var MEditViewPanelController = class extends MDControlController {
    */
   async afterLoad(args, items) {
     await super.afterLoad(args, items);
+    const tempPanelUiItems = this.state.panelUiItems.filter((UiItem) => {
+      return UiItem.id.startsWith("mockId:");
+    });
     this.state.panelUiItems = [];
-    this.doItems(items);
-    if (this.model.panelStyle === "TAB_TOP" && this.state.panelUiItems.length > 0) {
+    this.doItems(items, tempPanelUiItems);
+    if (this.model.panelStyle === "TAB_TOP" && this.state.panelUiItems.length > 0 && tempPanelUiItems.length === 0) {
       this.state.activeTab = this.state.panelUiItems[0].id;
     }
     return items;
@@ -43017,11 +43066,14 @@ var MEditViewPanelController = class extends MDControlController {
    * @author: zhujiamin
    * @Date: 2023-10-16 15:00:02
    */
-  doItems(datas) {
+  doItems(datas, tempPanelUiItems) {
     datas.forEach((arg) => {
       const item = this.handlePanelItemParams(arg);
       this.state.panelUiItems.push(item);
     });
+    if (tempPanelUiItems) {
+      this.state.panelUiItems.push(...tempPanelUiItems);
+    }
   }
   /**
    * 处理添加
@@ -43030,6 +43082,7 @@ var MEditViewPanelController = class extends MDControlController {
    * @Date: 2023-10-16 15:18:01
    */
   async handleAdd() {
+    this.state.isNeedScroll = true;
     this.doItems([{ srfuf: 0 }]);
     if (this.model.panelStyle === "TAB_TOP") {
       this.state.activeTab = this.state.panelUiItems[this.state.panelUiItems.length - 1].id;
@@ -43043,13 +43096,14 @@ var MEditViewPanelController = class extends MDControlController {
    * @Date: 2023-10-16 15:23:59
    */
   async handleDelete(item) {
+    this.state.isNeedScroll = false;
     if (item.data.srfuf === 0) {
       const index = this.state.panelUiItems.findIndex((value) => {
         return value === item;
       });
       this.state.panelUiItems.splice(index, 1);
     } else {
-      await this.remove({ data: [item.data] });
+      await this.remove({ data: [item.data], notRefresh: true });
     }
   }
   /**
@@ -43096,50 +43150,31 @@ var MEditViewPanelController = class extends MDControlController {
    */
   onViewDataChange(args, id) {
     if (args.eventName === "onSaveSuccess") {
-      this.save(args.data[0], id);
+      this.handleDataChange(args.data[0], id);
     }
   }
   /**
-   * 保存
+   * 处理数据变化
    *
    * @param {ControlVO} data
    * @returns {*}  {Promise<void>}
    */
-  async save(data, id) {
+  async handleDataChange(data, id) {
     const panelUiItemIndex = this.state.panelUiItems.findIndex(
       (item) => item.id === id
     );
-    if (!panelUiItemIndex) {
+    if (panelUiItemIndex < 0) {
       throw new RuntimeError52("\u7F16\u8F91\u89C6\u56FE\u9762\u677F\u90E8\u4EF6UI\u6570\u636E\u4E0D\u5B58\u5728");
     }
-    await this.startLoading();
-    let res;
-    const isCreate = data.srfuf === 0 /* CREATE */;
-    const deName = calcDeCodeNameById(this.model.appDataEntityId);
-    const tempContext = this.context.clone();
-    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: this.state.panelUiItems[panelUiItemIndex].data
-      });
-      throw error;
-    } finally {
-      await this.endLoading();
+    const tempUiItem = this.state.panelUiItems[panelUiItemIndex];
+    if (tempUiItem.id.startsWith("mockId:")) {
+      this.state.panelUiItems[panelUiItemIndex] = this.handlePanelItemParams(data);
+    } else {
+      tempUiItem.srfmajortext = data.srfmajortext;
+    }
+    if (this.model.panelStyle === "TAB_TOP") {
+      this.state.activeTab = this.state.panelUiItems[panelUiItemIndex].id;
     }
-    const index = this.state.items.findIndex(
-      (item) => item.srfkey === data.srfkey
-    );
-    this.state.items.splice(index, 1, res.data);
-    this.state.panelUiItems.splice(
-      panelUiItemIndex,
-      1,
-      this.handlePanelItemParams(res.data)
-    );
-    await this.evt.emit("onSaveSuccess", void 0);
   }
 };