@pisell/private-materials 6.8.74 → 6.8.76

package/es/components/booking/hooks/useQuotation.js

@@ -31,6 +31,12 @@ var formatBundleItemMap = function formatBundleItemMap(product) {
     return _objectSpread(_objectSpread({}, pre), curObj);
   }, {});
 };
+var formatVariantItemMap = function formatVariantItemMap(product) {
+  return ((product === null || product === void 0 ? void 0 : product.variants) || []).reduce(function (pre, cur) {
+    pre[cur.id] = cur;
+    return pre;
+  }, {});
+};
 export var calculateTotalPrice = function calculateTotalPrice(data) {
   var _price = data.reduce(function (total, item) {
     var _price = (item === null || item === void 0 ? void 0 : item.price) || (item === null || item === void 0 ? void 0 : item.add_price);
@@ -59,7 +65,7 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
   // 缓存跨日商品的 multiDayPrices，避免同一 groupId 重复计算
   var multiDayPricesCache = new Map();
   var value = cartValue.map(function (item) {
-    var _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4;
+    var _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4, _item$_extend5, _item$_extend7;
     // 格式化商品日期用于匹配
     var itemScheduleDate = (_item$_extend = item._extend) !== null && _item$_extend !== void 0 && _item$_extend.startDate ? dayjs(item._extend.startDate).format('YYYY-MM-DD') : '';
 
@@ -73,6 +79,7 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
     // 是否报价单变更价格更新
     var isChangePrice = newProduct.price != item.price;
     var bundleItemMap = formatBundleItemMap(newProduct);
+    var variantItemMap = formatVariantItemMap(newProduct);
     var newBundle = (((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle) || []).map(function (bundle) {
       if (!bundleItemMap[bundle.id]) {
         isNotFoundBundle = true;
@@ -103,9 +110,18 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
         // product_price: bundleItemMap[item.id].product_price,
       });
     });
+    var newVariant = (((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 || (_item$_extend3 = _item$_extend3.other) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.variant) || []).map(function (variant) {
+      if (!variantItemMap[variant.id]) {
+        return variant;
+      }
+      return _objectSpread(_objectSpread({}, variant), {}, {
+        price: variantItemMap[variant.id].price,
+        base_price: variantItemMap[variant.id].base_price
+      });
+    });
 
     // 处理跨日商品的 multiDayPrices
-    if ((_item$_extend3 = item._extend) !== null && _item$_extend3 !== void 0 && _item$_extend3.groupId) {
+    if ((_item$_extend4 = item._extend) !== null && _item$_extend4 !== void 0 && _item$_extend4.groupId) {
       // 检查缓存中是否已经计算过该 groupId
       if (!multiDayPricesCache.has(item._extend.groupId)) {
         // 找到该商品所有日期的价格记录
@@ -140,17 +156,23 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
     } else {
       isChange = true;
     }
+    var price = newProduct.price;
+    if ((_item$_extend5 = item._extend) !== null && _item$_extend5 !== void 0 && (_item$_extend5 = _item$_extend5.other) !== null && _item$_extend5 !== void 0 && _item$_extend5.product_variant_id) {
+      var _variantItemMap$item$, _variantItemMap$item$2, _item$_extend6;
+      price = (_variantItemMap$item$ = (_variantItemMap$item$2 = variantItemMap[(_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 || (_item$_extend6 = _item$_extend6.other) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.product_variant_id]) === null || _variantItemMap$item$2 === void 0 ? void 0 : _variantItemMap$item$2.price) !== null && _variantItemMap$item$ !== void 0 ? _variantItemMap$item$ : newProduct.price;
+    }
     var newItem = _objectSpread(_objectSpread({}, item), {}, {
       original_price: newProduct.original_price,
-      price: newProduct.price,
+      price: price,
       base_price: newProduct.base_price,
       _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
         price: newProduct.price,
         // total: newProduct.total,
         bundle_edit: isBundleChange ? 1 : item._extend.bundle_edit,
         other: _objectSpread(_objectSpread({}, item._extend.other), {}, {
-          option: (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.other) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.option,
-          bundle: newBundle
+          option: (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 || (_item$_extend7 = _item$_extend7.other) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.option,
+          bundle: newBundle,
+          variant: newVariant || []
         })
       })
     });
@@ -202,10 +224,10 @@ var useQuotation = function useQuotation(state, dispatch) {
               return !item.isCustomItem;
             }) // 过滤掉自定义商品
             .map(function (item) {
-              var _item$_extend5;
+              var _item$_extend8;
               return {
                 product_id: item.product_id,
-                schedule_date: (_item$_extend5 = item._extend) !== null && _item$_extend5 !== void 0 && _item$_extend5.startDate ? dayjs(item._extend.startDate).format('YYYY-MM-DD') : params === null || params === void 0 ? void 0 : params.schedule_date // 如果没有商品日期，使用传入的默认日期
+                schedule_date: (_item$_extend8 = item._extend) !== null && _item$_extend8 !== void 0 && _item$_extend8.startDate ? dayjs(item._extend.startDate).format('YYYY-MM-DD') : params === null || params === void 0 ? void 0 : params.schedule_date // 如果没有商品日期，使用传入的默认日期
               };
             });
             if (queryData.length) {

package/es/components/booking/info/addServiceVariant/index.d.ts

@@ -1,6 +1,7 @@
+import React from 'react';
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const AddServiceVariant: (props: AddServiceVariantProps) => JSX.Element;
+declare const AddServiceVariant: (props: AddServiceVariantProps) => React.JSX.Element;
 export default AddServiceVariant;

package/es/components/booking/info/client/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
 export default _default;

package/es/components/booking/info/client/index.js

@@ -36,7 +36,7 @@ import { getWaiverTitle } from "../clientVariant/utils";
 import useGetHolderList from "../hooks/useGetHolderList";
 var isLoadClient = false;
 var Client = function Client() {
-  var _state$client$value2, _state$client4, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11;
+  var _state$bookingConfig2, _state$client$value2, _state$client4, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11;
   var modalRef = useRef();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -54,6 +54,10 @@ var Client = function Client() {
     franchiseeLoading = _useState6[0],
     setFranchiseeLoading = _useState6[1];
   var getHolders = useGetHolderList(state, dispatch);
+  var boardConfig = useMemo(function () {
+    var _state$bookingConfig;
+    return (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.basic) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.appointment_subject) || {};
+  }, [state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.basic]);
   var _useState7 = useState({
       skip: 1,
       num: 10,
@@ -106,15 +110,21 @@ var Client = function Client() {
             if (!withKey.includes('contactsInfo')) {
               withKey.push('contactsInfo');
             }
-            _context.next = 8;
-            return api(_objectSpread(_objectSpread({}, resetParams), {}, {
+            // 返回用户的表单记录
+            if (!(withKey !== null && withKey !== void 0 && withKey.includes('formRecord'))) {
+              withKey.push('formRecord');
+            }
+            _context.next = 9;
+            return api(_objectSpread(_objectSpread(_objectSpread({}, resetParams), {}, {
               with: withKey
             }, !state.isFranchisee ? {
               _config: {
                 abort: true
               }
-            } : {}));
-          case 8:
+            } : {}), {}, {
+              relation_form_id: (boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.form_id) || undefined
+            }));
+          case 9:
             data = _context.sent;
             list = ((data === null || data === void 0 ? void 0 : data.list) || []).map(function (d) {
               return _objectSpread(_objectSpread({}, d), {}, {
@@ -151,7 +161,7 @@ var Client = function Client() {
             setLoadLoading(false);
             isLoadClient = true;
             return _context.abrupt("return", {});
-          case 21:
+          case 22:
           case "end":
             return _context.stop();
         }

package/es/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;
@@ -36,7 +36,7 @@ declare const useClientFn: (_params: useClientFnParams) => {
     };
     searchChange: (search: string) => void;
     loading: boolean;
-    loadMore: JSX.Element | null;
+    loadMore: React.JSX.Element | null;
     handleOpenClientModal: (val?: string) => void;
     getNickname: (item: any) => any;
     franchiseeLoading: number;

package/es/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/es/components/booking/info/date/index.d.ts

@@ -1,4 +1,5 @@
+import React from "react";
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
-declare const DateCom: () => JSX.Element;
+declare const DateCom: () => React.JSX.Element;
 export default DateCom;

package/es/components/booking/info/dateRange/index.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
+import React from 'react';
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
-declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;
+declare const DateRange: ({ state, dispatch, key }: any) => React.JSX.Element;
 export default DateRange;

package/es/components/booking/info/header/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const header: ({ state, dispatch }: any) => JSX.Element;
+declare const header: ({ state, dispatch }: any) => React.JSX.Element;
 export default header;

package/es/components/booking/info/hooks/useGetHolderList.d.ts

@@ -1,2 +1,2 @@
-declare const useGetHolderList: (state: any, dispatch: any) => () => Promise<void>;
+declare const useGetHolderList: (state: any, dispatch: any) => (this: unknown) => Promise<void>;
 export default useGetHolderList;

package/es/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,9 +1,9 @@
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;
-    handleEdit: (cacheItem: any, type?: string) => void;
+    handleEdit: (this: unknown, cacheItem: any, type?: string | undefined) => void;
     dispatchService: (type: string, payload: any) => void;
-    handleAction: (dataSource: any) => void;
+    handleAction: (this: unknown, dataSource: any) => void;
     showAddTimeModal: boolean;
     editNormalServiceRef: import("react").MutableRefObject<any>;
 };

package/es/components/booking/info/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { InfoProps } from './main';
-declare const APP: (props: InfoProps) => JSX.Element;
+declare const APP: (props: InfoProps) => React.JSX.Element;
 export default APP;

package/es/components/booking/info/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/info/notes/index.d.ts

@@ -1,2 +1,3 @@
-declare const Notes: () => JSX.Element | null;
+import React from "react";
+declare const Notes: () => React.JSX.Element | null;
 export default Notes;

package/es/components/booking/info/pet/index.d.ts

@@ -10,5 +10,5 @@ interface PetProps {
     clientChangeNotSetPet?: boolean;
     previewItemTitleRender?: (item: any, index: number, values: any[]) => React.ReactNode;
 }
-declare const Pet: (props: PetProps) => JSX.Element;
+declare const Pet: (props: PetProps) => React.JSX.Element;
 export default Pet;

package/es/components/booking/info/service/Lists.d.ts

@@ -1,2 +1,3 @@
-declare const Lists: ({ onEdit, onChange, onAction, isParallelResource, isShowDelete, isShowAmountFooter }: any) => JSX.Element;
+import React from 'react';
+declare const Lists: ({ onEdit, onChange, onAction, isParallelResource, isShowDelete, isShowAmountFooter }: any) => React.JSX.Element;
 export default Lists;

package/es/components/booking/info/service/actions/index.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import React from "react";
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default Actions;

package/es/components/booking/info/service/addService/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
 interface AddServiceProps {
@@ -7,5 +8,5 @@ interface AddServiceProps {
     drawerProps?: PisellDrawerProps;
     renderMode?: 'current' | 'drawer';
 }
-declare const Info: (props: AddServiceProps) => JSX.Element;
+declare const Info: (props: AddServiceProps) => React.JSX.Element;
 export default Info;

package/es/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info/service/addTimeModal/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const AddTimeModal: () => JSX.Element;
+declare const AddTimeModal: () => React.JSX.Element;
 export default AddTimeModal;

package/es/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,4 +1,5 @@
+import React from 'react';
 declare const BookingList: ({ items }: {
     items: any[];
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default BookingList;

package/es/components/booking/info/service/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
 export default _default;

package/es/components/booking/info/service/like/index.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="react" />
+import React from "react";
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;
     status: string;
     onChange?: any;
     className?: string | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default Like;

package/es/components/booking/info/service/serviceItem/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => JSX.Element;
+declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => React.JSX.Element;
 export default ServiceItem;

package/es/components/booking/info/service/serviceList/index.d.ts

@@ -1,5 +1,6 @@
+import React from 'react';
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default ServiceList;

package/es/components/booking/info/service2/Group/utils.js

@@ -81,7 +81,7 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
 
   // 根据时长 进行创建多个商品
   for (var i = 0; i < item._extend.duration; i++) {
-    var _extend$multiDayPrice;
+    var _extend$multiDayPrice, _cacheItem$_extend$or, _cacheItem$_extend;
     var _extend = _objectSpread({}, item._extend);
     var startDate = _extend.start_date.add(i, 'day');
     var endDate = _extend.start_date.add(i + 1, 'day');
@@ -106,7 +106,7 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
     });
     var totalPrice = getProductTotalPrice(cacheItem);
     cacheItem._extend.total = totalPrice;
-    cacheItem._extend.origin_total = totalPrice;
+    cacheItem._extend.origin_total = (_cacheItem$_extend$or = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.origin_total) !== null && _cacheItem$_extend$or !== void 0 ? _cacheItem$_extend$or : totalPrice;
     cacheItem._extend.items = undefined;
     cacheItem._serviceKey = genServiceKey(cacheItem);
     bookings.push(cacheItem);

package/es/components/booking/info/service2/Lists.d.ts

@@ -1,2 +1,3 @@
-declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
+import React from 'react';
+declare const Lists: ({ onEdit, onChange }: any) => React.JSX.Element;
 export default Lists;

package/es/components/booking/info/service2/index.d.ts

@@ -3,4 +3,4 @@ export declare const Service2Context: React.Context<any>;
 export declare const Service2Cart: ({ hideAdd, hideEdit, }: {
     hideAdd?: boolean | undefined;
     hideEdit?: boolean | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/es/components/booking/info/service2/utils.js

@@ -30,7 +30,7 @@ import { isShowAddTime } from "../utils";
 import { formatResources } from "../service/addService/utils";
 import { getProductExtend, isMultiDayProduct } from "../../info2/service/addService/utils";
 import { getErrorList as getErrorListInfo2 } from "../../info2/utilsByBooking";
-import { getRelationDetailsTotal } from "../../components/footer/amount";
+import { getProductDiscountProductDiscountDifference, getRelationDetailsTotal } from "../../components/footer/amount";
 locales.init(localeTexts, localStorage.getItem('umi_locale') || 'en');
 export var formatActiveKey = function formatActiveKey(lists, platform, isEdit) {
   if (!(lists !== null && lists !== void 0 && lists.length)) return [];
@@ -201,7 +201,7 @@ export var handleChangeHolder = function handleChangeHolder(products, currentIte
         _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
           holder_id: isArr(other) ? other.map(function (item) {
             return item.id;
-          }) : item._extend.quantity > 1 ? [other.id] : other.id
+          }) : item._extend.quantity > 1 ? [other.id] : other === null || other === void 0 ? void 0 : other.id
         })
       });
     }
@@ -631,6 +631,7 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     holders: formatHolders(holders),
     isShowChangeHolder: !isNormalProduct,
     isShowAction: isShowAddTime(state, item),
+    allowClearHolder: true,
     actionText: locales.getText('page.booking.text.add-time'),
     actionIcon: 'pisell2-clock-plus',
     isMultipleResource: true,
@@ -694,6 +695,7 @@ export var formatProducts = function formatProducts(lists, state) {
       title: item === null || item === void 0 ? void 0 : item.title,
       // 购物车显示需要 title 字段
       price: item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.price,
+      totalDifference: getProductDiscountProductDiscountDifference(item),
       total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.total, item === null || item === void 0 || (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.relation_details),
       origin_total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.origin_total, item === null || item === void 0 || (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.relation_details),
       num: item === null || item === void 0 ? void 0 : item._extend.quantity,

package/es/components/booking/info2/cartClientCard/index.js

@@ -35,7 +35,7 @@ import { useIsActive } from "../../../ticketBooking/context/IsActiveContext";
 // 导出类型
 
 var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
-  var _context$appHelper, _state$client;
+  var _context$appHelper, _state$bookingConfig2, _state$client;
   var _ref$clientCardProps = _ref.clientCardProps,
     clientCardProps = _ref$clientCardProps === void 0 ? {} : _ref$clientCardProps,
     beforeSwitchModalOpen = _ref.beforeSwitchModalOpen,
@@ -70,6 +70,10 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
     closeScan = _useScanCustomer.closeScan;
   var context = useEngineContext();
   locales.init(localeTexts, ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.storage) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.get('umi_locale')) || 'en');
+  var boardConfig = useMemo(function () {
+    var _state$bookingConfig;
+    return (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.basic) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.appointment_subject) || {};
+  }, [state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.basic]);
   var _useCustomer = useCustomer({}),
     customers = _useCustomer.customers,
     loading = _useCustomer.loading,
@@ -90,7 +94,7 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return initLoad(keyword);
+            return initLoad(keyword, boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.form_id);
           case 2:
             (_clientSearchRef$curr = clientSearchRef.current) === null || _clientSearchRef$curr === void 0 || (_clientSearchRef$curr2 = _clientSearchRef$curr.resetScrollPosition) === null || _clientSearchRef$curr2 === void 0 || _clientSearchRef$curr2.call(_clientSearchRef$curr);
           case 3:
@@ -106,13 +110,13 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // keyword 变动时触发
   var _debouncedSearch = useDebounceFn( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_keyword) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_keyword, formId) {
       var _clientSearchRef$curr3, _clientSearchRef$curr4;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return initLoad(keyword);
+            return initLoad(keyword, formId);
           case 2:
             (_clientSearchRef$curr3 = clientSearchRef.current) === null || _clientSearchRef$curr3 === void 0 || (_clientSearchRef$curr4 = _clientSearchRef$curr3.resetScrollPosition) === null || _clientSearchRef$curr4 === void 0 || _clientSearchRef$curr4.call(_clientSearchRef$curr3);
           case 3:
@@ -121,15 +125,15 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
         }
       }, _callee2);
     }));
-    return function (_x2) {
+    return function (_x2, _x3) {
       return _ref4.apply(this, arguments);
     };
   }(), {
     wait: 500
   });
   useEffect(function () {
-    _debouncedSearch.run(keyword);
-  }, [keyword]);
+    _debouncedSearch.run(keyword, boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.form_id);
+  }, [keyword, boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.form_id]);
   useEffect(function () {
     if (state.action) {
       state.action({
@@ -309,7 +313,7 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
         }
       }, _callee3, null, [[13, 21]]);
     }));
-    return function (_x3, _x4) {
+    return function (_x4, _x5) {
       return _ref5.apply(this, arguments);
     };
   }());
@@ -392,14 +396,16 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
       open: searchModalVisible,
       onCancel: handleModalCancel,
       // 同时存在两个搜索弹窗时，内部的无限滚动组件会发生冲突
-      destroyOnClose: true
+      destroyOnClose: true,
+      width: 880
     },
     isShowNewButton: false // 在模态框中隐藏新增按钮
     ,
     resultProps: resultProps,
     onAddClient: handleAddClientSuccess,
     onLoadMore: loadMore,
