@ibiz-template/mob-vue3-components 0.7.41-alpha.8 → 0.7.41-alpha.9

package/es/_virtual/index12.mjs

@@ -1,3 +1,3 @@
-var frameTalkClientPc = {exports: {}};
+var middlewares = {};
 
-export { frameTalkClientPc as __module };
+export { middlewares as __exports };

package/es/_virtual/index13.mjs

@@ -1,3 +1,3 @@
-var middlewares = {};
+var frameTalkClientPc = {exports: {}};
 
-export { middlewares as __exports };
+export { frameTalkClientPc as __module };

package/es/_virtual/index17.mjs

@@ -1,3 +1,3 @@
-var lodash_isequal = {exports: {}};
+var lodash_clonedeep = {exports: {}};
 
-export { lodash_isequal as __module };
+export { lodash_clonedeep as __module };

package/es/_virtual/index18.mjs

@@ -1,3 +1,3 @@
-var lodash_clonedeep = {exports: {}};
+var lodash_isequal = {exports: {}};
 
-export { lodash_clonedeep as __module };
+export { lodash_isequal as __module };

package/es/mob-app/guard/auth-guard/auth-guard.mjs

@@ -1,4 +1,4 @@
-import { HttpError, CoreConst, getAppCookie, RuntimeError } from '@ibiz-template/core';
+import { HttpError, CoreConst, getAppCookie } from '@ibiz-template/core';
 import { ModelHelper } from '@ibiz-template/model-helper';
 import { mergeDeepRight } from 'ramda';
 import { AppHooks } from '@ibiz-template/vue3-util';
