@pisell/private-materials 6.3.36 → 6.3.38

package/es/components/authentication/admin/SaaSAdminAuth/locales.js

@@ -0,0 +1,74 @@
+export default {
+  en: {
+    // Page title and description
+    'saas.admin.auth.title': 'SaaS Platform Admin Authentication',
+    'saas.admin.auth.description': 'Configure authentication methods for your SaaS platform admin portal and other administrative channels.',
+    // Auth Methods section
+    'saas.admin.auth.methods.title': 'Auth Methods',
+    'saas.admin.auth.methods.description': 'Configure authentication methods that will be available for SaaS platform admins. Drag to reorder by priority.',
+    // Password Settings section
+    'saas.admin.password.settings.title': 'Password Settings',
+    'saas.admin.password.settings.description': 'Configure password requirements specifically for SaaS platform admin accounts. These rules apply to all platform administrative users.',
+    // Buttons
+    'auth.button.cancel': 'Cancel',
+    'auth.button.save': 'Save',
+    'auth.button.settings': 'Settings',
+    // Messages
+    'auth.save.success': 'Settings saved successfully',
+    'auth.save.error': 'Failed to save settings',
+    // OAuth configuration
+    'auth.oauth.config.message': 'Configure OAuth settings in Auth Configuration page first',
+    'auth.oauth.config.link': 'click to config',
+    // Category badges
+    'auth.category.general': 'General',
+    'auth.category.oauth': 'OAuth'
+  },
+  'zh-CN': {
+    // Page title and description
+    'saas.admin.auth.title': 'SaaS平台管理员认证',
+    'saas.admin.auth.description': '为您的SaaS平台管理员门户和其他管理渠道配置认证方法。',
+    // Auth Methods section
+    'saas.admin.auth.methods.title': '认证方法',
+    'saas.admin.auth.methods.description': '配置SaaS平台管理员可用的认证方法。拖动以调整优先级。',
+    // Password Settings section
+    'saas.admin.password.settings.title': '密码设置',
+    'saas.admin.password.settings.description': '专门为SaaS平台管理员账户配置密码要求。这些规则适用于所有平台管理用户。',
+    // Buttons
+    'auth.button.cancel': '取消',
+    'auth.button.save': '保存',
+    'auth.button.settings': '设置',
+    // Messages
+    'auth.save.success': '保存成功',
+    'auth.save.error': '保存失败',
+    // OAuth configuration
+    'auth.oauth.config.message': '请先在OAuth配置页面中配置OAuth设置',
+    'auth.oauth.config.link': '点击配置',
+    // Category badges
+    'auth.category.general': '通用',
+    'auth.category.oauth': 'OAuth'
+  },
+  'zh-HK': {
+    // Page title and description
+    'saas.admin.auth.title': 'SaaS平台管理員認證',
+    'saas.admin.auth.description': '為您的SaaS平台管理員門戶和其他管理渠道配置認證方法。',
+    // Auth Methods section
+    'saas.admin.auth.methods.title': '認證方法',
+    'saas.admin.auth.methods.description': '配置SaaS平台管理員可用的認證方法。拖動以調整優先級。',
+    // Password Settings section
+    'saas.admin.password.settings.title': '密碼設置',
+    'saas.admin.password.settings.description': '專門為SaaS平台管理員賬戶配置密碼要求。這些規則適用於所有平台管理用戶。',
+    // Buttons
+    'auth.button.cancel': '取消',
+    'auth.button.save': '保存',
+    'auth.button.settings': '設置',
+    // Messages
+    'auth.save.success': '保存成功',
+    'auth.save.error': '保存失敗',
+    // OAuth configuration
+    'auth.oauth.config.message': '請先在OAuth配置頁面中配置OAuth設置',
+    'auth.oauth.config.link': '點擊配置',
+    // Category badges
+    'auth.category.general': '通用',
+    'auth.category.oauth': 'OAuth'
+  }
+};

package/es/components/authentication/admin/SaaSAdminAuth/types.d.ts

@@ -0,0 +1,16 @@
+/// <reference types="react" />
+import { AuthMethod } from '../AuthMethods/types';
+export interface SaaSAdminAuthProps {
+    /**
+     * 自定义类名
+     */
+    className?: string;
+    /**
+     * 自定义样式
+     */
+    style?: React.CSSProperties;
+    /**
+     * 保存回调
+     */
+    onSave?: (authMethods: AuthMethod[], passwordRules: any) => void;
+}

