@pisell/private-materials 3.4.126 → 3.4.128

package/es/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/es/components/schedules/products/list/index.d.ts

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

package/es/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/es/components/schedules/resources/list/index.d.ts

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

package/es/components/schedules/resources/relationProduct/index.d.ts

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

package/es/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/es/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/es/components/schedules/schedules/index.d.ts

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

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

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

package/es/hooks/usePaymentLogger.d.ts

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

package/es/plus/clientName/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { IClientNameProps } from './type';
 declare const ClientName: ({ className, dataSource, style }: IClientNameProps) => JSX.Element | null;

package/es/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/es/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/es/plus/pisellReservation/PisellReservation.js

@@ -179,7 +179,7 @@ var PREVIEW_HTTP_CLIENT = {
  * {@link PisellVenueWallPage} / {@link PisellReservationTablePage} 通过 props 组合默认行为。
  */
 export var PisellReservationCore = function PisellReservationCore(props) {
-  var _engineCtx$appHelper, _engineCtx$engine, _engineCtx$appHelper2, _engineCtx$appHelper3, _app$router, _app$router$getRoutes, _app$history, _app$history$useParam, _engineCtx$appHelper8, _floorMapProp$mode, _scroll$autoCalc, _scroll;
+  var _engineCtx$appHelper, _engineCtx$engine, _engineCtx$appHelper2, _engineCtx$appHelper3, _app$router, _app$router$getRoutes, _app$history, _app$history$useParam, _engineCtx$appHelper8, _floorMapProp$floorMa2, _floorMapProp$mode, _scroll$autoCalc, _scroll;
   var _props$gridDataSource = props.gridDataSourceKey,
     gridDataSourceKey = _props$gridDataSource === void 0 ? GRID_DS_KEY : _props$gridDataSource,
     dataSourcesProp = props.dataSources,
@@ -252,6 +252,14 @@ export var PisellReservationCore = function PisellReservationCore(props) {
   var router = app === null || app === void 0 || (_app$router = app.router) === null || _app$router === void 0 || (_app$router$getRoutes = _app$router.getRoutes) === null || _app$router$getRoutes === void 0 ? void 0 : _app$router$getRoutes.call(_app$router);
   var params = app === null || app === void 0 || (_app$history = app.history) === null || _app$history === void 0 || (_app$history$useParam = _app$history.useParams) === null || _app$history$useParam === void 0 ? void 0 : _app$history$useParam.call(_app$history);
   var BIZ = reservationBizProp !== null && reservationBizProp !== void 0 ? reservationBizProp : params === null || params === void 0 ? void 0 : params.business_code;
+  /** 路由带 business_code 时等 params 就绪再拉列表，避免无 code 首包 + 有 code 二包 */
+  var gridBookingRouteReady = useMemo(function () {
+    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 || params === void 0 ? void 0 : params.business_code, params]);
 
   /** 路由有 business_code 时，表格/平面图两路 booking 列表请求扁平带上 business_code */
   var bookingListBusinessCodeExtra = useMemo(function () {
@@ -347,10 +355,32 @@ export var PisellReservationCore = function PisellReservationCore(props) {
     return getGridTableBookingSearchParams(operatingDayBoundary, effectiveTimelineRange);
   }, [operatingDayBoundary, effectiveTimelineRange]);
 
+  /**
+   * 等路由 business_code + 营业边界派生完成后再拉 grid 列表。
+   * Strict Mode 首挂载时 `operatingDayBoundary` 常未就绪，立即请求会与重挂载后参数不一致各打一遍。
+   */
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    gridBookingBootstrapReady = _useState2[0],
+    setGridBookingBootstrapReady = _useState2[1];
+  useEffect(function () {
+    if (!isInternalListData || !gridBookingRouteReady) {
+      setGridBookingBootstrapReady(false);
+      return;
+    }
+    var id = window.setTimeout(function () {
+      return setGridBookingBootstrapReady(true);
+    }, 0);
+    return function () {
+      window.clearTimeout(id);
+      setGridBookingBootstrapReady(false);
+    };
+  }, [isInternalListData, gridBookingRouteReady, operatingDayBoundary, effectiveTimelineRange]);
+
   // --- 三套 booking 相关数据：表格列表 / 平面图绑定桌当日列表 / 远程 floor plan ---
 
   var resourceBoardData = usePisellReservationResourceTableData(isInternalListData);
-  var gridBookingData = usePisellReservationBookingData(isInternalListData, {
+  var gridBookingData = usePisellReservationBookingData(isInternalListData && gridBookingRouteReady && gridBookingBootstrapReady, {
     listPageSize: 50,
     getInitialSearchParams: getGridBookingInitialSearchParams,
     extraRequestParams: bookingListBusinessCodeExtra,
@@ -359,16 +389,23 @@ export var PisellReservationCore = function PisellReservationCore(props) {
      * booking 订阅槽或同 URL 请求互 abort，平面图那路 HTTP/推送会被挤掉，表现为 floor map 无预约。
      * 表格只信 HTTP；实时合并以 `floorDayBookingData`（带 form_record_ids）为准。
      */
-    subscribeRealtimePush: true
+    subscribeRealtimePush: true,
+    /**
+     * 表格与平面图并发请求同一 `/shop/schedule/booking`，开启 `abort` 会被后发起的平面图请求
+     * 取消（表现为表格 `req.data` 一直为空、列表不展示）。表格这一路关闭 HTTP abort，
+     * 由 ahooks 自身按调用序丢弃过期响应即可，避免被平面图请求挤掉。
+     */
+    httpAbort: false,
+    requestScopeKey: 'grid-booking'
   });
 
   /** 与 RecordBoard 当前子视图同步，用于资源墙下按所选资源切换 floorDayBooking 的 form_record_ids */
-  var _useState = useState(function () {
+  var _useState3 = useState(function () {
       return readBodyViewFromStorageKey(bodyViewStorageKey);
     }),
-    _useState2 = _slicedToArray(_useState, 2),
-    shellBodyView = _useState2[0],
-    setShellBodyView = _useState2[1];
+    _useState4 = _slicedToArray(_useState3, 2),
+    shellBodyView = _useState4[0],
+    setShellBodyView = _useState4[1];
 
   /** 锁定大屏子视图、显式 prop、或 Segmented 切到「大屏」：强制墙钟跟随且不可关 */
   var wallClockFollowLocked = useMemo(function () {
@@ -456,10 +493,22 @@ export var PisellReservationCore = function PisellReservationCore(props) {
   var getFloorDayBookingInitialSearchParams = useCallback(function () {
     return getDefaultMonitorSearchParams(dayjs(), operatingDayBoundary, effectiveTimelineRange);
   }, [operatingDayBoundary, effectiveTimelineRange]);
-  var floorDayBookingData = usePisellReservationBookingData(floorBookingResourceReady, {
+  /**
+   * 平面图当日列表：等远程 layout / 低代码 sceneElements 就绪后再拉，避免
+   * `form_record_ids: []` 与带 id 的两次重复请求；表格专用页无需此路数据。
+   */
+  var floorDayBookingBindingsReady = useMemo(function () {
+    var _floorMapProp$floorMa;
+    if (lockedBodyView === 'grid') return false;
+    if (floorPlanRemoteId != null) return true;
+    var propScene = floorMapProp === null || floorMapProp === void 0 || (_floorMapProp$floorMa = floorMapProp.floorMapConfig) === null || _floorMapProp$floorMa === void 0 ? void 0 : _floorMapProp$floorMa.sceneElements;
+    return Array.isArray(propScene) && propScene.length > 0;
+  }, [lockedBodyView, floorPlanRemoteId, floorMapProp === null || floorMapProp === void 0 || (_floorMapProp$floorMa2 = floorMapProp.floorMapConfig) === null || _floorMapProp$floorMa2 === void 0 ? void 0 : _floorMapProp$floorMa2.sceneElements]);
+  var floorDayBookingData = usePisellReservationBookingData(floorBookingResourceReady && floorDayBookingBindingsReady, {
     listPageSize: 9999,
     extraRequestParams: floorBookingExtraParams,
-    getInitialSearchParams: getFloorDayBookingInitialSearchParams
+    getInitialSearchParams: getFloorDayBookingInitialSearchParams,
+    requestScopeKey: 'floor-day-booking'
   });
   var _getRelationTables = useRequest(getRelationTables);
   var bookingPerspectiveParams = useMemo(function () {
@@ -692,7 +741,7 @@ export var PisellReservationCore = function PisellReservationCore(props) {
    * - 外部 data + 当前 bodyView 为平面图：把 reservationDate/At 透传给外部 onSearch。
    */
   useEffect(function () {
-    if (isInternalListData && bodyViewRef.current !== 'calendar') {
+    if (isInternalListData && floorDayBookingBindingsReady && bodyViewRef.current !== 'calendar') {
       var d = debouncedSchedule.date;
       floorDayBookingData.patchSearchParams(function (prevParams) {
         return mergeSearchParamsBookingWindow(prevParams, d, operatingDayBoundary, effectiveTimelineRange, dayjs());
@@ -705,7 +754,7 @@ export var PisellReservationCore = function PisellReservationCore(props) {
         reservationAt: debouncedSchedule.at.toISOString()
       }));
     }
-  }, [debouncedSchedule, isInternalListData, floorDayBookingData.patchSearchParams, operatingDayBoundary, effectiveTimelineRange]);
+  }, [debouncedSchedule, isInternalListData, floorDayBookingBindingsReady, floorDayBookingData.patchSearchParams, operatingDayBoundary, effectiveTimelineRange]);
   var handleScheduleChange = useCallback(function (next) {
     if (!wallClockFollowLocked) {
       setFollowWallClock(false);
@@ -724,10 +773,10 @@ export var PisellReservationCore = function PisellReservationCore(props) {
     return _objectSpread(_objectSpread({}, dataSourcesProp), {}, _defineProperty({}, gridDataSourceKey, tables));
   }, [gridDataSourceKey, tables, dataSourcesProp]);
   var isFloorModeControlled = (floorMapProp === null || floorMapProp === void 0 ? void 0 : floorMapProp.mode) !== undefined;
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    mapEditInternal = _useState4[0],
-    setMapEditInternal = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    mapEditInternal = _useState6[0],
+    setMapEditInternal = _useState6[1];
   var effectiveMapMode = (_floorMapProp$mode = floorMapProp === null || floorMapProp === void 0 ? void 0 : floorMapProp.mode) !== null && _floorMapProp$mode !== void 0 ? _floorMapProp$mode : mapEditInternal ? 'edit' : 'read';
   var _useReservationHudDra = useReservationHudDrawer({
       floorMapHudTableDrawer: floorMapHudTableDrawer,
@@ -762,10 +811,10 @@ export var PisellReservationCore = function PisellReservationCore(props) {
     handleHudDrawerFormRecordIdsChange = _useReservationHudDra.handleHudDrawerFormRecordIdsChange,
     reservationFloorMapViewportOverlay = _useReservationHudDra.reservationFloorMapViewportOverlay,
     renderItemByKind = _useReservationHudDra.renderItemByKind;
-  var _useState5 = useState('light'),
-    _useState6 = _slicedToArray(_useState5, 2),
-    floorMapAppearanceMode = _useState6[0],
-    setFloorMapAppearanceMode = _useState6[1];
+  var _useState7 = useState('light'),
+    _useState8 = _slicedToArray(_useState7, 2),
+    floorMapAppearanceMode = _useState8[0],
+    setFloorMapAppearanceMode = _useState8[1];
   var toggleFloorMapAppearanceMode = useCallback(function () {
     setFloorMapAppearanceMode(function (prev) {
       return prev === 'light' ? 'dark' : 'light';

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

@@ -28,8 +28,8 @@ export function loadPicoCodingOpenDataSnapshot(_x, _x2) {
  */
 function _loadPicoCodingOpenDataSnapshot() {
   _loadPicoCodingOpenDataSnapshot = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(engineCtx, BIZ) {
-    var _engineCtx$appHelper, _engineCtx$appHelper$, _engineCtx$appHelper2, _engineCtx$appHelper3;
-    var emptyResult, res, picoCodingOpenData, reservationAssociatedMenuListIds, linkIds, now, products;
+    var _engineCtx$appHelper2, _engineCtx$appHelper3, _engineCtx$appHelper4, _engineCtx$appHelper5;
+    var emptyResult, shopId, res, picoCodingOpenData, reservationAssociatedMenuListIds, linkIds, now, products;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -44,9 +44,17 @@ function _loadPicoCodingOpenDataSnapshot() {
           }
           return _context2.abrupt("return", emptyResult);
         case 3:
-          _context2.next = 5;
+          /** shop_id 取不到时跳过请求，避免拼出 `/open/my-pisell/undefined/setting` 的无效请求 */
+          shopId = engineCtx === null || engineCtx === void 0 || (_engineCtx$appHelper2 = engineCtx.appHelper) === null || _engineCtx$appHelper2 === void 0 || (_engineCtx$appHelper2 = _engineCtx$appHelper2.utils) === null || _engineCtx$appHelper2 === void 0 || (_engineCtx$appHelper3 = _engineCtx$appHelper2.getData) === null || _engineCtx$appHelper3 === void 0 ? void 0 : _engineCtx$appHelper3.call(_engineCtx$appHelper2, 'shop_id');
+          if (!(shopId == null || String(shopId).trim() === '')) {
+            _context2.next = 6;
+            break;
+          }
+          return _context2.abrupt("return", emptyResult);
+        case 6:
+          _context2.next = 8;
           return getPicoCodingOpenData({
-            shop_id: engineCtx === null || engineCtx === void 0 || (_engineCtx$appHelper = engineCtx.appHelper) === null || _engineCtx$appHelper === void 0 || (_engineCtx$appHelper = _engineCtx$appHelper.utils) === null || _engineCtx$appHelper === void 0 || (_engineCtx$appHelper$ = _engineCtx$appHelper.getData) === null || _engineCtx$appHelper$ === void 0 ? void 0 : _engineCtx$appHelper$.call(_engineCtx$appHelper, 'shop_id'),
+            shop_id: String(shopId),
             data: {
               scope: SCOPE,
               section_code: ['reservation', 'fulfillment', 'menu'],
@@ -55,22 +63,22 @@ function _loadPicoCodingOpenDataSnapshot() {
           }, {
             prefix: false,
             headers: {
-              'Tenant-Id': engineCtx === null || engineCtx === void 0 || (_engineCtx$appHelper2 = engineCtx.appHelper) === null || _engineCtx$appHelper2 === void 0 || (_engineCtx$appHelper2 = _engineCtx$appHelper2.utils) === null || _engineCtx$appHelper2 === void 0 || (_engineCtx$appHelper3 = _engineCtx$appHelper2.getData) === null || _engineCtx$appHelper3 === void 0 ? void 0 : _engineCtx$appHelper3.call(_engineCtx$appHelper2, 'tenant_id')
+              'Tenant-Id': engineCtx === null || engineCtx === void 0 || (_engineCtx$appHelper4 = engineCtx.appHelper) === null || _engineCtx$appHelper4 === void 0 || (_engineCtx$appHelper4 = _engineCtx$appHelper4.utils) === null || _engineCtx$appHelper4 === void 0 || (_engineCtx$appHelper5 = _engineCtx$appHelper4.getData) === null || _engineCtx$appHelper5 === void 0 ? void 0 : _engineCtx$appHelper5.call(_engineCtx$appHelper4, 'tenant_id')
             }
           });
-        case 5:
+        case 8:
           res = _context2.sent;
           if (!((res === null || res === void 0 ? void 0 : res.code) !== 200)) {
-            _context2.next = 8;
+            _context2.next = 11;
             break;
           }
           return _context2.abrupt("return", emptyResult);
-        case 8:
+        case 11:
           picoCodingOpenData = res.data;
           reservationAssociatedMenuListIds = mapAssociatedMenusToMenuListIds(picoCodingOpenData);
           linkIds = collectLinkProductIdsFromReservationRules(picoCodingOpenData === null || picoCodingOpenData === void 0 ? void 0 : picoCodingOpenData['fulfillment.enabled_resource_rules']);
           if (!(linkIds.length === 0)) {
-            _context2.next = 13;
+            _context2.next = 16;
             break;
           }
           return _context2.abrupt("return", {
@@ -78,22 +86,22 @@ function _loadPicoCodingOpenDataSnapshot() {
             reservationRuleProduct: null,
             reservationAssociatedMenuListIds: reservationAssociatedMenuListIds
           });
-        case 13:
+        case 16:
           now = dayjs();
-          _context2.next = 16;
+          _context2.next = 19;
           return queryProductsByIds({
             product_ids: linkIds,
             schedule_date: now.format('YYYY-MM-DD'),
             schedule_datetime: now.format('YYYY-MM-DD HH:mm:ss')
           });
-        case 16:
+        case 19:
           products = _context2.sent;
           return _context2.abrupt("return", {
             picoCodingOpenData: picoCodingOpenData,
             reservationRuleProduct: pickFirstDurationProduct(products),
             reservationAssociatedMenuListIds: reservationAssociatedMenuListIds
           });
-        case 18:
+        case 21:
         case "end":
           return _context2.stop();
       }
@@ -102,6 +110,7 @@ function _loadPicoCodingOpenDataSnapshot() {
   return _loadPicoCodingOpenDataSnapshot.apply(this, arguments);
 }
 export function usePicoCodingOpenData(engineCtx, BIZ) {
+  var _engineCtx$appHelper, _engineCtx$appHelper$;
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     picoCodingOpenData = _useState2[0],
@@ -113,7 +122,13 @@ export function usePicoCodingOpenData(engineCtx, BIZ) {
   var reservationAssociatedMenuListIds = useMemo(function () {
     return mapAssociatedMenusToMenuListIds(picoCodingOpenData);
   }, [picoCodingOpenData]);
+
+  /** 原始 shop_id：作为 effect 依赖，从无到有时再触发一次请求（晚到的 shop_id 也能拉到数据） */
+  var shopId = engineCtx === null || engineCtx === void 0 || (_engineCtx$appHelper = engineCtx.appHelper) === null || _engineCtx$appHelper === void 0 || (_engineCtx$appHelper = _engineCtx$appHelper.utils) === null || _engineCtx$appHelper === void 0 || (_engineCtx$appHelper$ = _engineCtx$appHelper.getData) === null || _engineCtx$appHelper$ === void 0 ? void 0 : _engineCtx$appHelper$.call(_engineCtx$appHelper, 'shop_id');
+  var shopIdStr = shopId == null ? '' : String(shopId).trim();
   useEffect(function () {
+    // shop_id 未就绪：跳过本次（就绪后依赖变化会再次进入本 effect）
+    if (!shopIdStr) return;
     var cancelled = false;
     _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var snapshot;
@@ -141,9 +156,9 @@ export function usePicoCodingOpenData(engineCtx, BIZ) {
     return function () {
       cancelled = true;
     };
-    // 与 PisellReservation 旧版一致：仅首 mount 拉取一次（避免 engineCtx 引用抖动重复请求）
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- intentional mount-once
-  }, []);
+    // 依赖 shopIdStr / BIZ（primitive）触发：避免 engineCtx 引用抖动重复请求，又能在 shop_id 晚到时补拉
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [shopIdStr, BIZ]);
   return {
     picoCodingOpenData: picoCodingOpenData,
     reservationRuleProduct: reservationRuleProduct,

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

@@ -52,6 +52,17 @@ export interface UsePisellReservationBookingDataOptions {
      * 平面图合并用 booking 请求可保持默认 `true`。
      */
     subscribeRealtimePush?: boolean;
+    /**
+     * 是否启用 HTTP「同 URL 互 abort」。默认 true。
+     * 表格与平面图两路并发请求同一 `/shop/schedule/booking`，会因同 URL abort 互相取消
+     *（后发起者取消先发起者）。需对表格这一路传 false，保证其 HTTP 结果不被平面图请求挤掉。
+     */
+    httpAbort?: boolean;
+    /**
+     * 同一页面多实例 effect 去重作用域（如 grid / floor-day 两路 booking）。
+     * 不传时按单实例处理。
+     */
+    requestScopeKey?: string;
 }
 /** 内置列表数据 hook 返回结构（booking / resource 页共用） */
 export interface UsePisellReservationBookingDataResult {

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

@@ -24,7 +24,7 @@ import { getRangeBounds, pickReferenceDateContainingNow } from '@pisell/material
 import { boundaryClockFromOperatingDayBoundary } from "../data/reservationOperatingDayRange";
 import { RESERVATION_TIMELINE_BUSINESS_RANGE } from "../reservationConstants";
 import { defaultPaymentStatusKeys } from "../../pisellSalesManagement/config/booking";
-import { formatBookingResult, getBookingList } from "../../pisellSalesGrid/serve";
+import { formatBookingResult, getBookingList, getBookingListRequestCacheKey } from "../../pisellSalesGrid/serve";
 
 /** 避免 `?? []` 每次 render 新数组引用，触发依赖 list 的 effect 死循环 */
 export var EMPTY_RESERVATION_LIST = [];
@@ -134,14 +134,30 @@ export function getGridTableBookingSearchParams(operatingDayBoundary) {
 
 /** 内置列表数据 hook 返回结构（booking / resource 页共用） */
 
+/** 跨 Strict Mode 重挂载：短时间窗内相同来源+参数不重复触发 effect run */
+var BOOKING_HOOK_EFFECT_DEDUP_MS = 500;
+var BOOKING_HOOK_DEDUP_GLOBAL = '__pisellBookingHookEffectDedup_v1';
+function getBookingHookEffectDedup() {
+  var g = globalThis;
+  if (!g[BOOKING_HOOK_DEDUP_GLOBAL]) {
+    g[BOOKING_HOOK_DEDUP_GLOBAL] = new Map();
+  }
+  return g[BOOKING_HOOK_DEDUP_GLOBAL];
+}
 export function usePisellReservationBookingData(enabled, options) {
-  var _options$listPageSize, _options$getInitialSe, _options$subscribeRea, _req$data, _req$data$count, _req$data2;
+  var _options$listPageSize, _options$getInitialSe, _options$subscribeRea, _options$httpAbort, _options$requestScope, _req$data, _req$data$count, _req$data2;
   var listPageSize = (_options$listPageSize = options === null || options === void 0 ? void 0 : options.listPageSize) !== null && _options$listPageSize !== void 0 ? _options$listPageSize : 50;
   var getInitialSearchParams = (_options$getInitialSe = options === null || options === void 0 ? void 0 : options.getInitialSearchParams) !== null && _options$getInitialSe !== void 0 ? _options$getInitialSe : function () {
     return getDefaultMonitorSearchParams(dayjs());
   };
   var extraRequestParams = options === null || options === void 0 ? void 0 : options.extraRequestParams;
   var subscribeRealtimePush = (_options$subscribeRea = options === null || options === void 0 ? void 0 : options.subscribeRealtimePush) !== null && _options$subscribeRea !== void 0 ? _options$subscribeRea : true;
+  var httpAbort = (_options$httpAbort = options === null || options === void 0 ? void 0 : options.httpAbort) !== null && _options$httpAbort !== void 0 ? _options$httpAbort : true;
+  var requestScopeKey = (_options$requestScope = options === null || options === void 0 ? void 0 : options.requestScopeKey) !== null && _options$requestScope !== void 0 ? _options$requestScope : 'booking-list';
+  /** 避免 effect 在相同查询参数下重复发起 HTTP（如 Strict Mode 重挂载、patch 无实质变更） */
+  var lastEffectRequestKeyRef = useRef(null);
+  /** 手动 refresh 时跳过后端短时去重 */
+  var forceNextFetchRef = useRef(false);
   var _useState = useState({
       pageNumber: 1,
       pageSize: listPageSize
@@ -207,21 +223,32 @@ export function usePisellReservationBookingData(enabled, options) {
       num: pagination.pageSize
     });
   }, [searchParams, pagination.pageNumber, pagination.pageSize, extraRequestParams]);
+  var requestParamsKey = useMemo(function () {
+    return getBookingListRequestCacheKey(requestParams, {
+      abort: httpAbort,
+      osServer: true
+    });
+  }, [requestParams, httpAbort]);
   var fetchBookingList = useMemoizedFn( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+      var skipRecentDedup, listOptions;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            skipRecentDedup = forceNextFetchRef.current;
+            forceNextFetchRef.current = false;
+            listOptions = {
+              osServer: true,
+              abort: httpAbort,
+              skipRecentDedup: skipRecentDedup
+            };
             if (subscribeRealtimePush) {
-              _context.next = 2;
+              _context.next = 5;
               break;
             }
-            return _context.abrupt("return", getBookingList(params, {
-              osServer: true
-            }));
-          case 2:
-            return _context.abrupt("return", getBookingList(params, {
-              osServer: true,
+            return _context.abrupt("return", getBookingList(params, listOptions));
+          case 5:
+            return _context.abrupt("return", getBookingList(params, _objectSpread(_objectSpread({}, listOptions), {}, {
               subscriberId: subscriberIdRef.current,
               /**
                * 订阅推送会多次进 callback；若 payload 没有与列表接口一致的 `list` 数组，
@@ -234,7 +261,6 @@ export function usePisellReservationBookingData(enabled, options) {
                */
               callback: function callback(res) {
                 var _res$data;
-                console.log(res, 'res123454321');
                 var payload = (_res$data = res === null || res === void 0 ? void 0 : res.data) !== null && _res$data !== void 0 ? _res$data : res;
                 if (payload == null || !Array.isArray(payload.list)) return;
                 /**
@@ -259,8 +285,8 @@ export function usePisellReservationBookingData(enabled, options) {
                   });
                 });
               }
-            }));
-          case 3:
+            })));
+          case 6:
           case "end":
             return _context.stop();
         }
@@ -273,11 +299,28 @@ export function usePisellReservationBookingData(enabled, options) {
   var req = useRequest(fetchBookingList, {
     manual: true
   });
+  var reqRunRef = useRef(req.run);
+  reqRunRef.current = req.run;
   bookingMutateRef.current = req.mutate;
   useEffect(function () {
-    if (!enabled) return;
-    void req.run(requestParams);
-  }, [enabled, requestParams]);
+    if (!enabled) {
+      lastEffectRequestKeyRef.current = null;
+      return;
+    }
+    var now = Date.now();
+    var bookingHookEffectDedup = getBookingHookEffectDedup();
+    var 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);
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- req.run 引用每轮变，走 ref
+  }, [enabled, requestParamsKey, requestParams, requestScopeKey]);
   var onPageChange = useCallback(function (pageNumber, pageSize) {
     if (pageNumber < 1 || pageSize < 1) return;
     setPagination({
@@ -303,20 +346,28 @@ export function usePisellReservationBookingData(enabled, options) {
   }, [getInitialSearchParams]);
   var patchSearchParams = useCallback(function (updater) {
     setSearchParams(function (prev) {
-      return updater(_objectSpread({}, prev));
-    });
-    setPagination(function (p) {
-      return _objectSpread(_objectSpread({}, p), {}, {
-        pageNumber: 1
+      var next = updater(_objectSpread({}, prev));
+      if (next === prev) return prev;
+      setPagination(function (p) {
+        return p.pageNumber === 1 ? p : _objectSpread(_objectSpread({}, p), {}, {
+          pageNumber: 1
+        });
       });
+      return next;
     });
   }, []);
   var refresh = useCallback(function () {
+    lastEffectRequestKeyRef.current = null;
+    getBookingHookEffectDedup().delete(requestScopeKey);
+    forceNextFetchRef.current = true;
     void req.run(requestParams);
-  }, [req, requestParams]);
+  }, [req, requestParams, requestScopeKey]);
   var refreshAsync = useCallback(function () {
+    lastEffectRequestKeyRef.current = null;
+    getBookingHookEffectDedup().delete(requestScopeKey);
+    forceNextFetchRef.current = true;
     return req.runAsync(requestParams);
-  }, [req, requestParams]);
+  }, [req, requestParams, requestScopeKey]);
 
   /** 接口常返回新的 `[]`，勿直接作依赖否则下游 effect（如 sales 合并）死循环 */
   var rawList = (_req$data = req.data) === null || _req$data === void 0 ? void 0 : _req$data.list;

package/es/plus/pisellSalesGrid/serve.d.ts

@@ -3,6 +3,14 @@ export interface RequestOptions {
     osServer?: boolean;
     subscriberId?: string;
     callback?: (res: any) => void;
+    /**
+     * 是否启用「同 URL 请求互相 abort」。默认 true。
+     * 同一页面有两路并发请求同一 booking URL（如表格 + 平面图）时，需对其中一路传 false，
+     * 避免后发起的请求把先发起的那路 abort 掉（表现为该路 `req.data` 永远为空、列表不展示）。
+     */
+    abort?: boolean;
+    /** 为 true 时跳过后端短时去重缓存（用于手动 refresh） */
+    skipRecentDedup?: boolean;
 }
 /**
  * 获取订单列表（支持 osServer 本地代理）。
@@ -33,6 +41,8 @@ export interface GetBookingListParams {
     [key: string]: any;
 }
 export declare const formatBookingResult: (data: any) => any;
+/** 与 HTTP 去重一致；供 hook effect 比对使用 */
+export declare function getBookingListRequestCacheKey(params: Record<string, any>, options?: Pick<RequestOptions, 'abort' | 'osServer'>): string;
 export declare const getBookingList: (params: Record<string, any>, options?: RequestOptions) => Promise<any>;
 /** 取消订单列表订阅（组件卸载时调用，与 useProducts cleanup 一致） */
 export declare const unsubscribeOrderQuery: (subscriberId: string) => Promise<void>;