@pisell/private-materials 6.3.31 → 6.3.33

package/es/pro/Login2.0/Login2.js

@@ -91,13 +91,13 @@ var Login2 = function Login2(_ref) {
     translate: locales.getText,
     fallbackMinLength: 6,
     messageKeys: {
-      required: 'pisell-login2-password-required',
-      minLength: 'pisell-set-password-min-length',
-      requireUppercase: 'pisell-set-password-require-uppercase',
-      requireLowercase: 'pisell-set-password-require-lowercase',
-      requireNumber: 'pisell-set-password-require-number',
-      requireSpecialCharacters: 'pisell-set-password-require-special',
-      summary: 'pisell-set-password-must-contain'
+      required: locales.getText('pisell-login2-password-required'),
+      minLength: locales.getText('pisell-set-password-min-length'),
+      requireUppercase: locales.getText('pisell-set-password-require-uppercase'),
+      requireLowercase: locales.getText('pisell-set-password-require-lowercase'),
+      requireNumber: locales.getText('pisell-set-password-require-number'),
+      requireSpecialCharacters: locales.getText('pisell-set-password-require-special'),
+      summary: locales.getText('pisell-set-password-must-contain')
     }
   });
 
@@ -1445,14 +1445,14 @@ var Login2 = function Login2(_ref) {
   // 处理三方登录
   var handleOAuthClickInternal = /*#__PURE__*/function () {
     var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(provider) {
-      var _config$loginMethods, fbConfig, token, _config$loginMethods2, appleConfig, _token;
+      var _config$loginMethods, fbConfig, token, res, _config$loginMethods2, appleConfig, _token, _res4;
       return _regeneratorRuntime().wrap(function _callee13$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
           case 0:
             _context13.prev = 0;
             setLoading(true);
             if (!(provider === 'facebook')) {
-              _context13.next = 13;
+              _context13.next = 15;
               break;
             }
             fbConfig = config === null || config === void 0 || (_config$loginMethods = config.loginMethods) === null || _config$loginMethods === void 0 ? void 0 : _config$loginMethods.find(function (n) {
@@ -1460,22 +1460,29 @@ var Login2 = function Login2(_ref) {
             });
             token = fbConfig === null || fbConfig === void 0 ? void 0 : fbConfig.appId;
             if (!token) {
-              _context13.next = 10;
+              _context13.next = 12;
               break;
             }
             _context13.next = 8;
             return registerAndLogin.loginWithFacebook(token);
           case 8:
-            _context13.next = 11;
+            res = _context13.sent;
+            if (res.status) {
+              onLogin === null || onLogin === void 0 || onLogin(res.data, 'facebook', {
+                account: '',
+                password: ''
+              }, config.channel);
+            }
+            _context13.next = 13;
             break;
-          case 10:
+          case 12:
             throw new Error('Facebook app_id not configured');
-          case 11:
-            _context13.next = 26;
-            break;
           case 13:
+            _context13.next = 30;
+            break;
+          case 15:
             if (!(provider === 'apple')) {
-              _context13.next = 24;
+              _context13.next = 28;
               break;
             }
             appleConfig = config === null || config === void 0 || (_config$loginMethods2 = config.loginMethods) === null || _config$loginMethods2 === void 0 ? void 0 : _config$loginMethods2.find(function (n) {
@@ -1483,38 +1490,49 @@ var Login2 = function Login2(_ref) {
             });
             _token = appleConfig === null || appleConfig === void 0 ? void 0 : appleConfig.clientId;
             if (!_token) {
-              _context13.next = 21;
+              _context13.next = 25;
               break;
             }
-            _context13.next = 19;
+            _context13.next = 21;
             return registerAndLogin.loginWithApple(_token);
-          case 19:
-            _context13.next = 22;
-            break;
           case 21:
-            throw new Error('Apple client_id not configured');
-          case 22:
+            _res4 = _context13.sent;
+            onLogin === null || onLogin === void 0 || onLogin(_res4.data, 'apple', {
+              account: '',
+              password: ''
+            }, config.channel);
             _context13.next = 26;
             break;
-          case 24:
-            _context13.next = 26;
-            return onOAuthLogin === null || onOAuthLogin === void 0 ? void 0 : onOAuthLogin(provider, config.channel);
+          case 25:
+            throw new Error('Apple client_id not configured');
           case 26:
-            _context13.next = 31;
+            _context13.next = 30;
             break;
           case 28:
-            _context13.prev = 28;
+            _context13.next = 30;
+            return onOAuthLogin === null || onOAuthLogin === void 0 ? void 0 : onOAuthLogin(provider, config.channel);
+          case 30:
+            _context13.next = 37;
+            break;
+          case 32:
+            _context13.prev = 32;
             _context13.t0 = _context13["catch"](0);
+            if (!(_context13.t0.message === 'facebook_login_cancel')) {
+              _context13.next = 36;
+              break;
+            }
+            return _context13.abrupt("return", message.error(locales.getText('pisell-register2-facebook-login-canceled')));
+          case 36:
             message.error((_context13.t0 === null || _context13.t0 === void 0 ? void 0 : _context13.t0.message) || locales.getText('pisell-login2-login-failed'));
-          case 31:
-            _context13.prev = 31;
+          case 37:
+            _context13.prev = 37;
             setLoading(false);
-            return _context13.finish(31);
-          case 34:
+            return _context13.finish(37);
+          case 40:
           case "end":
             return _context13.stop();
         }
-      }, _callee13, null, [[0, 28, 31, 34]]);
+      }, _callee13, null, [[0, 32, 37, 40]]);
     }));
     return function handleOAuthClickInternal(_x12) {
       return _ref14.apply(this, arguments);
@@ -1933,14 +1951,16 @@ var Login2 = function Login2(_ref) {
     }
     return /*#__PURE__*/React.createElement(React.Fragment, null, showDivider && /*#__PURE__*/React.createElement("div", {
       className: "login2-divider"
-    }, locales.getText('pisell-login2-or')), nonOauthButtons.length > 0 && /*#__PURE__*/React.createElement("div", {
+    }, locales.getText('pisell-login2-or')), (nonOauthButtons.length > 0 || oauthProviders.length > 0) && /*#__PURE__*/React.createElement("div", {
+      className: "login2-switch-groups"
+    }, nonOauthButtons.length > 0 && /*#__PURE__*/React.createElement("div", {
       className: "login2-switch-options"
     }, nonOauthButtons), oauthProviders.length > 0 && /*#__PURE__*/React.createElement(OAuthButtonGroup, {
       providers: oauthProviders,
       wrapperClassName: "login2-oauth-buttons",
       buttonClassName: "login2-oauth-button",
       gap: 12
-    }), registerPrompt);
+    })), registerPrompt);
   };
 
   // 渲染 OAuth 按钮

