@cloudbase/framework-plugin-low-code 0.7.8 → 0.7.10-beta.3

package/template/mp/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "scripts": {},
   "dependencies": {
-    "@cloudbase/weda-cloud-sdk": "1.0.8",
+    "@cloudbase/weda-cloud-sdk": "1.0.10",
     "@cloudbase/oauth": "0.1.1-alpha.2",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",

package/template/package.json

@@ -6,11 +6,10 @@
   },
   "dependencies": {
     "@cloudbase/js-sdk": "2.4.0-alpha.0",
-    "@cloudbase/weda-cloud-sdk": "1.0.8",
+    "@cloudbase/weda-cloud-sdk": "1.0.10",
     "@tcwd/weapps-core": "2.2.6",
     "@tcwd/weapps-sdk": "1.2.9",
     "@zxing/library": "^0.18.6",
-    "fastclick": "^1.0.6",
     "lodash": "^4.17.19",
     "mobx": "^5.15.4",
     "mobx-react-lite": "^2.0.7",

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

@@ -218,29 +218,44 @@ export async function checkAnonymous() {
   return isAnonymous;
 }
 
+let loginConfig;
+export async function getLoginConfig() {
+  if (loginConfig !== undefined) {
+    return loginConfig;
+  }
+  const { staticResourceDomain, id } = app.__internal__.getConfig();
+  const url = `https://${staticResourceDomain}/${id}/login.config.json?t=${Date.now()}`;
+  try {
+    let response = await fetch(url);
+    loginConfig = await response.json();
+  } catch (e) {
+    loginConfig = {};
+    console.error(`加载登录配置${url}失败`, e);
+  }
+  return loginConfig;
+}
+
 /**
  * 检查页面权限
  **/
 export async function checkAuth(app, appId, $page) {
   <% if (isAdminPortal || isXPage) { %>return true;<% } %>
-  const loginPage = findLoginPage(app);
-  if (loginPage?.id === $page.id) {
-    return true
-  }
-  app.showNavigationBarLoading();
+    app.showNavigationBarLoading();
+  const loginConfig = await getLoginConfig();
   const requestList = [getAccessPermission(app, appId, $page.id)];
-  // 暂时先认为有登录页则自定义登录功能开启且生效
-  if (loginPage) {
+  // 登录配置内有web登录项则认为开启web登录
+  if (loginConfig.web?.length > 0) {
     requestList.push(getAuthConfig(app));
     requestList.push(checkAnonymous());
+    requestList.push(getLoginConfig()); // 提前并行加载
   }
   const [isAccess, authConfig, isAnonymous] = await Promise.all(requestList);
   app.hideNavigationBarLoading();
 
-  if (loginPage && isAnonymous) {
+  if (loginConfig.web?.length > 0 && isAnonymous) {
     if (authConfig.NeedLogin || (!isAccess && authConfig.RejectStrategy === 'to_login')) {
       redirectToLogin($page);
-      return isAccess;
+      return false;
     }
   }
 
@@ -253,25 +268,22 @@ export async function checkAuth(app, appId, $page) {
   return isAccess;
 }
 
-export function redirectToLogin(currentPage) {
+export async function redirectToLogin(currentPage) {
   // 去登录则清空权限缓存。
   _AUTH_CACHE_MAP = {};
   const app = window.app;
-  const loginPage = findLoginPage(app);
-  if (!currentPage) {
-    currentPage = app.utils.getCurrentPage() || {};
-  }
-  if (loginPage?.id === currentPage.id) {
-    return true
-  }
-  if (loginPage) {
+
+  const loginConfig = await getLoginConfig();
+  if (loginConfig.web?.length > 0) {
+    const { staticResourceDomain, envId, id, clientId } = app.__internal__.getConfig();
+    const url = `${location.origin}/__auth/?redirect_uri=${encodeURIComponent(
+      location.href,
+    )}&app_id=${id}&env_id=${envId}&client_id=${clientId}`;
     app.redirectTo({
-      pageId: loginPage.id,
-      params: {
-        sourcePageId: currentPage.id,
-        sourcePageParams: currentPage.dataset.params
-      }
-    })
+      mode: 'web',
+      params: {},
+      url,
+    });
   } else {
     app.showToast({
       title: '用户未登录',

package/template/src/index.jsx

@@ -8,11 +8,10 @@ import './index.less'
 import './datasources'
 import { initGlobalVar } from './handlers/initWebEnv'
 import '@babel/polyfill/noConflict'
-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, checkAnonymous } from './handlers/utils'
+import { redirectToLogin, getAuthConfig, checkAnonymous, getLoginConfig } from './handlers/utils'
 // app 中注册配置页面以及app的全局配置miniprogram.config，h5里分app以及web页分别处理，使用process.env.isApp 区分判断
 if (process.env.isApp) {
   initWebConfig(app, AppConfig);
@@ -26,8 +25,7 @@ setConfig({
   },
   beforeCallFunction: async (params) => {
     try{
-      const loginPage = findLoginPage();
-
+      const loginConfig = await getLoginConfig();
       let skip = false;
       switch (params?.data?.methodName) {
         case 'callWedaApi': {
@@ -39,7 +37,7 @@ setConfig({
       }
 
       // 后续做过滤处理
-      if (!loginPage || (params?.data?.mode === 'c' && skip)) {
+      if (!(loginConfig.web?.length > 0) || (params?.data?.mode === 'c' && skip)) {
         return params;
       }
       const { accessToken } = await getAccessToken();
@@ -60,8 +58,8 @@ setConfig({
   },
   async afterCallFunction(params, error, res) {
     if(params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure','InvalidAccessToken'].includes(res?.result?.code)) {
-      const loginPage = findLoginPage();
-      if (loginPage) {
+      const loginConfig = await getLoginConfig();
+      if (loginConfig.web?.length > 0) {
         const authConfig = await getAuthConfig();
         const isAnonymous = await checkAnonymous();
         if (isAnonymous && authConfig.RejectStrategy == 'to_login') {
@@ -140,7 +138,6 @@ function render(props){
 
 // if (!process.env.isAdminPortal) {
 if (!window.__POWERED_BY_QIANKUN__) {
-  attachFastClick && attachFastClick.attach && attachFastClick.attach(document.body)
   render()
 }
 

package/template/webpack/web.prod.js

@@ -270,7 +270,7 @@ module.exports = function (options) {
             priority: 100, // 优先级
           },
           utils: {
-            test: /(lodash|dayjs|axios|kbone-api|fastclick)/,
+            test: /(lodash|dayjs|axios|kbone-api)/,
             chunks: 'all',
             priority: 100, // 优先级
           },