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

package/es/view-engine/edit-view.engine.mjs

@@ -1,24 +1,8 @@
 import { RuntimeError } from '@ibiz-template/core';
-import { ViewEngineBase, getControl, getControlsByView, calcDeCodeNameById, SysUIActionTag, ViewCallTag, ControlVO, getAppViewRef, OpenAppViewCommand, ViewMode, calcDynaSysParams, getDeDataMajorField, convertNavData } from '@ibiz-template/runtime';
+import { DEMainViewEngine, getControl, getControlsByView, calcDeCodeNameById, SysUIActionTag, ViewCallTag, ControlVO, getAppViewRef, OpenAppViewCommand, calcDynaSysParams, getDeDataMajorField, convertNavData } from '@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 ViewEngineBase {
-  constructor() {
-    super(...arguments);
-    /**
-     * 实体名称
-     * @author lxm
-     * @date 2024-01-31 11:05:49
-     * @type {string}
-     */
-    __publicField(this, "deName");
-  }
+class EditViewEngine extends DEMainViewEngine {
   get form() {
     return this.view.getController("form");
   }
@@ -86,7 +70,6 @@ class EditViewEngine extends ViewEngineBase {
     this.formDataStateChange = this.formDataStateChange.bind(this);
     const { childNames, modal } = this.view;
     childNames.push("form");
-    this.deName = calcDeCodeNameById(this.view.model.appDataEntityId);
     if (!this.view.slotProps.form) {
       this.view.slotProps.form = {};
     }
@@ -120,51 +103,52 @@ class EditViewEngine extends 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 = 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.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 = 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();
       }
-    });
-    if (!this.view.state.noLoadDefault && model.loadDefault) {
-      this.load();
     }
   }
   getData() {
@@ -352,128 +336,60 @@ class EditViewEngine extends ViewEngineBase {
     );
   }
   /**
-   * 初始化标记打开数据相关逻辑
-   * @author lxm
-   * @date 2024-01-31 11:52:13
-   * @return {*}  {void}
+   * 执行数据标记行为
+   *
+   * @memberof EditViewEngine
    */
-  initMarkOpenData() {
-    var _a;
-    if (![ViewMode.ROUTE, 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);
         }
       });
     }
@@ -485,10 +401,7 @@ class EditViewEngine extends 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/es/view-engine/index-view.engine.d.ts

@@ -1,5 +1,6 @@
 import { IViewController, ViewEngineBase, IIndexViewState, IViewEvent, IAppMenuController } from '@ibiz-template/runtime';
 import { IAppIndexView } from '@ibiz/model-core';
