@ibiz-template/vue3-components 0.7.38-alpha.21 → 0.7.38-alpha.43

package/lib/view-engine/edit-view.engine.cjs

@@ -4,23 +4,7 @@ var core = require('@ibiz-template/core');
 var runtime = require('@ibiz-template/runtime');
 
 "use strict";
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-class EditViewEngine extends runtime.ViewEngineBase {
-  constructor() {
-    super(...arguments);
-    /**
-     * 实体名称
-     * @author lxm
-     * @date 2024-01-31 11:05:49
-     * @type {string}
-     */
-    __publicField(this, "deName");
-  }
+class EditViewEngine extends runtime.DEMainViewEngine {
   get form() {
     return this.view.getController("form");
   }
@@ -88,7 +72,6 @@ class EditViewEngine extends runtime.ViewEngineBase {
     this.formDataStateChange = this.formDataStateChange.bind(this);
     const { childNames, modal } = this.view;
     childNames.push("form");
-    this.deName = runtime.calcDeCodeNameById(this.view.model.appDataEntityId);
     if (!this.view.slotProps.form) {
       this.view.slotProps.form = {};
     }
@@ -122,37 +105,52 @@ class EditViewEngine extends runtime.ViewEngineBase {
   }
   async onMounted() {
     await super.onMounted();
-    this.initMarkOpenData();
     const { model, evt } = this.view;
-    this.form.evt.on("onLoadSuccess", (event) => {
-      this.formDataStateChange(event);
-      const data = event.data[0];
-      this.view.state.srfactiveviewdata = data;
-      if (Object.prototype.hasOwnProperty.call(data, "srfreadonly")) {
-        this.view.context.srfreadonly = data.srfreadonly;
-      }
-      evt.emit("onDataChange", { ...event, actionType: "LOAD" });
-    });
-    this.form.evt.on("onLoadDraftSuccess", (event) => {
-      this.formDataStateChange(event);
-      evt.emit("onDataChange", { ...event, actionType: "LOADDRAFT" });
-    });
-    this.form.evt.on("onSaveSuccess", (event) => {
-      this.view.state.closeOK = true;
-      const deName = runtime.calcDeCodeNameById(this.view.model.appDataEntityId);
-      const formData = event.data[0];
-      if (this.view.context[deName] !== formData.srfkey) {
-        this.view.context[deName] = formData.srfkey;
+    if (this.form) {
+      this.form.evt.on("onLoadSuccess", (event) => {
+        this.formDataStateChange(event);
+        const data = event.data[0];
+        this.view.state.srfactiveviewdata = data;
+        if (Object.prototype.hasOwnProperty.call(data, "srfreadonly")) {
+          this.view.context.srfreadonly = data.srfreadonly;
+        }
+        evt.emit("onDataChange", { ...event, actionType: "LOAD" });
+      });
+      this.form.evt.on("onLoadDraftSuccess", (event) => {
+        this.formDataStateChange(event);
+        evt.emit("onDataChange", { ...event, actionType: "LOADDRAFT" });
+      });
+      this.form.evt.on("onSaveSuccess", (event) => {
+        this.view.state.closeOK = true;
+        const deName = runtime.calcDeCodeNameById(this.view.model.appDataEntityId);
+        const formData = event.data[0];
+        if (this.view.context[deName] !== formData.srfkey) {
+          this.view.context[deName] = formData.srfkey;
+        }
+        this.formDataStateChange(event);
+        evt.emit("onDataChange", { ...event, actionType: "SAVE" });
+      });
+      this.form.evt.on("onRemoveSuccess", (event) => {
+        this.formDataStateChange(event);
+        evt.emit("onDataChange", { ...event, actionType: "REMOVE" });
+      });
+      const appDe = await ibiz.hub.getAppDataEntity(
+        this.view.model.appDataEntityId,
+        this.view.model.appId
+      );
+      this.form.evt.on("onFormDataChange", (event) => {
+        const { name, value } = event;
+        if (name === appDe.formTypeAppDEFieldId && this.view.model.multiFormMode === 1) {
+          this.view.redrawView({
+            context: this.view.context,
+            params: { srfdatatype: value, [name]: value },
+            isReloadModel: true
+          });
+        }
+      });
+      if (!this.view.state.noLoadDefault && model.loadDefault) {
+        this.load();
       }
-      this.formDataStateChange(event);
-      evt.emit("onDataChange", { ...event, actionType: "SAVE" });
-    });
-    this.form.evt.on("onRemoveSuccess", (event) => {
-      this.formDataStateChange(event);
-      evt.emit("onDataChange", { ...event, actionType: "REMOVE" });
-    });
-    if (!this.view.state.noLoadDefault && model.loadDefault) {
-      this.load();
     }
   }
   getData() {
@@ -340,128 +338,60 @@ class EditViewEngine extends runtime.ViewEngineBase {
     );
   }
   /**
-   * 初始化标记打开数据相关逻辑
-   * @author lxm
-   * @date 2024-01-31 11:52:13
-   * @return {*}  {void}
+   * 执行数据标记行为
+   *
+   * @memberof EditViewEngine
    */
-  initMarkOpenData() {
-    var _a;
-    if (![runtime.ViewMode.ROUTE, runtime.ViewMode.ROUTE_MODAL].includes(this.view.modal.mode) || !this.view.model.markOpenDataMode) {
-      return;
-    }
-    const modes = this.view.model.markOpenDataMode.split(";");
-    let hasOpenConfirm = false;
-    (_a = this.coopPos) == null ? void 0 : _a.initMessageModes(modes);
-    const callback = async (data) => {
-      if (!this.view.state.activated) {
-        return;
-      }
-      const dataInfo = this.form.getData()[0].srfmajortext;
-      let actionMsg = "";
-      switch (data.action) {
-        case "VIEW":
-          actionMsg = ibiz.i18n.t("viewEngine.browseMsg");
-          break;
-        case "EDIT":
-          actionMsg = ibiz.i18n.t("viewEngine.editMsg");
-          break;
-        case "UPDATE":
-          actionMsg = ibiz.i18n.t("viewEngine.updateMsg");
-          break;
-        default:
-          break;
-      }
-      const message = "".concat(data.username, " ").concat(actionMsg, " ").concat(this.view.state.caption, "-").concat(dataInfo);
-      if (this.coopPos) {
-        this.coopPos.updateMessage({
-          title: message,
-          data
-        });
-      } else {
-        ibiz.message.notice({
-          message,
-          showClose: true,
-          duration: 3,
-          styleType: "alert"
-        });
-      }
-      if (hasOpenConfirm === false && data.action === "UPDATE" && modes.includes("NOTICERELOAD")) {
-        hasOpenConfirm = true;
-        const isReload = await this.reloadConfirm();
-        if (isReload) {
-          this.refresh();
-        }
-        hasOpenConfirm = false;
-      }
-    };
-    const doActions = [];
-    if (modes.includes("EDITDATA") || modes.includes("DISPLAYOPPERSON") || modes.includes("NOTICERELOAD")) {
-      doActions.push("EDIT", "VIEW", "UPDATE", "CLOSE");
-    } else if (modes.includes("OPENDATA")) {
-      doActions.push("VIEW", "CLOSE");
-    }
-    if (doActions.length === 0) {
-      return;
-    }
-    let srfkey;
-    let hasSubscribe = false;
-    if (doActions.includes("VIEW")) {
+  doMarkDataAction() {
+    if (this.doActions.includes("VIEW")) {
+      const callback = async (data) => {
+        const dataInfo = this.form.getData()[0].srfmajortext;
+        this.markOpenDataCallback(data, dataInfo);
+      };
       this.form.evt.on("onLoadSuccess", async (event) => {
-        const formData = event.data[0];
-        srfkey = formData.srfkey;
-        const result = await ibiz.markOpenData.action(
-          this.deName,
-          srfkey,
-          "VIEW"
-        );
+        const data = event.data[0];
+        const result = await this.sendMarkDataAction("VIEW", data.srfkey);
         if (result.ok && result.data.length > 0) {
           result.data.forEach((item) => {
-            var _a2;
+            var _a;
             if (item.data) {
-              (_a2 = this.coopPos) == null ? void 0 : _a2.updateMessage({
+              (_a = this.coopPos) == null ? void 0 : _a.updateMessage({
                 data: item.data
               });
             }
           });
         }
-        if (!hasSubscribe) {
-          ibiz.markOpenData.subscribe(this.deName, srfkey, callback);
-          this.view.evt.on("onDestroyed", () => {
-            ibiz.markOpenData.unsubscribe(this.deName, srfkey, callback);
-          });
-          hasSubscribe = true;
-        }
+        this.subscribeMarkDataAction(data.srfkey, callback);
       });
     }
-    if (doActions.includes("EDIT")) {
+    if (this.doActions.includes("EDIT")) {
       let isWait = false;
-      const actionEdit = () => {
-        if (!srfkey || isWait) {
+      this.form.evt.on("onFormDataChange", (event) => {
+        const data = event.data[0];
+        if (isWait) {
           return;
         }
         isWait = true;
-        ibiz.markOpenData.action(this.deName, srfkey, "EDIT");
+        this.sendMarkDataAction("EDIT", data.srfkey);
         setTimeout(
           () => {
             isWait = false;
           },
           1e3 * 60 * 5
         );
-      };
-      this.form.evt.on("onFormDataChange", actionEdit);
+      });
     }
-    if (doActions.includes("UPDATE")) {
-      this.form.evt.on("onSaveSuccess", () => {
-        if (srfkey) {
-          ibiz.markOpenData.action(this.deName, srfkey, "UPDATE");
-        }
+    if (this.doActions.includes("UPDATE")) {
+      this.form.evt.on("onSaveSuccess", (event) => {
+        const data = event.data[0];
+        this.sendMarkDataAction("UPDATE", data.srfkey);
       });
     }
-    if (doActions.includes("CLOSE")) {
+    if (this.doActions.includes("CLOSE")) {
       this.view.evt.on("onCloseView", () => {
-        if (srfkey) {
-          ibiz.markOpenData.action(this.deName, srfkey, "CLOSE");
+        const data = this.form.getData()[0];
+        if (data == null ? void 0 : data.srfkey) {
+          this.sendMarkDataAction("CLOSE", data.srfkey);
         }
       });
     }
@@ -473,10 +403,7 @@ class EditViewEngine extends runtime.ViewEngineBase {
    * @return {*}  {Promise<boolean>}
    */
   async reloadConfirm() {
-    const result = await ibiz.confirm.info({
-      title: ibiz.i18n.t("viewEngine.refreshPrompt"),
-      desc: ibiz.i18n.t("viewEngine.refreshPagePrompt")
-    });
+    const result = await super.reloadConfirm();
     if (result && this.form.state.modified) {
       return ibiz.confirm.warning({
         title: ibiz.i18n.t("viewEngine.refreshRemind"),

package/lib/view-engine/index-view.engine.cjs

@@ -1,9 +1,25 @@
 'use strict';
 
 var runtime = require('@ibiz-template/runtime');
+var vueRouter = require('vue-router');
 
 "use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class IndexViewEngine extends runtime.ViewEngineBase {
+  constructor() {
+    super(...arguments);
+    /**
+     * @description 路由对象
+     * @type {RouteLocationNormalizedLoaded}
+     * @memberof IndexViewEngine
+     */
+    __publicField(this, "route", vueRouter.useRoute());
+  }
   get appmenu() {
     return this.view.getController("appmenu");
   }
@@ -32,7 +48,7 @@ class IndexViewEngine extends runtime.ViewEngineBase {
   }
   async onMounted() {
     await super.onMounted();
-    if (!this.isExistAndInLayout("appmenu")) {
+    if (!this.isExistAndInLayout("appmenu") && !this.route.params.view2) {
       const { model, context, params } = this.view;
       const { defAppViewId } = model;
       if (defAppViewId) {

package/lib/view-engine/login-view.engine.cjs

@@ -97,8 +97,18 @@ class LoginViewEngine extends runtime.ViewEngineBase {
     );
     this.view.evt.emit("onAfterLogin", { ok: bol, panelDataParent });
     if (bol === true) {
+      const loginFailed = window.location.href.indexOf("srfthird_auth_success=false") >= 0;
       window.location.hash = this.route.query.ru || "/";
-      window.location.reload();
+      window.history.pushState({}, "");
+      if (loginFailed) {
+        const path = window.location.href.replace(
+          "?srfthird_auth_success=false",
+          ""
+        );
+        window.location.href = path;
+      } else {
+        window.location.reload();
+      }
     }
   }
   async cancelChanges() {

package/lib/view-engine/opt-view.engine.cjs

@@ -13,6 +13,27 @@ class OptViewEngine extends runtime.ViewEngineBase {
   get form() {
     return this.view.getController("form");
   }
+  init() {
+    super.init();
+    if (this.view.model.multiFormMode === 1 && this.view.params.srfdatatype) {
+      const model = runtime.getControl(
+        this.view.model,
+        "_form_".concat(this.view.params.srfdatatype)
+      );
+      if (model) {
+        const controls = runtime.getControlsByView(this.view.model).filter((item) => {
+          return item.controlType !== "FORM";
+        });
+        model.name = "form";
+        controls.push(model);
+        if (this.view.model.viewLayoutPanel) {
+          this.view.model.viewLayoutPanel.controls = controls;
+        } else {
+          this.view.model.controls = controls;
+        }
+      }
+    }
+  }
   /**
    * 视图created生命周期执行逻辑
    *
@@ -66,6 +87,25 @@ class OptViewEngine extends runtime.ViewEngineBase {
     this.form.evt.on("onSaveSuccess", (event) => {
       formDataStateChange(event);
     });
+    const appDe = await ibiz.hub.getAppDataEntity(
+      this.view.model.appDataEntityId,
+      this.view.model.appId
+    );
+    this.form.evt.on("onFormDataChange", (event) => {
+      const { name, value } = event;
+      if (name === appDe.formTypeAppDEFieldId && this.view.model.multiFormMode === 1) {
+        this.view.redrawView({
+          context: this.view.context,
+          params: {
+            ...this.view.params,
+            srfdatatype: value,
+            srfdefdata: event.data[0],
+            [name]: value
+          },
+          isReloadModel: true
+        });
+      }
+    });
     if (!this.view.state.noLoadDefault && model.loadDefault) {
       this.load();
     }

package/lib/view-engine/portal-view-engine.cjs

@@ -3,7 +3,13 @@
 var runtime = require('@ibiz-template/runtime');
 
 "use strict";
-class PortalViewEngine extends runtime.ViewEngineBase {
+class PortalViewEngine extends runtime.DEMainViewEngine {
+  /**
+   * 视图created生命周期执行逻辑
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof PortalViewEngine
+   */
   async onCreated() {
     await super.onCreated();
     const { childNames } = this.view;
@@ -18,12 +24,98 @@ class PortalViewEngine extends runtime.ViewEngineBase {
   get dashboard() {
     return this.view.getController("dashboard");
   }
+  /**
+   * 视图刷新
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof PortalViewEngine
+   */
+  async refresh() {
+    await this.dashboard.refresh();
+  }
+  /**
+   * 执行视图预置界面行为能力
+   *
+   * @param {string} key
+   * @param {*} args
+   * @return {*}  {(Promise<IData | null | undefined>)}
+   * @memberof PortalViewEngine
+   */
+  async call(key, args) {
+    if (key === runtime.SysUIActionTag.REFRESH) {
+      if (args.ctrl) {
+        await args.ctrl.refresh();
+      } else {
+        await this.refresh();
+      }
+      return null;
+    }
+    return super.call(key, args);
+  }
   async onMounted() {
     await super.onMounted();
     if (this.view.model.appDataEntityId) {
       await this.loadEntityData();
     }
   }
+  /**
+   * 执行标记数据行为
+   *
+   * @memberof PortalViewEngine
+   */
+  doMarkDataAction() {
+    let data;
+    if (this.doActions.includes("VIEW")) {
+      const callback = async (_data) => {
+        this.markOpenDataCallback(_data, data == null ? void 0 : data.srfmajortext);
+      };
+      this.view.evt.on("onDataChange", async (event) => {
+        data = event.data[0];
+        const result = await this.sendMarkDataAction("VIEW", data.srfkey);
+        if (result.ok && result.data.length > 0) {
+          result.data.forEach((item) => {
+            var _a;
+            if (item.data) {
+              (_a = this.coopPos) == null ? void 0 : _a.updateMessage({
+                data: item.data
+              });
+            }
+          });
+        }
+        this.subscribeMarkDataAction(data.srfkey, callback);
+      });
+    }
+    if (this.doActions.includes("EDIT")) {
+      let isWait = false;
+      this.dashboard.evt.on("onConfigChange", () => {
+        if (!(data == null ? void 0 : data.srfkey) || isWait) {
+          return;
+        }
+        isWait = true;
+        this.sendMarkDataAction("EDIT", data.srfkey);
+        setTimeout(
+          () => {
+            isWait = false;
+          },
+          1e3 * 60 * 5
+        );
+      });
+    }
+    if (this.doActions.includes("UPDATE")) {
+      this.dashboard.evt.on("onSavePortlet", () => {
+        if (data == null ? void 0 : data.srfkey) {
+          this.sendMarkDataAction("UPDATE", data == null ? void 0 : data.srfkey);
+        }
+      });
+    }
+    if (this.doActions.includes("CLOSE")) {
+      this.view.evt.on("onCloseView", () => {
+        if (data == null ? void 0 : data.srfkey) {
+          this.sendMarkDataAction("CLOSE", data.srfkey);
+        }
+      });
+    }
+  }
 }
 
 exports.PortalViewEngine = PortalViewEngine;

package/lib/view-engine/tab-search-view.engine.cjs

@@ -63,10 +63,60 @@ class TabSearchViewEngine extends tabExpView_engine.TabExpViewEngine {
       });
     }
     if (this.tabExpPanel) {
-      this.tabExpPanel.evt.on("onTabChange", () => {
-        this.calcViewParams();
+      this.tabExpPanel.evt.on(
+        "onTabChange",
+        ({ tab }) => {
+          this.calcViewParams();
+          this.onQuickSearchPlaceHolder(tab);
+        }
+      );
+      const { activeTabViewPanelModel } = this.tabExpPanel;
+      if (activeTabViewPanelModel) {
+        this.onQuickSearchPlaceHolder(activeTabViewPanelModel);
+      }
+    }
+  }
+  /**
+   * 给快捷搜索赋默认提示值
+   * @author ljx
+   * @date 2024-11-12 10:56:25
+   * @return {*}  {Promise<void>}
+   * @memberof TabSearchViewEngine
+   */
+  async onQuickSearchPlaceHolder(tab) {
+    let { caption } = tab;
+    const viewConfig = await ibiz.hub.config.view.get(
+      tab.embeddedAppDEViewId || ""
+    );
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      viewConfig.appDataEntityId,
+      viewConfig.appId
+    );
+    if (appDataEntity) {
+      const searchFields = appDataEntity.appDEFields.filter((field) => {
+        return field.enableQuickSearch;
       });
+      if (searchFields.length) {
+        const placeHolders = [];
+        searchFields.forEach((searchField) => {
+          if (searchField.lnlanguageRes && searchField.lnlanguageRes.lanResTag) {
+            placeHolders.push(
+              ibiz.i18n.t(
+                searchField.lnlanguageRes.lanResTag,
+                searchField.logicName
+              )
+            );
+          } else if (searchField.logicName) {
+            placeHolders.push(searchField.logicName);
+          }
+        });
+        if (placeHolders.length > 0) {
+          caption = placeHolders.join("\u3001");
+        }
+      }
     }
+    this.searchBar.placeHolder = caption || "";
+    this.searchBar.state.quickSearchPlaceHolder = caption || "";
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {

package/lib/view-engine/tree-exp-view.engine.cjs

@@ -81,6 +81,29 @@ class TreeExpViewEngine extends expView_engine.ExpViewEngine {
     }
     return super.call(key, args);
   }
+  /**
+   * 视图mounted生命周期执行逻辑
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof TreeExpViewEngine
+   */
+  async onMounted() {
+    await super.onMounted();
+    await this.loadEntityData();
+  }
+  /**
+   * 加载实体主数据
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof TreeExpViewEngine
+   */
+  async loadEntityData() {
+    const deName = runtime.calcDeCodeNameById(this.view.model.appDataEntityId);
+    if (!this.view.context[deName] || !this.view.model.showDataInfoBar) {
+      return;
+    }
+    return super.loadEntityData();
+  }
 }
 
 exports.TreeExpViewEngine = TreeExpViewEngine;

package/lib/web-app/attach-environment-config.cjs

@@ -17,7 +17,11 @@ async function attachEnvironmentConfig() {
   Object.keys(ibiz.env).forEach((key) => {
     const key2 = envMap.has(key) ? envMap.get(key) : key;
     if (env[key2] != null) {
-      ibiz.env[key] = env[key2];
+      if (key2 === "customParams") {
+        ibiz.env[key] = JSON.parse(env[key2]);
+      } else {
+        ibiz.env[key] = env[key2];
+      }
     }
   });
   if (query) {

package/lib/web-app/components/modal-router-shell/modal-router-shell.cjs

@@ -107,6 +107,10 @@ const ModalRouterShell = /* @__PURE__ */ vue.defineComponent({
       const result = await overlay.onWillDismiss();
       overlay = null;
       if (isDestroyed.value === false) {
+        const historyIndex = pathHistory.indexOf(route.fullPath);
+        if (historyIndex !== -1) {
+          pathHistory.splice(historyIndex, 1);
+        }
         if ((_a = window.history.state) == null ? void 0 : _a.back) {
           router.back();
         } else {