@pisell/private-materials 6.11.218 → 6.11.220

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

@@ -28,7 +28,6 @@ var import_floorMapHostCheckout = require("../floorMap/floorMapHostCheckout");
 var import_calendarAdapter = require("../data/calendarAdapter");
 var import_bookingToReservationTables = require("../data/bookingToReservationTables");
 var import_mapRowToFloorRoomCardData = require("../floorRoomCard/mapRowToFloorRoomCardData");
-var import_reservationTicketBookingHostParams = require("../utils/reservationTicketBookingHostParams");
 function bookingOrderFinancialSig(raw) {
   const order = raw.order;
   const sum = order == null ? void 0 : order.summary;
@@ -116,8 +115,6 @@ function useFloorMapBookingInteraction(options) {
     onFloorMapBookingClick,
     dataSources,
     mergedTableRows,
-    reservationRuleProduct,
-    associated_menu_list_ids,
     reservationBiz,
     resourceSelectMode
   } = options;
@@ -178,7 +175,12 @@ function useFloorMapBookingInteraction(options) {
       const shopId = ((_b = utils == null ? void 0 : utils.getData) == null ? void 0 : _b.call(utils, "shop_id")) ?? ((_g = (_f = (_e = (_d = (_c = utils == null ? void 0 : utils.store) == null ? void 0 : _c.getState) == null ? void 0 : _d.call(_c)) == null ? void 0 : _e.global) == null ? void 0 : _f.globalConfig) == null ? void 0 : _g.id);
       const n = Number(shopId);
       const isLegacyCheckoutShop = Number.isFinite(n) && n === 2155;
-      if (isLegacyCheckoutShop && reservationBiz !== "dine_in") {
+      const recHasBooking = (() => {
+        const rid = rec.id;
+        const bid = rec.booking_id;
+        return rid != null && String(rid).trim() !== "" || bid != null && String(bid).trim() !== "";
+      })();
+      if (isLegacyCheckoutShop && reservationBiz !== "dine_in" && recHasBooking) {
         (_h = utils == null ? void 0 : utils.action) == null ? void 0 : _h.call(utils, {
           type: "pisell1.handleOpenHostCheckoutDrawer",
           data: { item: rec }
@@ -201,7 +203,7 @@ function useFloorMapBookingInteraction(options) {
   );
   const floorMapItemClickBefore = (0, import_react.useCallback)(
     (args) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+      var _a, _b, _c, _d, _e, _f, _g;
       if (args.mode === "edit") return;
       const rowHit = (0, import_reservationCards.findReservationRow)(args.item, args.dataSources);
       if (resourceSelectMode == null ? void 0 : resourceSelectMode.enabled) {
@@ -234,50 +236,24 @@ function useFloorMapBookingInteraction(options) {
         const bid = rec.booking_id;
         return rid != null && String(rid).trim() !== "" || bid != null && String(bid).trim() !== "";
       })();
-      if (!hasValidBooking) {
-        if (!reservationRuleProduct) return;
-        if (!rowHit) return;
-        const createModeConfig = (0, import_reservationTicketBookingHostParams.buildReservationTicketBookingCreateModeConfigForRow)({
-          reservationBiz,
-          associated_menu_list_ids,
-          reservationRuleProduct,
-          row: rowHit
-        });
-        if (!createModeConfig) return;
-        (_f = (_e = (_d = engineCtx == null ? void 0 : engineCtx.appHelper) == null ? void 0 : _d.utils) == null ? void 0 : _e.action) == null ? void 0 : _f.call(_e, {
-          type: "pisell1.handleOpenEditBooking",
-          data: {
-            createModeConfig
-          },
-          callback: () => {
-          }
-        });
-        return;
-      }
       const rowResolved = rowHit ?? {
         id: String(
-          ((_h = (_g = args.item._sceneElement) == null ? void 0 : _g.dataBinding) == null ? void 0 : _h.recordId) ?? "unknown"
+          ((_e = (_d = args.item._sceneElement) == null ? void 0 : _d.dataBinding) == null ? void 0 : _e.recordId) ?? "unknown"
         ),
-        code: ((_i = args.item._sceneElement) == null ? void 0 : _i.name) != null ? String(args.item._sceneElement.name) : "—",
+        code: ((_f = args.item._sceneElement) == null ? void 0 : _f.name) != null ? String(args.item._sceneElement.name) : "—",
         cardStatus: "available"
       };
-      const sceneName = ((_j = args.item._sceneElement) == null ? void 0 : _j.name) != null ? String(args.item._sceneElement.name).trim() : void 0;
+      const sceneName = ((_g = args.item._sceneElement) == null ? void 0 : _g.name) != null ? String(args.item._sceneElement.name).trim() : void 0;
+      const recForDetail = hasValidBooking ? rec : {};
       showBookingDetail({
-        rec,
+        rec: recForDetail,
         rowResolved,
         event: args.event,
         sceneElementName: sceneName,
         floorMapItemId: String(args.item.id)
       });
     },
-    [
-      showBookingDetail,
-      reservationRuleProduct,
-      engineCtx,
-      associated_menu_list_ids,
-      reservationBiz,
-      resourceSelectMode
-    ]
+    [showBookingDetail, resourceSelectMode]
   );
   const openBookingDetailFromRaw = (0, import_react.useCallback)(
     (payload) => {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { RecordBoardResourceWallCardModel, RecordBoardResourceWallLayoutPersist, VenueWallAppearanceTheme } from '@pisell/materials';
 export interface UseReservationResourceWallPersistParams {
     bodyViewStorageKey: string | undefined;
@@ -14,8 +13,8 @@ export interface UseReservationResourceWallPersistParams {
 export declare function useReservationResourceWallPersist({ bodyViewStorageKey, isInternalListData, searchParams, onSearch, venueWallCards, floorDayBookingLoading, }: UseReservationResourceWallPersistParams): {
     venueWallAppearanceTheme: VenueWallAppearanceTheme;
     setVenueWallAppearanceTheme: import("react").Dispatch<import("react").SetStateAction<VenueWallAppearanceTheme>>;
-    venueWallAppearanceMode: "light" | "dark";
-    setVenueWallAppearanceMode: import("react").Dispatch<import("react").SetStateAction<"light" | "dark">>;
+    venueWallAppearanceMode: "dark" | "light";
+    setVenueWallAppearanceMode: import("react").Dispatch<import("react").SetStateAction<"dark" | "light">>;
     venueWallResourceLayout: RecordBoardResourceWallLayoutPersist;
     setVenueWallResourceLayout: import("react").Dispatch<import("react").SetStateAction<RecordBoardResourceWallLayoutPersist>>;
 };

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { ReservationScheduleBandValue } from '@pisell/materials';
 /**
  * @returns `schedule` 绑定日程带 UI；`debouncedSchedule` 绑定 sales / patch / 外部 onSearch。

package/lib/plus/pisellSalesGrid/PisellSalesGrid.js

@@ -254,6 +254,10 @@ var PisellSalesGrid = (props) => {
     };
   }, [searchParams, pagination.pageNumber, pagination.pageSize]);
   const initLoad = (0, import_react.useCallback)(() => {
+    if (propsOnRefresh) {
+      propsOnRefresh();
+      return;
+    }
     if (currentPerspective === "monitor") {
       _getBookingList.run({ ...requestParams, ...(extParams == null ? void 0 : extParams.list) || {} });
       return;
@@ -262,11 +266,12 @@ var PisellSalesGrid = (props) => {
       ...requestParams,
       ...(extParams == null ? void 0 : extParams.list) || {}
     });
-  }, [currentPerspective, requestParams, _getBookingList, _getOrderList]);
+  }, [currentPerspective, requestParams, _getBookingList, _getOrderList, propsOnRefresh]);
   const onClearSelection = (0, import_react.useCallback)(() => {
     setSelectedKeys([]);
     setSelectedRows([]);
-  }, []);
+    propsOnSelectionChange == null ? void 0 : propsOnSelectionChange([], []);
+  }, [propsOnSelectionChange]);
   const actions = (0, import_useActions.default)({
     onRefresh: initLoad,
     onClearSelection

package/lib/plus/pisellSalesManagement/config/booking.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const getBookingStatusMap: () => Record<string, string>;
 export declare const BOOKING_STATUS_COLOR_MAP: Record<string, string>;
 export declare const getBookingPlatformMap: () => Record<string, string>;

package/lib/plus/pisellSalesManagement/hooks/useSalesGridData.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface UseSalesGridDataParams {
     perspective: 'monitor' | 'handle';
     extParams?: {
@@ -25,7 +24,7 @@ export declare function useSalesGridData(params: UseSalesGridDataParams): {
     selectedKeys: import("react").Key[];
     selectedRows: any[];
     onSelectionChange: (keys: React.Key[], rows: any[]) => void;
-    rowKey: "id";
+    rowKey: (record: any) => import("react").Key;
     onRefresh: () => void;
     refreshAsync: () => Promise<any>;
 };

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

@@ -62,6 +62,12 @@ function getDefaultSearchParams(perspective) {
     sort: "created_at:desc"
   };
 }
+function resolveSalesGridRowKey(perspective, record) {
+  if (perspective === "handle") {
+    return (record == null ? void 0 : record.order_id) || (record == null ? void 0 : record.id);
+  }
+  return (record == null ? void 0 : record.id) ?? "";
+}
 function useSalesGridData(params) {
   var _a, _b, _c, _d;
   const { perspective, extParams } = params;
@@ -181,6 +187,10 @@ function useSalesGridData(params) {
   const data = perspective === "monitor" ? ((_a = _getBookingList.data) == null ? void 0 : _a.list) ?? [] : ((_b = _getOrderList.data) == null ? void 0 : _b.list) ?? [];
   const loading = perspective === "monitor" ? _getBookingList.loading : _getOrderList.loading;
   const total = perspective === "monitor" ? ((_c = _getBookingList.data) == null ? void 0 : _c.count) ?? 0 : ((_d = _getOrderList.data) == null ? void 0 : _d.count) ?? 0;
+  const rowKey = (0, import_react.useMemo)(
+    () => (record) => resolveSalesGridRowKey(perspective, record),
+    [perspective]
+  );
   return {
     data,
     loading,
@@ -193,7 +203,7 @@ function useSalesGridData(params) {
     selectedKeys,
     selectedRows,
     onSelectionChange,
-    rowKey: "id",
+    rowKey,
     onRefresh,
     refreshAsync
   };

package/lib/plus/productSelect/ProductCard/SkuCard/components/Action/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { ProductCardConfig } from '../../type';
 declare const Action: ({ props, className, }: {

package/lib/plus/productSelect/ProductCard/SkuCard/components/CardCom/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProductCardConfig } from '../../type';
 import './index.less';
 declare const CardCom: ({ props, className }: {

package/lib/plus/productSelect/ProductCard/SkuCard/components/CardWrapper/index.d.ts

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

package/lib/plus/productSelect/ProductCard/SkuCard/components/Cover/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProductCardConfig } from '../../type';
 import './index.less';
 declare const Cover: ({ props, onClick }: {

package/lib/plus/productSelect/ProductCard/SkuCard/components/Favorite/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { ProductCardConfig } from '../../type';
 declare const Favorite: ({ props }: {

package/lib/plus/productSelect/ProductCard/SkuCard/components/Price/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProductCardConfig } from '../../type';
 import './index.less';
 declare const Price: ({ props }: {

package/lib/plus/productSelect/ProductCard/SkuCard/components/Promotions/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProductCardConfig } from '../../type';
 import './index.less';
 declare const Promotions: ({ props }: {

package/lib/plus/productSelect/ProductCard/SkuCard/components/SubTitle/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProductCardConfig } from '../../type';
 import './index.less';
 declare const SubTitle: ({ props }: {

package/lib/plus/productSelect/ProductCard/SkuCard/components/Tags/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProductCardConfig } from '../../type';
 import './index.less';
 declare const Tags: ({ props }: {

package/lib/plus/productSelect/ProductCard/SkuCard/components/Title/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProductCardConfig } from '../../type';
 import './index.less';
 declare const Title: ({ props }: {

package/lib/plus/productSelect/ProductCard/SkuCard/components/TooltipTags/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { ProductCardConfig } from '../../type';
 declare const TooltipTags: ({ props }: {

package/lib/plus/productSelect/ProductCard/utils.d.ts

@@ -14,7 +14,7 @@ export declare const getSkuCardConfig: (finalConfig: ProductCardConfig) => {
         paddingY: number | undefined;
         paddingX: number | undefined;
         isBorderVisible: boolean;
-        layoutDirection: "row" | "column";
+        layoutDirection: "column" | "row";
     };
     skuActionConfig: {
         isOpen: boolean;

package/lib/plus/skuOptionsSelection/components/NormalCard/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { RenderItemProps } from '../../../../pro/Selector/types';
 declare const NormalCard: (props: RenderItemProps & {
     parentDataSource: any;

package/lib/plus/skuOptionsSelection/components/OptionsCard/OptionItemCard.d.ts

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

package/lib/plus/skuOptionsSelection/components/OptionsModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface OptionsModalProps {
     parentDataSource: any;
     dataSource: any;

package/lib/plus/skuOptionsSelection/components/VariantCard/index.d.ts

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

package/lib/plus/walletEditor/components/ImageUpload/index.d.ts

@@ -3,6 +3,6 @@ export interface ImageUploadProps {
     value?: string;
     onChange?: (val: string) => void;
 }
-export declare const getBaseTime: (size: number) => 2000 | 1000 | 4000 | 8000;
+export declare const getBaseTime: (size: number) => 1000 | 2000 | 4000 | 8000;
 declare const ImageUpload: React.FC<ImageUploadProps>;
 export default ImageUpload;

package/lib/plus/walletPassGallery/components/passDetail/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface PassDetailProps {
     dataSource?: any | null;

package/lib/plus/walletPassGallery/components/passList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface IPassListProps {
     dataSource: any[];
     value?: string | number;

package/lib/plus/walletPassGallery/components/timelineSection/index.d.ts

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

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

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

package/lib/pro/Selector/Selector.d.ts

@@ -3,7 +3,7 @@ import { ItemLayout, ItemProps, PresetConfig, SelectorProps, SelectorVariant } f
 import './selector.less';
 export declare const SelectorContext: React.Context<{
     disabled?: boolean | undefined;
-    mode?: "multiple" | "single" | undefined;
+    mode?: "single" | "multiple" | undefined;
     itemLayout?: ItemLayout | undefined;
     valueType?: "object" | "primitive" | undefined;
     variant?: SelectorVariant | undefined;

package/lib/pro/pisellPaymentList/example.d.ts

@@ -4,7 +4,6 @@
  * 这个文件演示了如何使用 PisellPaymentList 和 PisellPaymentListItem 组件
  * 包括如何通过 Context 访问父组件配置
  */
-/// <reference types="react" />
 export declare const BasicExample: () => JSX.Element;
 export declare const ChildrenExample: () => JSX.Element;
 export declare const CustomItemExample: () => JSX.Element;

package/lib/pro/priceKeyboard/components/cashKeyboard/CashKeyboardIntact.d.ts

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

package/lib/pro/skuDetailModal/components/weighing/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { TareOption, WeighingMode, WeighingProps, WeighingValue } from './types';
 import './index.less';
 export type { TareOption, WeighingMode, WeighingValue, WeighingProps };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.218",
+  "version": "6.11.220",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -68,9 +68,9 @@
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
     "@pisell/utils": "3.0.2",
+    "@pisell/materials": "6.11.71",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.8",
-    "@pisell/materials": "6.11.71"
+    "@pisell/date-picker": "3.0.8"
   },
   "peerDependencies": {
     "react": "^18.0.0",