@pisell/private-materials 6.8.75 → 6.8.76

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -21,7 +21,7 @@ import { getUniqueId, locales, sendWarningLog } from '@pisell/utils';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useMemoizedFn } from 'ahooks';
 import useEngineContext, { usePlatform } from "../../../../hooks/useEngineContext";
-import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession, getMainPrice } from "../../../booking/utils";
+import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession, isWalkIn, getMainPrice } from "../../../booking/utils";
 import { getProductExtend } from "../../../booking/info2/service/addService/utils";
 import { holderId, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
 import { isBooking4Shop } from "../../../booking/info/utils";
@@ -35,7 +35,7 @@ import { useProducts } from "../../hooks/pisellos";
 import { createCacheItem, genValues, isBundle, isOption, setHandleSetService } from "./utils";
 import { useToast } from '@pisell/materials';
 import { useIsActive } from "../../context/IsActiveContext";
-import { SelectHolderModal } from "../../../booking/utils/selectHolderModal";
+import { selectHolderModal, SelectHolderModal } from "../../../booking/utils/selectHolderModal";
 import { getOpenNormalServiceHandler } from "../../../booking/info2/service/openNormalService";
 var productListLayout = {
   grid: true,
@@ -296,7 +296,6 @@ var AddSerivce = function AddSerivce(props) {
       _extend: {
         start_date: state.date.value,
         quantity: (params === null || params === void 0 ? void 0 : params.quantity) || 1,
-        price: _detail.price,
         product_name: item.title,
         other: other,
         // end_date: endDate, 这个参数合并过来的没有入参
@@ -546,32 +545,101 @@ var AddSerivce = function AddSerivce(props) {
     };
   }());
 
+  // 处理添加 holder 的函数
+  var handleAddHolder = useMemoizedFn( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(cacheItem) {
+      var _stateRef$current2, _cacheItem$_extend6;
+      var holderConfig, currentMaxSelectedCount, result;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            // 获取 maxSelectedCount
+            holderConfig = ((_stateRef$current2 = stateRef.current) === null || _stateRef$current2 === void 0 || (_stateRef$current2 = _stateRef$current2.bookingConfig) === null || _stateRef$current2 === void 0 ? void 0 : _stateRef$current2.holder) || {};
+            currentMaxSelectedCount = (holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.maxSelectedCount) || (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend6 = cacheItem._extend) === null || _cacheItem$_extend6 === void 0 ? void 0 : _cacheItem$_extend6.quantity) || 1; // 调用 selectHolderModal，所有逻辑都在内部处理
+            _context2.next = 4;
+            return selectHolderModal({
+              state: stateRef.current,
+              dispatch: dispatch,
+              maxSelectedCount: currentMaxSelectedCount
+            });
+          case 4:
+            result = _context2.sent;
+            return _context2.abrupt("return", result);
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function (_x4) {
+      return _ref2.apply(this, arguments);
+    };
+  }());
+
   // 处理 booking4 的服务添加
-  var handleBooking4Service = useMemoizedFn(function (item, params, detail, notShowToast) {
-    var cacheItem = createCacheItemFromParams(item, params, detail);
-    if (cacheItem.autoClose) {
-      processAutoCloseService(cacheItem, item, detail, notShowToast);
-    } else {
-      processManualEditService(cacheItem);
-    }
-  });
+  var handleBooking4Service = useMemoizedFn( /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(item, params, detail, notShowToast) {
+      var _state$client3, _state$bookingConfig4, _state$bookingConfig5;
+      var cacheItem, res, _state$bookingConfig6;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            cacheItem = createCacheItemFromParams(item, params, detail); // 如果没有 holder 数据，且此时要求选择 holder，则弹出 holder 弹窗
+            // 且预约主体是表单
+            if (!(!isNormalProductByDurationSchedule(cacheItem) && (!cacheItem._extend.holder_id || !cacheItem._extend.holder_id.length) && !isWalkIn((_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id) && (state === null || state === void 0 || (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.config) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.basic) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.appointment_subject) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.type) === 'form' && (state === null || state === void 0 || (_state$bookingConfig5 = state.bookingConfig) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.config) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.basic) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.appointment_subject) === null || _state$bookingConfig5 === void 0 ? void 0 : _state$bookingConfig5.show_hold_on_add_cart) !== 0)) {
+              _context3.next = 11;
+              break;
+            }
+            _context3.next = 4;
+            return handleAddHolder(cacheItem);
+          case 4:
+            res = _context3.sent;
+            if (!(res && res.length > 0)) {
+              _context3.next = 9;
+              break;
+            }
+            cacheItem._extend.holder_id = res;
+            _context3.next = 11;
+            break;
+          case 9:
+            if (!((state === null || state === void 0 || (_state$bookingConfig6 = state.bookingConfig) === null || _state$bookingConfig6 === void 0 || (_state$bookingConfig6 = _state$bookingConfig6.config) === null || _state$bookingConfig6 === void 0 || (_state$bookingConfig6 = _state$bookingConfig6.basic) === null || _state$bookingConfig6 === void 0 ? void 0 : _state$bookingConfig6.subject_require) === 'require')) {
+              _context3.next = 11;
+              break;
+            }
+            return _context3.abrupt("return");
+          case 11:
+            if (cacheItem.autoClose) {
+              processAutoCloseService(cacheItem, item, detail, notShowToast);
+            } else {
+              processManualEditService(cacheItem);
+            }
+          case 12:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function (_x5, _x6, _x7, _x8) {
+      return _ref3.apply(this, arguments);
+    };
+  }());
 
   // 直接添加商品（不打开弹窗）
   var handleDirectAddService = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(item) {
       var cacheItem;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             console.log(item, 'handleSelectProduct33', '_list_list');
             if (isBooking4) {
-              _context2.next = 5;
+              _context4.next = 5;
               break;
             }
-            _context2.next = 4;
+            _context4.next = 4;
             return handleBookingCreation(item, item.cartDetailValue);
           case 4:
-            return _context2.abrupt("return");
+            return _context4.abrupt("return");
           case 5:
             console.time('createCacheItemFromParams');
             cacheItem = createCacheItemFromParams(item, item.cartDetailValue);
@@ -589,41 +657,41 @@ var AddSerivce = function AddSerivce(props) {
             }
           case 9:
           case "end":
-            return _context2.stop();
+            return _context4.stop();
         }
