@cloudbase/lowcode-builder 1.10.27 → 1.10.28

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

@@ -2,13 +2,13 @@
   <view wx:if="{{!initing && !error}}" class="wd-mp-root" data-weui-theme="light">
     <view style="width:90%;margin:0px auto;display:flex;flex-direction:column;max-width:50rem;" class="login-class">
       <block wx:if="{{!baseInfoShow}}">
-        <view style="margin:60px 0px 40px; display: flex; flex-direction: column; align-items: center;">
+        <view style="margin:40px 0px 20px; display: flex; flex-direction: column; align-items: center;">
           <image style="margin:0px auto;display:flex;justify-content:center;width: 80px;height: 80px;" class="weda-ui weda-image" mode="aspectFit" src="{{settingData.logo}}" />
           <view wx:if="{{ !!settingData.name }}" style="font-size: 16px;">
             {{ settingData.name }}
           </view>
         </view>
-        <view wx:if="{{currentLoginType === 'password'}}">
+        <view wx:if="{{currentLoginType === '__password'}}">
           <form bindsubmit="loginByPassword">
             <login-input name="username" placeholder="请输入用户名" type="text" />
             <view style="margin-bottom:30px;position:relative;">
@@ -21,44 +21,65 @@
             </button>
           </form>
         </view>
-        <view wx:elif="{{currentLoginType === 'sms'}}">
-          <form bindsubmit="loginBySms">
-            <login-input name="phoneNum" defaultValue="{{defaultPhoneNumber}}" placeholder="输入手机号" type="number" auto maxlength="11" bindchange="onPhoneChange">
+        <view wx:elif="{{currentLoginType === '__sms'}}">
+          <form bindsubmit="handleLogin">
+            <login-input name="phoneNum" defaultValue="{{defaultPhoneNumber}}" placeholder="输入手机号" type="number" auto maxlength="11" bindchange="handleInputChange">
               <view class="input-prefix" style="color:#acacac;padding: 0 10px" slot="prefix">
                 +86
               </view>
             </login-input>
             <view style="margin-bottom:30px;position:relative;">
               <login-input name="verificationCode" placeholder="输入验证码" style="padding-right:100px" type="text" maxlength="6">
-                <view class="input-suffix wd-event-tap" style="font-size:14px;width: 150px;text-align:center;padding:0 10px;color:{{phoneValidateMessage || smsDelay>0?'var(--wd-color-brand-disabled)':'var(--wd-color-text-brand)'}};" slot="suffix" bindtap="getCaptcha">
+                <view class="input-suffix wd-event-tap" style="font-size:14px;width: 150px;text-align:center;padding:0 10px;color:{{phoneValidateMessage || smsDelay>0?'var(--wd-color-brand-disabled)':'var(--wd-color-text-brand)'}};" slot="suffix" bindtap="handleCaptcha">
                   {{smsDelay > 0 ? '重新获取'+smsDelay : '获取验证码'}}
                 </view>
               </login-input>
             </view>
             <button class="{{loginButtonClass}}" style="width:100%;border-radius:5px;" size="md" form-type="submit">
-              登录
+              {{isRegister ? '注册' : '登录'}}
             </button>
           </form>
         </view>
-        <view wx:elif="{{currentLoginType === 'miniprogram_phone'}}">
+        <view wx:elif="{{currentLoginType === 'email'}}">
+          <form bindsubmit="handleLogin">
+            <login-input name="email" defaultValue="{{defaultEmail}}" placeholder="输入邮箱" type="text" auto bindchange="handleInputChange"></login-input>
+            <view style="margin-bottom:30px;position:relative;">
+              <login-input name="verificationCode" placeholder="输入验证码" style="padding-right:100px" type="text" maxlength="6">
+                <view class="input-suffix wd-event-tap" style="font-size:14px;width: 150px;text-align:center;padding:0 10px;color:{{emailValidateMessage || emailDelay>0?'var(--wd-color-brand-disabled)':'var(--wd-color-text-brand)'}};" slot="suffix" bindtap="handleCaptcha">
+                  {{emailDelay > 0 ? '重新获取'+emailDelay : '获取验证码'}}
+                </view>
+              </login-input>
+            </view>
+            <button class="{{loginButtonClass}}" style="width:100%;border-radius:5px;" size="md" form-type="submit">
+              {{isRegister ? '注册' : '登录'}}
+            </button>
+          </form>
+        </view>
+        <view wx:elif="{{currentLoginType === '__miniprogram_phone'}}">
           <button style="width:100%;border-radius: 5px;" bindgetphonenumber="getPhoneCodeNumber" open-type="getPhoneNumber" role="button" class="{{loginButtonClass}}">