package/es/pro/Login2.0/Register2.js

@@ -722,7 +722,7 @@ var Register2 = function Register2(_ref) {
           case 47:
             _context5.prev = 47;
             _context5.t0 = _context5["catch"](0);
-            if (!(_context5.t0.messager === 'facebook_login_cancel')) {
+            if (!(_context5.t0.message === 'facebook_login_cancel')) {
               _context5.next = 51;
               break;
             }

package/es/pro/Login2.0/components/ForgotPasswordFlow.d.ts

@@ -0,0 +1,31 @@
+/// <reference types="react" />
+import { PhoneValueObject } from './PhoneInput';
+export interface ForgotPasswordFlowProps {
+    /** 初始账号（可选，如果用户在登录页已输入） */
+    initialEmail?: string | PhoneValueObject;
+    /** 账号类型 */
+    accountType: 'email' | 'phone';
+    /** 发送验证码回调 */
+    onSendCode?: (account: string | PhoneValueObject) => Promise<void>;
+    /** 验证验证码回调 */
+    onVerifyCode?: (account: string | PhoneValueObject, code: string) => Promise<void>;
+    /** 发送重置密码链接回调 */
+    onSendResetLink?: (account: string) => Promise<void>;
+    /** 重置密码回调 */
+    onResetPassword?: (account: string | PhoneValueObject, password: string, code: string) => Promise<void>;
+    /** 返回登录页 */
+    onBack?: () => void;
+    /** 加载状态 */
+    loading?: boolean;
+    /** 倒计时 */
+    countdown?: number;
+    /** 可用的国家/地区列表 */
+    countries?: Array<{
+        name: string;
+        code: string;
+        calling_code: string;
+        currency_code: string;
+    }>;
+}
+declare function ForgotPasswordFlow({ initialEmail, accountType, onSendCode, onVerifyCode, onResetPassword, onSendResetLink, onBack, loading, countdown, countries, }: ForgotPasswordFlowProps): JSX.Element | null;
+export default ForgotPasswordFlow;

package/es/pro/Login2.0/components/LoginCodeInput.d.ts

@@ -0,0 +1,27 @@
+/// <reference types="react" />
+export interface LoginCodeInputProps {
+    /** 账号（邮箱或手机号） */
+    account: string;
+    /** 账号类型 */
+    accountType: 'email' | 'phone';
+    /** 验证码长度 */
+    codeLength?: number;
+    /** 提交验证码 */
+    onSubmit?: (code: string) => void;
+    /** 重新发送 */
+    onResend?: () => void;
+    /** 返回 */
+    onBack?: () => void;
+    /** 倒计时秒数 */
+    countdown?: number;
+    /** 加载状态 */
+    loading?: boolean;
+    /** 按钮文案（默认为"Log in"，忘记密码场景为"Verify"） */
+    submitButtonText?: string;
+    /** 错误信息 */
+    error?: string;
+    /** 当用户输入时清除错误的回调 */
+    onClearError?: () => void;
+}
+declare function LoginCodeInput({ account, accountType, codeLength, onSubmit, onResend, onBack, countdown, loading, submitButtonText, error, onClearError, }: LoginCodeInputProps): JSX.Element;
+export default LoginCodeInput;

package/es/pro/Login2.0/components/OAuthButtonGroup.d.ts

@@ -0,0 +1,22 @@
+import React from 'react';
+export interface OAuthProviderConfig {
+    key: string;
+    label: React.ReactNode;
+    onClick: () => void;
+    icon?: React.ReactNode;
+    disabled?: boolean;
+    className?: string;
+    badge?: string;
+    badgeClassName?: string;
+}
+export interface OAuthButtonGroupProps {
+    providers: OAuthProviderConfig[];
+    layout?: 'vertical' | 'horizontal';
+    size?: 'large' | 'middle' | 'small';
+    block?: boolean;
+    wrapperClassName?: string;
+    buttonClassName?: string;
+    gap?: number;
+}
+declare const OAuthButtonGroup: React.FC<OAuthButtonGroupProps>;
+export default OAuthButtonGroup;

package/es/pro/Login2.0/components/PhoneInput.d.ts

@@ -0,0 +1,53 @@
+import React from 'react';
+import './PhoneInput.less';
+/** 国家/地区配置（后端返回格式） */
+export interface CountryOption {
+    /** 国家/地区名称 */
+    name: string;
+    /** 国家/地区代码 */
+    code: string;
+    /** 区号（不带+号） */
+    calling_code: string;
+    /** 货币代码 */
+    currency_code: string;
+}
+/** 手机号对象格式 */
+export interface PhoneValueObject {
+    /** 手机号（不含区号） */
+    phone: string;
+    /** 国家区号（不带+号） */
+    country_calling_code: string;
+}
+/** 值格式类型 */
+export declare type ValueFormat = 'string' | 'object';
+/** 手机号输入组件属性 */
+export interface PhoneInputProps {
+    /** 完整的手机号值（包含区号），格式：+86138****，或 +1555****（字符串模式） */
+    value?: string | PhoneValueObject;
+    /** 值变化回调 */
+    onChange?: (value: string | PhoneValueObject) => void;
+    /** Placeholder */
+    placeholder?: string;
+    /** 大小 */
+    size?: 'large' | 'middle' | 'small';
+    /** 是否禁用 */
+    disabled?: boolean;
+    /** 自定义类名 */
+    className?: string;
+    /** 可用的国家/地区列表 */
+    countries?: CountryOption[];
+    /** 默认国家/地区代码 */
+    defaultCountry?: string;
+    /** 值格式：'string' 返回 "+8613800138000"，'object' 返回 { phone: "13800138000", country_calling_code: "86" } */
+    valueFormat?: ValueFormat;
+    /** 键盘按键事件回调 */
+    onKeyDown?: (e: React.KeyboardEvent<HTMLInputElement>) => void;
+}
+/**
+ * 手机号输入组件
+ *
+ * 支持国际区号选择和手机号输入
+ * 值格式：+区号+手机号，例如：+8613800138000 或 +15551234567
+ */
+declare function PhoneInput({ value, onChange, placeholder, onKeyDown, size, disabled, className, countries, defaultCountry, valueFormat, }: PhoneInputProps): JSX.Element;
+export default PhoneInput;

package/es/pro/Login2.0/components/phoneValidation.d.ts

@@ -0,0 +1,17 @@
+import { PhoneValueObject } from './PhoneInput';
+declare type GetTextFunction = (key: string) => string;
+/**
+ * 手机号校验函数，用于 Ant Design Form 的 rules
+ * @param value 手机号值，可以是字符串或对象格式
+ * @param getText 国际化文本获取函数
+ * @returns Promise<void> 校验通过时 resolve，失败时 reject 并返回错误信息
+ */
+export declare const validatePhoneNumber: (value: string | PhoneValueObject, getText: GetTextFunction) => Promise<void>;
+/**
+ * 创建手机号校验规则，用于 Form.Item 的 rules 属性
+ * @param getText 国际化文本获取函数
+ * @param required 是否必填
+ * @returns Form 校验规则数组
+ */
+export declare const createPhoneValidationRules: (getText: GetTextFunction, required?: boolean) => any[];
+export {};

package/es/pro/Login2.0/components/phoneValidation.js

@@ -106,7 +106,7 @@ export var validatePhoneNumber = /*#__PURE__*/function () {
         case 36:
           return _context.abrupt("break", 70);
         case 37:
-          if (/^4\d{8,9}$/.test(phone)) {
+          if (/^(\+?0)?4\d{8}$/.test(phone)) {
             _context.next = 39;
             break;
           }

package/es/pro/Login2.0/hooks/usePasswordValidationRules.d.ts

@@ -0,0 +1,24 @@
+import type { Rule } from 'antd/es/form';
+export interface PasswordRuleConfig {
+    minLength?: number;
+    requireUppercase?: boolean;
+    requireLowercase?: boolean;
+    requireNumber?: boolean;
+    requireSpecialCharacters?: boolean;
+}
+interface PasswordRuleMessages {
+    required?: string;
+    minLength?: string;
+    requireUppercase?: string;
+    requireLowercase?: string;
+    requireNumber?: string;
+    requireSpecialCharacters?: string;
+    summary?: string;
+}
+interface UsePasswordValidationRulesOptions {
+    translate?: (key: string) => string;
+    fallbackMinLength?: number;
+    messageKeys?: PasswordRuleMessages;
+}
+export declare const usePasswordValidationRules: (passwordRules?: PasswordRuleConfig, options?: UsePasswordValidationRulesOptions) => Rule[];
+export default usePasswordValidationRules;

package/es/pro/Login2.0/index.less

@@ -547,7 +547,10 @@
   align-items: center;
   justify-content: center;
   gap: 12px;
-
+  .pisell-lowcode-btn-icon {
+    margin-right: 0!important;
+    font-size: 24px;
+  }
   svg {
     flex-shrink: 0;
   }
@@ -685,6 +688,12 @@
 }
 
 // 切换选项区域
+.login2-container .login2-switch-groups {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
 .login2-container .login2-switch-options {
   display: flex;
   flex-direction: column;
@@ -778,7 +787,7 @@
   position: relative; // 为角标定位提供基准
 
   .oauth-icon {
-    font-size: 18px;
+    font-size: 24px;
     font-weight: 700;
     flex-shrink: 0;
   }