package/es/components/authentication/admin/SaaSAdminAuth/types.js

@@ -0,0 +1 @@
+export {};

package/es/components/authentication/admin/index.d.ts

@@ -0,0 +1,26 @@
+export type { AuthMethodsProps, AuthMethod } from './AuthMethods';
+export { AuthMethodType, AuthMethodCategory } from './AuthMethods';
+export { default as ChannelAuthSetting } from './ChannelAuthSetting';
+export type { ChannelAuthSettingProps, ChannelAuthSettingValue, TabKey } from './ChannelAuthSetting';
+export { default as PageSetting } from './ChannelAuthSetting/PageSetting';
+export { default as PageSettingItem } from './ChannelAuthSetting/PageSettingItem';
+export { default as AuthenticationMethods } from './ChannelAuthSetting/AuthenticationMethods';
+export { default as CollectInfo } from './ChannelAuthSetting/CollectInfo';
+export type { PageSettingProps, PageSettingValue, } from './ChannelAuthSetting/PageSetting/types';
+export type { PageSettingItemProps, PageSettingItemValue, TermsCondition, TranslationValue as PageTranslationValue, } from './ChannelAuthSetting/PageSettingItem/types';
+export type { AuthenticationMethodsProps, AuthenticationMethodsValue, GlobalAuthMethod, AuthenticationMethod, AuthenticationSettingsMode, } from './ChannelAuthSetting/AuthenticationMethods/types';
+export type { CollectInfoProps, CollectInfoValue, AccountField, CustomerFormItem, TranslationValue as CollectInfoTranslationValue, } from './ChannelAuthSetting/CollectInfo/types';
+export type { SaaSAdminAuthProps } from './SaaSAdminAuth';
+export type { OrgAdminAuthProps } from './OrgAdminAuth';
+export type { DeviceAuthProps } from './DeviceAuth';
+export type { POSOperatorAuthProps } from './POSOperatorAuth';
+export type { CustomerOAuthConfigProps } from './CustomerOAuthConfig';
+export { default as SaaSAdminAuth } from './SaaSAdminAuth';
+export { default as OrgAdminAuth } from './OrgAdminAuth';
+export { default as OAuthConfig } from './OAuthConfig';
+export { default as CustomerAuth } from './CustomerAuth';
+export { default as CustomerOAuthConfig } from './CustomerOAuthConfig';
+export { default as DeviceAuth } from './DeviceAuth';
+export { default as POSOperatorAuth } from './POSOperatorAuth';
+export { default as OnlineShopAuth } from './ChannelAuthSetting/OnlineShopAuth';
+export { default as SaaSManagermentAuth } from './ChannelAuthSetting/SaaSManagermentAuth';

package/es/components/authentication/admin/index.js

@@ -0,0 +1,23 @@
+// export { default as AuthMethods, SettingList } from './AuthMethods';
+
+export { AuthMethodType, AuthMethodCategory } from "./AuthMethods";
+
+// ChannelAuthSetting 主组件
+export { default as ChannelAuthSetting } from "./ChannelAuthSetting";
+// ChannelAuthSetting 子组件
+export { default as PageSetting } from "./ChannelAuthSetting/PageSetting";
+export { default as PageSettingItem } from "./ChannelAuthSetting/PageSettingItem";
+export { default as AuthenticationMethods } from "./ChannelAuthSetting/AuthenticationMethods";
+export { default as CollectInfo } from "./ChannelAuthSetting/CollectInfo";
+
+// ChannelAuthSetting 类型
+
+export { default as SaaSAdminAuth } from "./SaaSAdminAuth";
+export { default as OrgAdminAuth } from "./OrgAdminAuth";
+export { default as OAuthConfig } from "./OAuthConfig";
+export { default as CustomerAuth } from "./CustomerAuth";
+export { default as CustomerOAuthConfig } from "./CustomerOAuthConfig";
+export { default as DeviceAuth } from "./DeviceAuth";
+export { default as POSOperatorAuth } from "./POSOperatorAuth";
+export { default as OnlineShopAuth } from "./ChannelAuthSetting/OnlineShopAuth";
+export { default as SaaSManagermentAuth } from "./ChannelAuthSetting/SaaSManagermentAuth";

package/es/components/booking/components/customSelect/index.js

