@pisell/private-materials 6.3.36 → 6.3.38

package/lib/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/lib/components/authentication/admin/index.js

@@ -0,0 +1,83 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/authentication/admin/index.ts
+var admin_exports = {};
+__export(admin_exports, {
+  AuthMethodCategory: () => import_AuthMethods.AuthMethodCategory,
+  AuthMethodType: () => import_AuthMethods.AuthMethodType,
+  AuthenticationMethods: () => import_AuthenticationMethods.default,
+  ChannelAuthSetting: () => import_ChannelAuthSetting.default,
+  CollectInfo: () => import_CollectInfo.default,
+  CustomerAuth: () => import_CustomerAuth.default,
+  CustomerOAuthConfig: () => import_CustomerOAuthConfig.default,
+  DeviceAuth: () => import_DeviceAuth.default,
+  OAuthConfig: () => import_OAuthConfig.default,
+  OnlineShopAuth: () => import_OnlineShopAuth.default,
+  OrgAdminAuth: () => import_OrgAdminAuth.default,
+  POSOperatorAuth: () => import_POSOperatorAuth.default,
+  PageSetting: () => import_PageSetting.default,
+  PageSettingItem: () => import_PageSettingItem.default,
+  SaaSAdminAuth: () => import_SaaSAdminAuth.default,
+  SaaSManagermentAuth: () => import_SaaSManagermentAuth.default
+});
+module.exports = __toCommonJS(admin_exports);
+var import_AuthMethods = require("./AuthMethods");
+var import_ChannelAuthSetting = __toESM(require("./ChannelAuthSetting"));
+var import_PageSetting = __toESM(require("./ChannelAuthSetting/PageSetting"));
+var import_PageSettingItem = __toESM(require("./ChannelAuthSetting/PageSettingItem"));
+var import_AuthenticationMethods = __toESM(require("./ChannelAuthSetting/AuthenticationMethods"));
+var import_CollectInfo = __toESM(require("./ChannelAuthSetting/CollectInfo"));
+var import_SaaSAdminAuth = __toESM(require("./SaaSAdminAuth"));
+var import_OrgAdminAuth = __toESM(require("./OrgAdminAuth"));
+var import_OAuthConfig = __toESM(require("./OAuthConfig"));
+var import_CustomerAuth = __toESM(require("./CustomerAuth"));
+var import_CustomerOAuthConfig = __toESM(require("./CustomerOAuthConfig"));
+var import_DeviceAuth = __toESM(require("./DeviceAuth"));
+var import_POSOperatorAuth = __toESM(require("./POSOperatorAuth"));
+var import_OnlineShopAuth = __toESM(require("./ChannelAuthSetting/OnlineShopAuth"));
+var import_SaaSManagermentAuth = __toESM(require("./ChannelAuthSetting/SaaSManagermentAuth"));
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AuthMethodCategory,
+  AuthMethodType,
+  AuthenticationMethods,
+  ChannelAuthSetting,
+  CollectInfo,
+  CustomerAuth,
+  CustomerOAuthConfig,
+  DeviceAuth,
+  OAuthConfig,
+  OnlineShopAuth,
+  OrgAdminAuth,
+  POSOperatorAuth,
+  PageSetting,
+  PageSettingItem,
+  SaaSAdminAuth,
+  SaaSManagermentAuth
+});

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

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

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

