@pisell/private-materials 6.4.56 → 6.4.57

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

@@ -26,7 +26,7 @@ import { getProductExtend } from "../../../booking/info2/service/addService/util
 import { holderId, isDaysBooking, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
 import { isBooking4Shop } from "../../../booking/info/utils";
 import { useService } from "../../../booking/info/service/serviceManager";
-import ProductSelect from "../../../../plus/productSelect";
+import ProductDisplayAdapter, { resolveProductDisplayConfig } from "../ProductDisplayAdapter";
 import "./index.less";
 import { addService, addServiceScroll, createSimpleCacheItem, genServiceKey, getIsShowNumber, isSameProduct } from "../../utils";
 import NotAvailable from "../notAvailable";
@@ -34,6 +34,7 @@ import dayjs from 'dayjs';
 import { useProducts } from "../../hooks/pisellos";
 import { createCacheItem, genValues, isBundle, isOption, setHandleSetService } from "./utils";
 import { useToast } from '@pisell/materials';
+import { useIsActive } from "../../context/IsActiveContext";
 var productListLayout = {
   grid: true,
   config: '12:12'
@@ -52,11 +53,13 @@ var AddSerivce = function AddSerivce(props) {
     state = props.state,
     dispatch = props.dispatch,
     _props$renderMode = props.renderMode,
-    renderMode = _props$renderMode === void 0 ? 'current' : _props$renderMode;
+    renderMode = _props$renderMode === void 0 ? 'current' : _props$renderMode,
+    productDisplayConfig = props.productDisplayConfig;
   var context = useEngineContext();
   var notAvailableRef = useRef(null);
   var isLoadedServiceRef = useRef(false);
   request.setRequest(context.appHelper.utils.request);
+  var isActive = useIsActive();
   var Toast = useToast();
   var _useService = useService({
       renderMode: renderMode,
@@ -71,12 +74,25 @@ var AddSerivce = function AddSerivce(props) {
     _useState2 = _slicedToArray(_useState, 2),
     currentProduct = _useState2[0],
     setCurrentProduct = _useState2[1];
+  var _useState3 = useState(true),
+    _useState4 = _slicedToArray(_useState3, 2),
+    firstLoading = _useState4[0],
+    setFirstLoading = _useState4[1];
   var stateRef = useRef(state);
   stateRef.current = state;
   var _useProducts = useProducts(),
     getProducts = _useProducts.getProducts,
     products = _useProducts.products,
     loading = _useProducts.loading;
+  useEffect(function () {
+    var timer = setTimeout(function () {
+      setFirstLoading(false);
+    }, 300);
+    return function () {
+      clearTimeout(timer);
+    };
+  }, []);
+
   // 组件卸载时清理所有定时器
   useEffect(function () {
     return function () {
@@ -140,8 +156,10 @@ var AddSerivce = function AddSerivce(props) {
     });
   });
   useMemo(function () {
-    setHandleSetService(scanAddService);
-  }, []);
+    if (isActive) {
+      setHandleSetService(scanAddService);
+    }
+  }, [isActive]);
 
   /*
   const removeNotAvailableService = (list: any) => {
@@ -543,20 +561,37 @@ var AddSerivce = function AddSerivce(props) {
       });
     }
   }, [renderMode, currentDate, customerId, menuList, currentDatetime]);
+
+  // 产品展示配置，支持字符串预设或完整配置对象
+  var finalDisplayConfig = useMemo(function () {
+    // 解析配置（支持字符串或对象）
+    var resolvedConfig = resolveProductDisplayConfig(productDisplayConfig);
+
+    // 如果是 ProductSelect 模式，合并默认的 layout 和 setting
+    if (resolvedConfig.displayMode === 'product-select') {
+      var _resolvedConfig$produ, _resolvedConfig$produ2;
+      return _objectSpread(_objectSpread({}, resolvedConfig), {}, {
+        productSelectConfig: _objectSpread(_objectSpread({}, resolvedConfig.productSelectConfig), {}, {
+          layout: ((_resolvedConfig$produ = resolvedConfig.productSelectConfig) === null || _resolvedConfig$produ === void 0 ? void 0 : _resolvedConfig$produ.layout) || productListLayout,
+          productListSetting: ((_resolvedConfig$produ2 = resolvedConfig.productSelectConfig) === null || _resolvedConfig$produ2 === void 0 ? void 0 : _resolvedConfig$produ2.productListSetting) || productListSetting
+        })
+      });
+    }
+    return resolvedConfig;
+  }, [productDisplayConfig]);
   return useMemo(function () {
     if (renderMode === 'current') {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProductSelect, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProductDisplayAdapter, {
+        config: finalDisplayConfig,
         dataSource: renderList,
-        layout: productListLayout,
-        onChange: handleSelectProduct,
-        value: currentProduct === null || currentProduct === void 0 ? void 0 : currentProduct.id,
-        loading: !renderList.length && loading,
-        productListSetting: productListSetting
+        loading: !renderList.length && loading || firstLoading,
+        currentProductId: currentProduct === null || currentProduct === void 0 ? void 0 : currentProduct.id,
+        onSelectProduct: handleSelectProduct
       }), /*#__PURE__*/React.createElement(NotAvailable, {
         ref: notAvailableRef
       }));
     }
     return null;
-  }, [state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4]);
+  }, [state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4, finalDisplayConfig]);
 };
 export default AddSerivce;

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