@@ -281,8 +281,12 @@ var CustomSelect = function CustomSelect(props, ref) {
           return allKeys.some(function (k) {
             var val = item[k];
             if (val === null || val === undefined) return false;
-            var str = String(val).toLowerCase();
-            return str.includes(q);
+            try {
+              var str = JSON.stringify(val);
+              return str.includes(q) || str.toLocaleLowerCase().includes(q);
+            } catch (error) {
+              return false;
+            }
           });
         } catch (e) {
           return false;

package/es/components/booking/components/footer/utils.js

@@ -455,7 +455,7 @@ var formatBookings = function formatBookings(data, values) {
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
   var obj = {};
-  list.forEach(function (item, index) {
+  list.forEach(function (item) {
     var _item$_extend25;
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var end_date = item._extend.endDate.format('YYYY-MM-DD');

package/es/components/booking/info/service2/utils.d.ts

@@ -244,4 +244,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

package/es/components/booking/utils.d.ts

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/es/components/eftposPay/amount.d.ts

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/device.d.ts

@@ -10,7 +10,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "success" | "warn" | "loading" | "fail" | "question";
+        status: "loading" | "warn" | "success" | "fail" | "question";
     };
 };
 /**
@@ -295,20 +295,20 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
+        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
-        action?: "amount" | "deviceList" | "pay" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
         subTitle?: string | undefined;
-        type?: "step" | "unset" | undefined;
+        type?: "unset" | "step" | undefined;
         render?: boolean | undefined;
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/index.d.ts

@@ -18,4 +18,5 @@ import EditBookingModal from './booking/editBookingModal';
 import StepController from './stepController';
 import PinModal from './pinModal';
 import PinVerifyModal from './pinVerifyModal';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, };
+import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './authentication/admin';
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, };

package/es/components/index.js

@@ -18,4 +18,5 @@ import EditBookingModal from "./booking/editBookingModal";
 import StepController from "./stepController";
 import PinModal from "./pinModal";
 import PinVerifyModal from "./pinVerifyModal";
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal };
+import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from "./authentication/admin";
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth };

package/es/components/pay/toC/index.js

@@ -31,6 +31,7 @@ import { request } from "../../../utils";
 import { removePayGroupFromStorage } from "./payGroup";
 import localeTexts from "./locales";
 import { getIsWalletPassAndTripartitePayment } from "./utils";
+import { saleChannelMap } from "./status";
 import "./index.less";
 /**
  * @title: C端支付
@@ -142,11 +143,12 @@ var ToCPay = function ToCPay(props, ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             sale_channel = (initProps === null || initProps === void 0 || (_initProps$order = initProps.order) === null || _initProps$order === void 0 ? void 0 : _initProps$order.sale_channel) || 'online-store';
-            _context.next = 3;
+            sale_channel = saleChannelMap[sale_channel] || sale_channel;
+            _context.next = 4;
             return getWalletNameAndPopupStatus({
               setting_type: "".concat(sale_channel, "-wallet-setting")
             });
-          case 3:
+          case 4:
             _yield$getWalletNameA = _context.sent;
             wallet = _yield$getWalletNameA.wallet;
             wallet_setting = _yield$getWalletNameA.wallet_setting;
@@ -164,7 +166,7 @@ var ToCPay = function ToCPay(props, ref) {
               type: 'setWalletSetting',
               payload: setting
             });
-          case 9:
+          case 10:
           case "end":
             return _context.stop();
         }
@@ -261,7 +263,7 @@ var ToCPay = function ToCPay(props, ref) {
    */
   var _getPaymentsAndWalletPass = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(order) {
-      var _state$payGroup2, _paymentListRef$curre, data, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass;
+      var _state$payGroup2, _paymentListRef$curre, data, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass, withCustomerIdList;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -286,8 +288,11 @@ var ToCPay = function ToCPay(props, ref) {
               key: '支付数据获取',
               value: ""
             });
-
-            // 设置交易组
+            withCustomerIdList = wallet_pass_recommend_list.map(function (item) {
+              return _objectSpread(_objectSpread({}, item), {}, {
+                customer_id: customer_id || item.customer_id
+              });
+            }); // 设置交易组
             dispatch({
               type: 'setPayGroup',
               payload: {
@@ -300,7 +305,7 @@ var ToCPay = function ToCPay(props, ref) {
                 // 支付方式没有walletPass时walletPass设置null
                 walletPass: walletPass ? _objectSpread(_objectSpread(_objectSpread({}, (_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.walletPass), walletPass), {}, {
                   amount: wallet_pass_amount,
-                  cards: wallet_pass_recommend_list
+                  cards: withCustomerIdList
                 }) : null,
                 total_amount: order === null || order === void 0 ? void 0 : order.amount,
                 wait_amount: remain_amount
@@ -308,9 +313,9 @@ var ToCPay = function ToCPay(props, ref) {
             });
 
             // 初始化支付列表
-            _context3.next = 10;
+            _context3.next = 11;
             return (_paymentListRef$curre = paymentListRef.current) === null || _paymentListRef$curre === void 0 ? void 0 : _paymentListRef$curre.init(payment_list);
-          case 10:
+          case 11:
             // 解除loading
             setTimeout(function () {
               setLoading(false);
@@ -321,10 +326,10 @@ var ToCPay = function ToCPay(props, ref) {
               key: '获取支付列表成功',
               value: ""
             });
-            _context3.next = 20;
+            _context3.next = 21;
             break;
-          case 14:
-            _context3.prev = 14;
+          case 15:
+            _context3.prev = 15;
             _context3.t0 = _context3["catch"](1);
             console.log('err', _context3.t0);
 
@@ -347,11 +352,11 @@ var ToCPay = function ToCPay(props, ref) {
                 fn: '_getPaymentsAndWalletPass'
               }
             });
-          case 20:
+          case 21:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 14]]);
+      }, _callee3, null, [[1, 15]]);
     }));
     return function _getPaymentsAndWalletPass(_x3) {
       return _ref3.apply(this, arguments);

package/es/components/pay/toC/status.d.ts

@@ -10,3 +10,4 @@ export declare const paymentKeys: string[];
  * @Date: 2024-08-30 10:16:26
  */
 export declare const isTripartitePayment: (service: string) => boolean;
+export declare const saleChannelMap: Record<string, string>;

package/es/components/pay/toC/status.js

@@ -113,4 +113,7 @@ export var paymentKeys = Object.keys(paymentServices);
  */
 export var isTripartitePayment = function isTripartitePayment(service) {
   return tripartitePaymentKeys.includes(service);
+};
+export var saleChannelMap = {
+  'mobile_order': 'mobile-order'
 };

package/es/index.d.ts

@@ -51,6 +51,8 @@ export { default as WalletEditor } from './plus/walletEditor';
 export { default as WalletPassGallery } from './plus/walletPassGallery';
 export { default as PinModal } from './components/pinModal';
 export { default as PinVerifyModal } from './components/pinVerifyModal';
+export { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './components/authentication/admin';
+export type { SaaSAdminAuthProps, OrgAdminAuthProps, DeviceAuthProps, POSOperatorAuthProps, CustomerOAuthConfigProps } from './components/authentication/admin';
 export { default as ContactInfo } from './plus/contactInfo';
 export { default as ContactInfoModal } from './plus/contactInfoModal';
 export { Login2, Register2, AuthModal } from './pro/Login2.0';

package/es/index.js

@@ -55,6 +55,7 @@ export { default as WalletEditor } from "./plus/walletEditor";
 export { default as WalletPassGallery } from "./plus/walletPassGallery";
 export { default as PinModal } from "./components/pinModal";
 export { default as PinVerifyModal } from "./components/pinVerifyModal";
+export { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from "./components/authentication/admin";
 export { default as ContactInfo } from "./plus/contactInfo";
 export { default as ContactInfoModal } from "./plus/contactInfoModal";
 export { Login2, Register2, AuthModal } from "./pro/Login2.0";

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

@@ -117,17 +117,11 @@ var Login2 = function Login2(_ref) {
   // 初始化 currentLoginMethod（当 loginMethods 变化时）
   useEffect(function () {
     if (loginMethods.length > 0 && !currentLoginMethod) {
-      // 优先选择非OAuth类型的登录方式作为当前激活方式
-      var nonOAuthMethod = loginMethods.find(function (method) {
-        return method.type === 'email' || method.type === 'phone';
-      });
-      var first = nonOAuthMethod || loginMethods[0];
-      setCurrentLoginMethod(first);
-
-      // 设置默认验证方式
-      if (first.type === 'email' || first.type === 'phone') {
-        var _first$verificationMe;
-        setCurrentVerificationMethod(((_first$verificationMe = first.verificationMethods) === null || _first$verificationMe === void 0 ? void 0 : _first$verificationMe[0]) || 'password');
+      var initialMethod = loginMethods[0];
+      setCurrentLoginMethod(initialMethod);
+      if ((initialMethod === null || initialMethod === void 0 ? void 0 : initialMethod.type) === 'email' || (initialMethod === null || initialMethod === void 0 ? void 0 : initialMethod.type) === 'phone') {
+        var _initialMethod$verifi;
+        setCurrentVerificationMethod(((_initialMethod$verifi = initialMethod.verificationMethods) === null || _initialMethod$verifi === void 0 ? void 0 : _initialMethod$verifi[0]) || 'password');
       }
     }
     // 如果只有 guest 登录，则默认直接使用 guest 登录
@@ -1885,14 +1879,18 @@ var Login2 = function Login2(_ref) {
   // 渲染底部切换选项区域
   var renderSwitchOptions = function renderSwitchOptions() {
     if (!currentLoginMethod) return null;
-    var nonOauthButtons = [];
-    if (currentLoginMethod.type === 'email' || currentLoginMethod.type === 'phone') {
+    var primaryMethod = loginMethods[0];
+    var currentIsFormMethod = currentLoginMethod.type === 'email' || currentLoginMethod.type === 'phone';
+    var primaryIsFormMethod = (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'email' || (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'phone';
+    var shouldUseFormLayout = currentIsFormMethod || primaryIsFormMethod;
+    var verificationSwitchButtons = [];
+    if (currentIsFormMethod) {
       (currentLoginMethod.verificationMethods || []).filter(function (method) {
         return method !== currentVerificationMethod;
       }).forEach(function (method) {
         if (method === 'verification_code') {
           var text = currentLoginMethod.type === 'email' ? locales.getText('pisell-login2-switch-to-email-code') : locales.getText('pisell-login2-switch-to-sms-code');
-          nonOauthButtons.push( /*#__PURE__*/React.createElement("button", {
+          verificationSwitchButtons.push( /*#__PURE__*/React.createElement("button", {
             key: "switch-to-code",
             className: "login2-switch-option-button",
             onClick: function onClick() {
@@ -1906,7 +1904,7 @@ var Login2 = function Login2(_ref) {
             className: "option-text"
           }, text)));
         } else {
-          nonOauthButtons.push( /*#__PURE__*/React.createElement("button", {
+          verificationSwitchButtons.push( /*#__PURE__*/React.createElement("button", {
             key: "switch-to-password",
             className: "login2-switch-option-button",
             onClick: function onClick() {
@@ -1920,16 +1918,15 @@ var Login2 = function Login2(_ref) {
         }
       });
     }
+    var emailPhoneSwitchButtons = [];
     loginMethods.forEach(function (method, index) {
       if (method.type === 'email' || method.type === 'phone') {
-        if (method.type === currentLoginMethod.type) {
-          return;
-        }
+        if (method.type === currentLoginMethod.type) return;
         var isLast = isLastLoginMethod(method.type);
         var _className = classNames('login2-switch-option-button', {
           'has-last-login-badge': isLast
         });
-        nonOauthButtons.push( /*#__PURE__*/React.createElement("button", {
+        emailPhoneSwitchButtons.push( /*#__PURE__*/React.createElement("button", {
           key: "".concat(method.type, "-").concat(index),
           className: _className,
           onClick: function onClick() {
@@ -1944,7 +1941,7 @@ var Login2 = function Login2(_ref) {
         }, method.type === 'email' ? locales.getText('pisell-login2-switch-to-email') : locales.getText('pisell-login2-switch-to-phone'))));
       }
     });
-    var showDivider = nonOauthButtons.length > 0 && oauthProviders.length > 0;
+    var nonOauthButtons = [].concat(verificationSwitchButtons, emailPhoneSwitchButtons);
     var registerPrompt = onSwitchToRegister && /*#__PURE__*/React.createElement("div", {
       className: "login2-register-prompt"
     }, /*#__PURE__*/React.createElement("span", {
@@ -1956,18 +1953,72 @@ var Login2 = function Login2(_ref) {
     if (!nonOauthButtons.length && !oauthProviders.length) {
       return registerPrompt;
     }
-    return /*#__PURE__*/React.createElement(React.Fragment, null, showDivider && /*#__PURE__*/React.createElement("div", {
-      className: "login2-divider"
-    }, locales.getText('pisell-login2-or')), (nonOauthButtons.length > 0 || oauthProviders.length > 0) && /*#__PURE__*/React.createElement("div", {
+    if (shouldUseFormLayout) {
+      var groups = [];
+      if (nonOauthButtons.length > 0) {
+        groups.push( /*#__PURE__*/React.createElement("div", {
+          key: "non-oauth",
+          className: "login2-switch-options"
+        }, nonOauthButtons));
+      }
+      if (oauthProviders.length > 0) {
+        groups.push( /*#__PURE__*/React.createElement(OAuthButtonGroup, {
+          key: "oauth",
+          providers: oauthProviders,
+          wrapperClassName: "login2-oauth-buttons",
+          buttonClassName: "login2-oauth-button",
+          gap: 12
+        }));
+      }
+      if (!groups.length) {
+        return registerPrompt;
+      }
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+        className: "login2-divider"
+      }, locales.getText('pisell-login2-or')), /*#__PURE__*/React.createElement("div", {
+        className: "login2-switch-groups"
+      }, groups), registerPrompt);
+    }
+    var primaryProvider = oauthProviders.find(function (provider) {
+      return provider.key === (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type);
+    });
+    var secondaryOauthProviders = oauthProviders.filter(function (provider) {
+      return provider.key !== (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type);
+    });
+    var hasSecondaryButtons = nonOauthButtons.length > 0 || secondaryOauthProviders.length > 0;
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: "login2-switch-groups"
-    }, nonOauthButtons.length > 0 && /*#__PURE__*/React.createElement("div", {
+    }, primaryProvider ? /*#__PURE__*/React.createElement(OAuthButtonGroup, {
+      providers: [primaryProvider],
+      wrapperClassName: "login2-oauth-buttons",
+      buttonClassName: "login2-oauth-button",
+      gap: 12
+    }) : /*#__PURE__*/React.createElement("div", {
+      className: "login2-switch-options"
+    }, /*#__PURE__*/React.createElement("button", {
+      key: "primary-fallback",
+      className: "login2-switch-option-button",
+      onClick: function onClick() {
+        if ((primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'guest') {
+          handleGuestLogin();
+        } else if ((primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'google' || (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'facebook' || (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'apple') {
+          handleOAuthClick(primaryMethod.type);
+        }
+      }
+    }, /*#__PURE__*/React.createElement(Iconfont, {
+      type: (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'guest' ? 'pisell2-user-01' : (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'google' ? 'pisell2-google' : (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'facebook' ? 'pisell2-facebook' : 'pisell2-apple'
+    }), /*#__PURE__*/React.createElement("span", {
+      className: "option-text"
+    }, (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'guest' ? locales.getText('pisell-login2-login-as-guest') : "".concat(locales.getText('pisell-login2-continue-with'), " ").concat(primaryMethod !== null && primaryMethod !== void 0 && primaryMethod.type ? primaryMethod.type.charAt(0).toUpperCase() + primaryMethod.type.slice(1) : '')))), hasSecondaryButtons && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+      className: "login2-divider"
+    }, locales.getText('pisell-login2-or')), nonOauthButtons.length > 0 && /*#__PURE__*/React.createElement("div", {
       className: "login2-switch-options"
-    }, nonOauthButtons), oauthProviders.length > 0 && /*#__PURE__*/React.createElement(OAuthButtonGroup, {
-      providers: oauthProviders,
+    }, nonOauthButtons), secondaryOauthProviders.length > 0 && /*#__PURE__*/React.createElement(OAuthButtonGroup, {
+      providers: secondaryOauthProviders,
       wrapperClassName: "login2-oauth-buttons",
       buttonClassName: "login2-oauth-button",
       gap: 12
-    })), registerPrompt);
+    }))), registerPrompt);
   };
 
   // 渲染 OAuth 按钮

package/es/pro/pisellPaymentList/example.d.ts

@@ -0,0 +1,19 @@
+/**
+ * PisellPaymentList 使用示例
+ *
+ * 这个文件演示了如何使用 PisellPaymentList 和 PisellPaymentListItem 组件
+ * 包括如何通过 Context 访问父组件配置
+ */
+export declare const BasicExample: () => JSX.Element;
+export declare const ChildrenExample: () => JSX.Element;
+export declare const CustomItemExample: () => JSX.Element;
+export declare const MethodConfigExample: () => JSX.Element;
+export declare const FullFeatureExample: () => JSX.Element;
+declare const _default: {
+    BasicExample: () => JSX.Element;
+    ChildrenExample: () => JSX.Element;
+    CustomItemExample: () => JSX.Element;
+    MethodConfigExample: () => JSX.Element;
+    FullFeatureExample: () => JSX.Element;
+};
+export default _default;