@pisell/private-materials 6.1.17 → 6.1.19

package/es/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.js

@@ -102,7 +102,7 @@ var DepositModal = function DepositModal(props) {
       minHeight: '300px'
     },
     destroyOnClose: true,
-    title: (item === null || item === void 0 ? void 0 : item.title) || (policy === null || policy === void 0 ? void 0 : policy.title) || '协议',
+    title: (item === null || item === void 0 ? void 0 : item.title) || (policy === null || policy === void 0 ? void 0 : policy.title) || undefined,
     onCancel: onCancel,
     mobileModalHeight: 'auto',
     className: 'policy-modal-wrap',

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

@@ -24,6 +24,7 @@ import "./index.less";
 import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
 import { useMemoizedFn } from 'ahooks';
 import useEngineContext, { usePisellOS } from "../../../../hooks/useEngineContext";
+import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager";
 // Toast 内容包装器，统一设置行高
 var createToastContent = function createToastContent(text) {
   return /*#__PURE__*/React.createElement("div", {
@@ -31,7 +32,7 @@ var createToastContent = function createToastContent(text) {
   }, text);
 };
 var ActionButtons = function ActionButtons(_ref) {
-  var _context$appHelper, _state$service2, _state$addons2, _context$appHelper3, _context$appHelper4, _context$appHelper4$g;
+  var _context$appHelper, _state$service2, _state$addons2, _state$service4, _state$service6, _context$appHelper3, _context$appHelper4, _context$appHelper4$g;
   var state = _ref.state,
     dispatch = _ref.dispatch,
     _ref$disabled = _ref.disabled,
@@ -71,6 +72,8 @@ var ActionButtons = function ActionButtons(_ref) {
       changeCustomerToGlobalState: changeCustomerToGlobalState
     }),
     selectCustomer = _useCustomer.selectCustomer;
+  var _useScanManager = useScanManager(),
+    clearAllScanListenersTaskQueue = _useScanManager.clearAllScanListenersTaskQueue;
 
   // 监听客户选择变化，清空手动折扣
   useEffect(function () {
@@ -135,6 +138,10 @@ var ActionButtons = function ActionButtons(_ref) {
   // 计算已使用的券数量
   var usedVouchersCount = useMemo(function () {
     try {
+      var _state$service3;
+      if (!((_state$service3 = state.service) !== null && _state$service3 !== void 0 && (_state$service3 = _state$service3.value) !== null && _state$service3 !== void 0 && _state$service3.length)) {
+        return 0;
+      }
       // 直接从全局折扣券列表中计算被选中的数量，避免重复计数
       return discountList.filter(function (discount) {
         return discount.isSelected;
@@ -143,13 +150,14 @@ var ActionButtons = function ActionButtons(_ref) {
       console.error('计算已使用券数量失败:', error);
       return 0;
     }
-  }, [discountList]);
+  }, [discountList, (_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : _state$service4.value]);
 
   // 判断是否有券可用但手动取消使用（显示红色感叹号）
   var shouldShowWarning = useMemo(function () {
     try {
-      // 条件：discountList 长度大于 0，且没有 isSelected 的优惠券，且有 isManualSelect 的优惠券
-      return discountList.length > 0 && !discountList.some(function (discount) {
+      var _state$service5;
+      // 条件：购物车不为空 && discountList 长度大于 0，且没有 isSelected 的优惠券，且有 isManualSelect 的优惠券
+      return ((_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.value) === null || _state$service5 === void 0 ? void 0 : _state$service5.length) > 0 && discountList.length > 0 && !discountList.some(function (discount) {
         return discount.isSelected;
       }) && discountList.some(function (discount) {
         return discount.isManualSelect;
@@ -158,7 +166,7 @@ var ActionButtons = function ActionButtons(_ref) {
       console.error('判断警告状态失败:', error);
       return false;
     }
-  }, [discountList]);
+  }, [discountList, (_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : _state$service6.value]);
 
   // 监听折扣券列表变化
   useEffect(function () {
@@ -182,6 +190,7 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 仅清空商品
   var handleClearItemsOnly = function handleClearItemsOnly() {
+    clearAllScanListenersTaskQueue();
     if (!hasCartItems) {
       // 购物车为空时显示Toast提示
       Toast === null || Toast === void 0 || Toast.info(createToastContent(locales.getText('pisell2.clear-cart-modal.empty-cart-tip')));
@@ -216,6 +225,7 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 清空所有内容并重置购物车
   var handleClearAllAndReset = function handleClearAllAndReset() {
+    clearAllScanListenersTaskQueue();
     // 清空服务项目
     dispatch({
       type: 'setService',
@@ -334,7 +344,7 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 处理自定义商品保存
   var handleCustomiseItemSave = function handleCustomiseItemSave(data) {
-    var _state$service3;
+    var _state$service7;
     console.log('保存自定义商品:', data);
 
     // 创建自定义商品项，按照标准商品结构
@@ -378,7 +388,7 @@ var ActionButtons = function ActionButtons(_ref) {
     };
 
     // 添加到购物车（使用 service 来存储自定义商品）
-    var currentServices = (state === null || state === void 0 || (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.value) || [];
+    var currentServices = (state === null || state === void 0 || (_state$service7 = state.service) === null || _state$service7 === void 0 ? void 0 : _state$service7.value) || [];
 
     // 直接添加自定义商品，不检查重复
     var updatedServices = [customItem].concat(_toConsumableArray(currentServices));

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

@@ -38,6 +38,7 @@ import { SubTotal } from "../../../../index";
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import { sendWarningLog } from '@pisell/utils';
 import dayjs from 'dayjs';
+import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager";
 /**
  * @title: 底部
  * @description:
@@ -86,6 +87,8 @@ var Footer = function Footer(props) {
     store = _context$appHelper$ut.store,
     storage = _context$appHelper$ut.storage,
     businessUtils = _context$appHelper$ut.businessUtils;
+  var _useScanManager = useScanManager(),
+    disableAllScanListeners = _useScanManager.disableAllScanListeners;
   useEffect(function () {
     store === null || store === void 0 || store.dispatch({
       type: 'global/_getMetadataMap',
@@ -291,9 +294,10 @@ var Footer = function Footer(props) {
             return _context.abrupt("return");
           case 5:
             if (!(isTerminal !== null && isTerminal !== void 0 && isTerminal())) {
-              _context.next = 7;
+              _context.next = 8;
               break;
             }
+            disableAllScanListeners();
             return _context.abrupt("return", interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 ? void 0 : _interaction$utils$po.call(_interaction$utils, {
               module: 'booking',
               key: 'booking_checkout',
@@ -304,7 +308,7 @@ var Footer = function Footer(props) {
                 newOrder: isNewOrder
               }
             }));
-          case 7:
+          case 8:
             state.action({
               type: 'pisell1.handlePayment',
               data: {
@@ -314,7 +318,7 @@ var Footer = function Footer(props) {
                 state === null || state === void 0 || state.callback();
               }
             });
-          case 8:
+          case 9:
           case "end":
             return _context.stop();
         }

package/es/components/booking/deposit/ClientItem/index.js

@@ -2,7 +2,7 @@ import React, { useCallback } from "react";
 import { Avatar } from "antd";
 import { image, locales } from "@pisell/utils";
 import classnames from 'classnames';
-import User01 from "@pisell/icon/src/User01";
+import User01 from "@pisell/icon/es/User01";
 import { isWalkIn as getIsWalkIn } from "../../utils";
 import "./index.less";
 var ClientItem = function ClientItem(props) {

package/es/components/booking/deposit/DepositItem/index.js

@@ -3,7 +3,7 @@ import { Button, Dropdown } from 'antd';
 import { DownOutlined } from '@ant-design/icons';
 import { formatAmount, locales } from '@pisell/utils';
 import ClientItem from "../ClientItem";
-import Edit05 from '@pisell/icon/src/Edit05';
+import Edit05 from '@pisell/icon/es/Edit05';
 import "./index.less";
 var statusTagColor = {
   unpaid: '#B2DDFF',

package/es/components/booking/hooks/useQuotation.js

@@ -15,7 +15,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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, { useEffect, useMemo, useRef, useState } from 'react';
 import { getProductTotalPrice } from "../utils";
-import useEngineContext from "../../../../es/hooks/useEngineContext";
+import useEngineContext from "../../../hooks/useEngineContext";
 import { locales } from "@pisell/utils";
 import { PisellModal } from "@pisell/materials";
 import { getProductPrice } from "../info/service/serve";

package/es/components/booking/info/hooks/useInfoHolder.js

@@ -34,7 +34,7 @@ var useInfoHolder = function useInfoHolder(state, dispatch) {
   var showAddTimeModal = useMemo(function () {
     return isOpenAddTime(state);
   }, [state, appointment_card.quick_time]);
-  var handleEdit = function handleEdit(cacheItem, type) {
+  var handleEdit = useMemoizedFn(function (cacheItem, type) {
     var isNoSpecAndPackage = getIsNoSpecAndPackage(cacheItem);
     if (isNoSpecAndPackage) {
       var _editNormalServiceRef;
@@ -43,7 +43,7 @@ var useInfoHolder = function useInfoHolder(state, dispatch) {
       var _detailRef$current, _detailRef$current$in;
       (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem, false, type === 'edit_product');
     }
-  };
+  });
   var dispatchService = function dispatchService(type, payload) {
     dispatch({
       type: type,

package/es/components/booking/info/service/Lists.js

@@ -105,7 +105,7 @@ var Lists = function Lists(_ref) {
     var p = formatProducts((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [], state, false, true, isParallelResource);
     console.timeEnd('products');
     return p;
-  }, [state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value]);
+  }, [state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value, state]);
   return useMemo(function () {
     console.log('render List');
     return /*#__PURE__*/React.createElement(CartContext.Provider, {

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/info/service/editService/constants.d.ts

@@ -0,0 +1 @@
+export declare const getIsPartyRoomResourceShop: (id: number) => boolean;

package/es/components/booking/info/service/editService/constants.js

@@ -0,0 +1,3 @@
+export var getIsPartyRoomResourceShop = function getIsPartyRoomResourceShop(id) {
+  return [2155, 9].includes(id);
+};

package/es/components/booking/info/service/editService/index.js

@@ -45,12 +45,15 @@ import Like from "../like";
 import { editSessionProduct, getMultiDayPrices } from "../../utils";
 import { useService } from "../serviceManager";
 import EditTabs from "./EditTabs";
+import { getIsPartyRoomResourceShop } from "./constants";
+import useEngineContext from "../../../../../hooks/useEngineContext";
 var submitLock = false;
 var Info = function Info(_, ref) {
   var _state$bookingConfig2, _state$service$cacheI4, _state$service$cacheI6, _state$service$cacheI7, _state$service4, _state$service6, _state$service8, _state$date, _state$date$format, _state$date2, _window$BaseMaterials, _state$service$cacheI13, _state$service10, _state$service$cacheI14, _state$bookingConfig4;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
+  var context = useEngineContext();
   var useTotal = Form.useWatch('total', form);
   var useLikeStatus = Form.useWatch('like_status', form);
   var useResource = Form.useWatch('resource', form);
@@ -570,7 +573,7 @@ var Info = function Info(_, ref) {
    */
   var getResourcesData = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var params, format, startDate, endDate, _formatDayTime, startDateTime, endDateTime, data, _list;
+      var _context$appHelper$ut, _context$appHelper$ut2, params, format, startDate, endDate, _formatDayTime, startDateTime, endDateTime, isPartyRoomResourceShop, codes, data, _list;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -603,16 +606,18 @@ var Info = function Info(_, ref) {
           case 13:
             params.with_date_times = state.date.value.format('YYYY-MM-DD');
           case 14:
-            _context3.next = 16;
+            isPartyRoomResourceShop = getIsPartyRoomResourceShop((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id);
+            codes = isPartyRoomResourceShop ? ['resources', 'therapist', 'table', 'party_room'] : ['resources', 'therapist', 'table'];
+            _context3.next = 18;
             return state.apis.getResources(_objectSpread({
               skip: 1,
               num: 1000,
-              codes: ['resources', 'therapist', 'table'],
+              codes: codes,
               _config: {
                 abort: true
               }
             }, params));
-          case 16:
+          case 18:
             data = _context3.sent;
             // 合并无资源
             _list = [getNoResource()].concat((data === null || data === void 0 ? void 0 : data.list) || []);
@@ -622,19 +627,19 @@ var Info = function Info(_, ref) {
                 resourcesOrigin: _list
               }
             });
-            _context3.next = 24;
+            _context3.next = 26;
             break;
-          case 21:
-            _context3.prev = 21;
+          case 23:
+            _context3.prev = 23;
             _context3.t0 = _context3["catch"](1);
             console.log(_context3.t0, 'err');
-          case 24:
+          case 26:
             setResourceLoading(false);
-          case 25:
+          case 27:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 21]]);
+      }, _callee3, null, [[1, 23]]);
     }));
     return function getResourcesData() {
       return _ref5.apply(this, arguments);

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

@@ -248,4 +248,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/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/booking/info2/service/editService/index.js

@@ -38,7 +38,7 @@ import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/utils";
 var submitLock = false;
 var Info = function Info(_, ref) {
-  var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI4, _state$service$cacheI5, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI10, _state$bookingConfig5, _state$service$cacheI11, _state$service$cacheI12, _state$service9, _state$service$resour2, _state$service$cacheI13;
+  var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI4, _state$service$cacheI5, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI10, _state$bookingConfig5, _state$service$cacheI11, _state$service$cacheI12, _state$service9, _state$service$resour2, _state$service$cacheI13, _state$service$cacheI14;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -171,7 +171,7 @@ var Info = function Info(_, ref) {
    * @Author: zhiwei.Wang
    * @Date: 2024-01-09 13:59
    */
-  var handleDeleteProduct = function handleDeleteProduct() {
+  var handleDeleteProduct = useMemoizedFn(function () {
     var _state$service$cacheI;
     if (state.channelDisabledEdit) {
       return;
@@ -191,7 +191,7 @@ var Info = function Info(_, ref) {
         cacheItem: null
       }
     });
-  };
+  });
 
   /**
    * @title: 计算折扣
@@ -597,7 +597,6 @@ var Info = function Info(_, ref) {
     return false;
   }, [state.renderType, isNormalProduct]);
   var SelectTime = (_window$BaseMaterials = window.BaseMaterials) === null || _window$BaseMaterials === void 0 ? void 0 : _window$BaseMaterials.SelectTime;
-  console.log(isShowTimeAndResource, 'isShowTimeAndResource');
   var productName = useMemo(function () {
     var _state$service7;
     return /*#__PURE__*/React.createElement(Col, {
@@ -771,6 +770,8 @@ var Info = function Info(_, ref) {
       }
     }, locales.getText('pisell2.text.apply')));
   }, [(_state$service$resour2 = state.service.resourcesOrigin) === null || _state$service$resour2 === void 0 ? void 0 : _state$service$resour2.length, isNormalProduct]);
+  console.log('render edit');
+  console.log(state.service.editModal && !((_state$service$cacheI13 = state.service.cacheItem) !== null && _state$service$cacheI13 !== void 0 && _state$service$cacheI13.autoClose), performance.now() - window.pp1, '打开商品1');
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     val = _useState4[0],
@@ -792,7 +793,7 @@ var Info = function Info(_, ref) {
     zIndex: state.service.changeService ? 999 : 1000,
     forceRender: true,
     mask: state.drawerMask,
-    open: !isNoSpecAndPackage && state.service.editModal && !((_state$service$cacheI13 = state.service.cacheItem) !== null && _state$service$cacheI13 !== void 0 && _state$service$cacheI13.autoClose),
+    open: !isNoSpecAndPackage && state.service.editModal && !((_state$service$cacheI14 = state.service.cacheItem) !== null && _state$service$cacheI14 !== void 0 && _state$service$cacheI14.autoClose),
     title: locales.getText('pisell2.text.edit-service'),
     onClose: function onClose() {
       closeBookingEditModal();

package/es/components/booking/info2/service/index.js

@@ -7,7 +7,6 @@ import AddTimeModal from "./addTimeModal";
 import useInfoHolder from "../../info/hooks/useInfoHolder";
 import Lists from "../../info/service/Lists";
 import useQuotation from "../../hooks/useQuotation";
-// import useClearCart from "../../hooks/useClearCart";
 import EditNormalService from "./editNormalService";
 var Service = function Service() {
   var _useContext = useContext(Context),

package/es/components/booking/locales.js

@@ -43,7 +43,7 @@ export default {
     'pisell2.text.holder': 'Holder',
     'pisell2.text.warnings': 'Warnings',
     'pisell2.text.order-notes': 'Order notes',
-    'pisell2.text.add-order-notes': 'Add Order note',
+    'pisell2.text.add-order-notes': 'Add Order Note',
     'pisell2.text.add-internal-notes': 'Add Internal note',
     'pisell2.text.add-notes': 'Add Notes',
     'pisell2.text.notes': 'Notes',
@@ -281,7 +281,7 @@ export default {
     // Action Buttons
     'pisell2.action-buttons.clear': 'Clear',
     'pisell2.action-buttons.manuel-order': "Manual\nOrder\xA0$",
-    'pisell2.action-buttons.customise-item': 'Cust. \nItem',
+    'pisell2.action-buttons.customise-item': 'Cust.\nItem',
     'pisell2.action-buttons.no-items-to-adjust': 'No items in cart to adjust price.',
     'pisell2.action-buttons.adjust-order-price': 'Adjust Order Price',
     'pisell2.action-buttons.price-adjusted-success': 'Order price adjusted successfully.',

package/es/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" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/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" | "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<"success" | "warn" | "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<"payo" | "tyro" | "windcave" | "stripe" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "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: "success" | "warn" | "loading" | "fail" | "question";
+        status: "loading" | "success" | "warn" | "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?: "fullPay" | "pay" | "refund" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
-        action?: "amount" | "deviceList" | "pay" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "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" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

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

@@ -17,6 +17,6 @@ declare let modal: Omit<ModalStaticFunctions, "warn">;
 export declare const setModal: (m: Omit<ModalStaticFunctions, "warn">) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
 }>;
 export { modal };

package/es/components/shoppingCart/components/Cart/Product.js

@@ -5,7 +5,7 @@ import { ProductCard } from '@pisell/materials';
 import useClearCart from "../../hooks/useClearCart";
 import { useContext } from "../../hooks/useContext";
 import useAddService from "../../hooks/useAddService";
-import { useMemoizedFn, useTrackedEffect } from 'ahooks';
+import { useMemoizedFn } from 'ahooks';
 import { isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
 import PisellNumberSelector from "../../../../pro/pisellNumberSelector";
 var Product = function Product(props) {
@@ -57,16 +57,13 @@ var Product = function Product(props) {
       isShowEditProduct: isShowEditProduct
     };
   }, [isShowNote, isShowPackageNote, disabledEdit, isShowChangeResource, isShowDelete, isShowHolder, isShowAddHolderButton, isShowChangeHolder, isShowEditProduct]);
-  useTrackedEffect(function (changes) {
-    console.log('Index of changed dependencies: ', changes);
-  }, [clearCart, lists, productParams, hideAddBtn, isAdd, platform]);
-  var getProductCardStyleProps = function getProductCardStyleProps(type) {
+  var getProductCardStyleProps = useMemoizedFn(function (type) {
     var conf = productCardStyleConfig["".concat(type, "_product_card_style")];
     return {
       isShowImage: conf === null || conf === void 0 ? void 0 : conf.show_product_image,
       isShowDelete: conf === null || conf === void 0 ? void 0 : conf.show_remove_button
     };
-  };
+  });
   return useMemo(function () {
     console.log('render cart');
     return /*#__PURE__*/React.createElement("div", {
@@ -101,6 +98,7 @@ var Product = function Product(props) {
           }),
           color: '#667085'
         }],
+        escapeDom: ".pisell-number-selector-popover",
         key: item._id,
         dataSource: item,
         onAction: function onAction(e) {