@@ -8,7 +8,8 @@ import React, { useRef } from 'react';
 import AddService from "./addService";
 var AddServiceVariant = function AddServiceVariant(props) {
   var globalState = props.globalState,
-    setGlobalState = props.setGlobalState;
+    setGlobalState = props.setGlobalState,
+    productDisplayConfig = props.productDisplayConfig;
   var stateRef = useRef(globalState);
   stateRef.current = globalState;
   var dispatch = function dispatch(_ref) {
@@ -22,7 +23,8 @@ var AddServiceVariant = function AddServiceVariant(props) {
   };
   return /*#__PURE__*/React.createElement(AddService, {
     state: globalState,
-    dispatch: dispatch
+    dispatch: dispatch,
+    productDisplayConfig: productDisplayConfig
   });
 };
 export default AddServiceVariant;

package/es/components/ticketBooking/components/menuBar/index.js

@@ -4,9 +4,33 @@ import "./index.less";
 import { Menu } from 'antd';
 import { SettingOutlined } from '@ant-design/icons';
 import { locales } from '@pisell/utils';
-import { ConfigProvider } from '@pisell/materials';
-var index = function index() {
+import { ConfigProvider, Iconfont } from '@pisell/materials';
+var index = function index(props) {
+  var _props$activeNavKey = props.activeNavKey,
+    activeNavKey = _props$activeNavKey === void 0 ? 'ticket' : _props$activeNavKey,
+    onNavChange = props.onNavChange;
   var status = useNetworkStatus();
+
+  // 导航项配置
+  var navItems = [{
+    key: 'ticket',
+    icon: /*#__PURE__*/React.createElement(Iconfont, {
+      type: "pisell2-ticket",
+      style: {
+        fontSize: 32
+      }
+    }),
+    label: ''
+  }, {
+    key: 'food',
+    label: '',
+    icon: /*#__PURE__*/React.createElement(Iconfont, {
+      type: "pisell2-food",
+      style: {
+        fontSize: 32
+      }
+    })
+  }];
   var items = [{
     key: '1',
     icon: /*#__PURE__*/React.createElement(SettingOutlined, null),
@@ -43,6 +67,11 @@ var index = function index() {
       window.location.href = '/login';
     }
   };
+
+  // 处理导航项点击
+  var handleNavClick = function handleNavClick(key) {
+    onNavChange === null || onNavChange === void 0 || onNavChange(key);
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-ticket-booking-menu-bar"
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
@@ -58,21 +87,15 @@ var index = function index() {
     fill: "#8157D5"
   }))), /*#__PURE__*/React.createElement("div", {
     className: "nav-wrapper"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "nav-item active"
-  }, /*#__PURE__*/React.createElement("svg", {
-    xmlns: "http://www.w3.org/2000/svg",
-    width: "32",
-    height: "25",
-    viewBox: "0 0 34 27",
-    fill: "none"
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M13.8 7.05078V5.48828M13.8 14.082V12.5195M13.8 21.1133V19.5508M6.12 0.800781H27.88C29.6722 0.800781 30.5683 0.800781 31.2528 1.14139C31.8549 1.44099 32.3444 1.91905 32.6512 2.50706C33 3.17554 33 4.05062 33 5.80078V7.83203C29.9072 7.83203 27.4 10.2805 27.4 13.3008C27.4 16.3211 29.9072 18.7695 33 18.7695V20.8008C33 22.5509 33 23.426 32.6512 24.0945C32.3444 24.6825 31.8549 25.1606 31.2528 25.4602C30.5683 25.8008 29.6722 25.8008 27.88 25.8008H6.12C4.32783 25.8008 3.43175 25.8008 2.74723 25.4602C2.14511 25.1606 1.65557 24.6825 1.34878 24.0945C1 23.426 1 22.5509 1 20.8008V18.7695C4.09279 18.7695 6.6 16.3211 6.6 13.3008C6.6 10.2805 4.09279 7.83203 1 7.83203V5.80078C1 4.05062 1 3.17554 1.34878 2.50706C1.65557 1.91905 2.14511 1.44099 2.74723 1.14139C3.43175 0.800781 4.32783 0.800781 6.12 0.800781Z",
-    stroke: "white",
-    "stroke-width": "1.5",
-    "stroke-linecap": "round",
-    "stroke-linejoin": "round"
-  }))))), /*#__PURE__*/React.createElement("div", {
+  }, navItems.map(function (navItem) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: navItem.key,
+      className: "nav-item ".concat(activeNavKey === navItem.key ? 'active' : ''),
+      onClick: function onClick() {
+        return handleNavClick(navItem.key);
+      }
+    }, navItem.icon && navItem.icon, navItem.label && navItem.label);
+  }))), /*#__PURE__*/React.createElement("div", {
     className: "menu-wrapper"
   }, /*#__PURE__*/React.createElement(ConfigProvider, {
     theme: {

package/es/components/ticketBooking/components/menuBar/index.less

@@ -28,6 +28,7 @@
     display: flex;
     flex-direction: column;
     align-items: center;
+    gap: 12px;
 
     .nav-item {
       cursor: pointer;
@@ -38,10 +39,35 @@
       justify-content: center;
       align-items: center;
       position: relative;
-      background: var(--Gray-950, #0c111d);
+      background: transparent;
+      color: rgba(255, 255, 255, 0.75);
+      transition: all 0.3s ease;
+
+      svg {
+        transition: all 0.3s ease;
+        
+        path {
+          stroke: rgba(255, 255, 255, 0.75);
+          transition: all 0.3s ease;
+        }
+      }
+
+      &:hover {
+        background: rgba(129, 87, 213, 0.1);
+        color: rgba(255, 255, 255, 0.95);
+
+        svg path {
+          stroke: rgba(255, 255, 255, 0.95);
+        }
+      }
 
       &.active {
         background: #8157d5;
+        color: #ffffff;
+
+        svg path {
+          stroke: #ffffff;
+        }
 
         &::before {
           display: block;

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

@@ -1,4 +1,9 @@
 import './index.less';
+import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 export declare const _formatBookingDetail: (data: any, modalState: any) => any;
-declare const TicketBooking: () => JSX.Element;
+declare const TicketBooking: (props: {
+    productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
+    isShowTimeBar?: boolean;
+    isShowFloatButtons?: boolean;
+}) => JSX.Element;
 export default TicketBooking;

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -32,7 +32,7 @@ import dayjs from 'dayjs';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { useStore } from "../../miniRedux";
 import BookingInfo from "../../../../components/booking/info";
-import { formatDateToStr, getNextTimeSlice, getDisabledEdit, restoreProductOtherData, getIsParallelResourcesBooking, formatHolder } from "../../utils";
+import { formatDateToStr, getNextTimeSlice, getDisabledEdit, restoreProductOtherData, getIsParallelResourcesBooking, formatHolder, getBoardConfigCache, setBoardConfigCache } from "../../utils";
 import AddServiceVariant from "../addServiceVariant";
 import TimeBar from "../timeBar";
 import { formatProducts } from "../../../booking/info/service2/utils";
@@ -49,6 +49,9 @@ import { useCustomer } from "../../hooks/pisellos";
 import { useMemoizedFn } from 'ahooks';
 import useScanManager from "../../hooks/pisellos/useScanManager";
 import { useDebounceFn } from 'ahooks';
+import { useOsKey } from "../../context";
+import { useIsActive } from "../../context/IsActiveContext";
+import { useShopDiscountModule } from "../../hooks/pisellos/useShopDiscountModule";
 export var _formatBookingDetail = function _formatBookingDetail(data, modalState) {
   var _bookings$list, _bookings$list2;
   var customer_id = data.customer_id,
@@ -218,8 +221,13 @@ var formatProductValues = function formatProductValues(data) {
     });
   });
 };
-var TicketBooking = function TicketBooking() {
+var TicketBooking = function TicketBooking(props) {
   var _engineContext$appHel2, _state$modalState2, _state$modalState4;
+  var productDisplayConfig = props.productDisplayConfig,
+    _props$isShowTimeBar = props.isShowTimeBar,
+    isShowTimeBar = _props$isShowTimeBar === void 0 ? true : _props$isShowTimeBar,
+    _props$isShowFloatBut = props.isShowFloatButtons,
+    isShowFloatButtons = _props$isShowFloatBut === void 0 ? true : _props$isShowFloatBut;
   var _useStore = useStore(),
     _useStore2 = _slicedToArray(_useStore, 2),
     state = _useStore2[0],
@@ -244,6 +252,7 @@ var TicketBooking = function TicketBooking() {
   var _listTimerRef = useRef();
   var _timerRef = useRef();
   var _callbackFnRef = useRef();
+  var _isFirstLoadBoardConfigRef = useRef(true); // 跟踪 boardConfig 是否首次加载
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     activeBookingId = _useState2[0],
@@ -254,6 +263,9 @@ var TicketBooking = function TicketBooking() {
     setShowTerminalUpgradeModal = _useState4[1];
   var pisellFloatingPanelRef = useRef(null);
   var closeRef = useRef(null);
+  var shopDiscount = useShopDiscountModule();
+  var isActive = useIsActive();
+  var osKey = useOsKey();
   var bookingTicket = useBookingTicket();
   var _useScanGlobal = useScanGlobal(),
     openScan = _useScanGlobal.openScan,
@@ -302,16 +314,16 @@ var TicketBooking = function TicketBooking() {
       }
     }
   });
-  useMemo(function () {
-    openScan(function (data) {
-      handleScan(data);
-    });
-  }, []);
   useEffect(function () {
+    if (isActive) {
+      openScan(function (data) {
+        handleScan(data);
+      });
+    }
     return function () {
       closeScan();
     };
-  }, []);
+  }, [isActive]);
   var _useDebounceFn = useDebounceFn(function (type, orderId) {
       // 支付成功后清空状态
       try {
@@ -720,27 +732,57 @@ var TicketBooking = function TicketBooking() {
    */
   var _getBoardConfig = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _data$config;
-      var bookingConfigParams, data;
+      var bookingConfigParams, isHasCache, cachedBoardConfig, _cachedBoardConfig$co, data;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            bookingConfigParams = state.bookingConfigParams; // 获取board设置
-            _context2.next = 3;
+            bookingConfigParams = state.bookingConfigParams;
+            isHasCache = false; // 1. 如果是首次加载，尝试从缓存中获取数据
+            if (_isFirstLoadBoardConfigRef.current && osKey) {
+              cachedBoardConfig = getBoardConfigCache(osKey);
+              if (cachedBoardConfig) {
+                isHasCache = true;
+                // 先展示缓存数据
+                setState({
+                  bookingConfig: cachedBoardConfig
+                });
+                console.log('[BoardConfigCache] 使用缓存数据展示');
+
+                // 如果缓存数据中有 quick_time 配置，也加载快捷时间产品
+                if (cachedBoardConfig !== null && cachedBoardConfig !== void 0 && (_cachedBoardConfig$co = cachedBoardConfig.config) !== null && _cachedBoardConfig$co !== void 0 && (_cachedBoardConfig$co = _cachedBoardConfig$co.information_tab) !== null && _cachedBoardConfig$co !== void 0 && (_cachedBoardConfig$co = _cachedBoardConfig$co.appointment_card) !== null && _cachedBoardConfig$co !== void 0 && _cachedBoardConfig$co.quick_time) {
+                  _getAddTimeProducts();
+                }
+              }
+              _isFirstLoadBoardConfigRef.current = false;
+            }
+
+            // 2. 无论是否有缓存，都调用接口获取最新数据
+            _context2.prev = 3;
+            _context2.next = 6;
             return getBookingConfig(_objectSpread({}, bookingConfigParams));
-          case 3:
+          case 6:
             data = _context2.sent;
-            if (data !== null && data !== void 0 && (_data$config = data.config) !== null && _data$config !== void 0 && (_data$config = _data$config.information_tab) !== null && _data$config !== void 0 && (_data$config = _data$config.appointment_card) !== null && _data$config !== void 0 && _data$config.quick_time) {
-              _getAddTimeProducts();
+            if (!isHasCache) {
+              setState({
+                bookingConfig: data
+              });
             }
-            setState({
-              bookingConfig: data
-            });
-          case 6:
+            // 4. 将新数据缓存到 storage
+            if (osKey && data) {
+              setBoardConfigCache(osKey, data);
+              console.log('[BoardConfigCache] 已更新缓存');
+            }
+            _context2.next = 14;
+            break;
+          case 11:
+            _context2.prev = 11;
+            _context2.t0 = _context2["catch"](3);
+            console.error('[BoardConfigCache] 获取配置失败:', _context2.t0);
+          case 14:
           case "end":
             return _context2.stop();
         }
-      }, _callee2);
+      }, _callee2, null, [[3, 11]]);
     }));
     return function _getBoardConfig() {
       return _ref2.apply(this, arguments);
@@ -1265,10 +1307,11 @@ var TicketBooking = function TicketBooking() {
       productExtensionType: state.productExtensionType,
       isBookingTicket2: true
     }),
-    setGlobalState: _setModalState
-  }), /*#__PURE__*/React.createElement(FloatButtons, {
+    setGlobalState: _setModalState,
+    productDisplayConfig: productDisplayConfig
+  }), isShowFloatButtons && /*#__PURE__*/React.createElement(FloatButtons, {
     items: floatButtons
-  })), /*#__PURE__*/React.createElement(TimeBar, {
+  })), isShowTimeBar && /*#__PURE__*/React.createElement(TimeBar, {
     onCreateClick: handleCreateClick,
     setGlobalState: setState,
     globalState: state,

package/es/components/ticketBooking/components/timeBar/index.less

@@ -4,6 +4,7 @@
   align-items: center;
   gap: 16px;
   padding: 8px;
+  background-color: #fff;
 
   button {
     flex-shrink: 0;

package/es/components/ticketBooking/context/IsActiveContext.js

@@ -0,0 +1,37 @@
+import React, { createContext, useContext } from 'react';
+
+/**
+ * IsActive Context
+ * 用于在 TicketBooking 组件树中提供 isActive 状态
+ * isActive 用于标识当前组件是否处于激活状态
+ */
+
+var IsActiveContext = /*#__PURE__*/createContext({
+  isActive: true
+});
+/**
+ * IsActive Provider
+ * 提供 isActive 给子组件使用
+ */
+export var IsActiveProvider = function IsActiveProvider(_ref) {
+  var isActive = _ref.isActive,
+    children = _ref.children;
+  return /*#__PURE__*/React.createElement(IsActiveContext.Provider, {
+    value: {
+      isActive: isActive
+    }
+  }, children);
+};
+
+/**
+ * useIsActive Hook
+ * 在子组件中使用此 hook 获取 isActive 状态
+ */
+export var useIsActive = function useIsActive() {
+  var context = useContext(IsActiveContext);
+  if (!context) {
+    throw new Error('useIsActive must be used within an IsActiveProvider');
+  }
+  return context.isActive;
+};
+export default IsActiveContext;

package/es/components/ticketBooking/context/OsKeyContext.js

@@ -0,0 +1,37 @@
+import React, { createContext, useContext } from 'react';
+
+/**
+ * OsKey Context
+ * 用于在 TicketBooking 组件树中提供 pisellos 的 osKey
+ * osKey 用于区分不同页面使用同一个组件时的模块标识
+ */
+
+var OsKeyContext = /*#__PURE__*/createContext({
+  osKey: undefined
+});
+/**
+ * OsKey Provider
+ * 提供 osKey 给子组件使用
+ */
+export var OsKeyProvider = function OsKeyProvider(_ref) {
+  var osKey = _ref.osKey,
+    children = _ref.children;
+  return /*#__PURE__*/React.createElement(OsKeyContext.Provider, {
+    value: {
+      osKey: osKey
+    }
+  }, children);
+};
+
+/**
+ * useOsKey Hook
+ * 在子组件中使用此 hook 获取 osKey
+ */
+export var useOsKey = function useOsKey() {
+  var context = useContext(OsKeyContext);
+  if (!context) {
+    throw new Error('useOsKey must be used within an OsKeyProvider');
+  }
+  return (context === null || context === void 0 ? void 0 : context.osKey) || "ticket";
+};
+export default OsKeyContext;

package/es/components/ticketBooking/context/index.js

@@ -0,0 +1,2 @@
+export { OsKeyProvider, useOsKey } from "./OsKeyContext";
+export { default as OsKeyContext } from "./OsKeyContext";

package/es/components/ticketBooking/hooks/pisellos/bookingTicket.js

@@ -1,5 +1,17 @@
 import { usePisellOS } from "../../../../hooks/useEngineContext";
+import { useOsKey } from "../../context/OsKeyContext";
+import { getBookingTicketKey } from "../../utils";
+
+/**
+ * useBookingTicket Hook
+ * 获取当前 TicketBooking 实例对应的 BookingTicket 模块
+ * 通过 osKey 区分不同页面的模块实例
+ */
 export var useBookingTicket = function useBookingTicket() {
   var pisellOS = usePisellOS();
-  return pisellOS.getModule('bookingTicket');
+  var osKey = useOsKey();
+
+  // 根据 osKey 生成模块名称
+  var moduleKey = getBookingTicketKey(osKey || 'ticket');
+  return pisellOS.getModule(moduleKey);
 };

package/es/components/ticketBooking/hooks/pisellos/index.js

@@ -1,3 +1,4 @@
 export * from "./bookingTicket";
 export * from "./useProducts";
-export * from "./useCustomer";
+export * from "./useCustomer";
+export * from "./useActiveExecute";

package/es/components/ticketBooking/hooks/pisellos/useActiveExecute.js

@@ -0,0 +1,50 @@
+import { useMemoizedFn } from 'ahooks';
+import { useRef, useEffect } from 'react';
+import { useIsActive } from "../../context/IsActiveContext";
+
+/**
+ * useActiveExecute Hook
+ * 返回一个函数，该函数接收一个回调函数，并返回一个包装后的函数
+ * 包装后的函数只在 isActive 为 true 时执行原始回调
+ *
+ * @example
+ * ```tsx
+ * const { executeIfActive } = useActiveExecute();
+ *
+ * // 创建一个包装函数用于事件监听
+ * const handleChange = (data) => {
+ *   console.log('data:', data);
+ * };
+ *
+ * // 返回的函数会在被调用时检查 isActive
+ * pisellos.effects.on('event', executeIfActive(handleChange));
+ * ```
+ */
+export var useActiveExecute = function useActiveExecute() {
+  var isActive = useIsActive();
+  // 使用 ref 存储最新的 isActive 值，避免闭包陷阱
+  var isActiveRef = useRef(isActive);
+
+  // 每次 isActive 变化时更新 ref
+  useEffect(function () {
+    isActiveRef.current = isActive;
+  }, [isActive]);
+
+  /**
+   * executeIfActive 接收一个函数，返回一个包装后的函数
+   * 包装后的函数会接收所有参数，并在 isActive 为 true 时调用原始函数
+   */
+  var executeIfActive = useMemoizedFn(function (fn) {
+    return function () {
+      // 使用 ref.current 获取最新的 isActive 值
+      if (!isActiveRef.current) return;
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      return fn === null || fn === void 0 ? void 0 : fn.apply(void 0, args);
+    };
+  });
+  return {
+    executeIfActive: executeIfActive
+  };
+};

package/es/components/ticketBooking/hooks/pisellos/useCustomer.js

@@ -17,9 +17,12 @@ import { useState, useEffect } from 'react';
 import { useBookingTicket } from "./bookingTicket";
 import { usePisellOS } from "../../../../hooks/useEngineContext";
 import { useMemoizedFn } from 'ahooks';
+import { useActiveExecute } from "./useActiveExecute";
 export var useCustomer = function useCustomer(props) {
   var bookingTicket = useBookingTicket();
   var pisellos = usePisellOS();
+  var _useActiveExecute = useActiveExecute(),
+    executeIfActive = _useActiveExecute.executeIfActive;
 
   // 客户列表
   var _useState = useState([]),
@@ -59,10 +62,12 @@ export var useCustomer = function useCustomer(props) {
 
   // 监听事件
   useEffect(function () {
-    if (!pisellos) {
+    var _bookingTicket$store;
+    if (!bookingTicket) {
       return;
     }
-    var unlisten1 = pisellos.effects.on('customer:onUpdate', function (state) {
+    var customerModule = bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$store = bookingTicket.store) === null || _bookingTicket$store === void 0 ? void 0 : _bookingTicket$store.customer;
+    var wrappedOnCustomerListUpdate = executeIfActive(function (state) {
       setCustomers(state.customerList);
       setHasMore(state.hasMore);
       setPagination(function (prev) {
@@ -73,14 +78,17 @@ export var useCustomer = function useCustomer(props) {
         });
       });
     });
-    var unlisten2 = pisellos.effects.on('customer:onSelected', function (customer) {
+    var wrappedOnCustomerSelected = executeIfActive(function (customer) {
       var _props$changeCustomer;
       setSelectedCustomer(customer);
       (_props$changeCustomer = props.changeCustomerToGlobalState) === null || _props$changeCustomer === void 0 || _props$changeCustomer.call(props, customer);
     });
-    var unlisten3 = pisellos.effects.on('customer:onPaginationChange', function (paginationInfo) {
+    var wrappedOnPaginationChange = executeIfActive(function (paginationInfo) {
       setPagination(paginationInfo);
     });
+    var unlisten1 = customerModule.effectsOn('onCustomerListUpdate', wrappedOnCustomerListUpdate);
+    var unlisten2 = customerModule.effectsOn('onCustomerSelected', wrappedOnCustomerSelected);
+    var unlisten3 = customerModule.effectsOn('onPaginationChange', wrappedOnPaginationChange);
     return function () {
       unlisten1();
       unlisten2();