@pisell/private-materials 6.5.8 → 6.5.10

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

@@ -165,7 +165,7 @@ var VoucherCard = function VoucherCard(props) {
         productListToValue(val.productList);
       }
     }, {
-      wait: 500
+      wait: 1000
     }),
     run = _useDebounceFn.run;
 

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -47,7 +47,7 @@ var productListSetting = {
   isStock: 0
 };
 var AddSerivce = function AddSerivce(props) {
-  var _context$appHelper, _context$appHelper$ge, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _state$bookingConfig2, _state$client2;
+  var _context$appHelper, _context$appHelper$ge, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _state$service, _state$bookingConfig2, _state$client2;
   var onEdit = props.onEdit,
     state = props.state,
     dispatch = props.dispatch,
@@ -75,6 +75,30 @@ var AddSerivce = function AddSerivce(props) {
   var stateRef = useRef(state);
   stateRef.current = state;
   var prerenderCompletedRef = useRef(false);
+  var latestServiceValueRef = useRef((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || []);
+  var lastOperationTimeRef = useRef(0);
+  var isInFastClickMode = function isInFastClickMode() {
+    var now = Date.now();
+    return now - lastOperationTimeRef.current < 2000;
+  };
+  var getCurrentServiceValue = function getCurrentServiceValue() {
+    if (isInFastClickMode()) {
+      var _stateRef$current;
+      return latestServiceValueRef.current || ((_stateRef$current = stateRef.current) === null || _stateRef$current === void 0 || (_stateRef$current = _stateRef$current.service) === null || _stateRef$current === void 0 ? void 0 : _stateRef$current.value) || [];
+    } else {
+      var _state$service2;
+      var stateValue = (state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || [];
+      latestServiceValueRef.current = null;
+      return stateValue;
+    }
+  };
+
+  // useEffect(() => {
+  //   if (!isInFastClickMode()) {
+  //     latestServiceValueRef.current = null;
+  //   }
+  // }, [state?.service?.value]);
+
   var _useProducts = useProducts(),
     getProducts = _useProducts.getProducts,
     products = _useProducts.products,
@@ -259,6 +283,7 @@ var AddSerivce = function AddSerivce(props) {
 
     // 执行原始的回调函数
     originalCallback(finalCacheValues, '', item, true);
+    lastOperationTimeRef.current = Date.now();
   });
 
   // 为每个商品单独创建防抖函数
@@ -277,8 +302,8 @@ var AddSerivce = function AddSerivce(props) {
     var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'select';
     console.log('handleSelectProduct');
     if (!isNormalProductByDurationSchedule(item)) {
-      var _state$service;
-      if (!Array.isArray((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.resourcesOrigin) || !state.service.resourcesOrigin.length) {
+      var _state$service3;
+      if (!Array.isArray((_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.resourcesOrigin) || !state.service.resourcesOrigin.length) {
         dispatch({
           type: 'setService',
           payload: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
@@ -316,7 +341,7 @@ var AddSerivce = function AddSerivce(props) {
     }
     var callback = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e, extension_type, detail, notShowToast) {
-        var data, _currentItem, _detail, other, cacheItem, _total, _isEdit, _state$service$cacheI, _addService2, _list, quantity, _context$appHelper$ut4, _context$appHelper$ut5, val, sendData, _window$openBookingEd, _window;
+        var data, _currentItem, _detail, other, cacheItem, _total, _isEdit, _state$service$cacheI, val, _addService2, _list, quantity, _context$appHelper$ut4, _context$appHelper$ut5, _val, sendData, _window$openBookingEd, _window;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -392,7 +417,10 @@ var AddSerivce = function AddSerivce(props) {
               if (cacheItem.autoClose) {
                 cacheItem.autoClose = false;
                 cacheItem._serviceKey = genServiceKey(cacheItem);
-                _addService2 = addService(_toConsumableArray(stateRef.current.service.value), cacheItem, state), _list = _addService2.list, quantity = _addService2.quantity;
+                val = getCurrentServiceValue();
+                _addService2 = addService(_toConsumableArray(val), cacheItem, state), _list = _addService2.list, quantity = _addService2.quantity; // 更新ref以确保后续快速操作时使用最新值
+                latestServiceValueRef.current = _list;
+                lastOperationTimeRef.current = Date.now();
                 if (!notShowToast) {
                   handleAddToast(cacheItem.title, quantity || 1);
                 }
@@ -403,7 +431,7 @@ var AddSerivce = function AddSerivce(props) {
                 }));
                 try {
                   if (((_context$appHelper$ut4 = context.appHelper.utils.store) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut4.getState) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.call(_context$appHelper$ut4)) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.global) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id) === 2155) {
-                    val = _list === null || _list === void 0 ? void 0 : _list.map(function (s) {
+                    _val = _list === null || _list === void 0 ? void 0 : _list.map(function (s) {
                       return {
                         product_id: s === null || s === void 0 ? void 0 : s.product_id,
                         detailId: s === null || s === void 0 ? void 0 : s.id,
@@ -421,7 +449,7 @@ var AddSerivce = function AddSerivce(props) {
                       detailProductId: _detail === null || _detail === void 0 ? void 0 : _detail.product_id,
                       product_name: _currentItem === null || _currentItem === void 0 ? void 0 : _currentItem.title,
                       price: _detail === null || _detail === void 0 ? void 0 : _detail.price,
-                      serviceVal: val
+                      serviceVal: _val
                     };
                     sendWarningLog({
                       title: 'addService',

package/lib/components/booking/components/voucher/index.js

@@ -170,7 +170,7 @@ var VoucherCard = (props) => {
         productListToValue(val.productList);
       }
     },
-    { wait: 500 }
+    { wait: 1e3 }
   );
   (0, import_react.useEffect)(() => {
     run();

package/lib/components/ticketBooking/components/addServiceVariant/addService.js

@@ -62,7 +62,7 @@ var productListSetting = {
   isStock: 0
 };
 var AddSerivce = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const { onEdit, state, dispatch, renderMode = "current", onPrerenderComplete } = props;
   const context = (0, import_useEngineContext.default)();
   const notAvailableRef = (0, import_react.useRef)(null);
@@ -84,6 +84,22 @@ var AddSerivce = (props) => {
   const stateRef = (0, import_react.useRef)(state);
   stateRef.current = state;
   const prerenderCompletedRef = (0, import_react.useRef)(false);
+  const latestServiceValueRef = (0, import_react.useRef)(((_j = state == null ? void 0 : state.service) == null ? void 0 : _j.value) || []);
+  const lastOperationTimeRef = (0, import_react.useRef)(0);
+  const isInFastClickMode = () => {
+    const now = Date.now();
+    return now - lastOperationTimeRef.current < 2e3;
+  };
+  const getCurrentServiceValue = () => {
+    var _a2, _b2, _c2;
+    if (isInFastClickMode()) {
+      return latestServiceValueRef.current || ((_b2 = (_a2 = stateRef.current) == null ? void 0 : _a2.service) == null ? void 0 : _b2.value) || [];
+    } else {
+      const stateValue = ((_c2 = state == null ? void 0 : state.service) == null ? void 0 : _c2.value) || [];
+      latestServiceValueRef.current = null;
+      return stateValue;
+    }
+  };
   const { getProducts, products, loading } = (0, import_pisellos.useProducts)();
   (0, import_react.useEffect)(() => {
     return () => {
@@ -118,11 +134,11 @@ var AddSerivce = (props) => {
   const menuList = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.menu_list_tab) == null ? void 0 : _c2.menu_list) || [];
-  }, [(_j = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _j.config]);
+  }, [(_k = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _k.config]);
   const customerId = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     return ((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id) || void 0;
-  }, [(_l = (_k = state.client) == null ? void 0 : _k.value) == null ? void 0 : _l.id]);
+  }, [(_m = (_l = state.client) == null ? void 0 : _l.value) == null ? void 0 : _m.id]);
   const scanAddService = (0, import_ahooks.useMemoizedFn)((list, code) => {
     let newService = [...state.service.value];
     list.forEach((item) => {
@@ -171,6 +187,7 @@ var AddSerivce = (props) => {
       delete clickCountRef.current[productId];
       delete debounceTimersRef.current[productId];
       originalCallback(finalCacheValues, "", item, true);
+      lastOperationTimeRef.current = Date.now();
     }
   );
   const debouncedExecuteCacheValues = (0, import_ahooks.useMemoizedFn)(
@@ -278,11 +295,14 @@ var AddSerivce = (props) => {
         if (cacheItem.autoClose) {
           cacheItem.autoClose = false;
           cacheItem._serviceKey = (0, import_utils6.genServiceKey)(cacheItem);
+          const val = getCurrentServiceValue();
           let { list: _list, quantity } = (0, import_utils6.addService)(
-            [...stateRef.current.service.value],
+            [...val],
             cacheItem,
             state
           );
+          latestServiceValueRef.current = _list;
+          lastOperationTimeRef.current = Date.now();
           if (!notShowToast) {
             handleAddToast(cacheItem.title, quantity || 1);
           }
@@ -295,7 +315,7 @@ var AddSerivce = (props) => {
           );
           try {
             if (((_f2 = (_e2 = (_d3 = (_c3 = (_b3 = context.appHelper.utils.store) == null ? void 0 : _b3.getState) == null ? void 0 : _c3.call(_b3)) == null ? void 0 : _d3.global) == null ? void 0 : _e2.globalConfig) == null ? void 0 : _f2.id) === 2155) {
-              const val = _list == null ? void 0 : _list.map((s) => {
+              const val2 = _list == null ? void 0 : _list.map((s) => {
                 return {
                   product_id: s == null ? void 0 : s.product_id,
                   detailId: s == null ? void 0 : s.id,
@@ -313,7 +333,7 @@ var AddSerivce = (props) => {
                 detailProductId: _detail == null ? void 0 : _detail.product_id,
                 product_name: _currentItem == null ? void 0 : _currentItem.title,
                 price: _detail == null ? void 0 : _detail.price,
-                serviceVal: val
+                serviceVal: val2
               };
               (0, import_utils.sendWarningLog)({
                 title: "addService",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.5.8",
+  "version": "6.5.10",
   "scripts": {
     "dev": "father dev",
     "build": "father build",

package/es/components/ticketBooking/components/ticketBooking/index.d.ts

@@ -1,7 +0,0 @@
-import './index.less';
-export declare const _formatBookingDetail: (data: any, modalState: any) => any;
-interface TicketBookingProps {
-    onPrerenderComplete?: () => void;
-}
-declare const TicketBooking: (props: TicketBookingProps) => JSX.Element;
-export default TicketBooking;

package/lib/components/ticketBooking/components/ticketBooking/index.d.ts

@@ -1,7 +0,0 @@
-import './index.less';
-export declare const _formatBookingDetail: (data: any, modalState: any) => any;
-interface TicketBookingProps {
-    onPrerenderComplete?: () => void;
-}
-declare const TicketBooking: (props: TicketBookingProps) => JSX.Element;
-export default TicketBooking;