@pisell/private-materials 3.4.126 → 3.4.128

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/resources/relationProduct/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const RelationProduct: ({ value, onChange, }: {
     value?: 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/taxSelect/index.d.ts

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

package/lib/hooks/usePaymentLogger.d.ts

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

package/lib/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/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/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,18 +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
-  });
+  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)
   );
@@ -349,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);
@@ -556,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)(
@@ -578,6 +624,7 @@ var PisellReservationCore = (props) => {
   }, [
     debouncedSchedule,
     isInternalListData,
+    floorDayBookingBindingsReady,
     floorDayBookingData.patchSearchParams,
     operatingDayBoundary,
     effectiveTimelineRange
@@ -852,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

@@ -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/lib/plus/pisellReservation/hooks/usePisellReservationBookingData.js

@@ -119,12 +119,25 @@ 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;
   const getInitialSearchParams = (options == null ? void 0 : options.getInitialSearchParams) ?? (() => getDefaultMonitorSearchParams((0, import_dayjs.default)()));
   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
@@ -166,15 +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
-        });
+        return (0, import_serve.getBookingList)(params, listOptions);
       }
       return (0, import_serve.getBookingList)(params, {
-        osServer: true,
+        ...listOptions,
         subscriberId: subscriberIdRef.current,
         /**
          * 订阅推送会多次进 callback；若 payload 没有与列表接口一致的 `list` 数组，
@@ -186,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;
@@ -205,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 });
@@ -224,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) {

package/lib/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>;

package/lib/plus/pisellSalesGrid/serve.js

@@ -31,12 +31,14 @@ var serve_exports = {};
 __export(serve_exports, {
   formatBookingResult: () => formatBookingResult,
   getBookingList: () => getBookingList,
+  getBookingListRequestCacheKey: () => getBookingListRequestCacheKey,
   getOrderList: () => getOrderList,
   unsubscribeBookingQuery: () => unsubscribeBookingQuery,
   unsubscribeOrderQuery: () => unsubscribeOrderQuery
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../utils");
+var import_utils2 = require("@pisell/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var formatParams = (params) => {
   const { orderDate, total_amount, sort: sort_key, ...rest } = params;
@@ -172,16 +174,54 @@ var formatBookingResult = (data) => {
     list: formatBookingData((data == null ? void 0 : data.list) || [])
   };
 };
-var getBookingList = async (params, options) => {
-  const { data } = await import_utils.request.getRequest().get(`/shop/schedule/booking`, formatBookingParams(params), {
-    abort: true,
-    fullResult: true,
-    isShopApi: true,
-    ...options
+var BOOKING_LIST_RECENT_DEDUP_MS = 500;
+var BOOKING_LIST_CACHE_GLOBAL = "__pisellBookingListRecentCache_v1";
+function getBookingListRecentCache() {
+  const g = globalThis;
+  if (!g[BOOKING_LIST_CACHE_GLOBAL]) {
+    g[BOOKING_LIST_CACHE_GLOBAL] = /* @__PURE__ */ new Map();
+  }
+  return g[BOOKING_LIST_CACHE_GLOBAL];
+}
+function getBookingListRequestCacheKey(params, options) {
+  return JSON.stringify({
+    query: formatBookingParams(params),
+    abort: (options == null ? void 0 : options.abort) ?? true,
+    osServer: Boolean(options == null ? void 0 : options.osServer)
   });
-  return formatBookingResult(normalizeListPayload(data));
+}
+function bookingListRequestCacheKey(params, options) {
+  return getBookingListRequestCacheKey(params, options);
+}
+var getBookingList = async (params, options) => {
+  const cacheKey = bookingListRequestCacheKey(params, options);
+  const now = Date.now();
+  const bookingListRecentCache = getBookingListRecentCache();
+  if (!(options == null ? void 0 : options.skipRecentDedup)) {
+    const cached = bookingListRecentCache.get(cacheKey);
+    if (cached && now - cached.at < BOOKING_LIST_RECENT_DEDUP_MS) {
+      return cached.promise;
+    }
+  }
+  const promise = (async () => {
+    const { data } = await import_utils.request.getRequest().get(`/shop/schedule/booking`, formatBookingParams(params), {
+      abort: true,
+      fullResult: true,
+      isShopApi: true,
+      ...options
+    });
+    return formatBookingResult(normalizeListPayload(data));
+  })();
+  bookingListRecentCache.set(cacheKey, { promise, at: now });
+  try {
+    return await promise;
+  } catch (err) {
+    bookingListRecentCache.delete(cacheKey);
+    throw err;
+  }
 };
 var unsubscribeOrderQuery = async (subscriberId) => {
+  if (!(0, import_utils2.isWebposOsServerEnv)()) return;
   await import_utils.request.getRequest().post(
     "/shop/order/v2/list/unsubscribe",
     { subscriberId },
@@ -192,6 +232,7 @@ var unsubscribeOrderQuery = async (subscriberId) => {
   );
 };
 var unsubscribeBookingQuery = async (subscriberId) => {
+  if (!(0, import_utils2.isWebposOsServerEnv)()) return;
   await import_utils.request.getRequest().get(
     "/shop/schedule/booking/unsubscribe",
     { subscriberId },
@@ -205,6 +246,7 @@ var unsubscribeBookingQuery = async (subscriberId) => {
 0 && (module.exports = {
   formatBookingResult,
   getBookingList,
+  getBookingListRequestCacheKey,
   getOrderList,
   unsubscribeBookingQuery,
   unsubscribeOrderQuery

package/lib/plus/pisellSalesManagement/hooks/useSalesGridData.js

@@ -82,6 +82,7 @@ function useSalesGridData(params) {
   const [selectedRows, setSelectedRows] = (0, import_react.useState)([]);
   const orderSubscriberIdRef = (0, import_react.useRef)((0, import_utils.getUniqueId)());
   const bookingSubscriberIdRef = (0, import_react.useRef)((0, import_utils.getUniqueId)());
+  const prevPerspectiveRef = (0, import_react.useRef)(null);
   const orderMutateRef = (0, import_react.useRef)(null);
   const bookingMutateRef = (0, import_react.useRef)(null);
   const requestParams = (0, import_react.useMemo)(() => {
@@ -183,6 +184,9 @@ function useSalesGridData(params) {
     return _getOrderList.runAsync(runListParams);
   }, [perspective, runListParams, _getBookingList, _getOrderList]);
   (0, import_react.useEffect)(() => {
+    const prev = prevPerspectiveRef.current;
+    prevPerspectiveRef.current = perspective;
+    if (prev == null || prev === perspective) return;
     if (perspective === "monitor") {
       void (0, import_serve.unsubscribeOrderQuery)(orderSubscriberIdRef.current);
       return;

package/lib/plus/saasCreateOrganization/components/Header.d.ts

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

package/lib/plus/saasCreateOrganization/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SCOProps } from './types';
 import './index.less';
 declare const SaasCreateOrganization: (props: SCOProps) => JSX.Element;

package/lib/plus/saasDevice/devicePlanning/locales/en.d.ts

@@ -166,6 +166,8 @@ declare const enText: {
     'pisell2.saas.device-planning.detail.report.field.name': string;
     'pisell2.saas.device-planning.detail.report.field.type': string;
     'pisell2.saas.device-planning.detail.report.field.version': string;
+    'pisell2.saas.device-planning.detail.report.field.resource_type': string;
+    'pisell2.saas.device-planning.detail.report.field.resource_version': string;
     'pisell2.saas.device-planning.detail.report.field.level': string;
     'pisell2.saas.device-planning.detail.report.field.ssid': string;
     'pisell2.saas.device-planning.detail.report.field.gateway': string;
@@ -176,6 +178,8 @@ declare const enText: {
     'pisell2.saas.device-planning.detail.report.field.os_version': string;
     'pisell2.saas.device-planning.detail.report.field.used': string;
     'pisell2.saas.device-planning.detail.report.field.total': string;
+    'pisell2.saas.device-planning.detail.report.resource-type.builtin': string;
+    'pisell2.saas.device-planning.detail.report.resource-type.bundle': string;
     'pisell2.saas.device-planning.detail.report.charging': string;
     'pisell2.saas.device-planning.detail.report.not-charging': string;
     'pisell2.saas.device-planning.edit.title': string;

package/lib/plus/saasDevice/devicePlanning/locales/en.js

@@ -190,6 +190,8 @@ var enText = {
   "pisell2.saas.device-planning.detail.report.field.name": "Name",
   "pisell2.saas.device-planning.detail.report.field.type": "Type",
   "pisell2.saas.device-planning.detail.report.field.version": "Version",
+  "pisell2.saas.device-planning.detail.report.field.resource_type": "Resource Type",
+  "pisell2.saas.device-planning.detail.report.field.resource_version": "Resource Version",
   "pisell2.saas.device-planning.detail.report.field.level": "Battery Level",
   "pisell2.saas.device-planning.detail.report.field.ssid": "SSID",
   "pisell2.saas.device-planning.detail.report.field.gateway": "Gateway",
@@ -200,6 +202,8 @@ var enText = {
   "pisell2.saas.device-planning.detail.report.field.os_version": "OS Version",
   "pisell2.saas.device-planning.detail.report.field.used": "Used",
   "pisell2.saas.device-planning.detail.report.field.total": "Total",
+  "pisell2.saas.device-planning.detail.report.resource-type.builtin": "Built-in",
+  "pisell2.saas.device-planning.detail.report.resource-type.bundle": "Hot Update",
   "pisell2.saas.device-planning.detail.report.charging": "Charging",
   "pisell2.saas.device-planning.detail.report.not-charging": "Not Charging",
   "pisell2.saas.device-planning.edit.title": "Edit Device",