@pisell/private-materials 6.4.52 → 6.4.54

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

@@ -450,7 +450,9 @@ var getSurcharge = function getSurcharge(state, options) {
   if (!isEdit && bookingId) {
     if (Array.isArray(bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.surcharge)) {
       var _state$bookingDetail3;
-      return (((_state$bookingDetail3 = state.bookingDetail) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.surcharge) || []).map(function (d, index) {
+      return (((_state$bookingDetail3 = state.bookingDetail) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.surcharge) || []).filter(function (d) {
+        return Number(d.amount) > 0;
+      }).map(function (d, index) {
         return {
           key: "custom_surcharge_".concat(index),
           label: d.name[state.locale || 'en'] || d.name['en'] || d.name['original'],
@@ -578,6 +580,9 @@ var getSurcharge = function getSurcharge(state, options) {
       finalAmount = configTotal.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
     }
     var name = surchargeConfig.name || {};
+    if (Number(finalAmount) <= 0) {
+      continue;
+    }
     surchargeWithAmount.push({
       key: "custom_surcharge_".concat(i),
       label: name[state.locale || 'en'] || name['en'] || name['original'],

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

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

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

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

package/es/components/checkout/components/CashPaymentModule/index.js

@@ -121,35 +121,35 @@ export function CashPaymentModule(_ref) {
               break;
             }
             setAmount('');
-            _context.next = 33;
+            _context.next = 32;
             break;
           case 13:
             // 移除可能的货币符号和多余空格
             cleanValue = finalValue.replace(/[$\s]/g, '');
             numValue = parseFloat(cleanValue); // 检查当前金额是否等于剩余支付金额
-            debugger;
+            // debugger
             // 需要确认当前是否是定金模式，如果是定金模式则 balanceDue 应该为完整订单剩余待付金额
             balanceDue = parseFloat(orderInfo !== null && orderInfo !== void 0 && orderInfo.isDeposit ? balanceDueTotalAmount || '0' : balanceDueAmount);
             shouldApplyRounding = Math.abs(numValue - balanceDue) < 0.01; // 使用小数精度比较
             finalAmount = numValue;
             roundingDiff = 0;
             if (!(shouldApplyRounding && roundingFunction)) {
-              _context.next = 30;
+              _context.next = 29;
               break;
             }
-            _context.next = 23;
+            _context.next = 22;
             return roundingFunction(numValue);
-          case 23:
+          case 22:
             _result = _context.sent;
             _ref3 = _result || {}, _ref3$roundedAmount = _ref3.roundedAmount, roundedAmount = _ref3$roundedAmount === void 0 ? numValue : _ref3$roundedAmount, _ref3$roundingDiffere = _ref3.roundingDifference, roundingDifference = _ref3$roundingDiffere === void 0 ? 0 : _ref3$roundingDiffere;
             finalAmount = roundedAmount;
             roundingDiff = roundingDifference;
             console.log('应用抹零：', numValue, '->', roundedAmount, '差额:', roundingDifference);
-            _context.next = 31;
+            _context.next = 30;
             break;
-          case 30:
+          case 29:
             console.log('不应用抹零，用户输入金额:', numValue, '剩余支付金额:', balanceDue);
-          case 31:
+          case 30:
             setRoundingAmount(roundingDiff);
             if (isNaN(numValue)) {
               setAmount('');
@@ -157,7 +157,7 @@ export function CashPaymentModule(_ref) {
               setAmount(finalAmount.toString());
               console.log('设置金额为:', finalAmount);
             }
-          case 33:
+          case 32:
           case "end":
             return _context.stop();
         }

package/es/components/checkout/components/PaymentOptionsModule/index.js

@@ -57,7 +57,10 @@ function PaymentOptionsModule(_ref) {
         onClick(method);
       }
     }, {
-      wait: 500 // 500ms 防抖延迟
+      wait: 1000,
+      // 500ms 防抖延迟
+      leading: true,
+      trailing: false
     }),
     handlePaymentClick = _useDebounceFn.run;
   return /*#__PURE__*/React.createElement("div", {

package/es/components/checkout/hooks/useWalletPass.js

@@ -393,7 +393,10 @@ export var useWalletPass = function useWalletPass(props) {
 
     // 更新不可用钱包数据
     setDisabledWalletData(isDisabledData);
-    var newValues = [].concat(_toConsumableArray(selectedWalletRef.current), isAvailableData);
+    var newValues = _toConsumableArray(selectedWalletRef.current);
+    if (isAvailableData.length === 1) {
+      newValues = [].concat(_toConsumableArray(selectedWalletRef.current), isAvailableData);
+    }
     setSearchIdentificationCodeList(cachedSearchResults);
     setWalletSelect(newValues);
     handleFetchUserIdentificationCodes(newValues.map(function (item) {

package/es/pro/priceKeyboard/components/cashKeyboard/CashKeyboardIntact.js

@@ -16,6 +16,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useMemo, useState } from 'react';
+import { Tooltip } from 'antd';
 import { useControllableValue } from 'ahooks';
 //@ts-ignore
 import { merge, omit } from 'lodash';
@@ -232,15 +233,21 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     className: "pisell-cash-keyboard-intact-container-top-label"
   }, mergedDisplayField.balanceDue.label), /*#__PURE__*/React.createElement("div", {
     className: "pisell-cash-keyboard-intact-container-top-value"
+  }, /*#__PURE__*/React.createElement(Tooltip, {
+    title: formatAmountWithOptions(originalValue || '', amountSymbol, {
+      precision: 2,
+      hideDecimalForWholeNumbers: false,
+      showCurrencySymbol: true
+    })
   }, /*#__PURE__*/React.createElement(AutoResizeText, {
     minFontSizePx: 10,
-    maxFontSizePx: 14,
+    maxFontSizePx: 18,
     fontSizePrecisionPx: 0.5
   }, formatAmountWithOptions(originalValue || '', amountSymbol, {
     precision: 2,
     hideDecimalForWholeNumbers: false,
     showCurrencySymbol: true
-  })))), ((_mergedDisplayField$c = mergedDisplayField.cashReceived) === null || _mergedDisplayField$c === void 0 ? void 0 : _mergedDisplayField$c.visible) && /*#__PURE__*/React.createElement("div", {
+  }))))), ((_mergedDisplayField$c = mergedDisplayField.cashReceived) === null || _mergedDisplayField$c === void 0 ? void 0 : _mergedDisplayField$c.visible) && /*#__PURE__*/React.createElement("div", {
     style: _objectSpread(_objectSpread({}, getGridStyle(1)), {}, {
       padding: '6px 16px',
       borderRadius: '8px',
@@ -265,16 +272,12 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
         color: '#667085'
       }
     }, mergedDisplayField.cashReceived.label),
-    value: internalValue ? /*#__PURE__*/React.createElement(AutoResizeText, {
-      minFontSizePx: 10,
-      maxFontSizePx: 14,
-      fontSizePrecisionPx: 0.5
-    }, formatAmountWithOptions(internalValue || '', amountSymbol, {
+    value: internalValue ? formatAmountWithOptions(internalValue || '', amountSymbol, {
       value: internalValue,
       hideDecimalForWholeNumbers: false,
       precision: 2,
       showCurrencySymbol: true
-    })) : '',
+    }) : '',
     height: 30,
     fontSize: 20,
     placeholder: placeholder,
@@ -294,16 +297,23 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     className: "pisell-cash-keyboard-intact-container-top-label"
   }, mergedDisplayField.changeDue.label), /*#__PURE__*/React.createElement("div", {
     className: "pisell-cash-keyboard-intact-container-top-value"
+  }, /*#__PURE__*/React.createElement(Tooltip, {
+    title: formatAmountWithOptions(hiddenChangeDue ? 0 : changeDue, amountSymbol, {
+      value: hiddenChangeDue ? 0 : changeDue,
+      showCurrencySymbol: true,
+      hideDecimalForWholeNumbers: false,
+      precision: 2
+    })
   }, /*#__PURE__*/React.createElement(AutoResizeText, {
     minFontSizePx: 10,
-    maxFontSizePx: 14,
+    maxFontSizePx: 18,
     fontSizePrecisionPx: 0.5
   }, formatAmountWithOptions(hiddenChangeDue ? 0 : changeDue, amountSymbol, {
     value: hiddenChangeDue ? 0 : changeDue,
     showCurrencySymbol: true,
     hideDecimalForWholeNumbers: false,
     precision: 2
-  }))))), /*#__PURE__*/React.createElement(Shortcuts, {
+  })))))), /*#__PURE__*/React.createElement(Shortcuts, {
     presets: getDefaultPresets(),
     onChange: setInternalValue,
     disabled: disabled

package/es/pro/priceKeyboard/components/cashKeyboard/index.less

@@ -49,8 +49,7 @@
         display: flex;
         flex-direction: column;
         justify-content: center;
-        gap: 4px;
-        padding-top: 4px;
+        padding: 6px 0;
 
         .pisell-cash-keyboard-intact-container-top-label {
           font-size: 14px;

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

@@ -313,7 +313,7 @@ var getSurcharge = (state, options) => {
   const { bookingDetail, bookingId } = state;
   if (!isEdit && bookingId) {
     if (Array.isArray(bookingDetail == null ? void 0 : bookingDetail.surcharge)) {
-      return (((_a = state.bookingDetail) == null ? void 0 : _a.surcharge) || []).map(
+      return (((_a = state.bookingDetail) == null ? void 0 : _a.surcharge) || []).filter((d) => Number(d.amount) > 0).map(
         (d, index) => {
           return {
             key: `custom_surcharge_${index}`,
@@ -396,6 +396,9 @@ var getSurcharge = (state, options) => {
       finalAmount = configTotal.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
     }
     const name = surchargeConfig.name || {};
+    if (Number(finalAmount) <= 0) {
+      continue;
+    }
     surchargeWithAmount.push({
       key: `custom_surcharge_${i}`,
       label: name[state.locale || "en"] || name["en"] || name["original"],

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: any;
+    locale: string;
     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: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/checkout/components/CashPaymentModule/index.js

@@ -122,7 +122,6 @@ function CashPaymentModule({
     } else {
       const cleanValue = finalValue.replace(/[$\s]/g, "");
       const numValue = parseFloat(cleanValue);
-      debugger;
       const balanceDue = parseFloat((orderInfo == null ? void 0 : orderInfo.isDeposit) ? balanceDueTotalAmount || "0" : balanceDueAmount);
       const shouldApplyRounding = Math.abs(numValue - balanceDue) < 0.01;
       let finalAmount = numValue;

package/lib/components/checkout/components/PaymentOptionsModule/index.js

@@ -87,8 +87,10 @@ function PaymentOptionsModule({
       }
     },
     {
-      wait: 500
+      wait: 1e3,
       // 500ms 防抖延迟
+      leading: true,
+      trailing: false
     }
   );
   return /* @__PURE__ */ import_react.default.createElement(

package/lib/components/checkout/hooks/useWalletPass.js

@@ -242,7 +242,10 @@ var useWalletPass = (props) => {
       });
     }
     setDisabledWalletData(isDisabledData);
-    const newValues = [...selectedWalletRef.current, ...isAvailableData];
+    let newValues = [...selectedWalletRef.current];
+    if (isAvailableData.length === 1) {
+      newValues = [...selectedWalletRef.current, ...isAvailableData];
+    }
     setSearchIdentificationCodeList(cachedSearchResults);
     setWalletSelect(newValues);
     handleFetchUserIdentificationCodes(newValues.map((item) => item.id));

package/lib/pro/priceKeyboard/components/cashKeyboard/CashKeyboardIntact.js

@@ -33,6 +33,7 @@ __export(CashKeyboardIntact_exports, {
 });
 module.exports = __toCommonJS(CashKeyboardIntact_exports);
 var import_react = __toESM(require("react"));
+var import_antd = require("antd");
 var import_ahooks = require("ahooks");
 var import_lodash = require("lodash");
 var import_utils = require("@pisell/utils");
@@ -234,17 +235,35 @@ var CashKeyboardIntact = (props) => {
       },
       /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-cash-keyboard-intact-container-top-label" }, mergedDisplayField.balanceDue.label),
       /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-cash-keyboard-intact-container-top-value" }, /* @__PURE__ */ import_react.default.createElement(
-        import_materials2.AutoResizeText,
+        import_antd.Tooltip,
         {
-          minFontSizePx: 10,
-          maxFontSizePx: 14,
-          fontSizePrecisionPx: 0.5
+          title: (0, import_utils3.formatAmountWithOptions)(
+            originalValue || "",
+            amountSymbol,
+            {
+              precision: 2,
+              hideDecimalForWholeNumbers: false,
+              showCurrencySymbol: true
+            }
+          )
         },
-        (0, import_utils3.formatAmountWithOptions)(originalValue || "", amountSymbol, {
-          precision: 2,
-          hideDecimalForWholeNumbers: false,
-          showCurrencySymbol: true
-        })
+        /* @__PURE__ */ import_react.default.createElement(
+          import_materials2.AutoResizeText,
+          {
+            minFontSizePx: 10,
+            maxFontSizePx: 18,
+            fontSizePrecisionPx: 0.5
+          },
+          (0, import_utils3.formatAmountWithOptions)(
+            originalValue || "",
+            amountSymbol,
+            {
+              precision: 2,
+              hideDecimalForWholeNumbers: false,
+              showCurrencySymbol: true
+            }
+          )
+        )
       ))
     ), ((_b = mergedDisplayField.cashReceived) == null ? void 0 : _b.visible) && /* @__PURE__ */ import_react.default.createElement(
       "div",
@@ -281,19 +300,15 @@ var CashKeyboardIntact = (props) => {
             },
             mergedDisplayField.cashReceived.label
           ),
-          value: internalValue ? /* @__PURE__ */ import_react.default.createElement(
-            import_materials2.AutoResizeText,
+          value: internalValue ? (0, import_utils3.formatAmountWithOptions)(
+            internalValue || "",
+            amountSymbol,
             {
-              minFontSizePx: 10,
-              maxFontSizePx: 14,
-              fontSizePrecisionPx: 0.5
-            },
-            (0, import_utils3.formatAmountWithOptions)(internalValue || "", amountSymbol, {
               value: internalValue,
               hideDecimalForWholeNumbers: false,
               precision: 2,
               showCurrencySymbol: true
-            })
+            }
           ) : "",
           height: 30,
           fontSize: 20,
@@ -315,18 +330,37 @@ var CashKeyboardIntact = (props) => {
       },
       /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-cash-keyboard-intact-container-top-label" }, mergedDisplayField.changeDue.label),
       /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-cash-keyboard-intact-container-top-value" }, /* @__PURE__ */ import_react.default.createElement(
-        import_materials2.AutoResizeText,
+        import_antd.Tooltip,
         {
-          minFontSizePx: 10,
-          maxFontSizePx: 14,
-          fontSizePrecisionPx: 0.5
+          title: (0, import_utils3.formatAmountWithOptions)(
+            hiddenChangeDue ? 0 : changeDue,
+            amountSymbol,
+            {
+              value: hiddenChangeDue ? 0 : changeDue,
+              showCurrencySymbol: true,
+              hideDecimalForWholeNumbers: false,
+              precision: 2
+            }
+          )
         },
-        (0, import_utils3.formatAmountWithOptions)(hiddenChangeDue ? 0 : changeDue, amountSymbol, {
-          value: hiddenChangeDue ? 0 : changeDue,
-          showCurrencySymbol: true,
-          hideDecimalForWholeNumbers: false,
-          precision: 2
-        })
+        /* @__PURE__ */ import_react.default.createElement(
+          import_materials2.AutoResizeText,
+          {
+            minFontSizePx: 10,
+            maxFontSizePx: 18,
+            fontSizePrecisionPx: 0.5
+          },
+          (0, import_utils3.formatAmountWithOptions)(
+            hiddenChangeDue ? 0 : changeDue,
+            amountSymbol,
+            {
+              value: hiddenChangeDue ? 0 : changeDue,
+              showCurrencySymbol: true,
+              hideDecimalForWholeNumbers: false,
+              precision: 2
+            }
+          )
+        )
       ))
     )), /* @__PURE__ */ import_react.default.createElement(
       import_shortcuts.default,

package/lib/pro/priceKeyboard/components/cashKeyboard/index.less

@@ -49,8 +49,7 @@
         display: flex;
         flex-direction: column;
         justify-content: center;
-        gap: 4px;
-        padding-top: 4px;
+        padding: 6px 0;
 
         .pisell-cash-keyboard-intact-container-top-label {
           font-size: 14px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.52",
+  "version": "6.4.54",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
-    "@pisell/materials": "6.4.12",
-    "@pisell/date-picker": "3.0.7",
+    "@pisell/icon": "0.0.11",
     "@pisell/utils": "3.0.2",
-    "@pisell/icon": "0.0.11"
+    "@pisell/date-picker": "3.0.7",
+    "@pisell/materials": "6.4.12"
   },
   "peerDependencies": {
     "react": "^18.0.0",