@pisell/private-materials 3.4.80 → 3.4.82

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

@@ -427,7 +427,7 @@ var Footer = function Footer(props) {
    */
   var handleSave = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref4) {
-      var type, _ref4$messageShow, messageShow, isHasDayProducts, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, _store$getState, _window, callbackData, values, api;
+      var type, _ref4$messageShow, messageShow, isHasDayProducts, _setLoading, loadingTimer, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, _store$getState, _window, callbackData, values, api;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -452,27 +452,31 @@ var Footer = function Footer(props) {
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === 'checkout' ? setCheckoutLoading : setLoading;
             _setLoading(true);
+            // 超时保护: 超过20秒自动关闭loading
+            loadingTimer = setTimeout(function () {
+              _setLoading(false);
+            }, 20000);
             _getApis = getApis(), createBooking = _getApis.createBooking, editBooking = _getApis.editBooking;
             editApi = state.renderType === 'eventBooking' ? editEventBooking : editBooking;
             createApi = state.renderType === 'eventBooking' ? createEventBooking : createBooking;
             saveOtherValue = {};
             if (!(type === 'save')) {
-              _context4.next = 20;
+              _context4.next = 21;
               break;
             }
-            _context4.next = 16;
+            _context4.next = 17;
             return state === null || state === void 0 || (_state$onSave = state.onSave) === null || _state$onSave === void 0 ? void 0 : _state$onSave.call(state, state.client);
-          case 16:
+          case 17:
             _context4.t0 = _context4.sent;
             if (_context4.t0) {
-              _context4.next = 19;
+              _context4.next = 20;
               break;
             }
             _context4.t0 = {};
-          case 19:
-            saveOtherValue = _context4.t0;
           case 20:
-            _context4.prev = 20;
+            saveOtherValue = _context4.t0;
+          case 21:
+            _context4.prev = 21;
             callbackData = null; // 格式化提交的参数
             values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // 区分是新增还是编辑
             api = state.bookingId ? editApi : createApi; // 增加日志记录
@@ -528,43 +532,45 @@ var Footer = function Footer(props) {
 
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context4.next = 28;
+              _context4.next = 29;
               break;
             }
-            _context4.next = 28;
+            _context4.next = 29;
             return handleSaveAddons();
-          case 28:
+          case 29:
             if (!infoEdit) {
-              _context4.next = 33;
+              _context4.next = 34;
               break;
             }
-            _context4.next = 31;
+            _context4.next = 32;
             return api(values, state.bookingId);
-          case 31:
+          case 32:
             callbackData = _context4.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 33:
+          case 34:
             // 回调关闭弹窗
             state === null || state === void 0 || state.callback(callbackData, type);
+            clearTimeout(loadingTimer);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context4.abrupt("return", callbackData || values);
-          case 38:
-            _context4.prev = 38;
-            _context4.t1 = _context4["catch"](20);
+          case 40:
+            _context4.prev = 40;
+            _context4.t1 = _context4["catch"](21);
             console.log(_context4.t1);
             if ((_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.code) === 70101) {
               message.error(_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.message);
             }
+            clearTimeout(loadingTimer);
             _setLoading(false);
-          case 43:
+          case 46:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[20, 38]]);
+      }, _callee4, null, [[21, 40]]);
     }));
     return function handleSave(_x2) {
       return _ref5.apply(this, arguments);

package/es/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

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

@@ -166,10 +166,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     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/ecocup/hooks.js

@@ -12,24 +12,24 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useState } from 'react';
 import useEngineContext, { usePlatform } from "../../hooks/useEngineContext";
