@cloudbase/framework-plugin-low-code 0.7.2-beta.0 → 0.7.2-beta.1

package/lib/weapps-core/utils/formily.js

@@ -17,9 +17,9 @@ function serialize(webRuntimeAppData) {
         vars: webRuntimeAppData.vars || { data: [] },
         dataset: webRuntimeAppData.dataset,
     };
-    common_1.setValidValue(weAppData, 'appConfig', webRuntimeAppData.appConfig);
-    common_1.setValidValue(weAppData, 'themeVars', webRuntimeAppData.themeVars);
-    common_1.setValidValue(weAppData, 'presetColors', webRuntimeAppData.presetColors);
+    (0, common_1.setValidValue)(weAppData, 'appConfig', webRuntimeAppData.appConfig);
+    (0, common_1.setValidValue)(weAppData, 'themeVars', webRuntimeAppData.themeVars);
+    (0, common_1.setValidValue)(weAppData, 'presetColors', webRuntimeAppData.presetColors);
     handlePageInstanceList(webRuntimeAppData.pageInstanceList, weAppData.pageInstanceList);
     function handlePageInstanceList(pageInstanceList, collection) {
         pageInstanceList.map((pageData) => {
@@ -27,20 +27,20 @@ function serialize(webRuntimeAppData) {
             const newPage = {
                 id: pageData.id,
             };
-            common_1.setValidValue(newPage, 'isHome', pageData.isHome);
-            common_1.setValidValue(newPage, 'data', readDynamicData(pageData));
-            common_1.setValidValue(newPage, 'commonStyle', style_1.removeInvalidStyleFormValue(pageData.style));
-            common_1.setValidValue(newPage, 'styleBindPath', pageData.styleBindPath);
-            if (common_1.isValidStyleBind(pageData.styleBind)) {
-                common_1.setValidValue(newPage, 'styleBind', pageData.styleBind);
+            (0, common_1.setValidValue)(newPage, 'isHome', pageData.isHome);
+            (0, common_1.setValidValue)(newPage, 'data', readDynamicData(pageData));
+            (0, common_1.setValidValue)(newPage, 'commonStyle', (0, style_1.removeInvalidStyleFormValue)(pageData.style));
+            (0, common_1.setValidValue)(newPage, 'styleBindPath', pageData.styleBindPath);
+            if ((0, common_1.isValidStyleBind)(pageData.styleBind)) {
+                (0, common_1.setValidValue)(newPage, 'styleBind', pageData.styleBind);
             }
-            if (common_1.isValidClassNameListBind(pageData.classNameListBind)) {
-                common_1.setValidValue(newPage, 'classNameListBind', pageData.classNameListBind);
+            if ((0, common_1.isValidClassNameListBind)(pageData.classNameListBind)) {
+                (0, common_1.setValidValue)(newPage, 'classNameListBind', pageData.classNameListBind);
             }
-            common_1.setValidValue(newPage, 'componentInstances', readComponents(pageData.componentSchemaJson.properties));
-            common_1.setValidValue(newPage, 'listeners', readListeners(pageData.listenerInstances));
-            common_1.setValidValue(newPage, 'pluginInstances', pageData.pluginInstances);
-            common_1.setValidValue(newPage, 'lowCodes', pageData.codeModules);
+            (0, common_1.setValidValue)(newPage, 'componentInstances', readComponents(pageData.componentSchemaJson.properties));
+            (0, common_1.setValidValue)(newPage, 'listeners', readListeners(pageData.listenerInstances));
+            (0, common_1.setValidValue)(newPage, 'pluginInstances', pageData.pluginInstances);
+            (0, common_1.setValidValue)(newPage, 'lowCodes', pageData.codeModules);
             if ((_a = pageData.children) === null || _a === void 0 ? void 0 : _a.length) {
                 newPage.children = newPage.children || [];
                 handlePageInstanceList(pageData.children, newPage.children);
@@ -60,41 +60,41 @@ function serialize(webRuntimeAppData) {
             if (srcProps) {
                 const cmpParts = srcProps.sourceKey.split(':');
                 cmps[key] = { genericComp: srcCmp['genericComp'] };
-                common_1.setValidValue(cmps[key], 'xComponent', {
+                (0, common_1.setValidValue)(cmps[key], 'xComponent', {
                     moduleName: cmpParts[0],
                     name: cmpParts[1],
                 });
                 const componentXProps = {};
-                common_1.setValidValue(componentXProps, 'data', readDynamicData(srcProps));
-                common_1.setValidValue(componentXProps, 'listeners', readListeners(srcProps.listenerInstances));
-                common_1.setValidValue(componentXProps, 'staticResourceAttribute', srcProps.staticResourceAttribute);
-                common_1.setValidValue(componentXProps, 'directives', readDirectives(srcProps));
-                common_1.setValidValue(componentXProps, 'customDataForm', srcProps.customDataForm);
-                common_1.setValidValue(componentXProps, 'style', srcProps.style);
-                common_1.setValidValue(componentXProps, 'commonStyle', style_1.removeInvalidStyleFormValue(srcProps.commonStyle));
-                common_1.setValidValue(componentXProps, 'styleBindPath', srcProps.styleBindPath);
+                (0, common_1.setValidValue)(componentXProps, 'data', readDynamicData(srcProps));
+                (0, common_1.setValidValue)(componentXProps, 'listeners', readListeners(srcProps.listenerInstances));
+                (0, common_1.setValidValue)(componentXProps, 'staticResourceAttribute', srcProps.staticResourceAttribute);
+                (0, common_1.setValidValue)(componentXProps, 'directives', readDirectives(srcProps));
+                (0, common_1.setValidValue)(componentXProps, 'customDataForm', srcProps.customDataForm);
+                (0, common_1.setValidValue)(componentXProps, 'style', srcProps.style);
+                (0, common_1.setValidValue)(componentXProps, 'commonStyle', (0, style_1.removeInvalidStyleFormValue)(srcProps.commonStyle));
+                (0, common_1.setValidValue)(componentXProps, 'styleBindPath', srcProps.styleBindPath);
                 if ((_a = srcProps.styleBind) === null || _a === void 0 ? void 0 : _a.bindDataPath) {
                     componentXProps.styleBind = {
                         type: srcProps.styleBind.type,
                         value: srcProps.styleBind.bindDataPath,
                     };
                 }
-                if (common_1.isValidClassNameListBind(srcProps.classNameListBind)) {
+                if ((0, common_1.isValidClassNameListBind)(srcProps.classNameListBind)) {
                     const classList = srcProps.classNameListBind;
-                    common_1.setValidValue(componentXProps, 'classListBind', {
+                    (0, common_1.setValidValue)(componentXProps, 'classListBind', {
                         type: classList.type,
                         value: classList.bindDataPath,
                     });
                 }
                 if (srcProps.classNameList) {
-                    common_1.setValidValue(componentXProps, 'classList', srcProps.classNameList);
+                    (0, common_1.setValidValue)(componentXProps, 'classList', srcProps.classNameList);
                 }
-                common_1.setValidValue(cmps[key], 'xProps', componentXProps);
-                common_1.setValidValue(cmps[key], 'xIndex', srcCmp['x-index']);
+                (0, common_1.setValidValue)(cmps[key], 'xProps', componentXProps);
+                (0, common_1.setValidValue)(cmps[key], 'xIndex', srcCmp['x-index']);
                 const excludeKeys = (srcProps.dataTypes || [])
                     .filter((dataType) => dataType.type !== 'slot')
                     .map((dataType) => dataType.propertyPath);
-                common_1.setValidValue(cmps[key], 'properties', readComponents(srcCmp.properties, excludeKeys));
+                (0, common_1.setValidValue)(cmps[key], 'properties', readComponents(srcCmp.properties, excludeKeys));
             }
             else {
                 cmps[key] = { properties: readComponents(srcCmp.properties) };
@@ -212,7 +212,7 @@ function deserialize(weAppData) {
             page.vars = srcPage.vars ? srcPage.vars : page.vars;
             page.isHome = srcPage.isHome || false;
             page.style = srcPage.commonStyle || {};
-            common_1.setValidValue(page, 'styleBindPath', srcPage.styleBindPath);
+            (0, common_1.setValidValue)(page, 'styleBindPath', srcPage.styleBindPath);
             page.codeModules = srcPage.lowCodes || [];
             page.pluginInstances = srcPage.pluginInstances || [];
             page.componentSchemaJson = {
@@ -264,7 +264,7 @@ function readCmpInstances(cmps) {
             xProps.style = cmp.xProps.style || {};
             xProps.commonStyle = cmp.xProps.commonStyle || {};
             xProps.staticResourceAttribute = cmp.xProps.staticResourceAttribute || [];
-            common_1.setValidValue(xProps, 'styleBindPath', cmp.xProps.styleBindPath);
+            (0, common_1.setValidValue)(xProps, 'styleBindPath', cmp.xProps.styleBindPath);
             let { classList, classListBind } = cmp.xProps;
             const { styleBind } = cmp.xProps;
             const legacyClassList = classList;
@@ -277,9 +277,9 @@ function readCmpInstances(cmps) {
                     classListBind = classListBind;
                 }
             }
-            classList && common_1.setValidValue(xProps, 'classNameList', classList);
+            classList && (0, common_1.setValidValue)(xProps, 'classNameList', classList);
             classListBind &&
-                common_1.setValidValue(xProps, 'classNameListBind', {
+                (0, common_1.setValidValue)(xProps, 'classNameListBind', {
                     type: classListBind.type,
                     propertyPath: 'classNameList',
                     bindDataPath: classListBind.value,
@@ -330,10 +330,10 @@ function readCmpInstances(cmps) {
                 xProps.data = xProps.data || {};
                 xProps.data._visible = true;
             }
-            common_1.setValidValue(target, 'x-component', xCmp.toLocaleLowerCase());
-            common_1.setValidValue(xProps, 'customDataForm', cmp.xProps.customDataForm);
+            (0, common_1.setValidValue)(target, 'x-component', xCmp.toLocaleLowerCase());
+            (0, common_1.setValidValue)(xProps, 'customDataForm', cmp.xProps.customDataForm);
             target['x-props'] = xProps;
-            common_1.setValidValue(target, 'x-index', cmp.xIndex);
+            (0, common_1.setValidValue)(target, 'x-index', cmp.xIndex);
         }
     }
     return properties;

package/lib/weapps-core/utils/index.js

@@ -7,7 +7,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./formily"), exports);

package/lib/weapps-core/utils/style.js

@@ -76,9 +76,9 @@ function toCssStyle(commonStyle = {}, options = { toRem: true, ignoreSelf: false
         if (radius !== undefined) {
             setStyleValue(style, 'borderRadius', _handleStyleNumValue(radius, !!options.addPXUnit));
         }
-        if (radiusInfo && !common_1.isEmptyObj(radiusInfo)) {
+        if (radiusInfo && !(0, common_1.isEmptyObj)(radiusInfo)) {
             if (Object.keys(radiusInfo).length === 4) {
-                if (uniq_1.default(map_1.default(radiusInfo, (val) => val)).length === 1) {
+                if ((0, uniq_1.default)((0, map_1.default)(radiusInfo, (val) => val)).length === 1) {
                     setStyleValue(style, 'borderRadius', _handleStyleNumValue(radiusInfo.topLeft, !!options.addPXUnit));
                 }
                 else if (radiusInfo.topLeft === radiusInfo.bottomRight &&
@@ -120,7 +120,7 @@ function toCssStyle(commonStyle = {}, options = { toRem: true, ignoreSelf: false
                 setStyleValue(style, 'backgroundSize', _handleStyleNumValue(size, !!options.addPXUnit));
             }
             setStyleValue(style, 'backgroundPosition', position);
-            if (positionObj && !common_1.isEmptyObj(positionObj)) {
+            if (positionObj && !(0, common_1.isEmptyObj)(positionObj)) {
                 style.background += ` ${_handleStyleNumValue(positionObj.left, !!options.addPXUnit)} ${_handleStyleNumValue(positionObj.top, !!options.addPXUnit)}`;
             }
         }
@@ -166,7 +166,7 @@ exports.toCssStyle = toCssStyle;
 function removeInvalidStyleFormValue(styleForm = {}) {
     return Object.keys(styleForm).reduce((result, key) => {
         const propStyleFormData = styleForm[key];
-        if (common_1.isPlainObject(propStyleFormData)) {
+        if ((0, common_1.isPlainObject)(propStyleFormData)) {
             setStyleValue(result, key, removeInvalidStyleFormValue(propStyleFormData));
         }
         else {
@@ -178,24 +178,24 @@ function removeInvalidStyleFormValue(styleForm = {}) {
 exports.removeInvalidStyleFormValue = removeInvalidStyleFormValue;
 function setDistanceStyle(style, distance, attr, addPXUnit) {
     if (Object.keys(distance).length === 4) {
-        if (uniq_1.default(map_1.default(distance, (val) => val)).length === 1) {
-            setStyleValue(style, common_1.camelcase(`${attr}`), _handleStyleNumValue(distance.top, addPXUnit));
+        if ((0, uniq_1.default)((0, map_1.default)(distance, (val) => val)).length === 1) {
+            setStyleValue(style, (0, common_1.camelcase)(`${attr}`), _handleStyleNumValue(distance.top, addPXUnit));
         }
         else if (distance.top === distance.bottom &&
             distance.left === distance.right) {
-            setStyleValue(style, common_1.camelcase(`${attr}`), `${_handleStyleNumValue(distance.top, addPXUnit)} ${_handleStyleNumValue(distance.right, addPXUnit)}`);
+            setStyleValue(style, (0, common_1.camelcase)(`${attr}`), `${_handleStyleNumValue(distance.top, addPXUnit)} ${_handleStyleNumValue(distance.right, addPXUnit)}`);
         }
         else if (distance.left === distance.right) {
-            setStyleValue(style, common_1.camelcase(`${attr}`), `${_handleStyleNumValue(distance.top, addPXUnit)} ${_handleStyleNumValue(distance.right, addPXUnit)} ${_handleStyleNumValue(distance.bottom, addPXUnit)}`);
+            setStyleValue(style, (0, common_1.camelcase)(`${attr}`), `${_handleStyleNumValue(distance.top, addPXUnit)} ${_handleStyleNumValue(distance.right, addPXUnit)} ${_handleStyleNumValue(distance.bottom, addPXUnit)}`);
         }
         else {
-            setStyleValue(style, common_1.camelcase(`${attr}`), `${_handleStyleNumValue(distance.top, addPXUnit)} ${_handleStyleNumValue(distance.right, addPXUnit)} ${_handleStyleNumValue(distance.bottom, addPXUnit)} ${_handleStyleNumValue(distance.left, addPXUnit)}`);
+            setStyleValue(style, (0, common_1.camelcase)(`${attr}`), `${_handleStyleNumValue(distance.top, addPXUnit)} ${_handleStyleNumValue(distance.right, addPXUnit)} ${_handleStyleNumValue(distance.bottom, addPXUnit)} ${_handleStyleNumValue(distance.left, addPXUnit)}`);
         }
     }
     else {
         config_1.DISTANCE_KEY_LIST.forEach((key) => {
             if (distance[key] !== undefined)
-                setStyleValue(style, common_1.camelcase(`${attr}_${key}`), _handleStyleNumValue(distance[key], addPXUnit));
+                setStyleValue(style, (0, common_1.camelcase)(`${attr}_${key}`), _handleStyleNumValue(distance[key], addPXUnit));
         });
     }
 }
@@ -227,10 +227,10 @@ function setStyleValue(object, key, value) {
     if (key === 'open') {
         return;
     }
-    if (common_1.isEmptyObj(value)) {
+    if ((0, common_1.isEmptyObj)(value)) {
         return;
     }
-    object[common_1.camelcase(key)] = value;
+    object[(0, common_1.camelcase)(key)] = value;
 }
 function calPxToREM(px) {
     if (Number.isNaN(px / 28))
@@ -280,7 +280,7 @@ exports.toRPX = toRPX;
 function removeWrapperBadEffectStyle(commonStyle = {}) {
     return Object.keys(commonStyle).reduce((result, key) => {
         const value = commonStyle[key];
-        const camelcaseKey = common_1.camelcase(key);
+        const camelcaseKey = (0, common_1.camelcase)(key);
         if (config_1.WRAPPER_REMOVE_STYLE_KEY_LIST.includes(camelcaseKey)) {
             return result;
         }
@@ -296,7 +296,7 @@ function removeEffectTwiceStyle(commonStyle = {}) {
     const style = {};
     Object.keys(commonStyle).map((key) => {
         const value = commonStyle[key];
-        const camelcaseKey = common_1.camelcase(key);
+        const camelcaseKey = (0, common_1.camelcase)(key);
         if (config_1.SELF_REMOVE_STYLE_KEY_LIST.includes(camelcaseKey)) {
             return false;
         }
@@ -313,7 +313,7 @@ function toCssText(style, className = '.some-class-name') {
     const attrText = Object.keys(style)
         .map((key) => {
         const value = style[key];
-        return `${common_1.kebabCase(key)}: ${value};`;
+        return `${(0, common_1.kebabCase)(key)}: ${value};`;
     })
         .join('\n');
     return `${className} { ${attrText} }\n`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.7.2-beta.0",
+  "version": "0.7.2-beta.1",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/mp/app/weapps-api.js

@@ -25,7 +25,12 @@ function createGlboalApi() {
     id: '<%= appId %>',
     domain: '<%= domain %>',
     platform: 'MINIPROGRAME',
-    activePage: null,
+    __internal__: {
+      activePage: null,
+      getConfig: function () {
+        return <%= appConfig %>;
+      },
+    },
     dataSources: DS_SDK,
     pages: {},
     session: {
@@ -39,7 +44,7 @@ function createGlboalApi() {
     common,
     relaunchHome: function () {
       let wx_pages = getCurrentPages();
-      const { pages = [] } = globalAPI.utils._getConfig();
+      const { pages = [] } = globalAPI.__internal__.getConfig();
       if (
         wx_pages[0]?.route?.match(/pages\/(.*)\/index/)?.[1] === pages[0]?.id
       ) {
@@ -55,8 +60,11 @@ function createGlboalApi() {
       formatEnum,
       get: getter,
       set: setter,
-      _getConfig: function () {
-        return <%= appConfig %>;
+      /**
+       * @deprecated
+       */
+      _getConfig(){
+        return globalAPI.__internal__.getConfig()
       },
       async getWXContext() {
         const { Data } = await globalAPI.cloud.callWedaApi({
@@ -68,7 +76,7 @@ function createGlboalApi() {
         return typeof Data === 'string' ? JSON.parse(Data) : Data
       },
       getCurrentPage: function(){
-        return globalAPI.activePage
+        return globalAPI.__internal__.activePage
       }
     },
     // ... other sdk apis & apis from mp

package/template/mp/app.js

@@ -20,64 +20,75 @@ const wxReport = new WxReportV2({
 });
 <% }%>
 
-// 设置数据源请求的 loading 及 toast 处理
-setConfig({
-  beforeDSRequest: (cfg) => {
-    if (!cfg.options || !cfg.options.showLoading) return
-    app.showLoading()
-  },
-  beforeCallFunction: async (params) => {
-    try {
-      const loginPage = findLoginPage();
+  // 设置数据源请求的 loading 及 toast 处理
+  setConfig({
+    beforeDSRequest: (cfg) => {
+      if (!cfg.options || !cfg.options.showLoading) return
+      app.showLoading()
+    },
+    beforeCallFunction: async (params) => {
+      try {
+        const loginPage = findLoginPage();
 
-      let skip = false;
-      switch (params?.data?.methodName){
-        case 'callWedaApi': {
-          if(['GetMiniProgramUserTicket', 'DescribeRuntimeResourceStrategy'].includes(params?.data?.params.action)){
-            skip = true;
+        let skip = false;
+        switch (params?.data?.methodName) {
+          case 'callWedaApi': {
+            if (['GetMiniProgramUserTicket', 'DescribeRuntimeResourceStrategy'].includes(params?.data?.params.action)) {
+              skip = true;
+            }
+            break;
           }
-          break;
         }
-      }
 
-      // 后续做过滤处理
-      if (!loginPage || (params?.data?.mode === 'c' && skip)) {
-        return params;
-      }
-      // await initTcb();
-      const { accessToken } = await getAccessToken();
-      if (accessToken) {
-        params.data.accessToken = accessToken;
-      }
-    } catch (e) {
-      console.error('beforeCallFunction error', e);
-    }
-    return params;
-  },
-  afterDSRequest: (cfg, error, result) => {
-    if (!cfg.options) return
-    if (cfg.options.showLoading) app.hideLoading()
-    if (!cfg.options.showToast) return
-    const isSuccess = !error && result && !result.code
-    app.showToast({ icon: isSuccess ? 'success' : 'error' })
-  },
-  async afterCallFunction(params, error, res) {
-    if (params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure','InvalidAccessToken'].includes(res?.result?.code)) {
-      const loginPage = findLoginPage();
-      if (loginPage) {
-        const authConfig = await getAuthConfig();
-        if (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login') {
-          redirectToLogin();
-        } else if (authConfig.RejectStrategy == 'show_warning') {
+        // 后续做过滤处理
+        if (!loginPage || (params?.data?.mode === 'c' && skip)) {
+          return params;
+        }
+        // await initTcb();
+        const { accessToken } = await getAccessToken();
+        if (accessToken) {
+          params.data.accessToken = accessToken;
+        }
+      } catch (e) {
+        if (app?.cloud?.currentUser?.userType === "externalUser" && e?.error === 'unauthenticated') {
           app.showToast({
-            title: '接口无访问权限',
+            title: '登录态失效',
             icon: 'error',
           });
         }
+        console.error('beforeCallFunction error', e);
+      }
+      return params;
+    },
+    afterDSRequest: (cfg, error, result) => {
+      if (!cfg.options) return
+      if (cfg.options.showLoading) app.hideLoading()
+      if (!cfg.options.showToast) return
+      const isSuccess = !error && result && !result.code
+      app.showToast({ icon: isSuccess ? 'success' : 'error' })
+    },
+    async afterCallFunction(params, error, res) {
+      if (params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure', 'InvalidAccessToken'].includes(res?.result?.code)) {
+        const loginPage = findLoginPage();
+        if (loginPage) {
+          const authConfig = await getAuthConfig();
+          let isAnonymous = true;
+          try {
+            const { accessToken } = await getAccessToken();
+            isAnonymous = !accessToken;
+          } catch (e) { }
+          if (isAnonymous && authConfig.RejectStrategy == 'to_login') {
+            redirectToLogin();
+          } else if (authConfig.RejectStrategy == 'show_warning') {
+            app.showToast({
+              title: '接口无访问权限',
+              icon: 'error',
+            });
+          }
+        }
       }
     }
-  }
-})
+  })
 
 App({
   onLaunch(options) {

package/template/mp/common/util.js

@@ -235,7 +235,7 @@ export function setter(context, path, value = undefined) {
 
 export function findLoginPage() {
   const { app } = getApp();
-  const { pages = [] } = app.utils._getConfig();
+  const { pages = [] } = app.__internal__.getConfig();
   return pages.find(item => item.type === 'login');
 }
 
@@ -312,8 +312,11 @@ export async function checkAuth(app, appId, $page) {
   const [isAccess, authConfig] = await Promise.all(requestList);
   app.hideNavigationBarLoading();
 
+  const { accessToken } = await getAccessToken()
+  const isAnonymousUser = !accessToken
+
   if (!isAccess) {
-    if (loginPage && (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login')) {
+    if (isAnonymousUser && loginPage && (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login')) {
       redirectToLogin($page);
     } else {
       app.showToast({
@@ -324,8 +327,7 @@ export async function checkAuth(app, appId, $page) {
   } else if (loginPage && authConfig.NeedLogin) {
     // 此分支逻辑本不应该前端判断是否登录，历史原因后端短期内搞不定，后续后端优化后删除
     try {
-      const { accessToken } = await getAccessToken()
-      if (!accessToken) {
+      if (isAnonymousUser) {
         redirectToLogin($page);
       }
     } catch (e) {

package/template/mp/common/weapp-page.js

@@ -89,7 +89,7 @@ export function createPage(
       onLoad(options) {
         const $page = this.getWeAppInst()
 
-        app.activePage = $page;
+        app.__internal__.activePage = $page;
         setConfig({ currentPageId: $page.uuid });
         this._pageActive = true;
 
@@ -109,7 +109,7 @@ export function createPage(
       },
       async onShow() {
         const $page = this.getWeAppInst()
-        app.activePage = $page;
+        app.__internal__.activePage = $page;
         setConfig({ currentPageId: $page.uuid });
         $page.widgets = this._widgets;
         this._pageActive = true;

package/template/src/app/global-api.js

@@ -17,6 +17,9 @@ export const app = createGlboalApi();
 export const $page = createPageApi();
 
 export function setCurrentPage(pageCtx) {
+  try {
+    app.__internal__.activePage = pageCtx
+  } catch(e) { }
   Object.assign($page, pageCtx);
 }
 
@@ -25,6 +28,12 @@ function createGlboalApi() {
     id: '<%= appId %>',
     domain: '<%= domain %>',
     platform: 'WEB',
+    __internal__: {
+      activePage: null,
+      getConfig: function () {
+        return <%= appConfig %>;
+      },
+    },
     formActions: {},
     pages: {},
     session: {
@@ -38,7 +47,7 @@ function createGlboalApi() {
     common,
     dataSources: DS_SDK,
     relaunchHome: function () {
-      const { pages = [] } = globalAPI.utils._getConfig();
+      const { pages = [] } = globalAPI.__internal__.getConfig();
       if (pages[0]) {
         globalAPI.reLaunch({
           pageId: pages[0].id,
@@ -50,8 +59,11 @@ function createGlboalApi() {
       formatEnum,
       get: getter,
       set: setter,
-      _getConfig: function () {
-        return <%= appConfig %>;
+      /**
+       * @deprecated
+       */
+      _getConfig(){
+        return globalAPI.__internal__.getConfig()
       },
       getWXContext: function () {
         return Promise.resolve({})

package/template/src/handlers/utils/common.js

@@ -150,7 +150,7 @@ export function getStaticResourceAttribute(staticUrl) {
 }
 
 export function findLoginPage(app = window.app) {
-  const { pages = [] } = app.utils._getConfig();
+  const { pages = [] } = app.__internal__.getConfig();
   return pages.find(item => item.type === 'login');
 }
 
@@ -209,6 +209,19 @@ async function getAccessPermission(app, appId, pageId) {
   return isAccess
 }
 
+export async function checkAnonymous() {
+  // 用户是否非匿名登录前端判断条件：有accessToken且scope不为anonymous
+  // 此分支逻辑本不应该前端判断是否登录，历史原因后端短期内搞不定，后续后端优化后删除
+  let isAnonymous = true;
+  try {
+    const [scope, { accessToken }] = await Promise.all([loginScope(), getAccessToken()]);
+    if (accessToken && scope !== 'anonymous') {
+      isAnonymous = false;
+    }
+  } catch (e) { }
+  return isAnonymous;
+}
+
 /**
  * 检查页面权限
  **/
@@ -223,31 +236,24 @@ export async function checkAuth(app, appId, $page) {
   // 暂时先认为有登录页则自定义登录功能开启且生效
   if (loginPage) {
     requestList.push(getAuthConfig(app));
+    requestList.push(checkAnonymous());
   }
-  const [isAccess, authConfig] = await Promise.all(requestList);
+  const [isAccess, authConfig, isAnonymous] = await Promise.all(requestList);
   app.hideNavigationBarLoading();
 
-  if (!isAccess) {
-    if (loginPage && (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login')) {
-      redirectToLogin($page);
-    } else {
-      app.showToast({
-        title: '页面无访问权限',
-        icon: 'error',
-      });
-    }
-  } else if (loginPage && authConfig.NeedLogin) {
-    // 此分支逻辑本不应该前端判断是否登录，历史原因后端短期内搞不定，后续后端优化后删除
-    try {
-      const [scope, { accessToken }] = await Promise.all([loginScope(), getAccessToken()]);
-      if (!accessToken || scope === 'anonymous') {
-        redirectToLogin($page);
-      }
-    } catch (e) {
-      console.error('获取身份失败', e);
+  if (loginPage && isAnonymous) {
+    if (authConfig.NeedLogin || (!isAccess && authConfig.RejectStrategy === 'to_login')) {
       redirectToLogin($page);
+      return isAccess;
     }
   }
+
+  if (!isAccess) {
+    app.showToast({
+      title: '页面无访问权限',
+      icon: 'error',
+    });
+  }
   return isAccess;
 }
 

package/template/src/index.jsx

@@ -12,7 +12,7 @@ import attachFastClick from 'fastclick'
 import { initWebConfig } from 'handlers/lifecycle'
 const AppConfig = require('../webpack/miniprogram.config')
 import { app } from './app/global-api'
-import { redirectToLogin, findLoginPage, getAuthConfig } from './handlers/utils'
+import { redirectToLogin, findLoginPage, getAuthConfig, checkAnonymous } from './handlers/utils'
 // app 中注册配置页面以及app的全局配置miniprogram.config，h5里分app以及web页分别处理，使用process.env.isApp 区分判断
 if (process.env.isApp) {
   initWebConfig(app, AppConfig);
@@ -63,7 +63,8 @@ setConfig({
       const loginPage = findLoginPage();
       if (loginPage) {
         const authConfig = await getAuthConfig();
-        if (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login') {
+        const isAnonymous = await checkAnonymous();
+        if (isAnonymous && authConfig.RejectStrategy == 'to_login') {
           redirectToLogin();
         } else if (authConfig.RejectStrategy == 'show_warning') {
           app.showToast({