-      }, _callee2);
+      }, _callee4);
     }));
-    return function (_x4) {
-      return _ref2.apply(this, arguments);
+    return function (_x9) {
+      return _ref4.apply(this, arguments);
     };
   }());
 
   // 创建产品弹窗回调
   var createProductModalCallback = useMemoizedFn(function (item) {
     return /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e, extension_type, detail, notShowToast) {
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(e, extension_type, detail, notShowToast) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               setCurrentProduct(null);
               if (isBooking4) {
-                _context3.next = 5;
+                _context5.next = 5;
                 break;
               }
-              _context3.next = 4;
+              _context5.next = 4;
               return handleBookingCreation(item, e, detail);
             case 4:
-              return _context3.abrupt("return");
+              return _context5.abrupt("return");
             case 5:
               handleBooking4Service(item, e, detail, notShowToast);
             case 6:
             case "end":
-              return _context3.stop();
+              return _context5.stop();
           }
-        }, _callee3);
+        }, _callee5);
       }));
-      return function (_x5, _x6, _x7, _x8) {
-        return _ref3.apply(this, arguments);
+      return function (_x10, _x11, _x12, _x13) {
+        return _ref5.apply(this, arguments);
       };
     }();
   });
@@ -678,45 +746,45 @@ var AddSerivce = function AddSerivce(props) {
 
   // 处理产品选择
   var handleSelectProduct = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(item) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(item) {
       var type,
-        _args4 = arguments;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+        _args6 = arguments;
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            type = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : 'select';
+            type = _args6.length > 1 && _args6[1] !== undefined ? _args6[1] : 'select';
             console.time("handleSelectProduct2");
             console.log(item, 'handleSelectProduct');
             // 检查资源可用性
             console.time("checkResourceAvailability");
             if (checkResourceAvailability(item)) {
-              _context4.next = 6;
+              _context6.next = 6;
               break;
             }
-            return _context4.abrupt("return");
+            return _context6.abrupt("return");
           case 6:
             console.timeEnd("checkResourceAvailability");
             // 0ms
             // 如果不需要打开详情弹窗，直接添加服务
             if (!(!item.isOpenDetailModal && item.cartDetailValue)) {
-              _context4.next = 11;
+              _context6.next = 11;
               break;
             }
-            _context4.next = 10;
+            _context6.next = 10;
             return handleDirectAddService(item);
           case 10:
-            return _context4.abrupt("return");
+            return _context6.abrupt("return");
           case 11:
             // 打开产品选择弹窗
             openProductModal(item, type);
           case 12:
           case "end":
-            return _context4.stop();
+            return _context6.stop();
         }
-      }, _callee4);
+      }, _callee6);
     }));
