@pisell/private-materials 6.2.9 → 6.2.10

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

@@ -14,6 +14,8 @@ interface ProductSelectProps {
     value?: number;
     loading?: boolean;
     scrollDom?: string;
+    /** 某些设置了固定头部的情况 */
+    offsetDom?: string;
     style?: React.CSSProperties;
     emptyDescription?: string;
     token?: Partial<ProductSelectToken>;

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

@@ -1,8 +1,20 @@
 import React from 'react';
 import { useNetworkStatus, NetworkStatus, NetworkStatusColor } from "../../hooks/useNetworkStatus";
 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() {
   var status = useNetworkStatus();
+  var items = [{
+    key: '1',
+    icon: /*#__PURE__*/React.createElement(SettingOutlined, null),
+    children: [{
+      key: 'reload',
+      label: locales.getText('pisell2.ticket-booking.reload')
+    }]
+  }];
   var getStatusText = function getStatusText(status) {
     switch (status) {
       case NetworkStatus.GOOD:
@@ -13,9 +25,15 @@ var index = function index() {
         return 'Offline';
     }
   };
+  var handleClick = function handleClick(_ref) {
+    var key = _ref.key;
+    if (key === 'reload') {
+      window.location.reload();
+    }
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-ticket-booking-menu-bar"
-  }, /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "logo-wrapper"
   }, /*#__PURE__*/React.createElement("svg", {
     xmlns: "http://www.w3.org/2000/svg",
@@ -42,7 +60,25 @@ var index = function index() {
     "stroke-width": "1.5",
     "stroke-linecap": "round",
     "stroke-linejoin": "round"
-  })))), /*#__PURE__*/React.createElement("div", {
+  }))))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(ConfigProvider, {
+    theme: {
+      components: {
+        Menu: {
+          collapsedIconSize: 32,
+          itemHeight: 48,
+          groupTitleFontSize: 16,
+          fontSize: 16
+        }
+      }
+    }
+  }, /*#__PURE__*/React.createElement(Menu, {
+    className: "pisell-ticket-booking-menu",
+    mode: "inline",
+    theme: "dark",
+    inlineCollapsed: true,
+    items: items,
+    onClick: handleClick
+  }))), /*#__PURE__*/React.createElement("div", {
     className: "status-wrapper"
   }, /*#__PURE__*/React.createElement("div", {
     className: "network-status",

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

@@ -3,6 +3,14 @@
   padding-left: 6px;
   width: 86px;
   position: relative;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  padding-bottom: 44px;
+
+  .pisell-ticket-booking-menu {
+    background-color: transparent;
+  }
 
   .logo-wrapper {
     margin-top: 24px;

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

@@ -54,6 +54,7 @@ declare const _default: {
         'pisell2.product.card.day': (val: number) => string;
         'pisell2.product.card.day.event': (val: number) => string;
         'pisell2.product.card.minute': (val: number) => string;
+        "pisell2.ticket-booking.reload": string;
     };
     'zh-CN': {
         'pisell2.ticket-booking.info': string;
@@ -110,6 +111,7 @@ declare const _default: {
         'pisell2.product.card.day': (val: number) => string;
         'pisell2.product.card.day.event': (val: number) => string;
         'pisell2.product.card.minute': (val: number) => string;
+        "pisell2.ticket-booking.reload": string;
     };
     'zh-HK': {
         'pisell2.ticket-booking.info': string;
@@ -166,6 +168,7 @@ declare const _default: {
         'pisell2.product.card.day': (val: number) => string;
         'pisell2.product.card.day.event': (val: number) => string;
         'pisell2.product.card.minute': (val: number) => string;
+        "pisell2.ticket-booking.reload": string;
     };
 };
 export default _default;

package/es/components/ticketBooking/locales.js

@@ -65,7 +65,8 @@ export default {
     },
     'pisell2.product.card.minute': function pisell2ProductCardMinute(val) {
       return "".concat(val > 1 ? ' minutes' : ' minute');
-    }
+    },
+    "pisell2.ticket-booking.reload": 'Reload'
   },
   'zh-CN': {
     'pisell2.ticket-booking.info': '信息',
@@ -133,7 +134,8 @@ export default {
     },
     'pisell2.product.card.minute': function pisell2ProductCardMinute(val) {
       return '分钟';
-    }
+    },
+    "pisell2.ticket-booking.reload": '重新加载'
   },
   'zh-HK': {
     'pisell2.ticket-booking.info': '資訊',
@@ -201,6 +203,7 @@ export default {
     },
     'pisell2.product.card.minute': function pisell2ProductCardMinute(val) {
       return '分鐘';
-    }
+    },
+    "pisell2.ticket-booking.reload": '重新載入'
   }
 };

