@pisell/private-materials 6.4.62 → 6.4.63

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 ProductDisplayAdapter, { resolveProductDisplayConfig } from "../ProductDisplayAdapter";
+import ProductSelect from "../../../../plus/productSelect";
 import "./index.less";
 import { addService, addServiceScroll, createSimpleCacheItem, genServiceKey, getIsShowNumber, isSameProduct } from "../../utils";
 import NotAvailable from "../notAvailable";
@@ -34,7 +34,6 @@ 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'
@@ -53,13 +52,11 @@ var AddSerivce = function AddSerivce(props) {
     state = props.state,
     dispatch = props.dispatch,
     _props$renderMode = props.renderMode,
-    renderMode = _props$renderMode === void 0 ? 'current' : _props$renderMode,
-    productDisplayConfig = props.productDisplayConfig;
+    renderMode = _props$renderMode === void 0 ? 'current' : _props$renderMode;
   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,
@@ -74,25 +71,12 @@ 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(notAvailableRef),
+  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 () {
@@ -156,10 +140,8 @@ var AddSerivce = function AddSerivce(props) {
     });
   });
   useMemo(function () {
-    if (isActive) {
-      setHandleSetService(scanAddService);
-    }
-  }, [isActive]);
+    setHandleSetService(scanAddService);
+  }, []);
 
   /*
   const removeNotAvailableService = (list: any) => {
@@ -404,7 +386,7 @@ 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;
+                _addService2 = addService(_toConsumableArray(state.service.value), cacheItem, state), _list = _addService2.list, quantity = _addService2.quantity;
                 if (!notShowToast) {
                   handleAddToast(cacheItem.title, quantity || 1);
                 }
@@ -482,7 +464,7 @@ var AddSerivce = function AddSerivce(props) {
 
     // 如果不需要打开弹窗, 直接添加数据
     if (cacheValues) {
-      var _stateRef$current$ser, _detail$_extend, _Toast$success2;
+      var _state$service$value, _detail$_extend, _Toast$success2;
       var productId = item.id.toString();
 
       // 如果已经有pending的同商品，增加点击次数
@@ -494,7 +476,7 @@ var AddSerivce = function AddSerivce(props) {
         clickCountRef.current[productId] = 1;
       }
       var cacheItem = createSimpleCacheItem(item, cacheValues, state);
-      var detail = (_stateRef$current$ser = stateRef.current.service.value) === null || _stateRef$current$ser === void 0 ? void 0 : _stateRef$current$ser.find(function (val) {
+      var detail = (_state$service$value = state.service.value) === null || _state$service$value === void 0 ? void 0 : _state$service$value.find(function (val) {
         return isSameProduct(val, cacheItem);
       });
       var originalQuantity = (detail === null || detail === void 0 || (_detail$_extend = detail._extend) === null || _detail$_extend === void 0 ? void 0 : _detail$_extend.quantity) || 0;
@@ -561,37 +543,20 @@ 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(ProductDisplayAdapter, {
-        config: finalDisplayConfig,
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProductSelect, {
         dataSource: renderList,
-        loading: !renderList.length && loading || firstLoading,
-        currentProductId: currentProduct === null || currentProduct === void 0 ? void 0 : currentProduct.id,
-        onSelectProduct: handleSelectProduct
+        layout: productListLayout,
+        onChange: handleSelectProduct,
+        value: currentProduct === null || currentProduct === void 0 ? void 0 : currentProduct.id,
+        loading: !renderList.length && loading,
+        productListSetting: productListSetting
       }), /*#__PURE__*/React.createElement(NotAvailable, {
         ref: notAvailableRef
       }));
     }
     return null;
-  }, [firstLoading, state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4, finalDisplayConfig]);
+  }, [state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4]);
 };
 export default AddSerivce;

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

@@ -1,8 +1,6 @@
-import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;
-    productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
 }
 declare const AddServiceVariant: (props: AddServiceVariantProps) => JSX.Element;
 export default AddServiceVariant;

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

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

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

@@ -1,8 +1,3 @@
-/// <reference types="react" />
 import './index.less';