-    return function (_x9) {
-      return _ref4.apply(this, arguments);
+    return function (_x14) {
+      return _ref6.apply(this, arguments);
     };
   }());
   /**

package/es/components/ticketBooking/components/addServiceVariant/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 interface AddServiceVariantProps {
     globalState: any;
@@ -7,5 +7,5 @@ interface AddServiceVariantProps {
     onGetProductsReady?: (getProducts: any) => void;
     productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
 }
-declare const AddServiceVariant: (props: AddServiceVariantProps) => JSX.Element;
+declare const AddServiceVariant: (props: AddServiceVariantProps) => React.JSX.Element;
 export default AddServiceVariant;

package/es/components/ticketBooking/components/floatButtons/index.d.ts

@@ -7,5 +7,5 @@ interface FloatButtonsProps {
         key: string;
     }[];
 }
-declare const FloatButtons: (props: FloatButtonsProps) => JSX.Element;
+declare const FloatButtons: (props: FloatButtonsProps) => React.JSX.Element;
 export default FloatButtons;

package/es/components/ticketBooking/components/menuBar/index.d.ts

@@ -1,7 +1,8 @@
+import React from 'react';
 import './index.less';
 interface MenuBarProps {
     activeNavKey?: string;
     onNavChange?: (key: string) => void;
 }
-declare const index: (props: MenuBarProps) => JSX.Element;
+declare const index: (props: MenuBarProps) => React.JSX.Element;
 export default index;

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 export declare const _formatBookingDetail: (data: any, modalState: any) => any;
@@ -7,5 +8,5 @@ interface TicketBookingProps {
     isShowTimeBar?: boolean;
     isShowFloatButtons?: boolean;
 }
-declare const TicketBooking: (props: TicketBookingProps) => JSX.Element;
+declare const TicketBooking: (props: TicketBookingProps) => React.JSX.Element;
 export default TicketBooking;

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -1324,6 +1324,7 @@ var TicketBooking = function TicketBooking(props) {
       drawerMask: true,
       isBookingTicket2: true,
       isParallelResourcesBooking: state.isParallelResourcesBooking,
+      setIntervalTime: _setIntervalTime,
       onQrCodeClick: function onQrCodeClick() {
         console.log('onQrCodeClick');
         bookingTicket === null || bookingTicket === void 0 || bookingTicket.activateCamera();

package/es/components/ticketBooking/components/timeBar/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import type { Dayjs } from 'dayjs';
 import './index.less';
 interface ITimeBarProps {
@@ -10,5 +11,5 @@ interface ITimeBarProps {
     onCreateClick: () => void;
     setNowTime?: (time: Dayjs) => void;
 }
-declare const TimeBar: (props: ITimeBarProps) => JSX.Element;
+declare const TimeBar: (props: ITimeBarProps) => React.JSX.Element;
 export default TimeBar;

package/es/components/ticketBooking/hooks/pisellos/useActiveExecute.d.ts

@@ -17,5 +17,5 @@
  * ```
  */
 export declare const useActiveExecute: () => {
-    executeIfActive: <T extends (...args: any[]) => any>(fn: T) => T;
+    executeIfActive: (this: unknown, fn: (...args: any[]) => any) => (...args: any[]) => any;
 };