+import useLocale from "../../hooks/useLocale";
 import scanListener from "./utils/scanListener";
 
 /**
  * 获取当前语言
  */
 export var useLanguage = function useLanguage() {
-  var _context$appHelper;
-  var context = useEngineContext();
-  return (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.storage) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.get('umi_locale')) || 'en';
+  var locale = useLocale();
+  return locale || 'en';
 };
 
 /**
  * 扫码监听
  */
 export var useScanListener = function useScanListener() {
-  var _context$appHelper2;
+  var _context$appHelper;
   var context = useEngineContext();
-  var _ref = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils) || {},
+  var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
     interaction = _ref.interaction;
   var addListener = function addListener(key, callback) {
     scanListener.addListener(interaction, key, callback);
@@ -51,9 +51,9 @@ export var useScanListener = function useScanListener() {
  * 获取app
  */
 export var useGetApp = function useGetApp() {
-  var _context$appHelper3;
+  var _context$appHelper2;
   var context = useEngineContext();
-  return (_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.utils) === null || _context$appHelper3 === void 0 ? void 0 : _context$appHelper3.getApp;
+  return (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.getApp;
 };
 
 /**
@@ -95,9 +95,9 @@ export var useModal = function useModal(key) {
   };
 };
 export var useRequest = function useRequest() {
-  var _context$appHelper4;
+  var _context$appHelper3;
   var context = useEngineContext();
-  var request = (context === null || context === void 0 || (_context$appHelper4 = context.appHelper) === null || _context$appHelper4 === void 0 || (_context$appHelper4 = _context$appHelper4.utils) === null || _context$appHelper4 === void 0 ? void 0 : _context$appHelper4.request) || {};
+  var request = (context === null || context === void 0 || (_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.utils) === null || _context$appHelper3 === void 0 ? void 0 : _context$appHelper3.request) || {};
   var get = function get(url, data, config) {
     return request === null || request === void 0 ? void 0 : request.get(url, data, config);
   };
@@ -137,9 +137,9 @@ export var useGetGoalShopInfo = function useGetGoalShopInfo() {
  * 获取当前店铺id
  */
 export var useGetShopId = function useGetShopId() {
-  var _context$appHelper5, _utils$getStore, _utils$getStore$getSt, _utils$getData, _utils$store, _utils$store$getState;
+  var _context$appHelper4, _utils$getStore, _utils$getStore$getSt, _utils$getData, _utils$store, _utils$store$getState;
   var context = useEngineContext();
-  var utils = (context === null || context === void 0 || (_context$appHelper5 = context.appHelper) === null || _context$appHelper5 === void 0 ? void 0 : _context$appHelper5.utils) || {};
+  var utils = (context === null || context === void 0 || (_context$appHelper4 = context.appHelper) === null || _context$appHelper4 === void 0 ? void 0 : _context$appHelper4.utils) || {};
   var shopId = (utils === null || utils === void 0 || (_utils$getStore = utils.getStore) === null || _utils$getStore === void 0 || (_utils$getStore = _utils$getStore.call(utils)) === null || _utils$getStore === void 0 || (_utils$getStore$getSt = _utils$getStore.getState) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.call(_utils$getStore)) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.global) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.shop) === null || _utils$getStore$getSt === void 0 ? void 0 : _utils$getStore$getSt.id) || (utils === null || utils === void 0 || (_utils$getData = utils.getData) === null || _utils$getData === void 0 ? void 0 : _utils$getData.call(utils, 'shop_id')) || ((_utils$store = utils.store) === null || _utils$store === void 0 || (_utils$store$getState = _utils$store.getState) === null || _utils$store$getState === void 0 || (_utils$store$getState = _utils$store$getState.call(_utils$store)) === null || _utils$store$getState === void 0 || (_utils$store$getState = _utils$store$getState.global) === null || _utils$store$getState === void 0 || (_utils$store$getState = _utils$store$getState.globalConfig) === null || _utils$store$getState === void 0 ? void 0 : _utils$store$getState.id) || undefined;
   return shopId;
 };

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

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

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

