@cloudbase/framework-plugin-low-code 0.7.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.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/html/index.html.ejs

@@ -448,7 +448,7 @@
     ></script>
     <script
       crossorigin="anonymous"
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.8-alpha.11/dist/h5.browser.js?v=1"
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.8-alpha.12/dist/h5.browser.js?v=1"
     ></script>
     <script>
       // zxing polifill

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

@@ -1,5 +1,5 @@
 import { observable } from 'mobx'
-import { createComputed, formatDate, getter, setter } from '<%= subLevelPath %>../common/util'
+import { createComputed, formatDate, getter, setter, formatEnum, enumOptions} from '<%= subLevelPath %>../common/util'
 import process from '<%= subLevelPath %>../common/process'
 import { DS_SDK, CLOUD_SDK, createDataset, EXTRA_API } from '<%= subLevelPath %>../datasources/index'
 import appGlobal from '<%= subLevelPath %>../app/app-global'
@@ -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: {
@@ -33,12 +38,13 @@ function createGlboalApi() {
       //request: sdk.request,
       //getSessionId: sdk.getSessionId,
     },
+    enumOptions: enumOptions,
     state: observable(state),
     computed: createComputed(computed),
     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
       ) {
@@ -51,10 +57,14 @@ function createGlboalApi() {
     },
     utils: {
       formatDate,
+      formatEnum,
       get: getter,
       set: setter,
-      _getConfig: function () {
-        return <%= appConfig %>;
+      /**
+       * @deprecated
+       */
+      _getConfig(){
+        return globalAPI.__internal__.getConfig()
       },
       async getWXContext() {
         const { Data } = await globalAPI.cloud.callWedaApi({
@@ -66,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

@@ -3,6 +3,8 @@
 import { findForItemsOfWidget, mpCompToWidget } from './widget'
 import lodashGet from 'lodash.get';
 import lodashSet from 'lodash.set';
+import { observable } from 'mobx';
+import { app } from '../app/weapps-api'
 import { getAccessToken } from '@cloudbase/weda-cloud-sdk'
 
 /**
@@ -233,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');
 }
 
@@ -310,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({
@@ -322,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) {
@@ -646,8 +650,52 @@ class CustomDate {
 
 const dataInstance = new CustomDate();
 export const formatDate = new CustomDate().format.bind(dataInstance);
+
+let loading = {};
+export let enumOptions = observable({});
+export function formatEnum(path, optionname) {
+  // 判断是单选还是多选
+  let isSingle = Array.isArray(path);
+  // 获取到options
+  let parseOptions = getEnumOptions(optionname);
+  if (parseOptions === '') {
+    return !isSingle ? path : path.join(',');
+  }
+  let multiTmp = [];
+  let value = !isSingle
+    ? JSON.parse(parseOptions)?.find((item) => item?.key === path)?.value
+    : JSON.parse(parseOptions)
+      ?.filter((item) => path.some((pathValue) => item?.key === pathValue))
+      .map((item) => multiTmp.push(item?.value));
+  // 对多选或者单选有不同处理
+  return !isSingle ? value : multiTmp?.join(',');
+}
+function getEnumOptions(optionName) {
+  if (enumOptions[optionName]) {
+    return enumOptions[optionName];
+  }
+  if (!loading[optionName]) {
+    loading[optionName] = true;
+    getGeneralOptions(optionName).then((data) => {
+      enumOptions[optionName] = data?.Items[0]?.Config;
+    });
+  }
+  return '';
+}
+export async function getGeneralOptions(optionName) {
+  return app.cloud.callWedaApi({
+    action: 'DescribeGeneralOptionsDetailList',
+    data: {
+      PageSize: 1,
+      PageIndex: 1,
+      LikeNameOrTitle: optionName,
+    },
+  });
+}
+
 export const utils = {
   formatDate,
   get: getter,
   set: setter,
+  formatEnum
 };

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

@@ -14,6 +14,7 @@ export function createPage(
   app,
   $page,
   context,
+  pageAttributes
 ) {
   const evtHandlers = createEventHandlers(evtListeners, context);
 
@@ -32,6 +33,18 @@ export function createPage(
       if (res?.from === 'button' && res?.target?.dataset?.weda_share_info) {
         return res?.target?.dataset?.weda_share_info;
       }
+      if (res?.from === 'menu' && pageAttributes?.appShareMessage) {
+        let { enable, pageId, params, imageUrl, title } = pageAttributes.appShareMessage;
+        if (enable) {
+          pageId = pageId ? pageId.replace(/^(\.)?\//, '') : pageId;
+          let realPath = `/pages/${pageId}/index` + (params ? '?' + params.map(pair => pair.key + '=' + pair.value).join('&') : '');
+          return {
+            path: realPath,
+            imageUrl,
+            title
+          };
+        }
+      }
       try {
         return lifecycle?.['onShareAppMessage']?.() || {};
       } catch (error) {
@@ -76,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;
 
@@ -96,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;
@@ -119,7 +132,7 @@ export function createPage(
       },
 
       getWeAppInst() {
-        if(!this.$WEAPPS_PAGE){
+        if (!this.$WEAPPS_PAGE) {
           $page.state = observable(pageState);
           let dataset = createDataset($page.uuid);
           $page.dataset = dataset;

package/template/mp/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "scripts": {},
   "dependencies": {
-    "@cloudbase/weda-cloud-sdk": "1.0.8-alpha.11",
+    "@cloudbase/weda-cloud-sdk": "1.0.8-alpha.12",
     "@cloudbase/oauth": "0.1.1-alpha.2",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",
@@ -14,4 +14,4 @@
     })
 		%>
   }
-}
+}

package/template/mp/page/index.js

@@ -34,7 +34,9 @@ const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
   },<%}) %>
 }
 
+const pageAttributes = <%= pageAttributes?JSON.stringify(pageAttributes):'{}' %>
+
 $page.id = '<%= pageName %>'
 $page.uuid = '<%= pageUUID %>'
 $page.handler = handlers
-createPage(lifecyle, widgetProps, state, computed, evtListeners, dataBinds, app, $page, context)
+createPage(lifecyle, widgetProps, state, computed, evtListeners, dataBinds, app, $page, context,pageAttributes)

package/template/package.json

@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "@cloudbase/js-sdk": "1.5.3-alpha.0",
-    "@cloudbase/weda-cloud-sdk": "1.0.8-alpha.11",
+    "@cloudbase/weda-cloud-sdk": "1.0.8-alpha.12",
     "@tcwd/weapps-core": "2.2.6",
     "@tcwd/weapps-sdk": "1.2.9",
     "@zxing/library": "^0.18.6",
@@ -60,4 +60,4 @@
     "webpack-cli": "^4.2.0",
     "webpack-dev-server": "^3.11.0"
   }
-}
+}