@pisell/private-materials 6.6.11 → 6.6.12

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

@@ -81,7 +81,7 @@ var AuthModal = () => {
     }
   }, [currentView]);
   const login2Config = (0, import_react.useMemo)(() => {
-    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
     if (!localesInitialized) {
       return {
         loginMethods: [],
@@ -262,9 +262,13 @@ var AuthModal = () => {
           show: (config == null ? void 0 : config.logo) ? true : false,
           url: config == null ? void 0 : config.logo,
           // 直接从 config.logo 读取
-          position: "center"
+          position: "center",
+          size: {
+            width: ((_v = config == null ? void 0 : config.logoSize) == null ? void 0 : _v.width) || 48,
+            height: ((_w = config == null ? void 0 : config.logoSize) == null ? void 0 : _w.height) || 48
+          }
         } : void 0,
-        themeColor: ((_x = (_w = (_v = config == null ? void 0 : config.page) == null ? void 0 : _v.login) == null ? void 0 : _w.ui) == null ? void 0 : _x.themeColor) || "#7F56D9",
+        themeColor: ((_z = (_y = (_x = config == null ? void 0 : config.page) == null ? void 0 : _x.login) == null ? void 0 : _y.ui) == null ? void 0 : _z.themeColor) || "#7F56D9",
         formLabels: {
           email: { show: false },
           phone: { show: false },
@@ -275,7 +279,7 @@ var AuthModal = () => {
     };
   }, [config, channel, emailLinkVerification, localesInitialized]);
   const register2Config = (0, import_react.useMemo)(() => {
-    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     if (!localesInitialized) {
       return {
         registrationMethods: [],
@@ -395,10 +399,14 @@ var AuthModal = () => {
           show: config.logo ? true : false,
           url: config.logo,
           // 直接从 config.logo 读取
-          position: "center"
+          position: "center",
+          size: {
+            width: ((_l = config == null ? void 0 : config.logoSize) == null ? void 0 : _l.width) || 48,
+            height: ((_m = config == null ? void 0 : config.logoSize) == null ? void 0 : _m.height) || 48
+          }
         } : void 0,
-        themeColor: ((_n = (_m = (_l = config.page) == null ? void 0 : _l.register) == null ? void 0 : _m.ui) == null ? void 0 : _n.themeColor) || "#7F56D9",
-        passwordRules: transformPasswordRules((_o = config.auth) == null ? void 0 : _o.password),
+        themeColor: ((_p = (_o = (_n = config.page) == null ? void 0 : _n.register) == null ? void 0 : _o.ui) == null ? void 0 : _p.themeColor) || "#7F56D9",
+        passwordRules: transformPasswordRules((_q = config.auth) == null ? void 0 : _q.password),
         // 传递密码规则
         formLabels: {
           email: { show: false },

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

@@ -326,21 +326,21 @@
     .login2-submit-button {
       height: 44px;
       border-radius: 8px;
-      border: 1px solid var(--theme-color, #7f56d9);
-      background: var(--theme-color, #7f56d9);
+      border: 1px solid var(--custom-button-bg-color, var(--theme-color, #7f56d9));
+      background: var(--custom-button-bg-color, var(--theme-color, #7f56d9));
       box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
       font-size: 16px;
       font-weight: 600;
-      color: #ffffff;
+      color: var(--custom-button-text-color, #ffffff);
 
       &:hover:not(:disabled) {
-        background: #6941c6;
-        border-color: #6941c6;
+        background: var(--custom-button-bg-color, #6941c6);
+        border-color: var(--custom-button-bg-color, #6941c6);
       }
 
       &:focus {
-        background: var(--theme-color, #7f56d9);
-        border-color: var(--theme-color, #7f56d9);
+        background: var(--custom-button-bg-color, var(--theme-color, #7f56d9));
+        border-color: var(--custom-button-bg-color, var(--theme-color, #7f56d9));
         box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05),
           0px 0px 0px 4px rgba(127, 86, 217, 0.1);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.11",
+  "version": "6.6.12",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -62,7 +62,7 @@
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
     "@pisell/utils": "3.0.2",
-    "@pisell/materials": "6.6.4",
+    "@pisell/materials": "6.6.5",
     "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.7"
   },

package/es/components/checkout/PaymentModal.d.ts

@@ -1,31 +0,0 @@
-import React from 'react';
-import './index.less';
-interface PaymentModalData {
-    order_info: any;
-    subtotal_info: {
-        subTotalList: any[];
-        orderTotalList: any[];
-        total: number;
-        showDetail: boolean;
-    };
-    total: any;
-}
-interface PaymentModalProps {
-    open?: boolean;
-    data?: PaymentModalData;
-    callback?: (result: any) => void;
-    onClose?: (reset?: boolean) => void;
-    dispatch?: (action: {
-        type: string;
-        payload?: any;
-    }) => void;
-    state?: any;
-}
-interface PaymentModalMainProps extends PaymentModalProps {
-    onClose?: (reset?: boolean) => void;
-    setEditCartMode?: (order_id: number, payData: any, closeModal: boolean) => void;
-    editOrderId?: number;
-}
-declare const PaymentModal: React.FC<PaymentModalMainProps>;
-export type { PaymentModalData, PaymentModalProps };
-export default PaymentModal;

package/lib/components/checkout/PaymentModal.d.ts

@@ -1,31 +0,0 @@
-import React from 'react';
-import './index.less';
-interface PaymentModalData {
-    order_info: any;
-    subtotal_info: {
-        subTotalList: any[];
-        orderTotalList: any[];
-        total: number;
-        showDetail: boolean;
-    };
-    total: any;
-}
-interface PaymentModalProps {
-    open?: boolean;
-    data?: PaymentModalData;
-    callback?: (result: any) => void;
-    onClose?: (reset?: boolean) => void;
-    dispatch?: (action: {
-        type: string;
-        payload?: any;
-    }) => void;
-    state?: any;
-}
-interface PaymentModalMainProps extends PaymentModalProps {
-    onClose?: (reset?: boolean) => void;
-    setEditCartMode?: (order_id: number, payData: any, closeModal: boolean) => void;
-    editOrderId?: number;
-}
-declare const PaymentModal: React.FC<PaymentModalMainProps>;
-export type { PaymentModalData, PaymentModalProps };
-export default PaymentModal;