@@ -334,7 +334,7 @@ var formatBookings = (data, values) => {
   const eventOtherParams = data.eventOtherParams;
   let bookings = [];
   let obj = {};
-  list.forEach((item, index) => {
+  list.forEach((item) => {
     var _a, _b, _c, _d, _e;
     let start_date = item._extend.startDate.format("YYYY-MM-DD");
     let end_date = item._extend.endDate.format("YYYY-MM-DD");

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/components/index.js

@@ -34,13 +34,22 @@ __export(components_exports, {
   BookingForms: () => import_forms.default,
   BookingInfo: () => import_info.default,
   BookingNotes: () => import_notes.default,
+  CustomerAuth: () => import_admin.CustomerAuth,
+  CustomerOAuthConfig: () => import_admin.CustomerOAuthConfig,
+  DeviceAuth: () => import_admin.DeviceAuth,
   EditBookingModal: () => import_editBookingModal.default,
   Login: () => import_login.default,
+  OAuthConfig: () => import_admin.OAuthConfig,
+  OnlineShopAuth: () => import_admin.OnlineShopAuth,
+  OrgAdminAuth: () => import_admin.OrgAdminAuth,
+  POSOperatorAuth: () => import_admin.POSOperatorAuth,
   PinModal: () => import_pinModal.default,
   PinVerifyModal: () => import_pinVerifyModal.default,
   PisellSelectCustomerModal: () => import_pisellSelectCustomerModal.default,
   ProductExtension: () => import_productExtension.default,
   RuleSetting: () => import_ruleSetting.default,
+  SaaSAdminAuth: () => import_admin.SaaSAdminAuth,
+  SaaSManagermentAuth: () => import_admin.SaaSManagermentAuth,
   Schedules: () => import_schedules.default,
   StepController: () => import_stepController.default,
   SubTotal: () => import_subTotal.default,
@@ -71,6 +80,7 @@ var import_editBookingModal = __toESM(require("./booking/editBookingModal"));
 var import_stepController = __toESM(require("./stepController"));
 var import_pinModal = __toESM(require("./pinModal"));
 var import_pinVerifyModal = __toESM(require("./pinVerifyModal"));
+var import_admin = require("./authentication/admin");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Booking,
@@ -78,13 +88,22 @@ var import_pinVerifyModal = __toESM(require("./pinVerifyModal"));
   BookingForms,
   BookingInfo,
   BookingNotes,
+  CustomerAuth,
+  CustomerOAuthConfig,
+  DeviceAuth,
   EditBookingModal,
   Login,
+  OAuthConfig,
+  OnlineShopAuth,
+  OrgAdminAuth,
+  POSOperatorAuth,
   PinModal,
   PinVerifyModal,
   PisellSelectCustomerModal,
   ProductExtension,
   RuleSetting,
+  SaaSAdminAuth,
+  SaaSManagermentAuth,
   Schedules,
   StepController,
   SubTotal,

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

@@ -50,6 +50,7 @@ var import_utils2 = require("../../../utils");
 var import_payGroup = require("./payGroup");
 var import_locales = __toESM(require("./locales"));
 var import_utils3 = require("./utils");
+var import_status = require("./status");
 var import_index = require("./index.less");
 var ToCPay = (props, ref) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
@@ -98,7 +99,8 @@ var ToCPay = (props, ref) => {
   };
   const getWalletSetting = async (initProps) => {
     var _a2, _b2;
-    const sale_channel = ((_a2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _a2.sale_channel) || "online-store";
+    let sale_channel = ((_a2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _a2.sale_channel) || "online-store";
+    sale_channel = import_status.saleChannelMap[sale_channel] || sale_channel;
     const { wallet, wallet_setting } = await (0, import_serve.getWalletNameAndPopupStatus)({
       setting_type: `${sale_channel}-wallet-setting`
     });
@@ -176,6 +178,12 @@ var ToCPay = (props, ref) => {
         key: "支付数据获取",
         value: ""
       });
+      const withCustomerIdList = wallet_pass_recommend_list.map((item) => {
+        return {
+          ...item,
+          customer_id: customer_id || item.customer_id
+        };
+      });
       dispatch({
         type: "setPayGroup",
         payload: {
@@ -190,7 +198,7 @@ var ToCPay = (props, ref) => {
             ...(_a2 = state.payGroup) == null ? void 0 : _a2.walletPass,
             ...walletPass,
             amount: wallet_pass_amount,
-            cards: wallet_pass_recommend_list
+            cards: withCustomerIdList
           } : null,
           total_amount: order == null ? void 0 : order.amount,
           wait_amount: remain_amount

package/lib/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/lib/components/pay/toC/status.js

@@ -23,6 +23,7 @@ __export(status_exports, {
   paymentKeys: () => paymentKeys,
   paymentServices: () => paymentServices,
   paymentTypes: () => paymentTypes,
+  saleChannelMap: () => saleChannelMap,
   tripartitePaymentKeys: () => tripartitePaymentKeys
 });
 module.exports = __toCommonJS(status_exports);
@@ -112,11 +113,15 @@ var paymentKeys = Object.keys(paymentServices);
 var isTripartitePayment = (service) => {
   return tripartitePaymentKeys.includes(service);
 };
+var saleChannelMap = {
+  "mobile_order": "mobile-order"
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   isTripartitePayment,
   paymentKeys,
   paymentServices,
   paymentTypes,
+  saleChannelMap,
   tripartitePaymentKeys
 });

package/lib/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/lib/index.js

@@ -46,6 +46,9 @@ __export(src_exports, {
   BookingStartTime: () => import_startTime.default,
   ContactInfo: () => import_contactInfo.default,
   ContactInfoModal: () => import_contactInfoModal.default,
+  CustomerAuth: () => import_admin.CustomerAuth,
+  CustomerOAuthConfig: () => import_admin.CustomerOAuthConfig,
+  DeviceAuth: () => import_admin.DeviceAuth,
   EditBookingModal: () => import_editBookingModal.default,
   Eftpos: () => import_eftpos.default,
   EftposPay: () => import_eftposPay.default,
@@ -63,12 +66,18 @@ __export(src_exports, {
   EventTimeResourceSelector: () => import_timeResourceSelector.default,
   Login: () => import_login.default,
   Login2: () => import_Login2.Login2,
+  OAuthConfig: () => import_admin.OAuthConfig,
+  OnlineShopAuth: () => import_admin.OnlineShopAuth,
+  OrgAdminAuth: () => import_admin.OrgAdminAuth,
+  POSOperatorAuth: () => import_admin.POSOperatorAuth,
   PinModal: () => import_pinModal.default,
   PinVerifyModal: () => import_pinVerifyModal.default,
   PisellSelectCustomerModal: () => import_pisellSelectCustomerModal.default,
   ProductExtension: () => import_productExtension.default,
   Register2: () => import_Login2.Register2,
   RuleSetting: () => import_ruleSetting.default,
+  SaaSAdminAuth: () => import_admin.SaaSAdminAuth,
+  SaaSManagermentAuth: () => import_admin.SaaSManagermentAuth,
   SaasCreateOrganization: () => import_saasCreateOrganization.default,
   SaasLogin: () => import_saasLogin.default,
   SaasRegister: () => import_saasRegister.default,
@@ -143,6 +152,7 @@ var import_walletEditor = __toESM(require("./plus/walletEditor"));
 var import_walletPassGallery = __toESM(require("./plus/walletPassGallery"));
 var import_pinModal = __toESM(require("./components/pinModal"));
 var import_pinVerifyModal = __toESM(require("./components/pinVerifyModal"));
+var import_admin = require("./components/authentication/admin");
 var import_contactInfo = __toESM(require("./plus/contactInfo"));
 var import_contactInfoModal = __toESM(require("./plus/contactInfoModal"));
 var import_Login2 = require("./pro/Login2.0");
@@ -167,6 +177,9 @@ import_dayjs.default.extend(import_localeData.default);
   BookingStartTime,
   ContactInfo,
   ContactInfoModal,
+  CustomerAuth,
+  CustomerOAuthConfig,
+  DeviceAuth,
   EditBookingModal,
   Eftpos,
   EftposPay,
@@ -184,12 +197,18 @@ import_dayjs.default.extend(import_localeData.default);
   EventTimeResourceSelector,
   Login,
   Login2,
+  OAuthConfig,
+  OnlineShopAuth,
+  OrgAdminAuth,
+  POSOperatorAuth,
   PinModal,
   PinVerifyModal,
   PisellSelectCustomerModal,
   ProductExtension,
   Register2,
   RuleSetting,
+  SaaSAdminAuth,
+  SaaSManagermentAuth,
   SaasCreateOrganization,
   SaasLogin,
   SaasRegister,

package/lib/pro/Login2.0/Login2.js

@@ -104,14 +104,11 @@ var Login2 = ({
   (0, import_react.useEffect)(() => {
     var _a2;
     if (loginMethods.length > 0 && !currentLoginMethod) {
-      const nonOAuthMethod = loginMethods.find(
-        (method) => method.type === "email" || method.type === "phone"
-      );
-      const first = nonOAuthMethod || loginMethods[0];
-      setCurrentLoginMethod(first);
-      if (first.type === "email" || first.type === "phone") {
+      const initialMethod = loginMethods[0];
+      setCurrentLoginMethod(initialMethod);
+      if ((initialMethod == null ? void 0 : initialMethod.type) === "email" || (initialMethod == null ? void 0 : initialMethod.type) === "phone") {
         setCurrentVerificationMethod(
-          ((_a2 = first.verificationMethods) == null ? void 0 : _a2[0]) || "password"
+          ((_a2 = initialMethod.verificationMethods) == null ? void 0 : _a2[0]) || "password"
         );
       }
     }
@@ -1219,12 +1216,16 @@ var Login2 = ({
   };
   const renderSwitchOptions = () => {
     if (!currentLoginMethod) return null;
-    const nonOauthButtons = [];
-    if (currentLoginMethod.type === "email" || currentLoginMethod.type === "phone") {
+    const primaryMethod = loginMethods[0];
+    const currentIsFormMethod = currentLoginMethod.type === "email" || currentLoginMethod.type === "phone";
+    const primaryIsFormMethod = (primaryMethod == null ? void 0 : primaryMethod.type) === "email" || (primaryMethod == null ? void 0 : primaryMethod.type) === "phone";
+    const shouldUseFormLayout = currentIsFormMethod || primaryIsFormMethod;
+    const verificationSwitchButtons = [];
+    if (currentIsFormMethod) {
       (currentLoginMethod.verificationMethods || []).filter((method) => method !== currentVerificationMethod).forEach((method) => {
         if (method === "verification_code") {
           const text = currentLoginMethod.type === "email" ? import_utils.locales.getText("pisell-login2-switch-to-email-code") : import_utils.locales.getText("pisell-login2-switch-to-sms-code");
-          nonOauthButtons.push(
+          verificationSwitchButtons.push(
             /* @__PURE__ */ import_react.default.createElement(
               "button",
               {
@@ -1237,7 +1238,7 @@ var Login2 = ({
             )
           );
         } else {
-          nonOauthButtons.push(
+          verificationSwitchButtons.push(
             /* @__PURE__ */ import_react.default.createElement(
               "button",
               {
@@ -1252,17 +1253,15 @@ var Login2 = ({
         }
       });
     }
+    const emailPhoneSwitchButtons = [];
     loginMethods.forEach((method, index) => {
       if (method.type === "email" || method.type === "phone") {
-        if (method.type === currentLoginMethod.type) {
-          return;
-        }
+        if (method.type === currentLoginMethod.type) return;
         const isLast = isLastLoginMethod(method.type);
-        const className2 = (0, import_classnames.default)(
-          "login2-switch-option-button",
-          { "has-last-login-badge": isLast }
-        );
-        nonOauthButtons.push(
+        const className2 = (0, import_classnames.default)("login2-switch-option-button", {
+          "has-last-login-badge": isLast
+        });
+        emailPhoneSwitchButtons.push(
           /* @__PURE__ */ import_react.default.createElement(
             "button",
             {
@@ -1282,7 +1281,10 @@ var Login2 = ({
         );
       }
     });
-    const showDivider = nonOauthButtons.length > 0 && oauthProviders.length > 0;
+    const nonOauthButtons = [
+      ...verificationSwitchButtons,
+      ...emailPhoneSwitchButtons
+    ];
     const registerPrompt = onSwitchToRegister && /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-register-prompt" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "register-prompt-text" }, import_utils.locales.getText("pisell-login2-no-account")), /* @__PURE__ */ import_react.default.createElement(
       "button",
       {
@@ -1294,15 +1296,76 @@ var Login2 = ({
     if (!nonOauthButtons.length && !oauthProviders.length) {
       return registerPrompt;
     }
-    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showDivider && /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-divider" }, import_utils.locales.getText("pisell-login2-or")), (nonOauthButtons.length > 0 || oauthProviders.length > 0) && /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-switch-groups" }, nonOauthButtons.length > 0 && /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-switch-options" }, nonOauthButtons), oauthProviders.length > 0 && /* @__PURE__ */ import_react.default.createElement(
+    if (shouldUseFormLayout) {
+      const groups = [];
+      if (nonOauthButtons.length > 0) {
+        groups.push(
+          /* @__PURE__ */ import_react.default.createElement("div", { key: "non-oauth", className: "login2-switch-options" }, nonOauthButtons)
+        );
+      }
+      if (oauthProviders.length > 0) {
+        groups.push(
+          /* @__PURE__ */ import_react.default.createElement(
+            import_OAuthButtonGroup.default,
+            {
+              key: "oauth",
+              providers: oauthProviders,
+              wrapperClassName: "login2-oauth-buttons",
+              buttonClassName: "login2-oauth-button",
+              gap: 12
+            }
+          )
+        );
+      }
+      if (!groups.length) {
+        return registerPrompt;
+      }
+      return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-divider" }, import_utils.locales.getText("pisell-login2-or")), /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-switch-groups" }, groups), registerPrompt);
+    }
+    const primaryProvider = oauthProviders.find(
+      (provider) => provider.key === (primaryMethod == null ? void 0 : primaryMethod.type)
+    );
+    const secondaryOauthProviders = oauthProviders.filter(
+      (provider) => provider.key !== (primaryMethod == null ? void 0 : primaryMethod.type)
+    );
+    const hasSecondaryButtons = nonOauthButtons.length > 0 || secondaryOauthProviders.length > 0;
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-switch-groups" }, primaryProvider ? /* @__PURE__ */ import_react.default.createElement(
+      import_OAuthButtonGroup.default,
+      {
+        providers: [primaryProvider],
+        wrapperClassName: "login2-oauth-buttons",
+        buttonClassName: "login2-oauth-button",
+        gap: 12
+      }
+    ) : /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-switch-options" }, /* @__PURE__ */ import_react.default.createElement(
+      "button",
+      {
+        key: "primary-fallback",
+        className: "login2-switch-option-button",
+        onClick: () => {
+          if ((primaryMethod == null ? void 0 : primaryMethod.type) === "guest") {
+            handleGuestLogin();
+          } else if ((primaryMethod == null ? void 0 : primaryMethod.type) === "google" || (primaryMethod == null ? void 0 : primaryMethod.type) === "facebook" || (primaryMethod == null ? void 0 : primaryMethod.type) === "apple") {
+            handleOAuthClick(primaryMethod.type);
+          }
+        }
+      },
+      /* @__PURE__ */ import_react.default.createElement(
+        import_materials2.Iconfont,
+        {
+          type: (primaryMethod == null ? void 0 : primaryMethod.type) === "guest" ? "pisell2-user-01" : (primaryMethod == null ? void 0 : primaryMethod.type) === "google" ? "pisell2-google" : (primaryMethod == null ? void 0 : primaryMethod.type) === "facebook" ? "pisell2-facebook" : "pisell2-apple"
+        }
+      ),
+      /* @__PURE__ */ import_react.default.createElement("span", { className: "option-text" }, (primaryMethod == null ? void 0 : primaryMethod.type) === "guest" ? import_utils.locales.getText("pisell-login2-login-as-guest") : `${import_utils.locales.getText("pisell-login2-continue-with")} ${(primaryMethod == null ? void 0 : primaryMethod.type) ? primaryMethod.type.charAt(0).toUpperCase() + primaryMethod.type.slice(1) : ""}`)
+    )), hasSecondaryButtons && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-divider" }, import_utils.locales.getText("pisell-login2-or")), nonOauthButtons.length > 0 && /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-switch-options" }, nonOauthButtons), secondaryOauthProviders.length > 0 && /* @__PURE__ */ import_react.default.createElement(
       import_OAuthButtonGroup.default,
       {
-        providers: oauthProviders,
+        providers: secondaryOauthProviders,
         wrapperClassName: "login2-oauth-buttons",
         buttonClassName: "login2-oauth-button",
         gap: 12
       }
-    )), registerPrompt);
+    ))), registerPrompt);
   };
   if (!visible) {
     return null;

package/lib/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;