@cloudbase/lowcode-builder 1.9.7 → 1.9.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.9.7",
+  "version": "1.9.9",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -49,7 +49,7 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.2.4",
+    "@cloudbase/cals": "^1.2.5",
     "@cloudbase/lowcode-generator": "^1.8.37",
     "axios": "^0.21.0",
     "chalk": "^2.4.2",

package/template/html/index.html.ejs

@@ -464,7 +464,7 @@
     <script type="module" src="/src/index.jsx"></script>
     <% } %> <% if(!isAdminPortal){ %>
     <script src="<%= wedaPrivateConfigEndpoint ? wedaPrivateConfigEndpoint : '' %>/weda-config/weda-private.js"></script>
-    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.8.16-beta.0/cloudbase.full.js?v=1"></script>
+    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.8.21-beta.0/cloudbase.full.js?v=1"></script>
     <script
       crossorigin
       src="<%= cdnEndpoints.cdngo %>/lcap/lcap-resource-cdngo/-/release/_npm/cloudbase-adapter-privatelink@0.0.2/dist/index.js"
@@ -528,7 +528,7 @@
       crossorigin="anonymous"
       src="<%=
         cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.67/dist/h5.browser.js"
+      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.89/dist/h5.browser.js"
     ></script>
     <script
       crossorigin
@@ -557,7 +557,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.dfcfc20fa55fb52e639f.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.be9848557e443dbc9550.bundle.js"
     ></script>
   </body>
 </html>

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

@@ -8,6 +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'
 
 <%= importor.state? `import state from '../lowcode/state'` : "const state = {}" %>
 <%= importor.computed? `import computed from '../lowcode/computed'` : "const computed = {}" %>
@@ -86,6 +87,7 @@ function createGlboalApi() {
       staticResourceDomain: config.domain,
       privatelink: cloudConfig.privatelink,
       envVersion: cloudConfig.isProd ? 'production' : 'preview',
+      accessType: LOGIN_CONFIG?.access?.type, // 登录模式，'default'(无需登录) | 'env'（托管登录） | 'hash'（独立登录） | 'self'（自定义登录）
       ...(<%= appConfig %>)
     },
   });

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

@@ -49,11 +49,29 @@ const CLOUD_CONFIG =  {
     })
   },
   __defaultLoginType__: '<%= defaultLoginType %>',
-  // customConfig: '<%= defaultLoginType %>' !== 'openId' && !LOGIN_CONFIG?.access?.needLogin && !config.endpointType ? {
-	// 	async login({ app, auth }) {
-	// 		await auth.signInAnonymouslyInWx();
-	// 	}
-	// } : undefined
+  customConfig: {
+	 	async login({ app, auth, loginState, defaultLogin }) {
+			if (!LOGIN_CONFIG?.access?.needLogin) {
+        if (<%= pureAnonymousLogin %>) {
+				  return !loginState.isAnonymous && await auth.signInAnonymously();
+        } else if (!config.endpointType) {
+          return await auth.signInAnonymouslyInWx();
+        }
+			} else if (<%= publicPage %>){
+				const pages = getCurrentPages();
+				const currentPage = pages[pages.length - 1]?.route?.match(/^pages\/(.*)\//)?.[1] || getApp().app?.__internal__?.getConfig()?.page?.[0]?.id;
+				if (<%= publicPage %>.includes(currentPage)) {
+					// 未登录时，进入公开访问页面，则匿名登录
+					return !loginState.isAnonymous && await auth.signInAnonymously();
+				} else {
+					const { redirectToLogin } = getApp().app?.auth?.__internal__ || {};
+					return redirectToLogin?.();
+				}
+			}
+
+      return await defaultLogin();
+		}
+	}
 }
 
 export default CLOUD_CONFIG

package/template/package.json

@@ -43,4 +43,4 @@
     "webpack-dev-server": "^3.11.3",
     "webpack-cli": "^3.3.12"
   }
-}
+}