-            登录
+            {{isRegister ? '注册' : '登录'}}
           </button>
         </view>
-        <view wx:if="{{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 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="{{currentLoginList.length >= 1}}" class="login-method">
+        <view wx:if="{{registerMethods.length}}" class="register">
+          <text>{{isRegister ? '已有账号？' : '没有账号？'}}</text>
+          <text class="link" bind:tap="toRegister">{{isRegister ? '立即登录' : '立即注册'}}</text>
+        </view>
+        <view wx:if="{{isRegister ? registerMethods.length > 1 : currentLoginList.length > 1}}" class="login-method">
           <view class="divider">
             <view class="divider-line"></view>
-            <view class="divider-title">可选登录方式</view>
+            <view class="divider-title">可选{{isRegister?'注册':'登录'}}方式</view>
             <view class="divider-line"></view>
           </view>
           <view class="login-method__list">
-            <view class="login-method__list-item" wx:for="{{currentLoginList}}" wx:for-item="item" wx:key="index" bind:tap="methodClick" data-item="{{item}}">
-              <view class="short-name">{{item.label[0]}}</view>
-              <view class="name">{{item.label}}</view>
-            </view>
+            <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="name">{{isRegister ? item.registerLabel : item.label}}</view>
+              </view>
+            </block>
           </view>
         </view>
         <view style="display:flex;justify-content:center;flex-direction:row;font-size:0.8rem;position:fixed;left:0px;right:0px;bottom:50px;" class="have-read" wx:if="{{settingData.agreement.enable}}">
@@ -116,4 +137,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

@@ -2,134 +2,147 @@ button,
 button:hover,
 button,
 button:active {
-	font-size: 14px !important;
-	color: white;
+  font-size: 32rpx !important;
+  color: white;
 }
 
 .login-class .weda-ui .wedatea2td-input,
 .login-class .weda-ui .wedatea2td-button {
-	border: none;
+  border: none;
 }
 
 .login-class .weda-ui .wedatea2td-input,
 .login-class .weda-ui .weda-input {
-	width: 100%;
+  width: 100%;
 }
 
 .login-class .weda-ui .wedatea2td-btn {
-	border: none;
-	line-height: 1;
+  border: none;
+  line-height: 1;
 }
 
 .login-class .weda-ui .wedatea2td-btn::after {
-	border: none;
+  border: none;
 }
 
 .login-class .weda-ui .weui-cells:before,
 .login-class .weda-ui .weui-cells::after {
-	display: none;
+  display: none;
 }
 
 .login-class .token-container .weda-button {
-	width: 11rem;
-	padding: 0.5rem;
-	color: #1e6fd8;
+  width: 11rem;
+  padding: 0.5rem;
+  color: #1e6fd8;
 }
 
 .login-class .token-container .weda-button::after {
-	border: none;
+  border: none;
 }
 
 .login-class .token-container .weda-button[disabled] {
-	color: #d0d0d0;
+  color: #d0d0d0;
 }
 
 .login-class .have-read .weui-cells {
-	font-size: 0.8rem;
+  font-size: 0.8rem;
 }
 
 .login-class .have-read .weui-cell {
-	padding: 0;
+  padding: 0;
 }
 
 .login-class .have-read .weui-cells_checkbox .weui-cell__hd {
-	padding-right: 0.5rem;
+  padding-right: 0.5rem;
 }
 
 .login-class .have-read .weui-cells_checkbox .weui-icon-checked {
-	width: 1.2rem;
+  width: 1.2rem;
 }
 
 .login-class .weui-btn_primary.is-disabled {
-	background-color: var(--wd-color-brand-disabled) !important;
-	border-color: var(--wd-color-brand-disabled) !important;
-	color: #fff !important;
+  background-color: var(--wd-color-brand-disabled) !important;
+  border-color: var(--wd-color-brand-disabled) !important;
+  color: #fff !important;
 }
 
 .login-class .input-prefix {
-	border-right: 1px solid #dbdbdb;
+  border-right: 1px solid #dbdbdb;
 }
 
 .login-class .input-suffix {
-	border-left: 1px solid #dbdbdb;
+  border-left: 1px solid #dbdbdb;
+}
+
+.login-method {
+  text-align: center;
 }
 
 .login-method .divider {
-	margin: 32px auto 8px;
-	color: #9e9e9e;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-size: 13px;
-	width: 100%;
+  margin: 30rpx auto 16rpx;
+  color: #9e9e9e;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  width: 100%;
 }
 
 .login-method .divider-line {
-	flex: 1;
-	display: inline-block;
-	background-color: #ddd;
-	height: 1rpx;
-	width: 100%;
+  flex: 1;
+  display: inline-block;
+  background-color: #ddd;
+  height: 1rpx;
+  width: 100%;
 }
 
 .login-method .divider-title {
-	margin: 0 32rpx;
+  margin: 0 32rpx;
 }
 
 .login-method .login-method__list {
-	display: flex;
-	flex-wrap: wrap;
-	padding: 10rpx 0;
-	justify-content: center;
+  display: inline-flex;
+  flex-wrap: wrap;
+  padding: 10rpx 0;
 }
 
 .login-method .login-method__list .login-method__list-item {
-	cursor: pointer;
-	margin: 16rpx;
-	border-radius: 50%;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-direction: column;
-	width: 28.7%;
+  cursor: pointer;
+  margin: 16rpx;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  width: auto;
 }
 
 .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;
