@cloudbase/framework-plugin-low-code 0.7.7 → 0.7.8-beta.0

package/lib/builder/core/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/builder/core/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAe5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAkBnD,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,kCAA2B,EACzC,YAAY,6BAAsB,EAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EAAE,EAC1B,UAAU,EAAE,WAAW,EACvB,OAAO,qBAAwB,EAC/B,aAAa,qBAAiB,EAC9B,SAAS;iBACM,OAAO;eACT,GAAG;aAIf,EACD,MAAM,EAAE,MAAM,iBA6Gf;AACD,wBAAsB,mBAAmB,CACvC,YAAY,oBAAa,EACzB,WAAW,EAAE,MAAM,EACnB,MAAM,KAAA,iBASP"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/builder/core/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAe5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAkBnD,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,kCAA2B,EACzC,YAAY,6BAAsB,EAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EAAE,EAC1B,UAAU,EAAE,WAAW,EACvB,OAAO,qBAAwB,EAC/B,aAAa,qBAAiB,EAC9B,SAAS;iBACM,OAAO;eACT,GAAG;aAIf,EACD,MAAM,EAAE,MAAM,iBA8Gf;AACD,wBAAsB,mBAAmB,CACvC,YAAY,oBAAa,EACzB,WAAW,EAAE,MAAM,EACnB,MAAM,KAAA,iBASP"}

package/lib/builder/core/generate.js

@@ -53,6 +53,7 @@ function runGenerateCore(appBuildDir, appData, subAppDataList = [], dependencies
             }
         });
         yield Promise.all(allAppDataList.map((data) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const { pageInstanceList, rootPath = '' } = data;
             const appName = rootPath ? 'Sub app ' + rootPath : 'Main app';
             console.log(chalk_1.default.blue.bold('Generating files for ' + appName));
@@ -68,6 +69,7 @@ function runGenerateCore(appBuildDir, appData, subAppDataList = [], dependencies
                 appConfig: (0, util_1.JsonToStringWithVariableName)({
                     id: appKey,
                     envId: appData.envId,
+                    clientId: (_a = appData.extra) === null || _a === void 0 ? void 0 : _a.clientId,
                     staticResourceDomain: domain || '',
                     envVersion: deployMode === types_1.DEPLOY_MODE.UPLOAD ? 'production' : 'preview',
                     pages: pageInstanceList

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

@@ -214,14 +214,7 @@ function translateStyleByHandler(style = {}, handler) {
             setStyleValue(result, key, value);
         }
         else if (value !== undefined && value !== null) {
-          try {
-
             setStyleValue(result, key, handler(value));
-          }catch(e){
-            console.log(style,key,value)
-            console.log(e)
-            throw e
-          }
         }
         return result;
     }, {});
@@ -264,7 +257,6 @@ function toREM(cssLen) {
         return calPxToREM(cssLen);
     }
     else {
-        console.log(cssLen)
         throw new Error('cssLen type error');
     }
 }

package/package.json

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

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}&s_domain=${staticResourceDomain}`;
     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

@@ -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, 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 +26,7 @@ setConfig({
   },
   beforeCallFunction: async (params) => {
     try{
-      const loginPage = findLoginPage();
-
+      const loginConfig = await getLoginConfig();
       let skip = false;
       switch (params?.data?.methodName) {
         case 'callWedaApi': {
@@ -39,7 +38,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 +59,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') {