package/es/components/ticketBooking/hooks/pisellos/useCustomer.d.ts

@@ -11,15 +11,15 @@ export declare const useCustomer: (props: {
         pageSize: number;
         total: number;
     };
-    loadCustomers: (params?: {
-        skip?: number;
-        num?: number;
-        search?: string;
-    }) => Promise<void>;
-    changePage: (page: number, pageSize: number) => Promise<void>;
-    selectCustomer: (customer: ClientData | null, options?: any) => void;
-    addCustomerToFirst: (customer: ClientData) => void;
-    initLoad: (this: any, keyword?: any) => Promise<void>;
+    loadCustomers: (this: unknown, params?: {
+        skip?: number | undefined;
+        num?: number | undefined;
+        search?: string | undefined;
+    } | undefined) => Promise<void>;
+    changePage: (this: unknown, page: number, pageSize: number) => Promise<void>;
+    selectCustomer: (this: unknown, customer: ClientData | null, options?: any) => void;
+    addCustomerToFirst: (this: unknown, customer: ClientData) => void;
+    initLoad: (this: any, keyword: any, formId: number) => Promise<void>;
     hasMore: boolean;
-    loadMore: () => Promise<void>;
+    loadMore: (this: unknown) => Promise<void>;
 };

package/es/components/ticketBooking/hooks/pisellos/useCustomer.js

@@ -129,31 +129,34 @@ export var useCustomer = function useCustomer(props) {
   // 初始化滚动加载
   var initLoad = useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     var keyword,
+      formId,
       _args2 = arguments;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           keyword = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : '';
-          _context2.prev = 1;
+          formId = _args2.length > 1 ? _args2[1] : undefined;
+          _context2.prev = 2;
           setLoading(true);
-          _context2.next = 5;
+          _context2.next = 6;
           return bookingTicket.resetAndLoadCustomers({
-            search: keyword || undefined
+            search: keyword || undefined,
+            relation_form_id: formId || undefined
           });
-        case 5:
-          _context2.next = 10;
+        case 6:
+          _context2.next = 11;
           break;
-        case 7:
-          _context2.prev = 7;
-          _context2.t0 = _context2["catch"](1);
+        case 8:
+          _context2.prev = 8;
+          _context2.t0 = _context2["catch"](2);
           console.error('初始化加载失败:', _context2.t0);
-        case 10:
-          setLoading(false);
         case 11:
+          setLoading(false);
+        case 12:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[1, 7]]);
+    }, _callee2, null, [[2, 8]]);
   })));
 
   // 加载更多

package/es/components/ticketBooking/hooks/pisellos/useProducts.d.ts

@@ -8,8 +8,8 @@ interface IGetScheduleTimePointsParams {
     menu_list_ids?: number[];
 }
 export declare const useProducts: (notAvailableRef: any) => {
-    getScheduleTimePoints: (params?: IGetScheduleTimePointsParams) => Promise<void>;
-    getProducts: (params?: IGetProductsParams) => Promise<void>;
+    getScheduleTimePoints: (this: unknown, params?: IGetScheduleTimePointsParams | undefined) => Promise<void>;
+    getProducts: (this: unknown, params?: IGetProductsParams | undefined) => Promise<void>;
     products: any[];
     loading: boolean;
 };

package/es/components/ticketBooking/hooks/pisellos/useScanManager.d.ts