@@ -149,6 +149,7 @@ async function anonymousValidate(context) {
   if (authInfo && !authInfo.isAnonymous) {
     try {
       await appInit(context);
+      return;
     } catch (error) {
       const { status } = error;
       if (status === 401) {
@@ -172,7 +173,8 @@ async function anonymousValidate(context) {
       if (status === 401) {
         const loginResult = await ibiz.auth.anonymousLogin();
         if (!loginResult) {
-          throw new RuntimeError(ibiz.i18n.t("mobApp.authGuard.loginFailed"));
+          throw401();
+          return;
         }
         await appInit(context);
       } else {
@@ -180,7 +182,14 @@ async function anonymousValidate(context) {
       }
     }
   }
-  await initModel(context, false);
+  if (!authInfo || !authInfo.token) {
+    const loginResult = await ibiz.auth.anonymousLogin();
+    if (!loginResult) {
+      throw401();
+      return;
+    }
+    await appInit(context);
+  }
   const urlPaths = window.location.hash.split("/");
   const viewName = urlPaths[urlPaths.length - 2];
   let viewModel;
@@ -202,15 +211,7 @@ async function anonymousValidate(context) {
   }
   if (viewModel.accUserMode !== 3) {
     throw401();
-    return;
   }
-  if (!authInfo) {
-    const loginResult = await ibiz.auth.anonymousLogin();
-    if (!loginResult) {
-      throw new RuntimeError(ibiz.i18n.t("mobApp.authGuard.loginFailed"));
-    }
-  }
-  await appInit(context);
 }
 async function AuthGuard(appContext, permission = true) {
   if (permission) {
@@ -228,7 +229,17 @@ async function AuthGuard(appContext, permission = true) {
     }
     return result;
   }
-  await initModel(appContext, false);
+  if (ibiz.env.enableAnonymous) {
+    try {
+      await anonymousValidate(appContext);
+    } catch (error) {
+      error.tag = "APPINIT";
+      ibiz.util.error.handle(error);
+      return false;
+    }
+  } else {
+    await initModel(appContext, false);
+  }
   return true;
 }
 

package/es/mob-app/util/unauthorized-handler/unauthorized-handler.mjs

@@ -82,6 +82,9 @@ class UnauthorizedHandler {
    */
   async normalLogin() {
     const ru = window.location.hash.replace("#", "");
+    if (ru.startsWith("/login")) {
+      return;
+    }
     const targetUrl = `${UrlHelper.routeBase}/login?ru=${encodeURIComponent(
       ru
     )}`;

package/es/node_modules/.pnpm/dingtalk-jsapi@3.0.38/node_modules/dingtalk-jsapi/lib/packages/frame-talk-client-pc/index.mjs

@@ -1,5 +1,5 @@
 import { commonjsGlobal } from '../../../../../../../../_virtual/_commonjsHelpers.mjs';
-import { __module as frameTalkClientPc$1 } from '../../../../../../../../_virtual/index12.mjs';
+import { __module as frameTalkClientPc$1 } from '../../../../../../../../_virtual/index13.mjs';
 
 var frameTalkClientPc = frameTalkClientPc$1.exports;
 

package/es/node_modules/.pnpm/dingtalk-jsapi@3.0.38/node_modules/dingtalk-jsapi/lib/sdk/middlewares/index.mjs

@@ -1,5 +1,5 @@
 import { commonjsGlobal } from '../../../../../../../../_virtual/_commonjsHelpers.mjs';
-import { __exports as middlewares } from '../../../../../../../../_virtual/index13.mjs';
+import { __exports as middlewares } from '../../../../../../../../_virtual/index12.mjs';
 import '../../../../../../../../_virtual/bridge.mjs';
 import { __require as requireRetry } from './retry.mjs';
 import '../../../../../../../../_virtual/dealParamsAndResult.mjs';

package/es/node_modules/.pnpm/lodash.clonedeep@4.5.0/node_modules/lodash.clonedeep/index.mjs

@@ -1,5 +1,5 @@
 import { commonjsGlobal, getDefaultExportFromCjs } from '../../../../../_virtual/_commonjsHelpers.mjs';
-import { __module as lodash_clonedeep$1 } from '../../../../../_virtual/index18.mjs';
+import { __module as lodash_clonedeep$1 } from '../../../../../_virtual/index17.mjs';
 
 /**
  * lodash (Custom Build) <https://lodash.com/>

package/es/node_modules/.pnpm/lodash.isequal@4.5.0/node_modules/lodash.isequal/index.mjs

@@ -1,5 +1,5 @@
 import { commonjsGlobal, getDefaultExportFromCjs } from '../../../../../_virtual/_commonjsHelpers.mjs';
-import { __module as lodash_isequal$1 } from '../../../../../_virtual/index17.mjs';
+import { __module as lodash_isequal$1 } from '../../../../../_virtual/index18.mjs';
 
 /**
  * Lodash (Custom Build) <https://lodash.com/>

package/lib/_virtual/index12.cjs

@@ -1,5 +1,5 @@
 'use strict';
 
-var frameTalkClientPc = {exports: {}};
+var middlewares = {};
 
-exports.__module = frameTalkClientPc;
+exports.__exports = middlewares;

package/lib/_virtual/index13.cjs

@@ -1,5 +1,5 @@
 'use strict';
 
-var middlewares = {};
+var frameTalkClientPc = {exports: {}};
 
-exports.__exports = middlewares;
+exports.__module = frameTalkClientPc;

package/lib/_virtual/index17.cjs

@@ -1,5 +1,5 @@
 'use strict';
 
-var lodash_isequal = {exports: {}};
+var lodash_clonedeep = {exports: {}};
 
-exports.__module = lodash_isequal;
+exports.__module = lodash_clonedeep;

package/lib/_virtual/index18.cjs

@@ -1,5 +1,5 @@
 'use strict';
 
-var lodash_clonedeep = {exports: {}};
+var lodash_isequal = {exports: {}};
 
-exports.__module = lodash_clonedeep;
+exports.__module = lodash_isequal;

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

@@ -151,6 +151,7 @@ async function anonymousValidate(context) {
   if (authInfo && !authInfo.isAnonymous) {
     try {
       await appInit(context);
+      return;
     } catch (error) {
       const { status } = error;
       if (status === 401) {
@@ -174,7 +175,8 @@ async function anonymousValidate(context) {
       if (status === 401) {
         const loginResult = await ibiz.auth.anonymousLogin();
         if (!loginResult) {
-          throw new core.RuntimeError(ibiz.i18n.t("mobApp.authGuard.loginFailed"));
+          throw401();
+          return;
         }
         await appInit(context);
       } else {
@@ -182,7 +184,14 @@ async function anonymousValidate(context) {
       }
     }
   }
-  await initModel(context, false);
+  if (!authInfo || !authInfo.token) {
+    const loginResult = await ibiz.auth.anonymousLogin();
+    if (!loginResult) {
+      throw401();
+      return;
+    }
+    await appInit(context);
+  }
   const urlPaths = window.location.hash.split("/");
   const viewName = urlPaths[urlPaths.length - 2];
   let viewModel;
@@ -204,15 +213,7 @@ async function anonymousValidate(context) {
   }
   if (viewModel.accUserMode !== 3) {
     throw401();
-    return;
   }
-  if (!authInfo) {
-    const loginResult = await ibiz.auth.anonymousLogin();
-    if (!loginResult) {
-      throw new core.RuntimeError(ibiz.i18n.t("mobApp.authGuard.loginFailed"));
-    }
-  }
-  await appInit(context);
 }
 async function AuthGuard(appContext, permission = true) {
   if (permission) {
@@ -230,7 +231,17 @@ async function AuthGuard(appContext, permission = true) {
     }
     return result;
   }
-  await initModel(appContext, false);
+  if (ibiz.env.enableAnonymous) {
+    try {
+      await anonymousValidate(appContext);
+    } catch (error) {
+      error.tag = "APPINIT";
+      ibiz.util.error.handle(error);
+      return false;
+    }
+  } else {
+    await initModel(appContext, false);
+  }
   return true;
 }
 

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

@@ -84,6 +84,9 @@ class UnauthorizedHandler {
    */
   async normalLogin() {
     const ru = window.location.hash.replace("#", "");
+    if (ru.startsWith("/login")) {
+      return;
+    }
     const targetUrl = `${core.UrlHelper.routeBase}/login?ru=${encodeURIComponent(
       ru
     )}`;

package/lib/node_modules/.pnpm/dingtalk-jsapi@3.0.38/node_modules/dingtalk-jsapi/lib/packages/frame-talk-client-pc/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var _commonjsHelpers = require('../../../../../../../../_virtual/_commonjsHelpers.cjs');
-var index = require('../../../../../../../../_virtual/index12.cjs');
+var index = require('../../../../../../../../_virtual/index13.cjs');
 
 var frameTalkClientPc = index.__module.exports;
 

package/lib/node_modules/.pnpm/dingtalk-jsapi@3.0.38/node_modules/dingtalk-jsapi/lib/sdk/middlewares/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var _commonjsHelpers = require('../../../../../../../../_virtual/_commonjsHelpers.cjs');
-var index = require('../../../../../../../../_virtual/index13.cjs');
+var index = require('../../../../../../../../_virtual/index12.cjs');
 require('../../../../../../../../_virtual/bridge.cjs');
 var retry = require('./retry.cjs');
 require('../../../../../../../../_virtual/dealParamsAndResult.cjs');

package/lib/node_modules/.pnpm/lodash.clonedeep@4.5.0/node_modules/lodash.clonedeep/index.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _commonjsHelpers = require('../../../../../_virtual/_commonjsHelpers.cjs');
-var index$1 = require('../../../../../_virtual/index18.cjs');
+var index$1 = require('../../../../../_virtual/index17.cjs');
 
 /**
  * lodash (Custom Build) <https://lodash.com/>

package/lib/node_modules/.pnpm/lodash.isequal@4.5.0/node_modules/lodash.isequal/index.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _commonjsHelpers = require('../../../../../_virtual/_commonjsHelpers.cjs');
-var index$1 = require('../../../../../_virtual/index17.cjs');
+var index$1 = require('../../../../../_virtual/index18.cjs');
 
 /**
  * Lodash (Custom Build) <https://lodash.com/>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/mob-vue3-components",
-  "version": "0.7.41-alpha.8",
+  "version": "0.7.41-alpha.9",
   "description": "移动端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",