@cloudbase/lowcode-builder 1.10.33 → 1.10.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.10.33",
+  "version": "1.10.35",
   "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.20",
+    "@cloudbase/cals": "^1.2.23",
     "@cloudbase/lowcode-generator": "^1.8.42",
     "axios": "^0.21.0",
     "chalk": "^2.4.2",
@@ -94,4 +94,4 @@
     "webpack-dev-server": "^4.7.3",
     "worker-loader": "^3.0.8"
   }
-}
+}

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.20.12/cloudbase.full.js?v=1"></script>
+    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.22.10/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"

package/template/mp/packages/$wd_system/index.js.tpl

@@ -1,4 +1,5 @@
 import { registerAi, createAi } from "@cloudbase/ai";
+import { registerApis, generateApis } from "@cloudbase/apis";
 import { generateAuthInstance, registerAuth } from "@cloudbase/auth";
 <% if(cdnEndpoints.aegis){ %>import Aegis from 'aegis-mp-sdk';<%} else {%> class Aegis {
   constructor() {
@@ -32,6 +33,10 @@ const loadMap = {
     generateAuthInstance,
     registerAuth,
   },
+  "@cloudbase/apis": {
+    registerApis,
+    generateApis,
+  },
   "@cloudbase/adapter-wx_mp": require('@cloudbase/adapter-wx_mp')
 };
 

package/template/mp/packages/$wd_system/pages/login/index.js

@@ -44,6 +44,13 @@ function decodePageQuery(query) {
 
 const BUTTON_CLASSNAME = 'weda-ui weda-button weui-btn weui-btn_primary wd-event-tap';
 
+const ICONS = {
+  __sms: 'data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20fill%3D%22none%22%3E%3Cpath%20fillRule%3D%22evenodd%22%20clipRule%3D%22evenodd%22%20d%3D%22M3%200.666626H13V15.3333H3V0.666626ZM4.33333%201.99996V14H11.6667V1.99996H4.33333Z%22%20fill%3D%22%234490ee%22%20fillOpacity%3D%220.9%22/%3E%3Cpath%20fillRule%3D%22evenodd%22%20clippRule%3D%22evenodd%22%20d%3D%22M7.3335%2011.3334H8.66943V12.6693H7.3335V11.3334Z%22%20fill%3D%22%234490ee%22%20fillOpacity%3D%220.9%22/%3E%3C/g%3E%3C/svg%3E',
+  __miniprogram_phone: 'data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20fill%3D%22%234490ee%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.3335%202.00006L15.3335%2014.0001L0.66683%2014.0001L0.66683%202.00006L15.3335%202.00006ZM14.0002%203.33339L2.00016%203.33339L2.00016%206.00006L14.0002%206.00006L14.0002%203.33339ZM14.0002%207.33339L2.00016%207.3334L2.00016%2012.6667L14.0002%2012.6667L14.0002%207.33339ZM6.66683%2010.6667L3.3335%2010.6667L3.3335%209.33339L6.66683%209.3334L6.66683%2010.6667Z%22%20fill%3D%22%234490ee%22%20fill-opacity%3D%220.9%22/%3E%3C/g%3E%3C/svg%3E',
+  email: 'data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20fill%3D%22none%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M0.666504%202.66669H15.3332V13.3334H0.666504V2.66669ZM3.31624%204.00002L7.99984%207.19316L12.6834%204.00002H3.31624ZM13.9998%204.71626V12H1.99984V4.71626L7.99984%208.80688L13.9998%204.71626Z%22%20fill%3D%22%234490ee%22%20fill-opacity%3D%220.9%22%3E%3C%2Fpath%3E%3C%2Fg%3E%3C%2Fsvg%3E',
+  __openid_login: 'data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2016%2016%22%3E%0A%20%20%20%20%20%20%3Cg%20fill%3D%22none%22%3E%0A%20%20%20%20%20%20%20%20%3Cpath%0A%20%20%20%20%20%20%20%20%20%20fillRule%3D%22evenodd%22%0A%20%20%20%20%20%20%20%20%20%20clipRule%3D%22evenodd%22%0A%20%20%20%20%20%20%20%20%20%20d%3D%22M10.9122%207.16659C8.74181%207.16659%207.15755%208.66323%207.15755%2010.3089C7.15755%2011.9545%208.74181%2013.4511%2010.9122%2013.4511C11.3394%2013.4511%2011.7484%2013.3913%2012.1286%2013.282L12.3599%2013.2155L13.2267%2013.5953L13.0731%2012.9055L13.4167%2012.6473C14.2041%2012.0555%2014.6667%2011.2145%2014.6667%2010.3089C14.6667%208.66323%2013.0825%207.16659%2010.9122%207.16659ZM5.82422%2010.3089C5.82422%207.74725%208.1989%205.83325%2010.9122%205.83325C13.6254%205.83325%2016.0001%207.74725%2016.0001%2010.3089C16.0001%2011.5424%2015.4361%2012.64%2014.5567%2013.4339L14.993%2015.3932H14.0073L12.2578%2014.6265C11.8282%2014.7297%2011.3769%2014.7845%2010.9122%2014.7845C8.1989%2014.7845%205.82422%2012.8705%205.82422%2010.3089Z%22%0A%20%20%20%20%20%20%20%20%20%20fill%3D%22%234490ee%22%0A%20%20%20%20%20%20%20%20%20%20fillOpacity%3D%220.9%22%0A%20%20%20%20%20%20%20%20%3E%3C%2Fpath%3E%0A%20%20%20%20%20%20%20%20%3Cpath%0A%20%20%20%20%20%20%20%20%20%20fillRule%3D%22evenodd%22%0A%20%20%20%20%20%20%20%20%20%20clipRule%3D%22evenodd%22%0A%20%20%20%20%20%20%20%20%20%20d%3D%22M5.96278%202.44661C3.30372%202.44661%201.33333%204.26852%201.33333%206.30474C1.33333%207.41602%201.90228%208.4435%202.86201%209.16679L3.19915%209.42087L3.01575%2010.3073L4.02507%209.81612L4.28122%209.89966C4.76113%2010.0562%205.28126%2010.1481%205.82681%2010.1612C5.91206%207.78491%208.04762%205.99865%2010.5585%205.84419C10.2883%204.00172%208.41944%202.44661%205.96278%202.44661ZM0%206.30474C0%203.34301%202.77191%201.11328%205.96278%201.11328C9.15365%201.11328%2011.9256%203.34301%2011.9256%206.30474C11.9256%206.38561%2011.9234%206.4661%2011.9192%206.54618L11.8838%207.22076L11.2097%207.17642C11.1116%207.16996%2011.0124%207.16667%2010.9121%207.16667C8.74176%207.16667%207.1575%208.66331%207.1575%2010.3089C7.1575%2010.4433%207.16758%2010.5754%207.18708%2010.7047L7.29247%2011.4042L6.58802%2011.468C6.38236%2011.4867%206.17376%2011.4962%205.96278%2011.4962C5.32541%2011.4962%204.70977%2011.4092%204.13147%2011.2472L2.2599%2012.1579H1.2713L1.72601%209.96009C0.674276%209.03578%200%207.74977%200%206.30474Z%22%0A%20%20%20%20%20%20%20%20%20%20fill%3D%22%234490ee%22%0A%20%20%20%20%20%20%20%20%20%20fillOpacity%3D%220.9%22%0A%20%20%20%20%20%20%20%20%3E%3C%2Fpath%3E%0A%20%20%20%20%20%20%20%20%3Cpath%0A%20%20%20%20%20%20%20%20%20%20fillRule%3D%22evenodd%22%0A%20%20%20%20%20%20%20%20%20%20clipRule%3D%22evenodd%22%0A%20%20%20%20%20%20%20%20%20%20d%3D%22M8.7207%209.29555C8.7207%208.8966%209.04409%208.57312%209.44282%208.57312C9.842%208.57312%2010.1653%208.89657%2010.1653%209.29555C10.1653%209.69453%209.842%2010.018%209.44282%2010.018C9.04409%2010.018%208.7207%209.69451%208.7207%209.29555ZM11.6657%209.29555C11.6657%208.89657%2011.9891%208.57312%2012.388%208.57312C12.7871%208.57312%2013.1103%208.8966%2013.1103%209.29555C13.1103%209.69451%2012.7871%2010.018%2012.388%2010.018C11.9891%2010.018%2011.6657%209.69453%2011.6657%209.29555Z%22%0A%20%20%20%20%20%20%20%20%20%20fill%3D%22%234490ee%22%0A%20%20%20%20%20%20%20%20%20%20fillOpacity%3D%220.9%22%0A%20%20%20%20%20%20%20%20%3E%3C%2Fpath%3E%0A%20%20%20%20%20%20%20%20%3Cpath%0A%20%20%20%20%20%20%20%20%20%20fillRule%3D%22evenodd%22%0A%20%20%20%20%20%20%20%20%20%20clipRule%3D%22evenodd%22%0A%20%20%20%20%20%20%20%20%20%20d%3D%22M3.36084%204.84006C3.36084%204.37603%203.73707%204%204.2009%204C4.66506%204%205.04113%204.37603%205.04113%204.84006C5.04113%205.30424%204.66508%205.68029%204.2009%205.68029C3.73705%205.68029%203.36084%205.30424%203.36084%204.84006ZM6.89497%204.84006C6.89497%204.37603%207.27104%204%207.73519%204C8.19916%204%208.57541%204.37601%208.57541%204.84006C8.57541%205.30426%208.19918%205.68029%207.73519%205.68029C7.27102%205.68029%206.89497%205.30424%206.89497%204.84006Z%22%0A%20%20%20%20%20%20%20%20%20%20fill%3D%22%234490ee%22%0A%20%20%20%20%20%20%20%20%20%20fillOpacity%3D%220.9%22%0A%20%20%20%20%20%20%20%20%3E%3C%2Fpath%3E%0A%20%20%20%20%20%20%3C%2Fg%3E%0A%20%20%20%20%3C%2Fsvg%3E',
+}
+
 function setStorage(data, key = phoneVerifyInfoKey) {
   const current = wx.getStorageSync(key || phoneVerifyInfoKey);
   wx.setStorageSync(key, {
@@ -104,6 +111,7 @@ Component({
 
     isRegister: false, // 是否注册场景
     registerMethods: [], // 注册方式
+    icons: ICONS,
   },
   methods: {
     async getPhoneCodeNumber(e) {
@@ -197,7 +205,7 @@ Component({
           },
           miniprogram: (config.miniprogram || []).map(v => ({
             ...v,
-            label: v.label?.replace(/^微信小程序/, '')
+            label: v.label?.split('(')[0]
           })),
           access: {
             ...config.access
@@ -316,6 +324,7 @@ Component({
         verificationInfo,
         loginOnly: !this.data.settingData.userRegistry?.enable,
         isRegister: this.data.isRegister,
+        isAutoRegister: !this.data.settingData.userRegistry.registerType || this.data.settingData.userRegistry.registerType === 'auto',
         hasRegisterConfig: this.data.settingData.userRegistry?.enable && !!this.data.settingData.userRegistry?.miniprogram?.find(v => v.id === this.data.currentLoginType), // 有注册配置，才会走注册配置的判断
         callback: (err, data) => {
           if (err) {
@@ -435,7 +444,15 @@ Component({
 
       // 5. 确定登录模式和目标类型
       const loginOnly = !this.data.settingData.userRegistry?.enable;
-      const target = loginOnly ? 'USER' : 'ANY';
+      const isAutoRegister= !this.data.settingData.userRegistry.registerType || this.data.settingData.userRegistry.registerType === 'auto'
+
+      /**
+       * 1) 如果当前是注册页面，则目标类型为ANY;
+       * 2) 如果当前是登录页面，且未开启注册，则目标类型为USER;
+       * 3) 如果当前是登录页面，且开启注册，且为自动注册，则目标类型为ANY;
+       * 4) 如果当前是登录页面，且开启注册，且为非自动注册，则目标类型为USER;
+       */
+      const target = !this.data.isRegister && (!isAutoRegister || loginOnly) ? 'USER' : 'ANY';
 
       // 6. 获取用户输入的标识（手机号/邮箱）
       const identifier = this.data[getInfoField];

package/template/mp/packages/$wd_system/pages/login/index.wxml

@@ -63,7 +63,7 @@
         <view wx:if="{{!isRegister && publicPage && publicPage.length > 0}}" class="weda-ui weda-button weui-btn weui-btn_default wd-event-tap" style="margin-top: 30rpx; width:100%; background: transparent;font-size: 14px;" size="md" bind:tap="loginCancel">
           暂不登录
         </view>
-        <view wx:if="{{registerMethods.length}}" class="register">
+        <view wx:if="{{registerMethods.length && settingData.userRegistry.registerType === 'split'}}" class="register">
           <text>{{isRegister ? '已有账号？' : '没有账号？'}}</text>
           <text class="link" bind:tap="toRegister">{{isRegister ? '立即登录' : '立即注册'}}</text>
         </view>
@@ -76,7 +76,10 @@
           <view class="login-method__list">
             <block wx:for="{{isRegister ? registerMethods : currentLoginList}}" wx:for-item="item" wx:key="index">
               <view wx:if="{{item.id !== currentLoginType}}" class="login-method__list-item" bind:tap="methodClick" data-item="{{item}}">
-                <view class="short-name">{{item.label[0]}}</view>
+                <view class="short-name">
+                  <image wx:if="{{icons[item.id]}}" class="short-name__image" src="{{icons[item.id]}}" />
+                  <text wx:else>{{item.label[0]}}</text>
+                </view>
                 <view class="name">{{isRegister ? item.registerLabel : item.label}}</view>
               </view>
             </block>
@@ -137,4 +140,4 @@
   </view>
   <wd-info type="{{initing? 'loading': 'auth'}}" wx:if="{{initing || error}}" message="{{loading?'加载配置中...':' '}}" error="{{error}}" />
   <captcha-dialog />
-</page-meta>
+</page-meta>

package/template/mp/packages/$wd_system/pages/login/index.wxss

@@ -120,11 +120,16 @@ button:active {
 .login-method .login-method__list .login-method__list-item .short-name {
   width: 84rpx;
   height: 84rpx;
-  line-height: 84rpx;
-  border-radius: 100%;
-  text-align: center;
-  background-color: #7fb5f1;
-  color: #fff;
+  border: 1px solid #d6dbe3;
+  border-radius: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.login-method .login-method__list .login-method__list-item .short-name .short-name__image {
+  height: 48rpx;
+  width: 48rpx;
 }
 
 .login-method .login-method__list .login-method__list-item .name {
@@ -145,4 +150,4 @@ button:active {
 
 .register .link {
   color: #006eff;
-}
+}

package/template/mp/packages/$wd_system/pages/login/methods/errorHandler.js

@@ -164,7 +164,7 @@ export const parseCommonError = (e) => {
       msg = `网络错误，请检查您的网络连接，稍后重试${prefixMsg(e.error_description)}`;
       break;
     case 'resource_exhausted':
-      return '验证码已被使用，或者尝试过于频繁，请稍后重试';
+      return '验证码已过期，或尝试过于频繁，请稍后重试，或选择其他登录方式';
     case 'license_required':
       return '该用户没有产品许可证，请授权后重试';
     default:

package/template/mp/packages/$wd_system/pages/login/methods/loginByEmail.js

@@ -19,7 +19,8 @@ export default async function loginByEmail(
     loginOnly,
     isRegister,
     bindInfo,
-    hasRegisterConfig
+    hasRegisterConfig,
+    isAutoRegister = true
   },
 ) {
   wx.showLoading({
@@ -39,12 +40,14 @@ export default async function loginByEmail(
       };
     }
 
-    if (isRegister && verificationInfo.isUser) {
-      throw new Error('user has already registered, please log in directly');
-    }
+    if (!isAutoRegister) {
+      if (isRegister && verificationInfo.isUser) {
+        throw new Error('user has already registered, please log in directly');
+      }
 
-    if (!isRegister && !verificationInfo.isUser) {
-      throw { error: 'user not registered, please register first' };
+      if (!isRegister && !verificationInfo.isUser) {
+        throw { error: 'user not registered, please register first' };
+      }
     }
 
     // 校验
@@ -67,7 +70,7 @@ export default async function loginByEmail(
           provider_token: bindInfo.providerToken,
         });
       }
-    } else if (hasRegisterConfig && isRegister) {
+    } else if ((hasRegisterConfig && isRegister) || isAutoRegister) {
       // 3. 注册
       await auth.signUp({
         email,

package/template/mp/packages/$wd_system/pages/login/methods/loginBySms.js

@@ -5,7 +5,7 @@ import { phoneVerifyInfoKey, verifyCodeFailedLimit } from './contants';
 
 export default async function loginBySms(
   instance,
-  { callback, verificationInfo, verificationCode, phoneNum, bindInfo, loginOnly, isRegister, hasRegisterConfig },
+  { callback, verificationInfo, verificationCode, phoneNum, bindInfo, loginOnly, isRegister, hasRegisterConfig, isAutoRegister = true },
 ) {
   wx.showLoading({ mask: true });
   const { usedCount = 0 } = wx.getStorageSync(phoneVerifyInfoKey) || {};
@@ -18,14 +18,17 @@ export default async function loginBySms(
       throw { error: 'get_verify_code' };
     }
 
-    if (isRegister && verificationInfo.isUser) {
-      throw new Error('user has already registered, please log in directly');
-    }
+    if (!isAutoRegister) {
+      if (isRegister && verificationInfo.isUser) {
+        throw new Error('user has already registered, please log in directly');
+      }
 
-    if (!isRegister && !verificationInfo.isUser) {
-      throw { error: 'user not registered, please register first' };
+      if (!isRegister && !verificationInfo.isUser) {
+        throw { error: 'user not registered, please register first' };
+      }
     }
 
+
     // 校验
     if (!phoneNum || !verificationCode) {
       throw new Error('输入内容不合法');
@@ -48,7 +51,7 @@ export default async function loginBySms(
           provider_token: bindInfo.providerToken,
         });
       }
-    } else if (hasRegisterConfig && isRegister) {
+    } else if ((hasRegisterConfig && isRegister) || isAutoRegister) {
       // 自定义应用走signUp逻辑
       await auth.signUp({
         phone_number: `+86 ${phoneNum}`,

package/template/mp/packages/$wd_system/pages/login/methods/loginSuccessCallBack.js

@@ -13,6 +13,16 @@ export default function (instance) {
       pageId: query.sourcePageId,
       packageName: query.sourcePagePackageName || undefined,
       params,
+      fail: (res) => {
+        if (res.errMsg?.includes?.('tabbar page')) {
+          const path = `${
+            query.sourcePagePackageName ? '/packages/' + query.sourcePagePackageName : ''
+          }/pages/${query.sourcePageId}/index`
+          app.switchTab({ url: path })
+        } else {
+          app.relaunchHome()
+        }
+      }
     }) : app.relaunchHome();
   } catch (e) {
     app.relaunchHome();

package/template/webpack/web.prod.js

@@ -100,7 +100,7 @@ module.exports = function (options) {
     }),
     new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
     new webpack.NormalModuleReplacementPlugin(
-      /@\/components\/(?!ui)(.*)|^@\/(lib|hooks|configs|utils)|^@\/components$/, // 使用否定前瞻匹配除ui外的所有路径
+      /@\/components\/(?!ui)(.*)|^@\/(lib|hooks|configs|utils|pages)|^@\/components$/, // 使用否定前瞻匹配除ui外的所有路径
       function (resource) {
         if (/lowcode\//.test(resource.context)) {
           if (resource.request === '@/components') {