@cloudbase/lowcode-builder 1.10.1 → 1.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.10.1",
+  "version": "1.10.3",
   "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

@@ -557,7 +557,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.18f98172f3be7e1d2860.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.c91146779b08145f3c29.bundle.js"
     ></script>
   </body>
 </html>

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

@@ -8,7 +8,7 @@ import { default as cloudConfig } from '<%= subLevelPath %>../datasources/config
 import { createDataset } from '<%= subLevelPath %>../common/cloud-sdk'
 
 import config from '<%= subLevelPath %>../common/config';
-import { LOGIN_CONFIG } from '../common/util'
+import { LOGIN_CONFIG, getLoginConfig } from '../common/util'
 
 <%= importor.state? `import state from '../lowcode/state'` : "const state = {}" %>
 <%= importor.computed? `import computed from '../lowcode/computed'` : "const computed = {}" %>
@@ -106,6 +106,8 @@ function createGlboalApi() {
     return globalAPI.__internal__.getConfig()
   }
 
+  globalAPI.__internal__.getLoginConfig = getLoginConfig
+
   let dataset = createDataset('$global', undefined, {
     appId: globalAPI.id
   })

package/template/mp/app.js

@@ -1,3 +1,4 @@
+import { APP_LAUNCH_OPTIONS_PROMISE } from '@cloudbase/weda-client'
 import { app, $app } from '<%= wedaRootRelativePath %>app/weapps-api';
 <%= importor.lifecycle? `import lifeCycle from '${wedaRootRelativePath}lowcode/lifecycle'` : "const lifeCycle = {}" %>
 // 引入数据源管理器并进行初始化
@@ -46,6 +47,7 @@ App({
     return this.globaldata._beforeCustomLaunchPromise;
   },
   async onLaunch(options) {
+    APP_LAUNCH_OPTIONS_PROMISE?.resolve(options)
     if (wx.onLazyLoadError) {
       wx.onLazyLoadError(({ type, subpackage, errMsg}) => {
         console.log('subpackage')

package/template/mp/common/util.js

@@ -29,7 +29,7 @@ export async function redirectToLogin($page) {
 
   // 开启了多种登录模式，跳入登录页面让用户选择登录方式
   if (loginConfig?.miniprogram?.length > 1) {
-    _redirectToLogin($page);
+    await _redirectToLogin($page);
     return null;
   }
 
@@ -46,15 +46,14 @@ export async function redirectToLogin($page) {
     const { avatarUrl, nickName } = app.auth.currentUser;
     // 信息不全，去登录页面补全信息
     if (!avatarUrl || !nickName) {
-      _redirectToLogin($page, { baseInfoShow: 'true', currentLoginType: loginType });
+      await _redirectToLogin($page, { baseInfoShow: 'true', currentLoginType: loginType });
       return null
     }
 
-    const accessData = await getAccessPermission(app.id, $page.__internal__.packageName, $page.id, <%= !!isAdminPortal %>)
-    return { returnResult: accessData?.isAccess };
+    return { refreshAccess: true };
   }
 
-  _redirectToLogin($page);
+  await _redirectToLogin($page);
   return null
 }
 
@@ -98,8 +97,9 @@ export async function checkAuth(app, appId, $page) {
         if (loginPage && !isInPublicPage) {
           // 开启了手机号授权登录，则判断是否跳转到登录页面
           const res = await redirectToLogin($page, loginConfig);
-          if(res !== null) {
-            return res.returnResult
+          if(res?.refreshAccess) {
+            const accessData = await getAccessPermission(appId, $page.__internal__.packageName, $page.id, <%= !!isAdminPortal %>)
+            return  accessData?.isAccess
           }
         }
       } else {
@@ -114,14 +114,16 @@ export async function checkAuth(app, appId, $page) {
       if (loginPage && !isInPublicPage) {
         try {
           const res = await redirectToLogin($page, loginConfig);
-          if(res !== null) {
-            return res.returnResult
+          if(res?.refreshAccess) {
+            const accessData = await getAccessPermission(appId, $page.__internal__.packageName, $page.id, <%= !!isAdminPortal %>)
+            return  accessData?.isAccess
           }
           return false;
         } catch (e) {
           const res = await redirectToLogin($page, loginConfig);
-          if(res !== null) {
-            return res.returnResult
+          if(res?.refreshAccess) {
+            const accessData = await getAccessPermission(appId, $page.__internal__.packageName, $page.id, <%= !!isAdminPortal %>)
+            return  accessData?.isAccess
           }
           return false;
         }

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

@@ -59,16 +59,17 @@ const CLOUD_CONFIG =  {
         } else if (!config.endpointType) {
           return loginState.notLogin && await auth.signInAnonymouslyInWx();
         }
-			} else if (publicPage){
-				const pages = getCurrentPages();
-				const currentPage = pages[pages.length - 1]?.route?.match(/^pages\/(.*)\//)?.[1] || getApp().app?.__internal__?.getConfig()?.pages?.[0]?.id;
-				if (publicPage.includes(currentPage)) {
-					// 未登录时，进入公开访问页面，则匿名登录
-					return loginState.notLogin && await auth.signInAnonymously();
-				} else {
-					return redirectToLogin?.();
-				}
-			}
+			} else {
+        if (publicPage){
+          const pages = getCurrentPages();
+          const currentPage = pages[pages.length - 1]?.route?.match(/^pages\/(.*)\//)?.[1] || getApp().app?.__internal__?.getConfig()?.pages?.[0]?.id;
+          if (publicPage.includes(currentPage)) {
+            // 未登录时，进入公开访问页面，则匿名登录
+            return loginState.notLogin && await auth.signInAnonymously();
+          }
+        }
+        return redirectToLogin?.();
+      }
 
       return await defaultLogin();
 		},