+  width: 84rpx;
+  height: 84rpx;
+  line-height: 84rpx;
+  border-radius: 100%;
+  text-align: center;
+  background-color: #7fb5f1;
+  color: #fff;
 }
 
 .login-method .login-method__list .login-method__list-item .name {
-	font-size: 24rpx;
-	margin-top: 12rpx;
-	text-overflow: ellipsis;
-	overflow: hidden;
-	white-space: nowrap;
-	width: 100%;
-	text-align: center;
+  font-size: 24rpx;
+  margin-top: 12rpx;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  width: 100%;
+  text-align: center;
 }
+
+.register {
+  font-size: 28rpx;
+  margin-top: 30rpx;
+  text-align: center;
+}
+
+.register .link {
+  color: #006eff;
+}

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

@@ -1,5 +1,7 @@
 export const phoneNumberPattern = /^1[0-9]{10}$/;
 export const phoneVerifyInfoKey = 'sso_phone_verifyInfo'; // 获取短信信息缓存key
-export const verifyCodeFailedLimit = 8; // 同一个短信验证码使用8次即提示错误
+export const emailVerifyInfoKey = 'sso_email_verifyInfo'; // 获取邮箱信息缓存key
+export const emailPattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+export const verifyCodeFailedLimit = 8; // 同一个验证码使用8次即提示错误
 export const verifyDelay = 60; // 获取验证码倒计时，单位s
 export const loginOnly = false;

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