-interface MenuBarProps {
-    activeNavKey?: string;
-    onNavChange?: (key: string) => void;
-}
-declare const index: (props: MenuBarProps) => JSX.Element;
+declare const index: () => JSX.Element;
 export default index;

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

@@ -2,43 +2,18 @@ import React from 'react';
 import { useNetworkStatus, NetworkStatus, NetworkStatusColor } from "../../hooks/useNetworkStatus";
 import "./index.less";
 import { Menu } from 'antd';
-import { ReloadOutlined, SettingOutlined } from '@ant-design/icons';
+import { SettingOutlined } from '@ant-design/icons';
 import { locales } from '@pisell/utils';
-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;
+import { ConfigProvider } from '@pisell/materials';
+var index = function index() {
   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: 'reload',
-    label: locales.getText('pisell2.ticket-booking.reload'),
-    icon: /*#__PURE__*/React.createElement(ReloadOutlined, null)
-  }, {
     key: '1',
     icon: /*#__PURE__*/React.createElement(SettingOutlined, null),
     children: [{
+      key: 'reload',
+      label: locales.getText('pisell2.ticket-booking.reload')
+    }, {
       key: 'version',
       label: '6.4.38'
     }
@@ -68,11 +43,6 @@ var index = function index(props) {
       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", {
@@ -88,15 +58,21 @@ var index = function index(props) {
     fill: "#8157D5"
   }))), /*#__PURE__*/React.createElement("div", {
     className: "nav-wrapper"
-  }, 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", {
+  }, /*#__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", {
     className: "menu-wrapper"
   }, /*#__PURE__*/React.createElement(ConfigProvider, {
     theme: {

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

@@ -28,7 +28,6 @@
     display: flex;
     flex-direction: column;
     align-items: center;
-    gap: 12px;
 
     .nav-item {
       cursor: pointer;
@@ -39,35 +38,10 @@
       justify-content: center;
       align-items: center;
       position: relative;
-      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);
-        }
-      }
+      background: var(--Gray-950, #0c111d);
 
       &.active {
         background: #8157d5;
-        color: #ffffff;
-
-        svg path {
-          stroke: #ffffff;
-        }
 
         &::before {
           display: block;
@@ -120,10 +94,5 @@
     bottom: 44px;
     left: 6px;
     z-index: 99999;
-    .pisell-lowcode-menu {
-      li {
-        padding-top: 6px;
-      }
-    }
   }
 }

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

@@ -1,9 +1,4 @@
 import './index.less';
-import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 export declare const _formatBookingDetail: (data: any, modalState: any) => any;
-declare const TicketBooking: (props: {
-    productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
-    isShowTimeBar?: boolean;
-    isShowFloatButtons?: boolean;
-}) => JSX.Element;
+declare const TicketBooking: () => 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, getBoardConfigCache, setBoardConfigCache } from "../../utils";
+import { formatDateToStr, getNextTimeSlice, getDisabledEdit, restoreProductOtherData, getIsParallelResourcesBooking, formatHolder } from "../../utils";
 import AddServiceVariant from "../addServiceVariant";
 import TimeBar from "../timeBar";
 import { formatProducts } from "../../../booking/info/service2/utils";
@@ -49,9 +49,6 @@ 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,
@@ -221,13 +218,8 @@ var formatProductValues = function formatProductValues(data) {
     });
   });
 };
-var TicketBooking = function TicketBooking(props) {
+var TicketBooking = function TicketBooking() {
   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],
@@ -252,7 +244,6 @@ var TicketBooking = function TicketBooking(props) {
   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],
@@ -263,9 +254,6 @@ var TicketBooking = function TicketBooking(props) {
     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,
@@ -314,16 +302,16 @@ var TicketBooking = function TicketBooking(props) {
       }
     }
   });