@@ -1,6 +1,6 @@
 declare const useScanManager: () => {
-    disableAllScanListeners: () => void;
-    enableAllScanListeners: () => void;
-    clearAllScanListenersTaskQueue: () => void;
+    disableAllScanListeners: (this: unknown) => void;
+    enableAllScanListeners: (this: unknown) => void;
+    clearAllScanListenersTaskQueue: (this: unknown) => void;
 };
 export default useScanManager;

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import { ProductDisplayConfig, ProductDisplayPresetKey } from './components/ProductDisplayAdapter/types';
 import './index.less';
 interface TicketBookingProps {
@@ -11,5 +12,5 @@ interface TicketBookingProps {
     isActive?: boolean;
     rulesHooks?: any;
 }
-declare const _default: (props: TicketBookingProps) => JSX.Element;
+declare const _default: (props: TicketBookingProps) => React.JSX.Element;
 export default _default;

package/es/components/ticketBooking/miniRedux.d.ts

@@ -13,7 +13,7 @@ interface ProviderProps<T extends object> {
     store: Store<T>;
     children: React.ReactNode;
 }
-export declare function Provider<T extends object>({ store, children, }: ProviderProps<T>): JSX.Element;
+export declare function Provider<T extends object>({ store, children, }: ProviderProps<T>): import("react").JSX.Element;
 export declare function createStore<T extends object>(initialState: T): Store<T>;
 export declare function useStore<T extends object>(): [
     T,

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

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

package/es/components/walletList/model.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { State, WalletListContextType } from './types';
 export declare const initialState: State;
 export declare const Context: React.Context<WalletListContextType>;
-export declare const Provider: (Component: React.ComponentType<any>) => (props: any) => JSX.Element;
+export declare const Provider: (Component: React.ComponentType<any>) => (props: any) => React.JSX.Element;
 export * from './types';

package/es/components/walletList/tempHolderSelector/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import './index.less';
 export declare const getAvatarText: (name: string) => string;
 interface ITempHolderSelectorProps {
@@ -10,5 +10,5 @@ interface ITempHolderSelectorProps {
     onCancel: () => void;
     confirmLoading: boolean;
 }
-export default function TempHolderSelector(props: ITempHolderSelectorProps): JSX.Element;
+export default function TempHolderSelector(props: ITempHolderSelectorProps): React.JSX.Element;
 export {};

package/es/components/workSpaceList/components/Modal/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {
@@ -12,7 +12,7 @@ declare type ModalComponent = typeof OriginModal & {
     success: typeof AntModal.success;
     info: typeof AntModal.info;
 };
-declare const OriginModal: (props: ModalProps) => JSX.Element;
+declare const OriginModal: (props: ModalProps) => React.JSX.Element;
 declare const Modal: ModalComponent;
 export declare type ModalFuncProps = AntModalFuncProps;
 export default Modal;

package/es/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts

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

package/es/hooks/usePaymentLogger.d.ts

@@ -15,8 +15,8 @@ interface UsePaymentLoggerOptions {
  */
 declare const usePaymentLogger: (options: UsePaymentLoggerOptions) => {
     logs: import("react").MutableRefObject<LogData[]>;
-    addLog: (logData: LogData) => void;
-    sendLogs: (title?: string, err?: any) => void;
+    addLog: (this: unknown, logData: LogData) => void;
+    sendLogs: (this: unknown, title?: string | undefined, err?: any) => void;
 };
 export default usePaymentLogger;
 export type { LogData, UsePaymentLoggerOptions };

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

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

package/es/plus/clinetSearch/Add/BirthdayField/index.d.ts

@@ -1,2 +1,3 @@
-declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => JSX.Element;
+import React from 'react';
+declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => React.JSX.Element;
 export default DateSectionCom;

package/es/plus/clinetSearch/Add/GenderField/index.d.ts

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

package/es/plus/clinetSearch/Add/PhoneField/index.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const PhoneField: ({ value, onChange }: any) => JSX.Element;
+import React from 'react';
+declare const PhoneField: ({ value, onChange }: any) => React.JSX.Element;
 export default PhoneField;

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

@@ -9,6 +9,7 @@ interface ClientSearchProps extends Omit<ComprehensiveSearchProps, 'resultDispla
     resultProps?: TableProps<ClientData>;
     hasMore?: boolean;
     onLoadMore?: () => void;
+    state?: any;
 }
 export declare type ClientSearchRef = {
     resetScrollPosition: () => void;

package/es/plus/clinetSearch/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["onRowClick", "resultProps", "onAddClient", "hasMore", "onLoadMore"];
+var _excluded = ["onRowClick", "resultProps", "onAddClient", "hasMore", "onLoadMore", "state"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -22,12 +22,13 @@ import useEngineContext from "../../hooks/useEngineContext";
 import useTranslationOriginal from "../../hooks/useTranslationOriginal";
 import "./index.less";
 var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
-  var _context$appHelper;
+  var _context$appHelper, _state$bookingConfig, _context$appHelper2;
   var onRowClick = _ref.onRowClick,
     resultProps = _ref.resultProps,
     onAddClient = _ref.onAddClient,
     hasMore = _ref.hasMore,
     onLoadMore = _ref.onLoadMore,
+    state = _ref.state,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -39,6 +40,8 @@ var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var translationOriginal = useTranslationOriginal();
   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 appointmentSubject = (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) || {};
+  var translation = context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.translationShop;
   var handleAdd = function handleAdd() {
     setModalVisible(true);
   };
@@ -72,7 +75,12 @@ var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
       style: {
         width: 180
       }
-    }, locales.getText('pisell2.text.client-search.contact-info')));
+    }, locales.getText('pisell2.text.client-search.contact-info')), /*#__PURE__*/React.createElement("div", {
+      className: "header-item",
+      style: {
+        width: 200
+      }
+    }, translation(appointmentSubject === null || appointmentSubject === void 0 ? void 0 : appointmentSubject.form_name) || locales.getText('pisell2.text.client-search.holder')));
   };
 
   // 自定义结果展示组件