package/es/components/walletList/index.js

@@ -141,7 +141,7 @@ var DEFAULT_BALANCE = {
   discount_card_count: 0
 };
 var WalletList = Provider(function (props) {
-  var _utils$getStore, _dvaStore$core, _store$getState;
+  var _utils$getStore, _context$engine, _store$getState;
   var _props$globalState = props.globalState,
     globalState = _props$globalState === void 0 ? {} : _props$globalState; // 接收globalState属性
   var _useContext = useContext(Context),
@@ -152,8 +152,8 @@ var WalletList = Provider(function (props) {
     constants = _ref.constants,
     utils = _ref.utils;
   var dvaStore = utils === null || utils === void 0 || (_utils$getStore = utils.getStore) === null || _utils$getStore === void 0 || (_utils$getStore = _utils$getStore.call(utils)) === null || _utils$getStore === void 0 ? void 0 : _utils$getStore.getState();
-  locales.init(localeTexts, (dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en');
   // 添加组件挂载状态引用
+  locales.init(localeTexts, (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || 'en'); // 添加组件挂载状态引用
   var isMountedRef = useRef(true);
   var carouselRef = useRef(null);
   var store = utils.store;
@@ -587,7 +587,7 @@ var WalletList = Provider(function (props) {
     };
   }();
   var renderWalletCard = function renderWalletCard(item) {
-    var _dvaStore$core2;
+    var _dvaStore$core;
     var code = item.code,
       shop = item.shop,
       wallet = item.wallet,
@@ -643,7 +643,7 @@ var WalletList = Provider(function (props) {
       iconImg: icon,
       symbol: symbol,
       cardNo: code,
-      walletName: getLocalizedName(name, dvaStore === null || dvaStore === void 0 || (_dvaStore$core2 = dvaStore.core) === null || _dvaStore$core2 === void 0 ? void 0 : _dvaStore$core2.translateLocale),
+      walletName: getLocalizedName(name, dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale),
       shopName: shopName,
       codeType: barcodetype,
       items: cardItems,

package/lib/components/appointmentBooking/components/Cart/utils.js

@@ -25,7 +25,6 @@ __export(utils_exports, {
   handleAddHolder: () => handleAddHolder
 });
 module.exports = __toCommonJS(utils_exports);
-var import_utils = require("../../utils");
 var checkLogin = async ({
   isLogin,
   openLoginModal,
@@ -38,16 +37,7 @@ var checkLogin = async ({
   if (!isLogin) {
     openLoginModal({
       callback: (status) => {
-        var _a;
         if (status === "success") {
-          if (!isFormSubject) {
-            const user = JSON.parse(((_a = utils == null ? void 0 : utils.storage) == null ? void 0 : _a.get("customer")) || "{}");
-            const currentUser = (0, import_utils.formatCustomer)(user);
-            const meAccount = accountLists == null ? void 0 : accountLists.find((d) => !(d == null ? void 0 : d.isGuest));
-            appointmentBooking.setLoginAccount(meAccount == null ? void 0 : meAccount.id, currentUser);
-          } else {
-            getHolders();
-          }
         }
       }
     });

package/lib/components/appointmentBooking/components/Content/index.js

@@ -48,8 +48,11 @@ var import_context = require("../../context");
 var import_PolicyModal = __toESM(require("../../deposit/components/PolicyModal"));
 var import_hooks = require("../../hooks");
 var import_index = require("./index.less");
+var import_useComponents = __toESM(require("../../../../hooks/useComponents"));
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var import_utils2 = require("../../utils");
 var Layout = () => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const stepRef = (0, import_react.useRef)();
   const {
     currentStep,
@@ -68,9 +71,37 @@ var Layout = () => {
   const { getHolders } = (0, import_hooks.useAppointmentBookingAccount)();
   const { removeStep } = (0, import_hooks.useAppointmentBookingStep)();
   const { shopDiscount } = (0, import_hooks.useShopDiscount)();
+  const { customPageData } = (_a = (0, import_useEngineContext.default)().engine) == null ? void 0 : _a.props;
+  const [CustomComponent] = (0, import_useComponents.default)({
+    components: ["CustomComponent"]
+  });
+  console.log("CustomComponent:", CustomComponent, typeof CustomComponent, CustomComponent == null ? void 0 : CustomComponent.$$typeof);
   (0, import_hooks.useAppointmentBookingCart)();
   (0, import_hooks.useAppointmentBookingStep)();
   const [params, setParams] = (0, import_react.useState)({});
+  const utils = (0, import_hooks.contextUtils)();
+  const context = (0, import_useEngineContext.default)();
+  const { pubsub } = context.appHelper.utils;
+  (0, import_react.useEffect)(() => {
+    const handleLoginSuccess = async () => {
+      var _a2;
+      if (!isFormSubject) {
+        const user = JSON.parse(((_a2 = utils == null ? void 0 : utils.storage) == null ? void 0 : _a2.get("customer")) || "{}");
+        const currentUser = (0, import_utils2.formatCustomer)(user);
+        const accountLists = await appointmentBooking.getAccounts();
+        const meAccount = accountLists == null ? void 0 : accountLists.find((d) => !(d == null ? void 0 : d.isGuest));
+        appointmentBooking.setLoginAccount(meAccount == null ? void 0 : meAccount.id, currentUser);
+      } else {
+        if (!isRetailTemplate) {
+          getHolders();
+        }
+      }
+    };
+    pubsub.subscribe("pisell1.login.success", handleLoginSuccess);
+    return () => {
+      pubsub.unsubscribe("pisell1.login.success");
+    };
+  }, []);
   (0, import_react.useEffect)(() => {
     appointmentBooking.removeStep("fill-form");
     return () => {
@@ -126,7 +157,7 @@ var Layout = () => {
       top: 0,
       behavior: "smooth"
     });
-  }, [(_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key]);
+  }, [(_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key]);
   const components = {
     // 选择服务
     "select-service": import_Services.default,
@@ -151,8 +182,14 @@ var Layout = () => {
     } else {
       Com2 = components[key];
     }
-    return /* @__PURE__ */ import_react.default.createElement(Com2, { onChange: setParams, params, ref: stepRef });
-  }, [(_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key]);
+    if (key === "select-service") {
+      return /* @__PURE__ */ import_react.default.createElement(CustomComponent, { block: customPageData == null ? void 0 : customPageData.block, customComponents: {
+        product_list: /* @__PURE__ */ import_react.default.createElement(Com2, { onChange: setParams, params, ref: stepRef })
+      } });
+    } else {
+      return /* @__PURE__ */ import_react.default.createElement(Com2, { onChange: setParams, params, ref: stepRef });
+    }
+  }, [(_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.key]);
   (0, import_react.useEffect)(() => {
     var _a2, _b2;
     if ((0, import_utils.isMobile)()) {
@@ -170,7 +207,7 @@ var Layout = () => {
         content.style.overflowY = "auto";
       }
     }
-  }, [(_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.key]);
+  }, [(_d = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _d.key]);
   const isShowCartCom = (0, import_react.useMemo)(() => {
     var _a2;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
@@ -182,14 +219,14 @@ var Layout = () => {
       var _a3, _b2;
       return (_b2 = (_a3 = stepRef == null ? void 0 : stepRef.current) == null ? void 0 : _a3.next) == null ? void 0 : _b2.call(_a3);
     } }));
-  }, [isDateSelectedFirst, (_d = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _d.key]);
+  }, [isDateSelectedFirst, (_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key]);
   const isFooter = (0, import_react.useMemo)(() => {
     var _a2;
     if (!(0, import_utils.isMobile)()) return false;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     if (isDateSelectedFirst && key === "select-date") return false;
     return key !== "confirm-information";
-  }, [isDateSelectedFirst, (_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key]);
+  }, [isDateSelectedFirst, (_f = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _f.key]);
   const depositProtocolRequest = (id) => {
     var _a2;
     return (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.getProtocol) == null ? void 0 : _a2.call(appointmentBooking, id);

package/lib/components/appointmentBooking/components/Services/index.js

@@ -166,12 +166,17 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
     }
     return (productListBlock == null ? void 0 : productListBlock.setting) || {};
   }, [context]);
+  const _isMobile = (0, import_react.useMemo)(() => {
+    if (typeof import_utils.isMobile === "function") return (0, import_utils.isMobile)();
+    return import_utils.isMobile;
+  }, import_utils.isMobile);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-service-wrap" }, /* @__PURE__ */ import_react.default.createElement(
     import_productSelect.default,
     {
       dataSource: products,
       onChange: handleSelectProduct,
-      scrollDom: (0, import_utils.isMobile)() ? ".parallel-content-wrap" : ".parallel-booking-wrap",
+      scrollDom: _isMobile ? ".parallel-content-wrap" : ".parallel-booking-wrap",
+      offsetDom: _isMobile ? "" : ".pisell-section-headers",
       loading: productLoading,
       emptyDescription: import_utils.locales.getText(
         "pisell2.appointment.booking.empty.service"

package/lib/components/appointmentBooking/components/Voucher/index.js

@@ -41,7 +41,6 @@ var import_utils = require("@pisell/utils");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_materials = require("@pisell/materials");
 var import_hooks = require("../../hooks");
-var import_utils2 = require("../../utils");
 var import_voucher = require("../../../booking/components/voucher/index.less");
 var import_index = require("./index.less");
 var ShopDiscountHooks = {
@@ -154,16 +153,6 @@ var VoucherCard = (props) => {
           if (!action) return;
           openLoginModal({
             callback: (status) => {
-              var _a2, _b2, _c;
-              const user = (_c = (_b2 = (_a2 = utils.store) == null ? void 0 : _a2.getState()) == null ? void 0 : _b2.global) == null ? void 0 : _c.userInfo;
-              const currentUser2 = (0, import_utils2.formatCustomer)(user);
-              const meAccount = accountLists == null ? void 0 : accountLists.find((d) => !(d == null ? void 0 : d.isGuest));
-              if (status === "success") {
-                appointmentBooking.setLoginAccount(
-                  meAccount == null ? void 0 : meAccount.id,
-                  currentUser2
-                );
-              }
             }
           });
         }

package/lib/components/appointmentBooking/hooks.js

@@ -265,23 +265,12 @@ var useAppointmentBookingStep = () => {
       };
       const checkLogin = async () => {
         if (!isLogin) {
-          const accountLists = await appointmentBooking.getAccounts();
+          const { pubsub } = utils;
+          pubsub.once("pisell1.login.success", () => {
+            checkHolder();
+          });
           return openLoginModal({
             callback: (status) => {
-              var _a3;
-              if (status === "success") {
-                if (!isFormSubject) {
-                  const user = JSON.parse(((_a3 = utils == null ? void 0 : utils.storage) == null ? void 0 : _a3.get("customer")) || "{}");
-                  const currentUser = (0, import_utils2.formatCustomer)(user);
-                  const meAccount = accountLists == null ? void 0 : accountLists.find((d) => !(d == null ? void 0 : d.isGuest));
-                  appointmentBooking.setLoginAccount(meAccount == null ? void 0 : meAccount.id, currentUser);
-                } else {
-                  if (!isRetailTemplate) {
-                    getHolders();
-                  }
-                }
-                checkHolder();
-              }
             }
           });
         } else {
@@ -390,7 +379,7 @@ var useAppointmentBookingLogin = () => {
     utils.action({
       type: "pisell1.login",
       data: {
-        type: "plugin"
+        // type: 'plugin'
       },
       callback
     });

package/lib/components/productSelect/components/TabProduct/index.js

@@ -39,7 +39,15 @@ var import_ahooks = require("ahooks");
 var import_utils = require("@pisell/utils");
 var import_tabs = __toESM(require("./tabs"));
 var import_productGroup = __toESM(require("../productGroup"));
-var io = null;
+var getOffsetTopRelativeToScrollContainer = (targetElement, scrollContainer) => {
+  if (!targetElement || !scrollContainer) return 0;
+  if (targetElement === scrollContainer) {
+    return 0;
+  }
+  const targetRect = targetElement.getBoundingClientRect();
+  const containerRect = scrollContainer.getBoundingClientRect();
+  return targetRect.top - containerRect.top + scrollContainer.scrollTop;
+};
 var TabProduct = (props) => {
   const {
     showTab = true,
@@ -48,6 +56,7 @@ var TabProduct = (props) => {
     onChange,
     amountSymbol = "$",
     scrollDom,
+    offsetDom,
     value: currentProductId,
     loading,
     emptyDescription,
@@ -55,6 +64,8 @@ var TabProduct = (props) => {
   } = props;
   const tabsRef = (0, import_react.useRef)();
   const [currentGroupId, setCurrentGroupId] = (0, import_react.useState)(1);
+  const tabLocatingRef = (0, import_react.useRef)(false);
+  const ioRef = (0, import_react.useRef)(null);
   (0, import_react.useEffect)(() => {
     if (list == null ? void 0 : list.length) {
       setCurrentGroupId(list[0].id);
@@ -62,6 +73,9 @@ var TabProduct = (props) => {
         handleObserver();
       });
     }
+    return () => {
+      handleUnobserver();
+    };
   }, [list]);
   const debouncedScroll = (0, import_ahooks.useDebounceFn)(
     (id) => {
@@ -75,18 +89,23 @@ var TabProduct = (props) => {
     const _marginTop = 270;
     const _marginBottom = window.innerHeight - 70 - 200 - 70;
     const _rootMargin = `${_marginTop * -1}px 0px ${_marginBottom * -1}px 0px`;
-    io = new IntersectionObserver(
+    ioRef.current = new IntersectionObserver(
       (entries) => {
-        var _a, _b;
+        var _a;
         const enteringEntries = entries.filter((entry) => entry.isIntersecting);
         if (enteringEntries.length > 0) {
           const topMostEntry = enteringEntries.reduce((top, current) => {
             return current.boundingClientRect.top < top.boundingClientRect.top ? current : top;
           });
-          const [name, id] = (_b = (_a = topMostEntry == null ? void 0 : topMostEntry.target) == null ? void 0 : _a.id) == null ? void 0 : _b.split("-");
-          const newGroupId = Number(id);
-          setCurrentGroupId(newGroupId);
-          debouncedScroll.run(id);
+          const targetId = (_a = topMostEntry == null ? void 0 : topMostEntry.target) == null ? void 0 : _a.id;
+          if (targetId) {
+            const [name, id] = targetId.split("-");
+            const newGroupId = Number(id);
+            if (!tabLocatingRef.current && !isNaN(newGroupId)) {
+              setCurrentGroupId(newGroupId);
+              debouncedScroll.run(id);
+            }
+          }
         }
       },
       {
@@ -94,24 +113,28 @@ var TabProduct = (props) => {
         rootMargin: _rootMargin
       }
     );
-    if (list == null ? void 0 : list.length) {
+    if ((list == null ? void 0 : list.length) && ioRef.current) {
       for (const item of list) {
         const _item = document.querySelector(`#list-${item.id}`);
         if (_item) {
-          io.observe(_item);
+          ioRef.current.observe(_item);
         }
       }
     }
   });
   const handleUnobserver = (0, import_ahooks.useMemoizedFn)(() => {
-    if ((list == null ? void 0 : list.length) && io) {
+    if ((list == null ? void 0 : list.length) && ioRef.current) {
       for (const item of list) {
         const _item = document.querySelector(`#list-${item.id}`);
         if (_item) {
-          io.unobserve(_item);
+          ioRef.current.unobserve(_item);
         }
       }
     }
+    if (ioRef.current) {
+      ioRef.current.disconnect();
+      ioRef.current = null;
+    }
   });
   const renderContent = () => {
     if (loading) {
@@ -126,7 +149,7 @@ var TabProduct = (props) => {
       );
     }
     return list.map((item, i) => {
-      return /* @__PURE__ */ import_react.default.createElement("div", { id: `list-${item.id}`, key: i }, /* @__PURE__ */ import_react.default.createElement(
+      return /* @__PURE__ */ import_react.default.createElement("div", { id: `list-${item.id}`, key: `list-${item.id}` }, /* @__PURE__ */ import_react.default.createElement(
         import_productGroup.default,
         {
           onSelectProduct: onChange,
@@ -148,7 +171,7 @@ var TabProduct = (props) => {
       }
     ), /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-pisell-tabs-content" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton.Button, { active: true, size: "large", shape: "round" })));
   }, []);
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showTab ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-product-select-tabs-wrapper" }, loading ? tabSkeleton : /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showTab && list && list.length > 1 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-product-select-tabs-wrapper" }, loading ? tabSkeleton : /* @__PURE__ */ import_react.default.createElement(
     import_tabs.default,
     {
       ref: tabsRef,
@@ -157,33 +180,47 @@ var TabProduct = (props) => {
       tab: currentGroupId,
       onChange: (e) => {
         var _a;
-        let comWrapper = document.querySelector(
-          ".pisell-product-select-wrapper"
-        );
-        let categoryDom = document.querySelector(
-          ".pisell-product-select-tabs-wrapper"
-        );
-        let wrapperOffsetTop = comWrapper.offsetTop;
-        let top = 0;
-        if (categoryDom) {
-          top = categoryDom.offsetHeight;
-        }
-        const dom = document == null ? void 0 : document.querySelector("#list-" + e);
-        const main = document == null ? void 0 : document.querySelector(scrollDom);
-        if (dom && main) {
-          if (e === ((_a = list[0]) == null ? void 0 : _a.id)) {
-            main.scrollTop = 0;
-          } else {
-            main.scrollTop = dom.offsetTop - top - wrapperOffsetTop;
+        try {
+          const productSelectWrapper = document.querySelector(
+            ".pisell-product-select-wrapper"
+          );
+          const tabsWrapper = document.querySelector(
+            ".pisell-product-select-tabs-wrapper"
+          );
+          let tabsHeight = 0;
+          if (tabsWrapper) {
+            tabsHeight = tabsWrapper.offsetHeight;
+          }
+          const targetListElement = document == null ? void 0 : document.querySelector("#list-" + e);
+          const scrollContainer = scrollDom ? document == null ? void 0 : document.querySelector(scrollDom) : null;
+          const offsetElement = offsetDom ? document == null ? void 0 : document.querySelector(offsetDom) : null;
+          const extraOffset = offsetElement ? offsetElement.clientHeight : 0;
+          handleUnobserver();
+          tabLocatingRef.current = true;
+          if (targetListElement && scrollContainer) {
+            if (e === ((_a = list[0]) == null ? void 0 : _a.id)) {
+              if (productSelectWrapper) {
+                const wrapperOffsetTop = getOffsetTopRelativeToScrollContainer(productSelectWrapper, scrollContainer);
+                scrollContainer.scrollTop = wrapperOffsetTop - extraOffset;
+              }
+            } else {
+              const listOffsetTop = getOffsetTopRelativeToScrollContainer(targetListElement, scrollContainer);
+              scrollContainer.scrollTop = listOffsetTop - tabsHeight - extraOffset;
+            }
           }
+          setCurrentGroupId(e);
+          debouncedScroll.run(e);
+          setTimeout(() => {
+            tabLocatingRef.current = false;
+            handleObserver();
+          }, 500);
+        } catch (error) {
+          console.error("Tab onChange error:", error);
+          tabLocatingRef.current = false;
+          setCurrentGroupId(e);
         }
-        handleUnobserver();
-        setCurrentGroupId(e);
-        setTimeout(() => {
-          handleObserver();
-        }, 1e3);
       }
     }
-  )) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-product-select-product-list" }, renderContent()));
+  )) : /* @__PURE__ */ import_react.default.createElement("p", null, /* @__PURE__ */ import_react.default.createElement("br", null)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-product-select-product-list" }, renderContent()));
 };
 var TabProduct_default = TabProduct;

package/lib/components/productSelect/components/TabProduct/tabs/index.less

@@ -107,6 +107,7 @@
         text-overflow: ellipsis;
         overflow: hidden;
         white-space: nowrap;
+        user-select: none;
       }
 
       &:hover {

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

@@ -14,6 +14,8 @@ interface ProductSelectProps {
     value?: number;
     loading?: boolean;
     scrollDom?: string;
+    /** 某些设置了固定头部的情况 */
+    offsetDom?: string;
     style?: React.CSSProperties;
     emptyDescription?: string;
     token?: Partial<ProductSelectToken>;