+  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 {
@@ -732,57 +720,27 @@ var TicketBooking = function TicketBooking(props) {
    */
   var _getBoardConfig = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var bookingConfigParams, isHasCache, cachedBoardConfig, _cachedBoardConfig$co, data;
+      var _data$config;
+      var bookingConfigParams, data;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            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;
+            bookingConfigParams = state.bookingConfigParams; // 获取board设置
+            _context2.next = 3;
             return getBookingConfig(_objectSpread({}, bookingConfigParams));
-          case 6:
+          case 3:
             data = _context2.sent;
-            if (!isHasCache) {
-              setState({
-                bookingConfig: data
-              });
+            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();
             }
-            // 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:
+            setState({
+              bookingConfig: data
+            });
+          case 6:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[3, 11]]);
+      }, _callee2);
     }));
     return function _getBoardConfig() {
       return _ref2.apply(this, arguments);
@@ -1307,11 +1265,10 @@ var TicketBooking = function TicketBooking(props) {
       productExtensionType: state.productExtensionType,
       isBookingTicket2: true
     }),
-    setGlobalState: _setModalState,
-    productDisplayConfig: productDisplayConfig
-  }), isShowFloatButtons && /*#__PURE__*/React.createElement(FloatButtons, {
+    setGlobalState: _setModalState
+  }), /*#__PURE__*/React.createElement(FloatButtons, {
     items: floatButtons
-  })), isShowTimeBar && /*#__PURE__*/React.createElement(TimeBar, {
+  })), /*#__PURE__*/React.createElement(TimeBar, {
     onCreateClick: handleCreateClick,
     setGlobalState: setState,
     globalState: state,

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

@@ -36,7 +36,8 @@
       .booking-info-create-new,
       .pisell-lowcode__booking-field-title,
       .pisell-lowcode__shopping-cart-empty,
-      .pisell-lowcode__booking-service-clear-btn {
+      .pisell-lowcode__booking-service-clear-btn,
+      .pisell-lowcode__booking-contact-info-title {
         color: #ffffff;
       }
     }

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

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

package/es/components/ticketBooking/hooks/pisellos/bookingTicket.d.ts

@@ -1,6 +1 @@
-/**
- * useBookingTicket Hook
- * 获取当前 TicketBooking 实例对应的 BookingTicket 模块
- * 通过 osKey 区分不同页面的模块实例
- */
 export declare const useBookingTicket: () => any;

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

@@ -1,17 +1,5 @@
 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();
-  var osKey = useOsKey();
-
-  // 根据 osKey 生成模块名称
-  var moduleKey = getBookingTicketKey(osKey || 'ticket');
-  return pisellOS.getModule(moduleKey);
+  return pisellOS.getModule('bookingTicket');
 };

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

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

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

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

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

@@ -17,12 +17,9 @@ 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([]),
@@ -62,12 +59,10 @@ export var useCustomer = function useCustomer(props) {
 
   // 监听事件
   useEffect(function () {
-    var _bookingTicket$store;
-    if (!bookingTicket) {
+    if (!pisellos) {
       return;
     }
-    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) {
+    var unlisten1 = pisellos.effects.on('customer:onUpdate', function (state) {
       setCustomers(state.customerList);
       setHasMore(state.hasMore);
       setPagination(function (prev) {
@@ -78,17 +73,14 @@ export var useCustomer = function useCustomer(props) {
         });
       });
     });
-    var wrappedOnCustomerSelected = executeIfActive(function (customer) {
+    var unlisten2 = pisellos.effects.on('customer:onSelected', function (customer) {
       var _props$changeCustomer;
       setSelectedCustomer(customer);
       (_props$changeCustomer = props.changeCustomerToGlobalState) === null || _props$changeCustomer === void 0 || _props$changeCustomer.call(props, customer);
     });
-    var wrappedOnPaginationChange = executeIfActive(function (paginationInfo) {
+    var unlisten3 = pisellos.effects.on('customer:onPaginationChange', 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();

package/es/components/ticketBooking/hooks/pisellos/useProducts.d.ts

@@ -4,7 +4,7 @@ interface IGetProductsParams {
     menu_list_ids?: number[];
     schedule_datetime?: string;
 }
-export declare const useProducts: (notAvailableRef: any) => {
+export declare const useProducts: () => {
     getProducts: (params?: IGetProductsParams) => Promise<void>;
     products: any[];
     loading: boolean;