@ibiz-template/vue3-components 0.7.41-alpha.19 → 0.7.41-alpha.20

package/lib/web-app/App.cjs

@@ -20,6 +20,22 @@ var App = /* @__PURE__ */ vue.defineComponent({
       ibiz.hub.destroy();
     };
     window.addEventListener("unload", destroyAppHub);
+    let watermarkDestroy;
+    vue.onMounted(() => {
+      vue3Util.AppHooks.initedApp.tapPromise(async ({
+        context
+      }) => {
+        var _a;
+        watermarkDestroy == null ? void 0 : watermarkDestroy();
+        watermarkDestroy = ibiz.util.watermark.mount(ibiz.config.watermark, void 0, {
+          ...context,
+          ...(_a = ibiz.appData) == null ? void 0 : _a.context
+        });
+      });
+    });
+    vue.onBeforeUnmount(() => {
+      watermarkDestroy == null ? void 0 : watermarkDestroy();
+    });
     vue.onUnmounted(() => {
       destroyAppHub();
       vue3Util.AppHooks.destoryApp.call(null);

package/lib/web-app/guard/auth-guard/auth-guard.cjs

@@ -130,6 +130,7 @@ class AuthGuard {
     }
     if (viewModel.accUserMode !== 3) {
       this.throw401();
+      return;
     }
     if (!authInfo) {
       const loginResult = await ibiz.auth.anonymousLogin();

package/lib/web-app/util/unauthorized-handler/unauthorized-handler.cjs

@@ -4,7 +4,22 @@ var qs = require('qs');
 var core = require('@ibiz-template/core');
 
 "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 UnauthorizedHandler {
+  constructor() {
+    /**
+     * @description 是否存在403错误未处理
+     * @protected
+     * @type {boolean}
+     * @memberof UnauthorizedHandler
+     */
+    __publicField(this, "hasPermErrPending", false);
+  }
   match(error) {
     return error instanceof core.HttpError && (error.status === 401 || error.status === 403);
   }
@@ -85,10 +100,15 @@ class UnauthorizedHandler {
    */
   async handle403(error) {
     if (error.tag === "APPINIT") {
+      if (this.hasPermErrPending) {
+        return;
+      }
+      this.hasPermErrPending = true;
       const result = await ibiz.confirm.warning({
         title: ibiz.i18n.t("webApp.unauthorizedHandler.forbiddenAccess"),
         desc: ibiz.i18n.t("webApp.unauthorizedHandler.logoutAccount")
       });
+      this.hasPermErrPending = false;
       if (result) {
         const bol = await ibiz.hub.controller.logout();
         if (bol) {
@@ -110,7 +130,8 @@ class UnauthorizedHandler {
     if (error instanceof core.HttpError) {
       if (error.status === 401) {
         const search = qs.parse(window.location.search.replace("?", ""));
-        if (search.isAnonymous || ibiz.env.enableAnonymous) {
+        if ((search.isAnonymous || ibiz.env.enableAnonymous) && // 匿名登录获取视图模型发生异常，走普通登录，防止循环执行
+        error.tag !== "APPINIT") {
           ibiz.auth.anonymousLogin().then((bol) => {
             if (bol) {
               window.location.reload();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.41-alpha.19",
+  "version": "0.7.41-alpha.20",
   "description": "web端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -36,12 +36,12 @@
     "@ibiz-template-plugin/data-view": "0.0.4",
     "@ibiz-template/core": "0.7.41-alpha.18",
     "@ibiz-template/devtool": "0.0.11",
-    "@ibiz-template/model-helper": "0.7.41-alpha.19",
-    "@ibiz-template/runtime": "0.7.41-alpha.19",
+    "@ibiz-template/model-helper": "0.7.41-alpha.20",
+    "@ibiz-template/runtime": "0.7.41-alpha.20",
     "@ibiz-template/theme": "0.7.39",
-    "@ibiz-template/vue3-util": "0.7.41-alpha.19",
+    "@ibiz-template/vue3-util": "0.7.41-alpha.20",
     "@ibiz-template/web-theme": "3.8.0",
-    "@ibiz/model-core": "^0.1.79",
+    "@ibiz/model-core": "^0.1.80",
     "@imengyu/vue3-context-menu": "^1.3.5",
     "@monaco-editor/loader": "^1.4.0",
     "@wangeditor/editor": "^5.1.23",
@@ -108,7 +108,7 @@
     "@ibiz-template/runtime": "^0.7.0",
     "@ibiz-template/theme": "^0.7.0",
     "@ibiz-template/vue3-util": "^0.7.0",
-    "@ibiz/model-core": "^0.1.79",
+    "@ibiz/model-core": "^0.1.80",
     "@imengyu/vue3-context-menu": "^1.3.3",
     "@monaco-editor/loader": "^1.3.3",
     "@wangeditor/editor": "^5.1.23",