@@ -11,7 +11,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" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "fail" | "print" | "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<"warn" | "success" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "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<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe" | "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: "warn" | "success" | "loading" | "fail" | "question";
+        status: "loading" | "success" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -295,10 +295,10 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
+        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "warn" | "success" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare type CallToBookProps = {
     show: boolean;
     type: string;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const StripePayment: () => import("react").JSX.Element;
 export default StripePayment;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const PageLoading: () => import("react").JSX.Element;
 export default PageLoading;

package/es/hooks/useLocale.js

@@ -1,7 +1,14 @@
 import useEngineContext from "./useEngineContext";
 var useLocale = function useLocale() {
-  var _context$engine;
+  var _context$appHelper, _app$locales, _context$engine;
   var context = useEngineContext();
+  var _ref = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    getApp = _ref.getApp;
+  var app = getApp && (getApp === null || getApp === void 0 ? void 0 : getApp()) || {};
+  if (app !== null && app !== void 0 && (_app$locales = app.locales) !== null && _app$locales !== void 0 && _app$locales.getLocale) {
+    var _app$locales2, _app$locales2$getLoca;
+    return app === null || app === void 0 || (_app$locales2 = app.locales) === null || _app$locales2 === void 0 || (_app$locales2$getLoca = _app$locales2.getLocale) === null || _app$locales2$getLoca === void 0 ? void 0 : _app$locales2$getLoca.call(_app$locales2);
+  }
   return (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || 'en';
 };
 export default useLocale;

package/es/hooks/useThemeTokens.d.ts

@@ -0,0 +1,7 @@
+declare type ThemeInput = {
+    token?: {
+        colorPrimary?: string;
+    };
+};
+declare const useThemeTokens: (themeInput?: ThemeInput) => any;
+export default useThemeTokens;

package/es/hooks/useThemeTokens.js

@@ -0,0 +1,20 @@
+import { theme } from 'antd';
+var themeTokenCache = new Map();
+var useThemeTokens = function useThemeTokens(themeInput) {
+  var _themeInput$token;
+  var useToken = theme.useToken,
+    getDesignToken = theme.getDesignToken;
+  var _useToken = useToken(),
+    antdToken = _useToken.token;
+  var overrideColorPrimary = (themeInput === null || themeInput === void 0 || (_themeInput$token = themeInput.token) === null || _themeInput$token === void 0 ? void 0 : _themeInput$token.colorPrimary) || antdToken.colorPrimary;
+  var cached = themeTokenCache.get(overrideColorPrimary);
+  if (cached) return cached;
+  var computed = getDesignToken({
+    token: {
+      colorPrimary: overrideColorPrimary
+    }
+  });
+  themeTokenCache.set(overrideColorPrimary, computed);
+  return computed;
+};
+export default useThemeTokens;

package/es/plus/walletEditor/components/ImageUpload/index.d.ts

@@ -3,6 +3,6 @@ export interface ImageUploadProps {
     value?: string;
     onChange?: (val: string) => void;
 }
-export declare const getBaseTime: (size: number) => 2000 | 1000 | 4000 | 8000;
+export declare const getBaseTime: (size: number) => 1000 | 2000 | 4000 | 8000;
 declare const ImageUpload: React.FC<ImageUploadProps>;
 export default ImageUpload;

package/es/pro/Cards/components/SKUCard/index.js

@@ -1,9 +1,14 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React, { useMemo } from 'react';
 import { Iconfont } from '@pisell/materials';
 import { image as imageAli, locales } from '@pisell/utils';
 import classNames from 'classnames';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import localeTexts from "./locales";
+import useThemeTokens from "../../../../hooks/useThemeTokens";
 import "./index.less";
 var SKUCard = function SKUCard(_ref) {
   var _context$appHelper, _skuCardConfig$title, _skuCardConfig$subTit, _skuCardConfig$price, _skuCardConfig$image, _skuCardConfig$disabl, _skuCardConfig$disabl2;
@@ -17,7 +22,11 @@ var SKUCard = function SKUCard(_ref) {
     _onClick = _ref.onClick,
     renderRight = _ref.renderRight,
     skuCardConfig = _ref.skuCardConfig,
-    skuDisabled = _ref.skuDisabled;
+    skuDisabled = _ref.skuDisabled,
+    theme = _ref.theme;
+  var _useThemeTokens = useThemeTokens(theme),
+    colorPrimary = _useThemeTokens.colorPrimary,
+    colorPrimaryBg = _useThemeTokens.colorPrimaryBg;
   var context = useEngineContext();
   var language = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.storage) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.get('umi_locale')) || 'en';
   locales.init(localeTexts, language);
@@ -170,9 +179,9 @@ var SKUCard = function SKUCard(_ref) {
       if (disabled) return;
       _onClick === null || _onClick === void 0 || _onClick();
     },
-    style: {
+    style: _defineProperty(_defineProperty({
       cursor: disabled ? 'not-allowed' : 'pointer'
-    }
+    }, '--color-primary', colorPrimary), '--color-primary-bg', colorPrimaryBg)
   }, !!skuDisabled && !!showDisabledText && /*#__PURE__*/React.createElement("div", {
     className: "pisell-pro-cards-sku-card-disabled-mask"
   }, /*#__PURE__*/React.createElement("div", {

package/es/pro/Cards/components/SKUCard/index.less

@@ -39,8 +39,8 @@
   }
 
   &-active {
-    border: 1px solid #7f56d9;
-    background: #fcfaff;
+    border: 1px solid var(--color-primary, #5d3f9f);
+    background: var(--color-primary-bg, #fcfaff);
   }
 
   &-disabled {

package/es/pro/Cards/components/SKUCard/types.d.ts

@@ -65,4 +65,9 @@ export interface SKUCardProps {
     skuCardConfig?: SkuCardConfig;
     /** SKU 是否禁用 */
     skuDisabled?: boolean;
+    theme?: {
+        token?: {
+            colorPrimary?: string;
+        };
+    };
 }

package/es/pro/NumericStepper/index.d.ts

@@ -30,6 +30,11 @@ export interface NumericStepperProps {
     onChange?: (value: number) => void;
     /** 自定义类名 */
     className?: string;
+    theme?: {
+        token?: {
+            colorPrimary?: string;
+        };
+    };
     /** 自定义样式 */
     styles?: {
         container?: React.CSSProperties;

package/es/pro/NumericStepper/index.js

@@ -1,4 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -13,6 +15,7 @@ import { useMemo, useState, useCallback, useEffect } from 'react';
 import classNames from 'classnames';
 import { isMobile } from '@pisell/utils';
 import { NumberKeyboard } from "../keyboards";
+import useThemeTokens from "../../hooks/useThemeTokens";
 import "./index.less";
 
 /**
@@ -48,7 +51,8 @@ var NumericStepper = function NumericStepper(_ref) {
     variant = _ref$variant === void 0 ? 'separated' : _ref$variant,
     _ref$enableInput = _ref.enableInput,
     enableInput = _ref$enableInput === void 0 ? true : _ref$enableInput,
-    displayMaxWidth = _ref.displayMaxWidth;
+    displayMaxWidth = _ref.displayMaxWidth,
+    theme = _ref.theme;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -60,6 +64,8 @@ var NumericStepper = function NumericStepper(_ref) {
   var _isMobile = useMemo(function () {
     return isMobile();
   }, [isMobile]);
+  var _useThemeTokens = useThemeTokens(theme),
+    colorPrimary = _useThemeTokens.colorPrimary;
   var _useState5 = useState(''),
     _useState6 = _slicedToArray(_useState5, 2),
     tempValue = _useState6[0],
@@ -267,7 +273,7 @@ var NumericStepper = function NumericStepper(_ref) {
   }))));
   return /*#__PURE__*/React.createElement("div", {
     className: stepperClasses,
-    style: styles === null || styles === void 0 ? void 0 : styles.container,
+    style: _objectSpread(_objectSpread({}, (styles === null || styles === void 0 ? void 0 : styles.container) || {}), {}, _defineProperty({}, '--color-primary', colorPrimary)),
     onClick: function onClick(e) {
       return e.stopPropagation();
     }

package/es/pro/NumericStepper/index.less

@@ -1,7 +1,5 @@
 // ========== 变量定义 ==========
-@primary-color: #7f56d9;
-@primary-hover: #6b46c1;
-@primary-active: #553c9a;
+@primary-color: var(--color-primary, #5d3f9f);
 
 @text-color: #101828;
 @text-secondary: #344054;
@@ -77,13 +75,7 @@
     align-items: center;
     display: flex;
     height: 100%;
-
-    &:hover .numeric-stepper-button:not(.numeric-stepper-button-disabled) {
-      background-color: @primary-hover;
-    }
-
     &:active .numeric-stepper-button:not(.numeric-stepper-button-disabled) {
-      background-color: @primary-active;
       transform: scale(0.95);
     }
 

package/es/pro/Selector/BatchSelectorDemo.js

@@ -35,13 +35,6 @@ var dataSource = [{
     title: '披萨',
     value: 'pizza'
   }],
-  grid: {
-    columns: 2,
-    gutter: 16,
-    colConfig: {
-      span: 3
-    }
-  },
   ruleConfig: {
     required: 1,
     autoValidate: true
@@ -120,10 +113,6 @@ var dataSource = [{
     value: 'extra-onion',
     cover: 'https://file.mypisell-dev.com/pisel/image/9/52fe9ca4233877f2c06865d27b9fb7912022_12_01_13_32_47_147_00076174656__1080_1073__.jpeg'
   }],
-  grid: {
-    columns: 3,
-    gutter: 16
-  },
   variant: 'card',
   itemProps: {
     layout: 'vertical',
@@ -299,7 +288,8 @@ export var BatchSelectorDemo = function BatchSelectorDemo() {
       padding: '0',
       margin: '0 auto',
       height: '100vh',
-      overflow: 'auto'
+      overflow: 'auto',
+      '--theme-color': '#5d3f9f'
     },
     ref: containerRef
   }, /*#__PURE__*/React.createElement(Title, {

package/es/pro/Selector/Selector.d.ts

@@ -3,7 +3,7 @@ import { ItemLayout, ItemProps, PresetConfig, SelectorProps, SelectorVariant } f
 import './selector.less';
 export declare const SelectorContext: React.Context<{
     disabled?: boolean | undefined;
-    mode?: "multiple" | "single" | undefined;
+    mode?: "single" | "multiple" | undefined;
     itemLayout?: ItemLayout | undefined;
     valueType?: "object" | "primitive" | undefined;
     variant?: SelectorVariant | undefined;

package/es/pro/Selector/Selector.js

@@ -10,7 +10,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { useEffect, useImperativeHandle, forwardRef } from 'react';
-import { Row, Col, Tag, Select } from 'antd';
+import { Tag, Select } from 'antd';
 import classNames from 'classnames';
 import { CheckCircleOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
 // @ts-ignore
@@ -22,10 +22,9 @@ import NumericStepper from "../NumericStepper";
 import useSelectionController from "./hooks/useSelectionController";
 import usePresetProps from "./hooks/usePresetProps";
 import useEngineContext from "../../hooks/useEngineContext";
+import useThemeTokens from "../../hooks/useThemeTokens";
 import Item from "./Item";
 import "./selector.less";
-var ARow = Row;
-var ACol = Col;
 var ATag = Tag;
 export var SelectorContext = /*#__PURE__*/React.createContext({
   disabled: false,
@@ -55,6 +54,9 @@ var Selector = /*#__PURE__*/forwardRef(function (props, ref) {
     valueType = _props$valueType === void 0 ? 'primitive' : _props$valueType,
     _props$variant = props.variant,
     variant = _props$variant === void 0 ? 'default' : _props$variant;
+  var _useThemeTokens = useThemeTokens(props.theme),
+    colorPrimary = _useThemeTokens.colorPrimary,
+    colorPrimaryBg = _useThemeTokens.colorPrimaryBg;
   var context = useEngineContext();
   locales.init(localeTexts, (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.storage) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.get('umi_locale')) || 'en');
   var _useSelectionControll = useSelectionController(props),
@@ -322,7 +324,7 @@ var Selector = /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement("div", {
     id: "pisell-pro-selector-".concat(props.id),
     className: classNames('pisell-pro-selector', props.className),
-    style: props.style
+    style: _objectSpread(_objectSpread({}, props.style || {}), {}, _defineProperty(_defineProperty({}, '--color-primary', colorPrimary), '--color-primary-bg', colorPrimaryBg))
   }, renderHeader(), /*#__PURE__*/React.createElement(SelectorContext.Provider, {
     value: {
       mode: mode,

package/es/pro/Selector/SelectorGroup.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { SelectionValue, SelectorGroupProps } from './types';
+import type { SelectionValue, SelectorGroupProps } from './types';
 import './selectorGroup.less';
 export declare type SelectorGroupRef = {
     getValues: (includeHidden?: boolean) => Record<string, SelectionValue>;

package/es/pro/Selector/SelectorGroup.js

@@ -27,6 +27,7 @@ import { isEqual } from 'lodash';
 import { locales } from '@pisell/utils';
 import localeTexts from "./locales";
 import useEngineContext from "../../hooks/useEngineContext";
+import useThemeTokens from "../../hooks/useThemeTokens";
 import Selector from "./Selector";
 import { normalizeRules, computeAutoHiddenGroups, computeEffects, getSelectedSet, pruneValuesByAllowOnly, generateSimpleUUID } from "./utils";
 import { IntersectionObserverProvider, IntersectionItem } from "./components/IntersectionObserver";
@@ -44,6 +45,9 @@ var SelectorGroup = /*#__PURE__*/forwardRef(function (props, ref) {
     _props$preserve = props.preserve,
     preserveDefault = _props$preserve === void 0 ? false : _props$preserve,
     style = props.style;
+  var _useThemeTokens = useThemeTokens(props.theme),
+    colorPrimary = _useThemeTokens.colorPrimary,
+    colorPrimaryBg = _useThemeTokens.colorPrimaryBg;
   var _useState = useState(-1),
     _useState2 = _slicedToArray(_useState, 2),
     activeIndex = _useState2[0],
@@ -556,7 +560,7 @@ var SelectorGroup = /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: classNames('pisell-batch-selector', "pisell-batch-selector-".concat(_uniqueId)),
     ref: containerRef,
-    style: style
+    style: _objectSpread(_objectSpread({}, style || {}), {}, _defineProperty(_defineProperty({}, '--color-primary', colorPrimary), '--color-primary-bg', colorPrimaryBg))
   }, renderTabs(), /*#__PURE__*/React.createElement(IntersectionObserverProvider, {
     rootMargin: "-70px 0px 0px 0px",
     disabled: ((_props$tabProps2 = props.tabProps) === null || _props$tabProps2 === void 0 ? void 0 : _props$tabProps2.visible) === false,

package/es/pro/Selector/components/Card/index.js

@@ -33,13 +33,15 @@ var Card = function Card(_ref) {
     className = _ref.className,
     style = _ref.style;
   // 样式属性对象，用于传递给样式函数
-  var styleProps = {
-    selected: selected,
-    disabled: disabled,
-    hoverable: hoverable,
-    variant: variant,
-    layout: layout
-  };
+  var styleProps = useMemo(function () {
+    return {
+      selected: selected,
+      disabled: disabled,
+      hoverable: hoverable,
+      variant: variant,
+      layout: layout
+    };
+  }, [selected, disabled, hoverable, variant, layout]);
 
   // 计算容器样式
   var containerStyle = useMemo(function () {