@pisell/private-materials 3.4.127 → 3.4.128

package/lib/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface CustomerListProps {
     value: any;

package/lib/components/pisellSelectCustomerModal/RightPanel/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface RightPanelProps {
     value: any;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PopoverProps } from 'antd';
 import { CustomerCardProps } from './CustomerCard';
 import './index.less';

package/lib/components/productExtension/fields/SelectProducts/ProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/lib/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const ProductItemPreview: ({ item, onClick, onRemove, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItemPreview;

package/lib/components/productExtension/fields/SelectProducts/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface valueType {
 }

package/lib/components/productExtension/fields/SelectResourcesTable/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const SelectResourcesTable: ({ value, onChange }: any) => JSX.Element;
 export default SelectResourcesTable;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface ProductExtensionProps {
     onDataChange: any;

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const TabProduct: (props: any) => JSX.Element;
 export default TabProduct;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare type BoolConfigVal = 0 | 1;
 export interface ProductCardConfig {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface RuleSettingProps {
     value: any;

package/lib/components/ruleSetting/ruleBorder/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface RuleSettingProps {
     value: any;

package/lib/components/schedules/calendar/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Calendar: () => JSX.Element;
 export default Calendar;

package/lib/components/schedules/components/ScheduleDetailList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ScheduleItem } from "../../type";
 import "./index.less";
 declare type ScheduleDetailListPropsType = {

package/lib/components/schedules/components/ScheduleList/RenderScheduleItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { ScheduleItem } from '../../../type';
 declare type Item = any;

package/lib/components/schedules/components/ScheduleList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ButtonProps } from 'antd';
 import { ScheduleItem } from '../../type';
 import './index.less';

package/lib/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,11 +68,4 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/MaxParticipantsModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const MaxParticipantsModule: ({ form, value, onChange, useSchedule, isAutoChange, onData, }: {
     form: any;

package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/ResourcesModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const ResourcesModule: ({ product }: {
     product: any;
 }) => JSX.Element;

package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/AddSchedules/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const AddSchedules: ({ value, onChange, drawerContainer, isSelf }: any) => JSX.Element;
 export default AddSchedules;

package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type Value = number[];
 declare const SchedulesModule: ({ value, onChange, drawerContainer, ruleFn, tabKey, previewItemChange, isSelf, isTitle, }: {

package/lib/components/schedules/products/ProductDetailDrawer/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const ProductDetailDrawer: () => JSX.Element;
 export default ProductDetailDrawer;

package/lib/components/schedules/products/list/ProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type Item = any;
 interface ProductItemProps {

package/lib/components/schedules/products/list/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface ProductListProps {
     loading: boolean;

package/lib/components/schedules/resources/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Resources: () => JSX.Element;
 export default Resources;

package/lib/components/schedules/resources/list/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type ResourcesListProps = {
     list: any;

package/lib/components/schedules/schedules/AllSchedules/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ScheduleItem } from '../../type';
 import './index.less';
 declare type AllSchedulesPropsType = {

package/lib/components/schedules/schedules/ScheduleDetailDrawer/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { DrawerProps } from "antd";
 import { ScheduleItem } from "../../type";
 import "./index.less";

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const SchedulesConnect: () => JSX.Element;
 export default SchedulesConnect;

package/lib/components/shoppingCart/components/Cart/Product.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProductProps } from '../../type';
 declare const Product: (props: ProductProps) => JSX.Element;
 export default Product;

package/lib/components/shoppingCart/components/Cart/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Cart: () => JSX.Element;
 export default Cart;

package/lib/components/shoppingCart/hooks/useAddService.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useAddService: (id?: number, type?: string) => JSX.Element | null;
 export default useAddService;

package/lib/components/shoppingCart/hooks/useClearCart.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useClearCart: (key?: number | undefined) => JSX.Element;
 export default useClearCart;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { shoppingCartProps } from './type';
 declare const shoppingCart: ({ onCard, onAction, onChange, onAddProduct, onActiveKey, ...props }: shoppingCartProps) => JSX.Element;
 export default shoppingCart;

package/lib/components/systemSettings/registry/components/DataSourceTreeSelect/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DataSourceType } from './serve';
 /**
  * 过滤项类型定义

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from "antd";
 import "./index.less";
 interface TaxSelectProps {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const index: () => JSX.Element;
 export default index;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const WalletList: (props: any) => JSX.Element;
 export default WalletList;

package/lib/components/workSpaceList/components/Modal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {

package/lib/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './../../index.less';
 declare const Search: () => JSX.Element;
 export default Search;

package/lib/hooks/usePaymentLogger.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface LogData {
     key: string;
     value: any;

package/lib/plus/clinetSearch/Add/BirthdayField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => JSX.Element;
 export default DateSectionCom;

package/lib/plus/clinetSearch/Add/GenderField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const GenderField: (props: any) => JSX.Element;
 export default GenderField;

package/lib/plus/contactInfoModal/ContactInfoContent.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ContactInfoContent: (props: any) => JSX.Element;
 export default ContactInfoContent;

package/lib/plus/orderList/components/HandleActions.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const HandleActions: (props: {
     locales: any;
     __id?: string;

package/lib/plus/orderList/components/QuickFilter.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const QuickFilter: (props: {
     locales: any;
 }) => JSX.Element;

package/lib/plus/orderList/components/Reset.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const Reset: (props: {
     locales: any;
     setValueType: (value: any) => void;

package/lib/plus/orderList/components/Toolbar.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const Toolbar: (props: {
     locales: any;
     clearSelectedData: () => void;

package/lib/plus/pisellReservation/PisellReservation.js

@@ -87,7 +87,7 @@ var PREVIEW_HTTP_CLIENT = {
   custom: async () => ({ data: {} })
 };
 var PisellReservationCore = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
   const {
     gridDataSourceKey = import_reservationConstants.GRID_DS_KEY,
     dataSources: dataSourcesProp,
@@ -156,6 +156,13 @@ var PisellReservationCore = (props) => {
   const router = (_i = (_h = app == null ? void 0 : app.router) == null ? void 0 : _h.getRoutes) == null ? void 0 : _i.call(_h);
   const params = (_k = (_j = app == null ? void 0 : app.history) == null ? void 0 : _j.useParams) == null ? void 0 : _k.call(_j);
   const BIZ = reservationBizProp ?? (params == null ? void 0 : params.business_code);
+  const gridBookingRouteReady = (0, import_react.useMemo)(() => {
+    if (reservationBizProp != null && String(reservationBizProp).trim() !== "") {
+      return true;
+    }
+    if (params == null) return true;
+    return params.business_code != null && String(params.business_code).trim() !== "";
+  }, [reservationBizProp, params == null ? void 0 : params.business_code, params]);
   const bookingListBusinessCodeExtra = (0, import_react.useMemo)(() => {
     const s = BIZ != null && BIZ !== "" ? String(BIZ).trim() : "";
     if (!s) return {};
@@ -254,24 +261,45 @@ var PisellReservationCore = (props) => {
     ),
     [operatingDayBoundary, effectiveTimelineRange]
   );
+  const [gridBookingBootstrapReady, setGridBookingBootstrapReady] = (0, import_react.useState)(false);
+  (0, import_react.useEffect)(() => {
+    if (!isInternalListData || !gridBookingRouteReady) {
+      setGridBookingBootstrapReady(false);
+      return;
+    }
+    const id = window.setTimeout(() => setGridBookingBootstrapReady(true), 0);
+    return () => {
+      window.clearTimeout(id);
+      setGridBookingBootstrapReady(false);
+    };
+  }, [
+    isInternalListData,
+    gridBookingRouteReady,
+    operatingDayBoundary,
+    effectiveTimelineRange
+  ]);
   const resourceBoardData = (0, import_usePisellReservationResourceTableData.usePisellReservationResourceTableData)(isInternalListData);
-  const gridBookingData = (0, import_usePisellReservationBookingData.usePisellReservationBookingData)(isInternalListData, {
-    listPageSize: 50,
-    getInitialSearchParams: getGridBookingInitialSearchParams,
-    extraRequestParams: bookingListBusinessCodeExtra,
-    /**
-     * 必须为 false：与 `floorDayBookingData` 两路并发开 `osServer` 时，宿主侧常共用一个
-     * booking 订阅槽或同 URL 请求互 abort，平面图那路 HTTP/推送会被挤掉，表现为 floor map 无预约。
-     * 表格只信 HTTP；实时合并以 `floorDayBookingData`（带 form_record_ids）为准。
-     */
-    subscribeRealtimePush: true,
-    /**
-     * 表格与平面图并发请求同一 `/shop/schedule/booking`，开启 `abort` 会被后发起的平面图请求
-     * 取消（表现为表格 `req.data` 一直为空、列表不展示）。表格这一路关闭 HTTP abort，
-     * 由 ahooks 自身按调用序丢弃过期响应即可，避免被平面图请求挤掉。
-     */
-    httpAbort: false
-  });
+  const gridBookingData = (0, import_usePisellReservationBookingData.usePisellReservationBookingData)(
+    isInternalListData && gridBookingRouteReady && gridBookingBootstrapReady,
+    {
+      listPageSize: 50,
+      getInitialSearchParams: getGridBookingInitialSearchParams,
+      extraRequestParams: bookingListBusinessCodeExtra,
+      /**
+       * 必须为 false：与 `floorDayBookingData` 两路并发开 `osServer` 时，宿主侧常共用一个
+       * booking 订阅槽或同 URL 请求互 abort，平面图那路 HTTP/推送会被挤掉，表现为 floor map 无预约。
+       * 表格只信 HTTP；实时合并以 `floorDayBookingData`（带 form_record_ids）为准。
+       */
+      subscribeRealtimePush: true,
+      /**
+       * 表格与平面图并发请求同一 `/shop/schedule/booking`，开启 `abort` 会被后发起的平面图请求
+       * 取消（表现为表格 `req.data` 一直为空、列表不展示）。表格这一路关闭 HTTP abort，
+       * 由 ahooks 自身按调用序丢弃过期响应即可，避免被平面图请求挤掉。
+       */
+      httpAbort: false,
+      requestScopeKey: "grid-booking"
+    }
+  );
   const [shellBodyView, setShellBodyView] = (0, import_react.useState)(
     () => (0, import_reservationDataUtils.readBodyViewFromStorageKey)(bodyViewStorageKey)
   );
@@ -355,12 +383,24 @@ var PisellReservationCore = (props) => {
     ),
     [operatingDayBoundary, effectiveTimelineRange]
   );
+  const floorDayBookingBindingsReady = (0, import_react.useMemo)(() => {
+    var _a2;
+    if (lockedBodyView === "grid") return false;
+    if (floorPlanRemoteId != null) return true;
+    const propScene = (_a2 = floorMapProp == null ? void 0 : floorMapProp.floorMapConfig) == null ? void 0 : _a2.sceneElements;
+    return Array.isArray(propScene) && propScene.length > 0;
+  }, [
+    lockedBodyView,
+    floorPlanRemoteId,
+    (_n = floorMapProp == null ? void 0 : floorMapProp.floorMapConfig) == null ? void 0 : _n.sceneElements
+  ]);
   const floorDayBookingData = (0, import_usePisellReservationBookingData.usePisellReservationBookingData)(
-    floorBookingResourceReady,
+    floorBookingResourceReady && floorDayBookingBindingsReady,
     {
       listPageSize: 9999,
       extraRequestParams: floorBookingExtraParams,
-      getInitialSearchParams: getFloorDayBookingInitialSearchParams
+      getInitialSearchParams: getFloorDayBookingInitialSearchParams,
+      requestScopeKey: "floor-day-booking"
     }
   );
   const _getRelationTables = (0, import_ahooks.useRequest)(import_serve.getRelationTables);
@@ -562,7 +602,7 @@ var PisellReservationCore = (props) => {
   });
   (0, import_react.useEffect)(() => {
     var _a2;
-    if (isInternalListData && bodyViewRef.current !== "calendar") {
+    if (isInternalListData && floorDayBookingBindingsReady && bodyViewRef.current !== "calendar") {
       const d = debouncedSchedule.date;
       floorDayBookingData.patchSearchParams(
         (prevParams) => (0, import_reservationDataUtils.mergeSearchParamsBookingWindow)(
@@ -584,6 +624,7 @@ var PisellReservationCore = (props) => {
   }, [
     debouncedSchedule,
     isInternalListData,
+    floorDayBookingBindingsReady,
     floorDayBookingData.patchSearchParams,
     operatingDayBoundary,
     effectiveTimelineRange
@@ -858,7 +899,7 @@ var PisellReservationCore = (props) => {
       scroll: { ...scrollBase, autoCalc: true }
     };
   }, [hudDrawerMobileGrid]);
-  const fillHeight = ((_n = mobileRecordBoardGrid == null ? void 0 : mobileRecordBoardGrid.scroll) == null ? void 0 : _n.autoCalc) ?? true;
+  const fillHeight = ((_o = mobileRecordBoardGrid == null ? void 0 : mobileRecordBoardGrid.scroll) == null ? void 0 : _o.autoCalc) ?? true;
   const reservationResourceWallSlotProps = (0, import_react.useMemo)(
     () => ({
       cards: venueWallCards,

package/lib/plus/pisellReservation/hooks/usePicoCodingOpenData.js

@@ -49,9 +49,11 @@ async function loadPicoCodingOpenDataSnapshot(engineCtx, BIZ) {
     reservationAssociatedMenuListIds: []
   };
   if (!engineCtx || !BIZ) return emptyResult;
+  const shopId = (_c = (_b = (_a = engineCtx == null ? void 0 : engineCtx.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id");
+  if (shopId == null || String(shopId).trim() === "") return emptyResult;
   const res = await (0, import_formResourcePage.getPicoCodingOpenData)(
     {
-      shop_id: (_c = (_b = (_a = engineCtx == null ? void 0 : engineCtx.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id"),
+      shop_id: String(shopId),
       data: {
         scope: SCOPE,
         section_code: ["reservation", "fulfillment", "menu"],
@@ -91,13 +93,17 @@ async function loadPicoCodingOpenDataSnapshot(engineCtx, BIZ) {
   };
 }
 function usePicoCodingOpenData(engineCtx, BIZ) {
+  var _a, _b, _c;
   const [picoCodingOpenData, setPicoCodingOpenData] = (0, import_react.useState)(null);
   const [reservationRuleProduct, setReservationRuleProduct] = (0, import_react.useState)(null);
   const reservationAssociatedMenuListIds = (0, import_react.useMemo)(
     () => (0, import_associatedMenuListIdsFromOpenData.mapAssociatedMenusToMenuListIds)(picoCodingOpenData),
     [picoCodingOpenData]
   );
+  const shopId = (_c = (_b = (_a = engineCtx == null ? void 0 : engineCtx.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id");
+  const shopIdStr = shopId == null ? "" : String(shopId).trim();
   (0, import_react.useEffect)(() => {
+    if (!shopIdStr) return;
     let cancelled = false;
     (async () => {
       const snapshot = await loadPicoCodingOpenDataSnapshot(engineCtx, BIZ);
@@ -108,7 +114,7 @@ function usePicoCodingOpenData(engineCtx, BIZ) {
     return () => {
       cancelled = true;
     };
-  }, []);
+  }, [shopIdStr, BIZ]);
   return {
     picoCodingOpenData,
     reservationRuleProduct,

package/lib/plus/pisellReservation/hooks/usePisellReservationBookingData.d.ts

@@ -58,6 +58,11 @@ export interface UsePisellReservationBookingDataOptions {
      *（后发起者取消先发起者）。需对表格这一路传 false，保证其 HTTP 结果不被平面图请求挤掉。
      */
     httpAbort?: boolean;
+    /**
+     * 同一页面多实例 effect 去重作用域（如 grid / floor-day 两路 booking）。
+     * 不传时按单实例处理。
+     */
+    requestScopeKey?: string;
 }
 /** 内置列表数据 hook 返回结构（booking / resource 页共用） */
 export interface UsePisellReservationBookingDataResult {

package/lib/plus/pisellReservation/hooks/usePisellReservationBookingData.js

@@ -119,6 +119,15 @@ function getGridTableBookingSearchParams(operatingDayBoundary, timelineRange = i
     timelineRange
   );
 }
+var BOOKING_HOOK_EFFECT_DEDUP_MS = 500;
+var BOOKING_HOOK_DEDUP_GLOBAL = "__pisellBookingHookEffectDedup_v1";
+function getBookingHookEffectDedup() {
+  const g = globalThis;
+  if (!g[BOOKING_HOOK_DEDUP_GLOBAL]) {
+    g[BOOKING_HOOK_DEDUP_GLOBAL] = /* @__PURE__ */ new Map();
+  }
+  return g[BOOKING_HOOK_DEDUP_GLOBAL];
+}
 function usePisellReservationBookingData(enabled, options) {
   var _a, _b;
   const listPageSize = (options == null ? void 0 : options.listPageSize) ?? 50;
@@ -126,6 +135,9 @@ function usePisellReservationBookingData(enabled, options) {
   const extraRequestParams = options == null ? void 0 : options.extraRequestParams;
   const subscribeRealtimePush = (options == null ? void 0 : options.subscribeRealtimePush) ?? true;
   const httpAbort = (options == null ? void 0 : options.httpAbort) ?? true;
+  const requestScopeKey = (options == null ? void 0 : options.requestScopeKey) ?? "booking-list";
+  const lastEffectRequestKeyRef = (0, import_react.useRef)(null);
+  const forceNextFetchRef = (0, import_react.useRef)(false);
   const [pagination, setPagination] = (0, import_react.useState)({
     pageNumber: 1,
     pageSize: listPageSize
@@ -167,17 +179,27 @@ function usePisellReservationBookingData(enabled, options) {
     pagination.pageSize,
     extraRequestParams
   ]);
+  const requestParamsKey = (0, import_react.useMemo)(
+    () => (0, import_serve.getBookingListRequestCacheKey)(requestParams, {
+      abort: httpAbort,
+      osServer: true
+    }),
+    [requestParams, httpAbort]
+  );
   const fetchBookingList = (0, import_ahooks.useMemoizedFn)(
     async (params) => {
+      const skipRecentDedup = forceNextFetchRef.current;
+      forceNextFetchRef.current = false;
+      const listOptions = {
+        osServer: true,
+        abort: httpAbort,
+        skipRecentDedup
+      };
       if (!subscribeRealtimePush) {
-        return (0, import_serve.getBookingList)(params, {
-          osServer: true,
-          abort: httpAbort
-        });
+        return (0, import_serve.getBookingList)(params, listOptions);
       }
       return (0, import_serve.getBookingList)(params, {
-        osServer: true,
-        abort: httpAbort,
+        ...listOptions,
         subscriberId: subscriberIdRef.current,
         /**
          * 订阅推送会多次进 callback；若 payload 没有与列表接口一致的 `list` 数组，
@@ -189,7 +211,6 @@ function usePisellReservationBookingData(enabled, options) {
          * 合并成 1 次，显著降低推送密集时的卡顿与画布闪烁。
          */
         callback: (res) => {
-          console.log(res, "res123454321");
           const payload = (res == null ? void 0 : res.data) ?? res;
           if (payload == null || !Array.isArray(payload.list)) return;
           pendingPayloadRef.current = payload;
@@ -208,11 +229,27 @@ function usePisellReservationBookingData(enabled, options) {
     }
   );
   const req = (0, import_ahooks.useRequest)(fetchBookingList, { manual: true });
+  const reqRunRef = (0, import_react.useRef)(req.run);
+  reqRunRef.current = req.run;
   bookingMutateRef.current = req.mutate;
   (0, import_react.useEffect)(() => {
-    if (!enabled) return;
-    void req.run(requestParams);
-  }, [enabled, requestParams]);
+    if (!enabled) {
+      lastEffectRequestKeyRef.current = null;
+      return;
+    }
+    const now = Date.now();
+    const bookingHookEffectDedup = getBookingHookEffectDedup();
+    const crossMountDedup = bookingHookEffectDedup.get(requestScopeKey);
+    if (lastEffectRequestKeyRef.current === requestParamsKey || crossMountDedup && crossMountDedup.key === requestParamsKey && now - crossMountDedup.at < BOOKING_HOOK_EFFECT_DEDUP_MS) {
+      return;
+    }
+    lastEffectRequestKeyRef.current = requestParamsKey;
+    bookingHookEffectDedup.set(requestScopeKey, {
+      key: requestParamsKey,
+      at: now
+    });
+    void reqRunRef.current(requestParams);
+  }, [enabled, requestParamsKey, requestParams, requestScopeKey]);
   const onPageChange = (0, import_react.useCallback)((pageNumber, pageSize) => {
     if (pageNumber < 1 || pageSize < 1) return;
     setPagination({ pageNumber, pageSize });
@@ -227,17 +264,29 @@ function usePisellReservationBookingData(enabled, options) {
   }, [getInitialSearchParams]);
   const patchSearchParams = (0, import_react.useCallback)(
     (updater) => {
-      setSearchParams((prev) => updater({ ...prev }));
-      setPagination((p) => ({ ...p, pageNumber: 1 }));
+      setSearchParams((prev) => {
+        const next = updater({ ...prev });
+        if (next === prev) return prev;
+        setPagination(
+          (p) => p.pageNumber === 1 ? p : { ...p, pageNumber: 1 }
+        );
+        return next;
+      });
     },
     []
   );
   const refresh = (0, import_react.useCallback)(() => {
+    lastEffectRequestKeyRef.current = null;
+    getBookingHookEffectDedup().delete(requestScopeKey);
+    forceNextFetchRef.current = true;
     void req.run(requestParams);
-  }, [req, requestParams]);
+  }, [req, requestParams, requestScopeKey]);
   const refreshAsync = (0, import_react.useCallback)(() => {
+    lastEffectRequestKeyRef.current = null;
+    getBookingHookEffectDedup().delete(requestScopeKey);
+    forceNextFetchRef.current = true;
     return req.runAsync(requestParams);
-  }, [req, requestParams]);
+  }, [req, requestParams, requestScopeKey]);
   const rawList = (_a = req.data) == null ? void 0 : _a.list;
   const data = (0, import_react.useMemo)(() => {
     if (!Array.isArray(rawList) || rawList.length === 0) {