@cloudbase/lowcode-builder 1.9.13 → 1.10.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/lib/builder/config/dependencies.js +3 -3
  2. package/lib/builder/core/index.js +8 -3
  3. package/lib/builder/h5/generate.js +1 -6
  4. package/lib/builder/mp/util.js +10 -4
  5. package/lib/builder/mp/wxml.js +10 -1
  6. package/lib/builder.web.js +7 -7
  7. package/package.json +2 -2
  8. package/template/html/index.html.ejs +4 -4
  9. package/template/mp/common/info/index.json +3 -2
  10. package/template/mp/common/util.js +34 -16
  11. package/template/mp/datasources/config.js.tpl +1 -1
  12. package/template/mp/packages/$wd_system/pages/login/index.js +544 -279
  13. package/template/mp/packages/$wd_system/pages/login/index.wxml +89 -61
  14. package/template/mp/packages/$wd_system/pages/login/index.wxss +82 -22
  15. package/template/mp/packages/$wd_system/pages/login/methods/loginByOpenId.js +24 -0
  16. package/template/mp/packages/$wd_system/pages/login/methods/loginByUnionId.js +24 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloudbase/lowcode-builder",
3
- "version": "1.9.13",
3
+ "version": "1.10.1",
4
4
  "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
5
5
  "author": "yhsunshining@gmail.com",
6
6
  "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -49,7 +49,7 @@
49
49
  "dependencies": {
50
50
  "@babel/core": "7.21.4",
51
51
  "@babel/preset-env": "7.21.4",
52
- "@cloudbase/cals": "^1.2.5",
52
+ "@cloudbase/cals": "^1.2.8",
53
53
  "@cloudbase/lowcode-generator": "^1.8.37",
54
54
  "axios": "^0.21.0",
55
55
  "chalk": "^2.4.2",
package/template/html/index.html.ejs CHANGED
@@ -392,7 +392,7 @@
392
392
 
393
393
  <body data-weui-theme="light">
394
394
  <div id="root" class="main-wrap">
395
- <% if(enableLoading){ %>
395
+ <% if(enableLoading && typeof enableLoading === 'boolean'){ %>
396
396
  <style type="text/css">
397
397
  .weda-loading-container {
398
398
  position: fixed;
@@ -464,7 +464,7 @@
464
464
  <script type="module" src="/src/index.jsx"></script>
465
465
  <% } %> <% if(!isAdminPortal){ %>
466
466
  <script src="<%= wedaPrivateConfigEndpoint ? wedaPrivateConfigEndpoint : '' %>/weda-config/weda-private.js"></script>
467
- <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.8.21-beta.0/cloudbase.full.js?v=1"></script>
467
+ <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.8.34/cloudbase.full.js?v=1"></script>
468
468
  <script
469
469
  crossorigin
470
470
  src="<%= cdnEndpoints.cdngo %>/lcap/lcap-resource-cdngo/-/release/_npm/cloudbase-adapter-privatelink@0.0.2/dist/index.js"
@@ -528,7 +528,7 @@
528
528
  crossorigin="anonymous"
529
529
  src="<%=
530
530
  cdnEndpoints.cdngo
531
- %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.89/dist/h5.browser.js"
531
+ %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.96/dist/h5.browser.js"
532
532
  ></script>
533
533
  <script
534
534
  crossorigin
@@ -557,7 +557,7 @@
557
557
  crossorigin
558
558
  src="<%=
559
559
  cdnEndpoints.cdngo
560
- %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.a33416580dd1425d5d06.bundle.js"
560
+ %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.18f98172f3be7e1d2860.bundle.js"
561
561
  ></script>
562
562
  </body>
563
563
  </html>
package/template/mp/common/info/index.json CHANGED
@@ -1,4 +1,5 @@
1
1
  {
2
2
  "component": true,
3
- "usingComponents": {}
4
- }
3
+ "usingComponents": {},
4
+ "styleIsolation": "shared"
5
+ }
package/template/mp/common/util.js CHANGED
@@ -27,21 +27,33 @@ export async function redirectToLogin($page) {
27
27
  const { app } = getWedaAPI();
28
28
  const loginConfig = await getLoginConfig();
29
29
 
30
- // openid 登录特殊处理，不在登录页登录，在原地静默登录
31
- const hasOpenIdLoginType = loginConfig?.miniprogram?.find(v => v.type === 'openid_login')?.enable;
32
- const hasUnionIdLoginType = loginConfig?.miniprogram?.find(v => v.type === 'unionid_login')?.enable;
33
-
34
- if(hasOpenIdLoginType){
35
- // 开启了openId静默登录，则进行openid登录
36
- const result = await app.cloud.openIdLoginInWxApp();
37
- cleanAccessPermissionCache?.()
38
- return { returnResult: result }
39
- } else if (hasUnionIdLoginType) {
40
- // 开启了unionId静默登录，则进行unionId登录
41
- const result = await app.cloud.unionIdLoginInWxApp();
42
- cleanAccessPermissionCache?.()
43
- return { returnResult: result }
30
+ // 开启了多种登录模式，跳入登录页面让用户选择登录方式
31
+ if (loginConfig?.miniprogram?.length > 1) {
32
+ _redirectToLogin($page);
33
+ return null;
44
34
  }
35
+
36
+ const AUTO_LOGIN = {
37
+ openid_login: app.cloud.openIdLoginInWxApp,
38
+ unionid_login: app.cloud.unionIdLoginInWxApp
39
+ }
40
+ const loginType = loginConfig?.miniprogram?.[0]?.type;
41
+
42
+ if(AUTO_LOGIN[loginType]){
43
+ await AUTO_LOGIN[loginType]();
44
+ cleanAccessPermissionCache?.();
45
+
46
+ const { avatarUrl, nickName } = app.auth.currentUser;
47
+ // 信息不全，去登录页面补全信息
48
+ if (!avatarUrl || !nickName) {
49
+ _redirectToLogin($page, { baseInfoShow: 'true', currentLoginType: loginType });
50
+ return null
51
+ }
52
+
53
+ const accessData = await getAccessPermission(app.id, $page.__internal__.packageName, $page.id, <%= !!isAdminPortal %>)
54
+ return { returnResult: accessData?.isAccess };
55
+ }
56
+
45
57
  _redirectToLogin($page);
46
58
  return null
47
59
  }
@@ -101,10 +113,16 @@ export async function checkAuth(app, appId, $page) {
101
113
  // 如果当前页面匿名用户有权限访问，且需要登录后访问应用，则按配置进行登录
102
114
  if (loginPage && !isInPublicPage) {
103
115
  try {
104
- await redirectToLogin($page, loginConfig);
116
+ const res = await redirectToLogin($page, loginConfig);
117
+ if(res !== null) {
118
+ return res.returnResult
119
+ }
105
120
  return false;
106
121
  } catch (e) {
107
- await redirectToLogin($page, loginConfig);
122
+ const res = await redirectToLogin($page, loginConfig);
123
+ if(res !== null) {
124
+ return res.returnResult
125
+ }
108
126
  return false;
109
127
  }
110
128
  }
package/template/mp/datasources/config.js.tpl CHANGED
@@ -57,7 +57,7 @@ const CLOUD_CONFIG = {
57
57
  if (<%= pureAnonymousLogin %>) {
58
58
  return loginState.notLogin && await auth.signInAnonymously();
59
59
  } else if (!config.endpointType) {
60
- return await auth.signInAnonymouslyInWx();
60
+ return loginState.notLogin && await auth.signInAnonymouslyInWx();
61
61
  }
62
62
  } else if (publicPage){
63
63
  const pages = getCurrentPages();