@pisell/private-materials 6.3.32 → 6.3.33

package/lib/components/booking/info/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -110,11 +109,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/notes/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/payments/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/pay/toC/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -30,11 +29,4 @@ export interface PayGroup {
     _order: any;
     front_order_uuid?: string;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,11 +68,4 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/wallet/Detail/model.d.ts

@@ -1,13 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    addWalletCard: any;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    walletDetailState: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/lib/components/wallet/DiscountCard/model.d.ts

@@ -1,14 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    total: number;
-    setup?: 'menu' | 'list' | 'detail' | string;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/lib/components/wallet/PointCard/model.d.ts

@@ -1,13 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    total: number;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/lib/components/wallet/RechargeableCard/model.d.ts

@@ -1,29 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    selectedGiftOptionId: string | null;
-    cardList: Array<{
-        id: string;
-        name: string;
-        price: number;
-    }>;
-    selectedItem: {
-        id?: string;
-        gift_price?: number;
-        price?: number;
-        name?: string;
-        variant_id?: string;
-    };
-    productId?: string;
-    detailId?: string;
-    total: string | number;
-    rechargeModalOpen: boolean;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/lib/components/wallet/Voucher/model.d.ts

@@ -1,13 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    total: 0;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/lib/components/wallet/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IWalletListItemProps } from './serve';
 export interface WalletCardItemProps {
     id: string;
@@ -27,11 +26,4 @@ export interface WalletListProps {
     currentSearchListItemCode?: string;
     [key: string]: any;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    global_wallet: WalletListProps;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -153,26 +153,31 @@ var AuthModal = () => {
     }
     enabledMethods.sort((a, b) => a.sort - b.sort);
     enabledMethods.forEach(({ type, config: methodConfig }) => {
-      var _a3, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2;
+      var _a3, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2;
       if (type === "email") {
         const verificationMethods = [];
-        const loginMethod = ((_a3 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _a3.login_method) || {};
+        const loginMethod = ((_a3 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _a3.login_method) || {
+          "password": {
+            enabled: true,
+            sort: 1
+          }
+        };
         const enabledVerificationMethods = [];
-        if ((_b2 = loginMethod.password) == null ? void 0 : _b2.enabled) {
+        if ((_b2 = loginMethod == null ? void 0 : loginMethod.password) == null ? void 0 : _b2.enabled) {
           enabledVerificationMethods.push({
             type: "password",
-            sort: loginMethod.password.sort || 0
+            sort: ((_c2 = loginMethod.password) == null ? void 0 : _c2.sort) || 0
             // 添加默认值保护
           });
         }
-        if ((_c2 = loginMethod.code) == null ? void 0 : _c2.enabled) {
+        if ((_d2 = loginMethod == null ? void 0 : loginMethod.code) == null ? void 0 : _d2.enabled) {
           enabledVerificationMethods.push({
             type: "verification_code",
             sort: loginMethod.code.sort || 0
             // 添加默认值保护
           });
         }
-        if ((_d2 = loginMethod.link) == null ? void 0 : _d2.enabled) {
+        if ((_e2 = loginMethod == null ? void 0 : loginMethod.link) == null ? void 0 : _e2.enabled) {
           enabledVerificationMethods.push({
             type: "verification_code",
             // link 映射为 verification_code
@@ -191,16 +196,16 @@ var AuthModal = () => {
         }
       } else if (type === "phone") {
         const verificationMethods = [];
-        const loginMethod = ((_e2 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _e2.login_method) || {};
+        const loginMethod = ((_f2 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _f2.login_method) || {};
         const enabledVerificationMethods = [];
-        if ((_f2 = loginMethod.password) == null ? void 0 : _f2.enabled) {
+        if ((_g2 = loginMethod == null ? void 0 : loginMethod.password) == null ? void 0 : _g2.enabled) {
           enabledVerificationMethods.push({
             type: "password",
             sort: loginMethod.password.sort || 0
             // 添加默认值保护
           });
         }
-        if ((_g2 = loginMethod.code) == null ? void 0 : _g2.enabled) {
+        if ((_h2 = loginMethod == null ? void 0 : loginMethod.code) == null ? void 0 : _h2.enabled) {
           enabledVerificationMethods.push({
             type: "verification_code",
             sort: loginMethod.code.sort || 0
@@ -223,12 +228,12 @@ var AuthModal = () => {
       } else if (type === "facebook") {
         loginMethods.push({
           type: "facebook",
-          appId: ((_h2 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _h2.appid) || ""
+          appId: ((_i2 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _i2.appid) || ""
         });
       } else if (type === "apple") {
         loginMethods.push({
           type: "apple",
-          clientId: ((_i2 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _i2.identifier) || ""
+          clientId: ((_j2 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _j2.identifier) || ""
         });
       } else if (type === "guest") {
         loginMethods.push({

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

@@ -842,7 +842,10 @@ var Login2 = ({
         const fbConfig = (_a2 = config == null ? void 0 : config.loginMethods) == null ? void 0 : _a2.find((n) => n.type === "facebook");
         const token = fbConfig == null ? void 0 : fbConfig.appId;
         if (token) {
-          await registerAndLogin.loginWithFacebook(token);
+          const res = await registerAndLogin.loginWithFacebook(token);
+          if (res.status) {
+            onLogin == null ? void 0 : onLogin(res.data, "facebook", { account: "", password: "" }, config.channel);
+          }
         } else {
           throw new Error("Facebook app_id not configured");
         }
@@ -850,7 +853,8 @@ var Login2 = ({
         const appleConfig = (_b2 = config == null ? void 0 : config.loginMethods) == null ? void 0 : _b2.find((n) => n.type === "apple");
         const token = appleConfig == null ? void 0 : appleConfig.clientId;
         if (token) {
-          await registerAndLogin.loginWithApple(token);
+          const res = await registerAndLogin.loginWithApple(token);
+          onLogin == null ? void 0 : onLogin(res.data, "apple", { account: "", password: "" }, config.channel);
         } else {
           throw new Error("Apple client_id not configured");
         }
@@ -858,6 +862,9 @@ var Login2 = ({
         await (onOAuthLogin == null ? void 0 : onOAuthLogin(provider, config.channel));
       }
     } catch (error) {
+      if (error.message === "facebook_login_cancel") {
+        return import_antd.message.error(import_utils.locales.getText("pisell-register2-facebook-login-canceled"));
+      }
       import_antd.message.error(
         (error == null ? void 0 : error.message) || import_utils.locales.getText("pisell-login2-login-failed")
       );
@@ -1281,7 +1288,7 @@ 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 && /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-switch-options" }, nonOauthButtons), oauthProviders.length > 0 && /* @__PURE__ */ import_react.default.createElement(
+    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(
       import_OAuthButtonGroup.default,
       {
         providers: oauthProviders,
@@ -1289,7 +1296,7 @@ var Login2 = ({
         buttonClassName: "login2-oauth-button",
         gap: 12
       }
-    ), registerPrompt);
+    )), registerPrompt);
   };
   if (!visible) {
     return null;

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

@@ -454,7 +454,7 @@ var Register2 = ({
       }
       await (onOAuthLogin == null ? void 0 : onOAuthLogin(provider, config.channel));
     } catch (error) {
-      if (error.messager === "facebook_login_cancel") {
+      if (error.message === "facebook_login_cancel") {
         return import_antd.message.error(import_utils.locales.getText("pisell-register2-facebook-login-canceled"));
       }
       console.error(`${provider} login error:`, error);

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

@@ -78,7 +78,7 @@ var validatePhoneNumber = async (value, getText) => {
       }
       break;
     case "61":
-      if (!/^4\d{8,9}$/.test(phone)) {
+      if (!/^(\+?0)?4\d{8}$/.test(phone)) {
         throw new Error(getText("pisell-phone-validation-australia"));
       }
       break;

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

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

@@ -130,7 +130,7 @@ var locales_default = {
     "pisell-phone-validation-taiwan": "Please enter a valid Taiwan phone (9 digits starting with 9)",
     "pisell-phone-validation-us-canada": "Please enter a valid US/Canada phone (10 digits)",
     "pisell-phone-validation-uk": "Please enter a valid UK phone (10 digits starting with 7)",
-    "pisell-phone-validation-australia": "Please enter a valid Australian phone (9-10 digits starting with 4)",
+    "pisell-phone-validation-australia": "Please enter a valid Australian phone",
     "pisell-phone-validation-japan": "Please enter a valid Japanese phone (10 digits)",
     "pisell-phone-validation-korea": "Please enter a valid Korean phone (9-10 digits)",
     "pisell-phone-validation-singapore": "Please enter a valid Singapore phone (8 digits)",
@@ -336,7 +336,7 @@ var locales_default = {
     "pisell-phone-validation-taiwan": "请输入正确的台湾手机号（9位数字，以9开头）",
     "pisell-phone-validation-us-canada": "请输入正确的美国/加拿大手机号（10位数字）",
     "pisell-phone-validation-uk": "请输入正确的英国手机号（10位数字，以7开头）",
-    "pisell-phone-validation-australia": "请输入正确的澳大利亚手机号（9-10位数字，以4开头）",
+    "pisell-phone-validation-australia": "请输入正确的澳大利亚手机号",
     "pisell-phone-validation-japan": "请输入正确的日本手机号（10位数字）",
     "pisell-phone-validation-korea": "请输入正确的韩国手机号（9-10位数字）",
     "pisell-phone-validation-singapore": "请输入正确的新加坡手机号（8位数字）",
@@ -477,8 +477,8 @@ var locales_default = {
     "pisell-register2-phone-placeholder": "請輸入手機號碼",
     "pisell-register2-password-placeholder": "請輸入密碼",
     // Already registered messages
-    "pisell-register2-email-already-registered": "此電子郵件已註冊，請登录或使用其他電子郵件",
-    "pisell-register2-phone-already-registered": "此手機號碼已註冊，請登录或使用其他手機號碼",
+    "pisell-register2-email-already-registered": "此電子郵件已註冊，請登錄或使用其他電子郵件",
+    "pisell-register2-phone-already-registered": "此手機號碼已註冊，請登錄或使用其他手機號碼",
     // Code input page
     "pisell-register2-check-email-title": "查看您的電子郵件",
     "pisell-register2-check-phone-title": "查看您的短訊",
@@ -504,20 +504,20 @@ var locales_default = {
     "pisell-register2-back-to-registration": "返回註冊",
     "pisell-register2-link-already-used-title": "驗證連結已使用",
     "pisell-register2-link-already-used-desc": "您已經驗證過此電子郵件。請登录以繼續。",
-    "pisell-register2-login-button": "登录",
+    "pisell-register2-login-button": "登錄",
     // Email link password reset
     "pisell-login2-reset-password-verifying": "驗證中...",
     "pisell-login2-reset-password-invalid-link": "無效的重置連結",
     "pisell-login2-reset-password-link-expired": "您的重置密碼連結已過期。請申請新的重置郵件。",
     "pisell-login2-reset-password-link-invalid": "您的重置密碼連結無效。請申請新的重置郵件。",
-    "pisell-login2-reset-password-back-to-login": "登录",
+    "pisell-login2-reset-password-back-to-login": "登錄",
     "pisell-login2-verification-failed-title": "驗證失敗",
     // Legal Terms
-    "pisell-legal-terms-login-text": "登录即代表同意 ",
+    "pisell-legal-terms-login-text": "登錄即代表同意 ",
     "pisell-legal-terms-register-text": "註冊即代表同意 ",
     "pisell-legal-terms-and": " & ",
     // Modal titles
-    "pisell-modal-login-title": "登录",
+    "pisell-modal-login-title": "登錄",
     "pisell-modal-register-title": "註冊",
     // Login code input
     "pisell-login2-check-email-title": "查看您的電子郵件",
@@ -552,7 +552,7 @@ var locales_default = {
     "pisell-register2-continue-with-google": "使用Google繼續",
     "pisell-register2-continue-with-facebook": "使用Facebook繼續",
     "pisell-register2-continue-with-apple": "使用Apple繼續",
-    "pisell-register2-facebook-login-canceled": "Facebook登录已取消",
+    "pisell-register2-facebook-login-canceled": "Facebook登錄已取消",
     // Phone input
     "pisell-phone-input-placeholder": "請輸入手機號碼",
     // Set password
@@ -561,7 +561,7 @@ var locales_default = {
     "pisell-set-password-reset-title": "請輸入新密碼",
     "pisell-set-password-placeholder": "輸入密碼",
     "pisell-set-password-confirm-placeholder": "確認密碼",
-    "pisell-set-password-submit": "確認並登录",
+    "pisell-set-password-submit": "確認並登錄",
     "pisell-set-password-required": "請輸入密碼",
     "pisell-set-password-min-length": "密碼至少需要 {length} 個字元",
     "pisell-set-password-require-uppercase": "一個大寫字母",
@@ -582,7 +582,7 @@ var locales_default = {
     "pisell-phone-validation-taiwan": "請輸入正確的台灣手機號碼（9位數字，以9開頭）",
     "pisell-phone-validation-us-canada": "請輸入正確的美國/加拿大手機號碼（10位數字）",
     "pisell-phone-validation-uk": "請輸入正確的英國手機號碼（10位數字，以7開頭）",
-    "pisell-phone-validation-australia": "請輸入正確的澳洲手機號碼（9-10位數字，以4開頭）",
+    "pisell-phone-validation-australia": "請輸入正確的澳洲手機號碼",
     "pisell-phone-validation-japan": "請輸入正確的日本手機號碼（10位數字）",
     "pisell-phone-validation-korea": "請輸入正確的韓國手機號碼（9-10位數字）",
     "pisell-phone-validation-singapore": "請輸入正確的新加坡手機號碼（8位數字）",
@@ -618,24 +618,24 @@ var locales_default = {
     "pisell-login2-continue-failed": "繼續失敗，請重試",
     "pisell-login2-back": "返回",
     // Login method switching
-    "pisell-login2-switch-to-email": "電子郵件登录",
-    "pisell-login2-switch-to-phone": "手機號碼登录",
+    "pisell-login2-switch-to-email": "電子郵件登錄",
+    "pisell-login2-switch-to-phone": "手機號碼登錄",
     "pisell-login2-login-as-guest": "遊客登錄",
-    "pisell-login2-switch-to-password": "密碼登录",
-    "pisell-login2-switch-to-email-code": "電子郵件驗證碼登录",
-    "pisell-login2-switch-to-sms-code": "短訊驗證碼登录",
+    "pisell-login2-switch-to-password": "密碼登錄",
+    "pisell-login2-switch-to-email-code": "電子郵件驗證碼登錄",
+    "pisell-login2-switch-to-sms-code": "短訊驗證碼登錄",
     // Switch to register
     "pisell-login2-no-account": "沒有帳號？",
     "pisell-login2-register-link": "註冊",
     // Last login method badge
-    "pisell-login2-last-login-badge": "上次登录",
+    "pisell-login2-last-login-badge": "上次登錄",
     // Remember me
     "pisell-login2-remember-me": "記住我",
     // Login status messages
     "pisell-login2-code-sent": "驗證碼已發送",
     "pisell-login2-code-send-failed": "發送驗證碼失敗",
-    "pisell-login2-login-success": "登录成功",
-    "pisell-login2-login-failed": "登录失敗",
+    "pisell-login2-login-success": "登錄成功",
+    "pisell-login2-login-failed": "登錄失敗",
     "pisell-register2-register-success": "註冊成功",
     "pisell-register2-complete-title": "註冊完成!",
     "pisell-register2-redirecting": "正在重定向到您的帳戶...",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.32",
+  "version": "6.3.33",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,9 +61,9 @@
     "decimal.js": "^10.4.3",
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
-    "@pisell/utils": "3.0.1",
-    "@pisell/materials": "6.3.8",
     "@pisell/icon": "0.0.11",
+    "@pisell/materials": "6.3.9",
+    "@pisell/utils": "3.0.1",
     "@pisell/date-picker": "3.0.4"
   },
   "peerDependencies": {