-    hasMore: hasMore
+    hasMore: hasMore,
+    state: state
   }), /*#__PURE__*/React.createElement(PisellModal, {
     className: "cart-client-card_switch-modal",
     open: switchModalVisible,

package/es/components/booking/info2/service/actions/index.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import React from 'react';
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default Actions;

package/es/components/booking/info2/service/addService/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {
@@ -7,5 +8,5 @@ interface AddServiceProps {
     drawerProps?: PisellDrawerProps;
     renderMode?: 'current' | 'drawer';
 }
-declare const Info: (props: AddServiceProps) => JSX.Element;
+declare const Info: (props: AddServiceProps) => React.JSX.Element;
 export default Info;

package/es/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info2/service/addTimeModal/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import '../../../info/service/addTimeModal/index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
 export default _default;

package/es/components/booking/info2/service/contactInfoMode/index.d.ts

@@ -1,2 +1,3 @@
-declare const ContactInfoMode: () => JSX.Element;
+import React from 'react';
+declare const ContactInfoMode: () => React.JSX.Element;
 export default ContactInfoMode;

package/es/components/booking/info2/service/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import '../../info/service/index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
 export default _default;

package/es/components/booking/info2/service/serviceItem/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => JSX.Element;
+declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => React.JSX.Element;
 export default ServiceItem;

package/es/components/booking/info2/service/serviceList/index.d.ts

@@ -1,5 +1,6 @@
+import React from 'react';
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default ServiceList;

package/es/components/booking/locales.js

@@ -367,7 +367,7 @@ export default {
     'pisell2.text.form.link.to.another.record.more': 'View More',
     // 联系信息
     'pisell2.booking.text.contact-info.title': 'Contact info',
-    'pisell2.booking.text.search-placeholder': 'Search Customers / Contacts',
+    'pisell2.booking.text.search-placeholder': 'Customers / Contacts / Holder',
     'pisell-select-holder-please-select': 'Please Select',
     'pisell-select-holder-selected': 'Selected: '
   },
@@ -743,7 +743,7 @@ export default {
     'pisell2.text.form.link.to.another.record.more': '查看更多',
     // 联系信息
     'pisell2.booking.text.contact-info.title': '联系信息',
-    'pisell2.booking.text.search-placeholder': '搜索客户/联系信息',
+    'pisell2.booking.text.search-placeholder': '搜索客户/联系信息/持有人',
     'pisell-select-holder-please-select': '请选择',
     'pisell-select-holder-selected': '已选择：'
   },
@@ -1119,7 +1119,7 @@ export default {
     'pisell2.text.form.link.to.another.record.more': '查看更多',
     // 联系信息
     'pisell2.booking.text.contact-info.title': '聯繫信息',
-    'pisell2.booking.text.search-placeholder': '搜索客戶/聯系信息',
+    'pisell2.booking.text.search-placeholder': '搜索客戶/聯系信息/持有人',
     'pisell-select-holder-please-select': '請選擇',
     'pisell-select-holder-selected': '已選擇：'
   }

package/es/components/booking/materiels/contacts/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;
@@ -12,5 +12,5 @@ declare type ContactsPropsType = {
     value: ContactType[];
     onChange: (value: ContactType[]) => void;
 };
-declare const Contacts: (props: ContactsPropsType) => JSX.Element;
+declare const Contacts: (props: ContactsPropsType) => React.JSX.Element;
 export default Contacts;