+import { RouteLocationNormalizedLoaded } from 'vue-router';
 export declare class IndexViewEngine extends ViewEngineBase {
     protected view: IViewController<IAppIndexView, IIndexViewState, IViewEvent>;
     get appmenu(): IAppMenuController;
@@ -11,6 +12,12 @@ export declare class IndexViewEngine extends ViewEngineBase {
      * @type {boolean}
      */
     get enableCollapse(): boolean;
+    /**
+     * @description 路由对象
+     * @type {RouteLocationNormalizedLoaded}
+     * @memberof IndexViewEngine
+     */
+    route: RouteLocationNormalizedLoaded;
     initViewState(): void;
     onCreated(): Promise<void>;
     onMounted(): Promise<void>;

package/es/view-engine/index-view.engine.mjs

@@ -1,7 +1,23 @@
 import { ViewEngineBase, OpenAppViewCommand, ViewCallTag } from '@ibiz-template/runtime';
+import { useRoute } from '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 ViewEngineBase {
+  constructor() {
+    super(...arguments);
+    /**
+     * @description 路由对象
+     * @type {RouteLocationNormalizedLoaded}
+     * @memberof IndexViewEngine
+     */
+    __publicField(this, "route", useRoute());
+  }
   get appmenu() {
     return this.view.getController("appmenu");
   }
@@ -30,7 +46,7 @@ class IndexViewEngine extends 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/es/view-engine/login-view.engine.mjs

@@ -95,9 +95,18 @@ class LoginViewEngine extends 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.history.pushState({}, "");
-      window.location.reload();
+      if (loginFailed) {
+        const path = window.location.href.replace(
+          "?srfthird_auth_success=false",
+          ""
+        );
+        window.location.href = path;
+      } else {
+        window.location.reload();
+      }
     }
   }
   async cancelChanges() {

package/es/view-engine/portal-view-engine.d.ts

@@ -1,6 +1,6 @@
-import { ViewEngineBase, ViewController, IPortalViewState, IPortalViewEvent, IWizardPanelController } from '@ibiz-template/runtime';
+import { ViewController, IPortalViewState, IPortalViewEvent, IDashboardController, DEMainViewEngine } from '@ibiz-template/runtime';
 import { IAppView } from '@ibiz/model-core';
-export declare class PortalViewEngine extends ViewEngineBase {
+export declare class PortalViewEngine extends DEMainViewEngine {
     /**
      * 视图控制器
      *
@@ -9,6 +9,12 @@ export declare class PortalViewEngine extends ViewEngineBase {
      * @memberof PortalViewEngine
      */
     protected view: ViewController<IAppView, IPortalViewState, IPortalViewEvent>;
+    /**
+     * 视图created生命周期执行逻辑
+     *
+     * @return {*}  {Promise<void>}
+     * @memberof PortalViewEngine
+     */
     onCreated(): Promise<void>;
     /**
      * 数据看板部件
@@ -16,6 +22,28 @@ export declare class PortalViewEngine extends ViewEngineBase {
      * @readonly
      * @memberof PortalViewEngine
      */
-    get dashboard(): IWizardPanelController;
+    get dashboard(): IDashboardController;
+    /**
+     * 视图刷新
+     *
+     * @return {*}  {Promise<void>}
+     * @memberof PortalViewEngine
+     */
+    refresh(): Promise<void>;
+    /**
+     * 执行视图预置界面行为能力
+     *
+     * @param {string} key
+     * @param {*} args
+     * @return {*}  {(Promise<IData | null | undefined>)}
+     * @memberof PortalViewEngine
+     */
+    call(key: string, args: any): Promise<IData | null | undefined>;
     onMounted(): Promise<void>;
+    /**
+     * 执行标记数据行为
+     *
+     * @memberof PortalViewEngine
+     */
+    doMarkDataAction(): void;
 }

package/es/view-engine/portal-view-engine.mjs

@@ -1,7 +1,13 @@
-import { ViewEngineBase } from '@ibiz-template/runtime';
+import { DEMainViewEngine, SysUIActionTag } from '@ibiz-template/runtime';
 
 "use strict";
-class PortalViewEngine extends ViewEngineBase {
+class PortalViewEngine extends DEMainViewEngine {
+  /**
+   * 视图created生命周期执行逻辑
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof PortalViewEngine
+   */
   async onCreated() {
     await super.onCreated();
     const { childNames } = this.view;
@@ -16,12 +22,98 @@ class PortalViewEngine extends 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 === 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);
+        }
+      });
+    }
+  }
 }
 
 export { PortalViewEngine };

package/es/view-engine/tree-exp-view.engine.d.ts

@@ -23,4 +23,18 @@ export declare class TreeExpViewEngine extends ExpViewEngine {
      */
     get tree(): ITreeController;
     call(key: string, args: any): Promise<IData | null | undefined>;
+    /**
+     * 视图mounted生命周期执行逻辑
+     *
+     * @return {*}  {Promise<void>}
+     * @memberof TreeExpViewEngine
+     */
+    onMounted(): Promise<void>;
+    /**
+     * 加载实体主数据
+     *
+     * @return {*}  {Promise<void>}
+     * @memberof TreeExpViewEngine
+     */
+    loadEntityData(): Promise<void>;
 }

package/es/view-engine/tree-exp-view.engine.mjs

@@ -1,4 +1,4 @@
-import { SysUIActionTag } from '@ibiz-template/runtime';
+import { SysUIActionTag, calcDeCodeNameById } from '@ibiz-template/runtime';
 import { RuntimeError } from '@ibiz-template/core';
 import { ExpViewEngine } from './exp-view.engine.mjs';
 
@@ -79,6 +79,29 @@ class TreeExpViewEngine extends 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 = calcDeCodeNameById(this.view.model.appDataEntityId);
+    if (!this.view.context[deName] || !this.view.model.showDataInfoBar) {
+      return;
+    }
+    return super.loadEntityData();
+  }
 }
 
 export { TreeExpViewEngine };

package/es/web-app/components/modal-router-shell/modal-router-shell.mjs

@@ -105,6 +105,10 @@ const ModalRouterShell = /* @__PURE__ */ 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 {

package/es/web-app/guard/auth-guard/auth-guard.d.ts

@@ -60,11 +60,12 @@ export declare class AuthGuard {
     /**
      * 加载应用数据
      *
-     * @author chitanda
-     * @date 2022-07-20 20:07:50
+     * @author tony001
+     * @date 2024-12-19 20:12:01
+     * @param {IParams} [context]
      * @return {*}  {Promise<void>}
      */
-    loadAppData(): Promise<void>;
+    loadAppData(context?: IParams): Promise<void>;
     /**
      * 加载组织数据
      *