@pisell/private-materials 6.11.140 → 6.11.142

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

@@ -64,6 +64,17 @@ function buildResourcePayloadFromRow(row) {
     ]
   };
 }
+function buildInitialExtendCapacityFromRuleProduct(product) {
+  const capacitys = product == null ? void 0 : product.capacity;
+  if ((capacitys == null ? void 0 : capacitys.type) !== "custom" || !Array.isArray(capacitys.custom)) {
+    return [];
+  }
+  return capacitys.custom.map((d) => ({
+    id: d.id,
+    value: d.min || 1,
+    name: d.name
+  }));
+}
 function buildServiceItemFromRuleProduct(product, resource) {
   var _a;
   const duration = Number((_a = product == null ? void 0 : product.duration) == null ? void 0 : _a.value) || 0;
@@ -82,7 +93,7 @@ function buildServiceItemFromRuleProduct(product, resource) {
     cover,
     duration,
     _extend: {
-      capacity: [],
+      capacity: buildInitialExtendCapacityFromRuleProduct(product),
       duration,
       price,
       total: price,
@@ -112,7 +123,8 @@ function useFloorMapBookingInteraction(options) {
     onFloorMapBookingClick,
     dataSources,
     reservationRuleProduct,
-    associated_menu_list_ids
+    associated_menu_list_ids,
+    reservationBiz
   } = options;
   const [bookingDetailOpen, setBookingDetailOpen] = (0, import_react.useState)(false);
   const [bookingDetailRaw, setBookingDetailRaw] = (0, import_react.useState)(null);
@@ -149,7 +161,7 @@ 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) {
+      if (isLegacyCheckoutShop && reservationBiz !== "dine_in") {
         (_h = utils == null ? void 0 : utils.action) == null ? void 0 : _h.call(utils, {
           type: "pisell1.handleOpenHostCheckoutDrawer",
           data: { item: rec }
@@ -180,27 +192,33 @@ function useFloorMapBookingInteraction(options) {
       if (!hasValidBooking) {
         if (!reservationRuleProduct) return;
         if (!rowHit) return;
-        const resourcePayload = buildResourcePayloadFromRow(rowHit);
-        const serviceItem = buildServiceItemFromRuleProduct(
-          reservationRuleProduct,
-          resourcePayload
-        );
+        if (!reservationBiz) return;
         const menuIds = (associated_menu_list_ids == null ? void 0 : associated_menu_list_ids.filter(
           (id) => typeof id === "number" && Number.isFinite(id) && id > 0
         )) ?? [];
+        const createModeConfig = {
+          bookingConfigParams: {
+            item_type: "appointment_booking",
+            sub_type: "ticket"
+          },
+          businessCode: reservationBiz,
+          ...menuIds.length > 0 ? { associated_menu_list_ids: menuIds } : {}
+        };
+        if (reservationBiz === "dine_in") {
+          const resourcePayload = buildResourcePayloadFromRow(rowHit);
+          const serviceItem = buildServiceItemFromRuleProduct(
+            reservationRuleProduct,
+            resourcePayload
+          );
+          createModeConfig.initialModalState = {
+            service: { value: [serviceItem], edit: true },
+            appointment_status: "started"
+          };
+        }
         (_c = (_b = (_a = engineCtx == null ? void 0 : engineCtx.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.action) == null ? void 0 : _c.call(_b, {
           type: "pisell1.handleOpenEditBooking",
           data: {
-            createModeConfig: {
-              bookingConfigParams: {
-                item_type: "appointment_booking",
-                sub_type: "ticket"
-              },
-              initialModalState: {
-                service: { value: [serviceItem], edit: true }
-              },
-              ...menuIds.length > 0 ? { associated_menu_list_ids: menuIds } : {}
-            }
+            createModeConfig
           },
           callback: () => {
           }
@@ -222,7 +240,13 @@ function useFloorMapBookingInteraction(options) {
         sceneElementName: sceneName
       });
     },
-    [showBookingDetail, reservationRuleProduct, engineCtx, associated_menu_list_ids]
+    [
+      showBookingDetail,
+      reservationRuleProduct,
+      engineCtx,
+      associated_menu_list_ids,
+      reservationBiz
+    ]
   );
   const openBookingDetailFromRaw = (0, import_react.useCallback)(
     (payload) => {

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

@@ -162,6 +162,7 @@ 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;
           if (payload.list.length === 0) return;

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

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

package/lib/plus/pisellSalesManagement/components/BookingFormsPreview.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare type BookingFormsPreviewProps = {
     value?: any;
     uniqueTables?: any[];

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

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

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

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

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

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

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

@@ -3,5 +3,5 @@ import { ProductCardConfig } from '../../type';
 import './index.less';
 declare const MemberPrice: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | JSX.Element | null;
 export default MemberPrice;

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

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

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

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

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

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

package/lib/plus/saasAttendance/settings/components/membersField/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const MembersField: (props: {
     id?: string | undefined;

package/lib/plus/saasRegister/components/VertifyEmail.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../index.less';
 declare const VertifyEmail: (props: {
     email: string;

package/lib/plus/selectHolder/components/ErrorTip/index.d.ts

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

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

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

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

@@ -1,6 +1,7 @@
 /**
  * 单规格商品卡片，点击后需要拉起弹窗展示具体的规格信息
  */
+/// <reference types="react" />
 import { RenderItemProps } from '../../../../pro/Selector/types';
 import './index.less';
 declare const OptionsCard: (props: RenderItemProps & {

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

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

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

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

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

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

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

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

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

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

package/lib/pro/pisellPhoneKeyboard/index.d.ts

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

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

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CashKeyboardBaseProps } from './types';
 export interface CashKeyboardProps extends CashKeyboardBaseProps {
     containerProps?: {

package/lib/pro/priceKeyboard/components/paymentKeyboard/index.d.ts

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

package/lib/pro/priceKeyboard/hooks/rightItems.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.140",
+  "version": "6.11.142",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -67,8 +67,8 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
+    "@pisell/materials": "6.11.45",
     "@pisell/utils": "3.0.2",
-    "@pisell/materials": "6.11.44",
     "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.8"
   },

package/es/components/booking/info/service2/Group/utils.d.ts

@@ -1,14 +0,0 @@
-export declare const getGroupTotalPrice: (items: any[]) => any;
-/**
- * @title: 创建一个虚拟的组
- * @description:
- * @param {any} items
- * @return {*}
- * @Author: zhiwei.Wang
- */
-export declare const concatBookings: (items: any[]) => any;
-export declare const createBookingItemsByGroup: (item: any, isBatchEdit?: any) => any[];
-export declare const isGroupBooking: (_id: any) => boolean;
-export declare const getProductByGroupId: (groupId: string, items: any[]) => any[];
-export declare const getGroupBooking: (groupId: string, items: any[]) => any;
-export declare const filterItemByGroupId: (groupId: string, items: any[]) => any[];

package/es/plus/pisellReservation/components/BucketButtonGroup.d.ts

@@ -1,33 +0,0 @@
-/// <reference types="react" />
-import './BucketButtonGroup.less';
-/**
- * 通用「桶 → 底层 key 数组」按钮组，HUD 抽屉里的支付状态 / 预约状态快筛都走这个组件。
- *
- * 设计动机：
- *   - 业务方在抽屉里只关心少量"业务桶"（如未支付 / 已支付 / 在场），但底层枚举更细
- *     （`partially_paid` / `payment_processing` / `arrived` / `started` …）；
- *   - 直接渲染所有底层 key 会有 7+ 个按钮把抽屉撑爆，且语义不连贯；
- *   - 桶 → 底层 key 多对一映射在前端组件里完成，写入 `searchParams.filter.values.<field>`
- *     仍是底层 key 数组，与 Filter modal 的 multi-select / 后端查询参数完全兼容。
- *
- * "选中"判定：桶 keys 任一在 value 中即视为选中（容忍历史/边角态 key）。
- * "切换"行为：选中 → 剔除该桶所有 key；未选中 → 加入该桶所有 key（保留 value 中已有非桶 key）。
- */
-export interface BucketDef {
-    /** 桶唯一 id，仅用于 React key */
-    id: string;
-    /** 按钮文案（已经过国际化） */
-    label: string;
-    /** 该桶承载的底层 enum key 集合 */
-    keys: string[];
-}
-export interface BucketButtonGroupProps {
-    /** 由外层 Form 注入：底层 key 数组 */
-    value?: string[];
-    /** 由外层 Form 注入：底层 key 数组变更回调 */
-    onChange?: (v: string[]) => void;
-    /** 桶定义，按 UI 顺序 */
-    buckets: BucketDef[];
-}
-export declare function BucketButtonGroup(props: BucketButtonGroupProps): JSX.Element;
-export default BucketButtonGroup;

package/es/plus/pisellReservation/components/ReservationBookingStatusButtonFilter.d.ts

@@ -1,21 +0,0 @@
-/// <reference types="react" />
-/**
- * HUD 抽屉里的「预约状态」快筛桶配置：
- *
- *   - **未到店 / no show**：`no_show`
- *   - **已完成 / completed**：`completed`
- *   - **在场 / on site**：`arrived` + `started`
- *     - 业务侧「客人已到 → 在场」的语义合并，无需让用户记住 `arrived` / `started` 两态差异。
- *
- * 写入 `searchParams.filter.values.appointment_status` 仍是底层 enum 数组，
- * 与 hudDrawerLocalListQuery / Filter modal multi-select 形态完全兼容。
- *
- * **不入桶**：`new` / `confirmed` / `cancelled` —— 抽屉聚焦"当下进行 / 历史结算"两类需要立即关注的状态，
- * 待确认 / 已取消属于"前置 / 终止"态，业务侧不在抽屉桶内暴露；如需要细查走 Filter modal 不影响。
- */
-export interface ReservationBookingStatusButtonFilterProps {
-    value?: string[];
-    onChange?: (v: string[]) => void;
-}
-export declare function ReservationBookingStatusButtonFilter(props: ReservationBookingStatusButtonFilterProps): JSX.Element;
-export default ReservationBookingStatusButtonFilter;

package/es/plus/pisellReservation/components/ReservationHudDrawerQuickFilters.d.ts

@@ -1,7 +0,0 @@
-/// <reference types="react" />
-/**
- * HUD 抽屉顶栏：把预约状态 + 支付状态两组桶放进同一 QuickFilter 项，减少 Space / Form.Item 嵌套。
- * 字段仍写入 `filter.values.appointment_status` / `order_payment_status`，与 Filter 弹层共用。
- */
-export declare function ReservationHudDrawerQuickFilters(): JSX.Element;
-export default ReservationHudDrawerQuickFilters;

package/es/plus/pisellReservation/components/ReservationHudDrawerResourceRail.d.ts

@@ -1,19 +0,0 @@
-/// <reference types="react" />
-import { type BucketDef } from './BucketButtonGroup';
-export declare type ReservationHudDrawerResourceRailProps = {
-    className?: string;
-    /** 与 Filter「Resource」树第一层一致，由 {@link buildResourceRootBuckets} 生成 */
-    buckets: BucketDef[];
-    /**
-     * 与 `searchParams.filter.values.form_record_ids` 一致（底层 id 集合，多桶间为并集）
-     */
-    value: string[];
-    onChange: (next: string[]) => void;
-    /** 侧栏无障碍名称 */
-    ariaLabel?: string;
-};
-/**
- * HUD 抽屉：表格右侧竖栏，桶按钮与顶栏 quick filter 同组件，筛 `form_record_ids`。
- */
-export declare function ReservationHudDrawerResourceRail(props: ReservationHudDrawerResourceRailProps): JSX.Element | null;
-export default ReservationHudDrawerResourceRail;

package/es/plus/pisellReservation/components/ReservationPaymentStatusButtonFilter.d.ts

@@ -1,19 +0,0 @@
-/// <reference types="react" />
-/**
- * HUD 抽屉里的「支付状态」快筛桶配置：
- *
- *   - **未支付**：unpaid / partially_paid / payment_processing
- *     - `paymentStatusForMatch` 把 `partially_paid` 归一为 `unpaid`，
- *       不带 `partially_paid` 同一行会因发起 / 已部分付不一致漏选；
- *     - `payment_processing` 业务侧定义为待回执（未到账），同入未支付。
- *   - **已支付**：paid / partially_refunded / refunded
- *     - 退款语义上"曾支付过"，与底层卡片 `PaymentStamp` 的"已盖章"判定一致。
- *   - **不入桶**：authorized / voided —— booking 业务里几乎不出现（仅 order 直购流程可能出现），
- *     刻意不进入这两个桶，避免桶语义被边角态污染。如未来业务需要可在 buckets 加 key。
- */
-export interface ReservationPaymentStatusButtonFilterProps {
-    value?: string[];
-    onChange?: (v: string[]) => void;
-}
-export declare function ReservationPaymentStatusButtonFilter(props: ReservationPaymentStatusButtonFilterProps): JSX.Element;
-export default ReservationPaymentStatusButtonFilter;

package/es/plus/pisellReservation/floorMap/ReservationHudDrawerHandle.d.ts

@@ -1,30 +0,0 @@
-import React from 'react';
-export interface ReservationHudDrawerHandleProps {
-    /** 关闭抽屉。点击或下拖超过阈值时调用。 */
-    onClose: () => void;
-    /**
-     * 触发关闭的下拖位移阈值（px）。短促的微小拖动不算关闭，避免误触；
-     * 用户从手柄向下「甩一下」即可关。默认 80px ≈ 一个手指节。
-     */
-    closeOffsetPx?: number;
-    /**
-     * 抽屉根节点 ref：拖动时给它实时打 transform: translateY，让面板跟着手指走；
-     * 松手后再决定「滑回原位」或「滑出关闭」。可不传——不传则只做关闭决策、不做跟随动画。
-     */
-    drawerRef?: React.RefObject<HTMLElement | null>;
-}
-/**
- * 抽屉顶端的「抓手 + 拍击区」：
- * - 视觉上是一条居中的胶囊形 bar，给用户一个「这里可以拖 / 可以点」的暗示；
- * - 点击：直接关闭抽屉；
- * - 指针下拖：传入 drawerRef 时，面板会实时跟随手指下移；
- *     • 松手时位移 ≥ closeOffsetPx → 平滑滑出底部并关闭；
- *     • 否则回弹到原位。
- *
- * 直接 mutate `drawerRef.current.style.transform` 而不是走 React state，是因为
- * 拖动每一帧都重渲染整个抽屉（PisellRecordBoard + 表格）开销太大。命令式风格
- * 把动画限制在 DOM 层、React 树不参与，掉帧风险最小。组件卸载 / 关闭后由抽屉
- * 节点本身被 unmount 一并清理，不留残留 inline style。
- */
-export declare const ReservationHudDrawerHandle: React.FC<ReservationHudDrawerHandleProps>;
-export default ReservationHudDrawerHandle;

package/es/plus/pisellReservation/floorMap/reservationHudResourceRootBuckets.d.ts

@@ -1,16 +0,0 @@
-/**
- * HUD 抽屉右侧竖栏：与 Filter「Resource」同源，写入 `filter.values.form_record_ids`。
- * 资源列表来自 GET /shop/form/resource/page。
- *
- * 优先按列表内 `parent_id` 推断树的第一层节点；若父链缺失会导致「每条记录都是根」、按钮爆炸，
- * 则回退为按 `form_id`（资源所属表单）聚合——对应 Filter 里顶层资源类型/主类，而非单个 form_record。
- */
-import type { BucketDef } from '../components/BucketButtonGroup';
-/** 与抽屉 / Filter 共用的 `searchParams.filter.values.form_record_ids` 读取 */
-export declare function extractFilterFormRecordIds(searchParams: Record<string, unknown>): string[];
-/**
- * 从 form/resource/page 扁平 list 构建第一层桶。
- * - 列表内父子链完整时：与 TreeSelect 第一层语义一致（根及其子树 id）；
- * - 父链缺失导致伪根过多时：按 `form_id` 聚合为「主类」桶，避免竖栏铺满具体资源名。
- */
-export declare function buildResourceRootBuckets(rawList: unknown[]): BucketDef[];