@@ -114,7 +122,7 @@ var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }, /*#__PURE__*/React.createElement(List, {
       dataSource: searchResults,
       renderItem: function renderItem(item, index) {
-        var _latest_wallet_detail, _item$contacts_info, _item$contacts_info2, _item$contacts_info3;
+        var _latest_wallet_detail, _item$contacts_info, _item$contacts_info2, _item$contacts_info3, _item$form_record, _item$form_record2;
         var membershipText = (_latest_wallet_detail = item.latest_wallet_detail) === null || _latest_wallet_detail === void 0 || (_latest_wallet_detail = _latest_wallet_detail.wallet) === null || _latest_wallet_detail === void 0 ? void 0 : _latest_wallet_detail.name;
         return /*#__PURE__*/React.createElement(List.Item, {
           key: item.id,
@@ -175,7 +183,21 @@ var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
             textOverflow: 'ellipsis',
             whiteSpace: 'nowrap'
           }
-        }, (item === null || item === void 0 || (_item$contacts_info3 = item.contacts_info) === null || _item$contacts_info3 === void 0 || (_item$contacts_info3 = _item$contacts_info3.value) === null || _item$contacts_info3 === void 0 ? void 0 : _item$contacts_info3.email) || '-'))));
+        }, (item === null || item === void 0 || (_item$contacts_info3 = item.contacts_info) === null || _item$contacts_info3 === void 0 || (_item$contacts_info3 = _item$contacts_info3.value) === null || _item$contacts_info3 === void 0 ? void 0 : _item$contacts_info3.email) || '-')), /*#__PURE__*/React.createElement("div", {
+          className: "item-cell",
+          style: {
+            width: 200
+          }
+        }, (item === null || item === void 0 || (_item$form_record = item.form_record) === null || _item$form_record === void 0 ? void 0 : _item$form_record.length) > 0 ? item === null || item === void 0 || (_item$form_record2 = item.form_record) === null || _item$form_record2 === void 0 ? void 0 : _item$form_record2.map(function (itemForm) {
+          return /*#__PURE__*/React.createElement("div", {
+            key: itemForm === null || itemForm === void 0 ? void 0 : itemForm.id,
+            style: {
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+              whiteSpace: 'nowrap'
+            }
+          }, (itemForm === null || itemForm === void 0 ? void 0 : itemForm.main_field) || '-');
+        }) : '-')));
       }
     }))));
   };