@@ -58,8 +58,6 @@ export const parseSignUpError = (e) => {
 // 验证码验证token
 export const parseVerifyError = (e) => {
   switch (e.error) {
-    case 'invalid_argument':
-      return `您输入的验证码不正确或已过期 ${e.message || ''}`;
     case 'get_verify_code':
       return '请重新获取验证码';
     case 'aborted':
@@ -130,6 +128,31 @@ export function parseSmsError(e, verificationTarget, loginOnly) {
   }
 }
 
+export function parseEmailError(e, verificationTarget, loginOnly) {
+  switch (e.error) {
+    case 'failed_precondition':
+      switch (verificationTarget) {
+        case 'USER':
+          if (loginOnly) {
+            return '用户不存在，请输入在平台注册过的邮箱';
+          }
+          return '你输入的手机号已被注册，请使用其他号码';
+        case 'NOT_USER':
+          return '该用户已被注册，请使用其他邮箱';
+        default:
+          return '邮箱功能未开启，请联系管理员开启';
+      }
+    case 'payment_required':
+      return '邮箱获取验证码资源不足，请联系管理员充值';
+    case 'aborted':
+      return '你尝试的次数过多，稍后重试';
+    case 'unavailable':
+      return `发件服务不可用，请稍后重试${prefixMsg(e.error_description)}`;
+    default:
+      return parseCommonError(e);
+  }
+}
+
 export const parseCommonError = (e) => {
   let msg;
   switch (e.error) {

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

@@ -0,0 +1,87 @@
+import {
+  parseEmailError
+} from './errorHandler';
+import {
+  app
+} from '../../../../../app/weapps-api';
+import loginSuccessCallBack from './loginSuccessCallBack';
+import {
+  emailVerifyInfoKey,
+  verifyCodeFailedLimit,
+} from './contants';
+
+export default async function loginByEmail(
+  instance, {
+    callback,
+    verificationInfo,
+    verificationCode,
+    email,
+    loginOnly,
+    isRegister,
+    bindInfo,
+    hasRegisterConfig
+  },
+) {
+  wx.showLoading({
+    mask: true
+  });
+  const {
+    usedCount = 0
+  } = wx.getStorageSync(emailVerifyInfoKey) || {};
+  try {
+    const cloud = await app.cloud.getCloudInstance();
+    const auth = cloud.auth;
+
+    // 验证码使用次数超过限制，直接提示错误
+    if (usedCount >= verifyCodeFailedLimit) {
+      throw {
+        error: 'get_verify_code'
+      };
+    }
+
+    if (isRegister && verificationInfo.isUser && verificationInfo.email === email) {
+      throw { error: 'user has already registered, please log in directly' };
+    }
+
+    // 校验
+    if (!email || !verificationCode) {
+      throw new Error('输入内容不合法');
+    }
+
+    // 1. 验证验证码
+    const { verification_token } = await auth.verify({
+      verification_id: verificationInfo.id,
+      verification_code: verificationCode,
+    });
+
+    // 2. 根据是否已经是用户，分别走登录或注册逻辑
+    if ((verificationInfo.isUser || loginOnly) && !isRegister) {
+      await auth.signIn({ verification_token, username: email });
+
+      if (bindInfo) {
+        await auth.bindWithProvider({
+          provider_token: bindInfo.providerToken,
+        });
+      }
+    } else if (!hasRegisterConfig || isRegister) {
+      // 3. 注册
+      await auth.signUp({
+        email,
+        verification_token,
+        provider_token: bindInfo?.providerToken,
+      });
+    }
+
+    await app.cloud.signIn({ userType: 'externalUser', force: true });
+    callback?.(null, 'success');
+    wx.hideLoading();
+    loginSuccessCallBack(instance);
+  } catch (e) {
+    wx.hideLoading();
+    wx.showModal({
+      title: '邮箱登录失败',
+      content: parseEmailError(e),
+    });
+    callback?.(new Error(parseEmailError(e)));
+  }
+}

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

@@ -1,55 +1,34 @@
 import { app } from '../../../../../app/weapps-api';
 import loginSuccessCallBack from './loginSuccessCallBack'
+import { parseLoginError } from './errorHandler';
 /**
  * 账号密码登录
  */
-export default async function (instance, {username, password}) {
-  const cloudbase = await app.cloud.getCloudInstance();
-  const auth = cloudbase.authInstance || cloudbase.auth;
-
-  // 校验
-  if (typeof username !== 'string' || typeof password !== 'string') {
-    throw new Error('账号密码填写不合法');
-  }
-  username = username.trim();
-  password = password.trim();
-  // 发起校验
-  // const validateResult = await Promise.all([$w.input1.custom.handleValidate(), $w.input2.handleValidate()]);
-  // if (validateResult.some((item) => item.length !== 0) || !username || !password) {
-  //   app.showModal({
-  //       title: '无法提交',
-  //       content: '账号或密码填写不合法',
-  //       showCancel: false,
-  //     });
-  //   return;
-  // }
+export default async function (instance, { username, password }) {
   // 登录
   try {
-    const res = await auth.signIn({ username, password });
+    const cloudbase = await app.cloud.getCloudInstance();
+    const auth = cloudbase.authInstance || cloudbase.auth;
+
+    // 校验
+    if (typeof username !== 'string' || typeof password !== 'string') {
+      throw new Error('账号密码填写不合法');
+    }
+    username = username.trim();
+    password = password.trim();
+    wx.showLoading({
+			title: '请稍后'
+		})
+    await auth.signIn({ username, password });
+    await app.cloud.signIn({ userType: 'externalUser', force: true });
+    wx.hideLoading()
     // 登录完成
     loginSuccessCallBack(instance);
   } catch (e) {
-    console.error(e)
-    // 错误处理
-    if (e?.error === 'invalid_password') {
-      app.showModal({
-        title: '登录失败',
-        content: '密码错误',
-        showCancel: false,
-      });
-    } else if (e?.error === 'not_found') {
-      app.showModal({
-        title: '登录失败',
-        content: '用户不存在',
-        showCancel: false,
-      });
-    } else {
-      app.showModal({
-        title: '登录失败',
-        content: JSON.stringify(e),
-        showCancel: false,
-      });
-    }
-
+    wx.hideLoading()
+    wx.showModal({
+      title: '登录失败',
+      content: parseLoginError(e),
+    });
   }
 }

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

@@ -5,41 +5,46 @@ import { phoneVerifyInfoKey, verifyCodeFailedLimit, loginOnly } from './contants
 
 export default async function loginBySms(
   instance,
-  { callback, verificationInfo, verificationCode, phoneNum, bindInfo },
+  { callback, verificationInfo, verificationCode, phoneNum, bindInfo, isRegister, hasRegisterConfig },
 ) {
   wx.showLoading({ mask: true });
   const { usedCount = 0 } = wx.getStorageSync(phoneVerifyInfoKey) || {};
   try {
     const cloud = await app.cloud.getCloudInstance();
     const auth = cloud.auth;
-    const isV2 = false;
 
     // 验证码使用次数超过限制，直接提示错误
     if (usedCount >= verifyCodeFailedLimit) {
       throw { error: 'get_verify_code' };
     }
+
+    if (isRegister && verificationInfo.isUser && verificationInfo.phoneNum === phoneNum) {
+      throw { error: 'user has already registered, please log in directly' };
+    }
+
+    // 校验
+    if (!phoneNum || !verificationCode) {
+      throw new Error('输入内容不合法');
+    }
+
     // 1. 验证验证码
     const { verification_token } = await auth.verify({
-      verification_id: isV2 ? undefined : verificationInfo.id,
-      verification_token: isV2 ? verificationInfo.id : undefined,
+      verification_id:  verificationInfo.id,
       verification_code: verificationCode,
-      version: isV2 ? 'v2' : undefined,
     });
     // 2. 根据是否已经是用户，分别走登录或注册逻辑
-    if (verificationInfo.isUser || loginOnly) {
-      // 私有化环境或者自定义应用走v1版本的老逻辑
-      if (!isV2) {
-        await auth.signIn({
-          username: `+86 ${phoneNum}`,
-          verification_token,
-        });
-      }
+    if ((verificationInfo.isUser || loginOnly) && !isRegister) {
+      await auth.signIn({
+        username: `+86 ${phoneNum}`,
+        verification_token,
+      });
+
       if (bindInfo) {
         await auth.bindWithProvider({
           provider_token: bindInfo.providerToken,
         });
       }
-    } else if (!isV2) {
+    } else if (!hasRegisterConfig || isRegister) {
       // 自定义应用走signUp逻辑
       await auth.signUp({
         phone_number: `+86 ${phoneNum}`,

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

@@ -0,0 +1,41 @@
+export const randomStr = (len = 32) => {
+  const s = [];
+  const hexDigits = '0123456789abcdef';
+  const dictLen = hexDigits.length;
+  for (var i = 0; i < len; i++) {
+    const index = Math.floor(Math.random() * dictLen);
+    s[i] = hexDigits[index];
+  }
+  const result = s.join('');
+  return result;
+}
+
+export const compareVersion = (version1, version2) => {
+  // 将版本号字符串分割成数组
+  const v1 = version1.split('.');
+  const v2 = version2.split('.');
+
+  // 获取两个版本号数组的最大长度
+  const maxLength = Math.max(v1.length, v2.length);
+
+  // 遍历版本号数组并比较每个部分
+  for (let i = 0; i < maxLength; i++) {
+    // 如果某个版本号的长度较短，则将其补0
+    const num1 = parseInt(v1[i] || 0, 10);
+    const num2 = parseInt(v2[i] || 0, 10);
+
+    // 比较当前位置的数字大小
+    if (num1 > num2) {
+      return 1;
+    } else if (num1 < num2) {
+      return -1;
+    }
+  }
+
+  // 如果所有位置的数字都相同，则两个版本号相等
+  return 0;
+}
+
+export const calDelay = (enable, delay) => {
+  return enable ? Math.max(0, Math.ceil(((delay || 0) - +new Date()) / 1000)) : 0;
+}