@cloudbase/framework-plugin-low-code 0.6.65 → 0.7.0

package/template/mp/common/util.js

@@ -3,8 +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'
+
 /**
  * Convert abcWordSnd -> abc-word-snd
  */
@@ -53,12 +53,12 @@ export function createEventHandlers(evtListeners, context) {
           })
         } catch (e) {
           let eventName = l.key ? `${prefix}$${l.key}_fail` : ''
-          if(self[eventName]){
+          if (self[eventName]) {
             await self[eventName]({
               ...event,
               detail: e
             })
-          }else {
+          } else {
             throw e
           }
 
@@ -207,8 +207,8 @@ export function set(object, path, value) {
         newValue = isObject(objValue)
           ? objValue
           : isIndex(path[index + 1])
-          ? []
-          : {}
+            ? []
+            : {}
       }
     }
     assignValue(nested, key, newValue)
@@ -231,37 +231,133 @@ export function setter(context, path, value = undefined) {
   return lodashSet(context, path, value);
 }
 
+export function findLoginPage() {
+  const { app } = getApp();
+  const { pages = [] } = app.utils._getConfig();
+  return pages.find(item => item.type === 'login');
+}
+
+let _AUTH_CONFIG_CACHE = null;
+export async function getAuthConfig() {
+  const { app } = getApp();
+  if (_AUTH_CONFIG_CACHE) {
+    return _AUTH_CONFIG_CACHE;
+  }
+  try {
+    const res = await app.cloud.callWedaApi({
+      action: "DescribeRuntimeResourceStrategy",
+      data: {
+        ResourceType: `<%= isAdminPortal? 'modelApp' : 'app'%>`,
+        ResourceId: app.id,
+      },
+    });
+    const settingData = {};
+    // 云api不支持map只能传字符串，需要转换
+    res.forEach((item) => {
+      settingData[item.Key] = ['AllowRegister', 'NeedLogin'].includes(item.Key) ? item.Value === '1' : item.Value;
+    });
+    _AUTH_CONFIG_CACHE = settingData;
+    return _AUTH_CONFIG_CACHE;
+  } catch (e) {
+    return {
+      NeedLogin: false,
+      RejectStrategy: "show_warning",
+    };
+  }
+}
+
+let _AUTH_CACHE_MAP = {}
+async function getAccessPermission(app, appId, pageId) {
+  const cacheKey = `${appId}-${pageId}`
+  if (_AUTH_CACHE_MAP[cacheKey] !== undefined) {
+    return _AUTH_CACHE_MAP[cacheKey];
+  }
+
+  let isAccess = false;
+  try {
+    const res = await app.cloud.callWedaApi({
+      action: 'DescribeResourcesPermission',
+      data: {
+        ResourceType: `<%= isAdminPortal? 'modelApp' : 'app'%>`,
+        ResourceIdList: [cacheKey],
+        AppResourceId: appId,
+      },
+    });
+    if (Array.isArray(res) && res.length > 0) {
+      isAccess = !!res[0].IsAccess;
+    }
+    _AUTH_CACHE_MAP[cacheKey] = isAccess;
+  } catch (e) {
+    console.warn('getAccessPermission', e);
+  }
+  return isAccess
+}
+
 /**
  * 检查页面权限
  **/
-const _AUTH_CACHE_MAP = {}
-export async function checkAuth(app, appId, pageId) {
-  const cacheKey = `${appId}-${pageId}`
-  if(_AUTH_CACHE_MAP[cacheKey] !== undefined) {
-    return _AUTH_CACHE_MAP[cacheKey]
+export async function checkAuth(app, appId, $page) {
+  const loginPage = findLoginPage(app);
+  if (loginPage?.id === $page.id) {
+    return true
   }
   app.showNavigationBarLoading();
-  const checkAuthResult = await app.cloud.callWedaApi({
-    action: 'DescribeResourcesPermission',
-    data: {
-      ResourceType: `<%= isAdminPortal? 'modelApp' : 'app'%>`,
-      ResourceIdList: [cacheKey],
-    },
-  });
-  let isLogin = false;
-  if (Array.isArray(checkAuthResult) && checkAuthResult.length > 0) {
-    isLogin = checkAuthResult[0]?.IsAccess || false;
+  const requestList = [getAccessPermission(app, appId, $page.id)];
+  // 暂时先认为有登录页则自定义登录功能开启且生效
+  if (loginPage) {
+    requestList.push(getAuthConfig(app));
   }
+  const [isAccess, authConfig] = await Promise.all(requestList);
   app.hideNavigationBarLoading();
 
-  if (!isLogin) {
+  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 { accessToken } = await getAccessToken()
+      if (!accessToken) {
+        redirectToLogin($page);
+      }
+    } catch (e) {
+      redirectToLogin($page);
+    }
+  }
+  return isAccess;
+}
+
+export function redirectToLogin(currentPage) {
+  // 去登录则清空权限缓存。
+  _AUTH_CACHE_MAP = {};
+  const { app } = getApp();
+  const loginPage = findLoginPage(app);
+  if (!currentPage) {
+    currentPage = app.utils.getCurrentPage() || {};
+  }
+  if (loginPage?.id === currentPage.id) {
+    return true
+  }
+  if (loginPage) {
+    app.redirectTo({
+      pageId: loginPage.id,
+      params: {
+        sourcePageId: currentPage.id,
+        sourcePageParams: currentPage.params
+      }
+    })
+  } else {
     app.showToast({
-      title: '页面无访问权限',
+      title: '用户未登录',
       icon: 'error',
     });
   }
-  _AUTH_CACHE_MAP[cacheKey] = isLogin
-  return isLogin;
 }
 
 // 日期转换
@@ -550,52 +646,8 @@ 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,7 +14,6 @@ export function createPage(
   app,
   $page,
   context,
-  pageAttributes
 ) {
   const evtHandlers = createEventHandlers(evtListeners, context);
 
@@ -33,18 +32,6 @@ 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) {
@@ -118,7 +105,7 @@ export function createPage(
         hook && hook.call(this);
 
         // 权限检查
-        if (await checkAuth(app, app.id, app.activePage.id)) {
+        if (await checkAuth(app, app.id, $page)) {
           this.setData({
             weDaHasLogin: true,
           });
@@ -132,7 +119,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/datasources/config.js.tpl

@@ -11,6 +11,8 @@ export default {
   appID: '<%= appID %>',
   /** 云开发环境ID */
   envID: '<%= envID %>',
+  /** 应用端ID */
+  tcbClientId: '<%= clientID %>',
   /** 云开发资源所属的微信app id */
   resourceAppid: '<%= resourceAppid %>',
   /** 数据源描述对象数组 */

package/template/mp/package.json

@@ -1,15 +1,17 @@
 {
-	"name": "lcap-<%= appId%>",
-	"version": "1.0.0",
-	"scripts": {	},
-	"dependencies": {
-    "@cloudbase/weda-cloud-sdk": "1.0.5",
+  "name": "lcap-<%= appId%>",
+  "version": "1.0.0",
+  "scripts": {},
+  "dependencies": {
+    "@cloudbase/weda-cloud-sdk": "1.0.8-alpha.11",
+    "@cloudbase/oauth": "0.1.1-alpha.2",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
-	"miniprogram-gesture": "^1.0.6",
+    "miniprogram-gesture": "^1.0.6",
     "miniprogram-api-promise": "^1.0.4"<% Object.keys(extraDeps).map(depName => {%>,
-		"<%= depName%>": "<%= extraDeps[depName]%>"<%})
+      "<%= depName%>": "<%= extraDeps[depName]%>"<%
+    })
 		%>
   }
-}
+}

package/template/mp/page/index.js

@@ -34,9 +34,7 @@ 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,pageAttributes)
+createPage(lifecyle, widgetProps, state, computed, evtListeners, dataBinds, app, $page, context)

package/template/package.json

@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "@cloudbase/js-sdk": "1.5.3-alpha.0",
-    "@cloudbase/weda-cloud-sdk": "1.0.1",
+    "@cloudbase/weda-cloud-sdk": "1.0.8-alpha.11",
     "@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"
   }
-}
+}

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

@@ -5,7 +5,6 @@ import store, { subPackageName } from '../store';
 import computed from '../store/computed';
 import common from './common';
 import { formatDate } from '../utils/date';
-import { formatEnum, enumOptions } from '../utils/formatEnum';
 import { getter, setter, _isMobile } from '../utils';
 import actionMap from './material-actions';
 import { scanCodeApi } from '../utils/scan-code-action';
@@ -32,7 +31,6 @@ function createGlboalApi() {
       request: sdk.request,
       getSessionId: sdk.getSessionId,
     },
-    enumOptions: enumOptions,
     state: store,
     computed: createComputed(computed.global),
     common,
@@ -47,7 +45,6 @@ function createGlboalApi() {
     },
     utils: {
       formatDate,
-      formatEnum,
       get: getter,
       set: setter,
       _getConfig: function () {
@@ -56,6 +53,9 @@ function createGlboalApi() {
       getWXContext: function() {
         return Promise.resolve({})
       },
+      getCurrentPage: function(){
+        return $page
+      },
     },
 
     // ... other sdk apis & apis from mp

package/template/src/datasources/config.js.tpl

@@ -11,6 +11,8 @@ export default {
   appID: '<%= appID %>',
   /** 云开发环境ID */
   envID: '<%= envID %>',
+  /** 应用端ID */
+  tcbClientId: '<%= clientID %>',
   /** 数据源描述对象数组 */
   dataSourceProfiles: dataSourceProfiles,
   /**