@pisell/private-materials 6.5.27 → 6.6.1

package/es/components/booking/utils/selectHolderModal.js

@@ -0,0 +1,407 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+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."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import React, { useState, useEffect, useMemo, useRef } from 'react';
+import { createPortal } from 'react-dom';
+import { locales } from '@pisell/utils';
+import { isWalkIn } from "../utils";
+import PisellSelectHolder from "../../../plus/selectHolder";
+// 全局状态管理
+var modalState = null;
+
+// 存储所有实例的 setState 函数
+var allSetStateCallbacks = new Set();
+
+// 当前渲染的实例 ID（确保只有一个实例渲染）
+var renderingInstanceId = null;
+
+// 通知所有实例更新状态
+function notifyAllInstances(newState) {
+  modalState = newState;
+  allSetStateCallbacks.forEach(function (setState) {
+    setState(newState);
+  });
+}
+
+/**
+ * 获取 formDataConfig 和 isMinorAndWaiver
+ */
+function getFormDataConfig(state) {
+  var _state$bookingConfig, _holder$form, _holder$form2;
+  var _holder = state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.holder;
+  if (!_holder) {
+    return {
+      formDataConfig: null,
+      isMinorAndWaiver: false
+    };
+  }
+  var formDataConfig = _objectSpread(_objectSpread(_objectSpread({}, _holder), _holder === null || _holder === void 0 ? void 0 : _holder.form), {}, {
+    options: [],
+    form_id: _holder === null || _holder === void 0 || (_holder$form = _holder.form) === null || _holder$form === void 0 ? void 0 : _holder$form.id,
+    field: _holder === null || _holder === void 0 || (_holder$form2 = _holder.form) === null || _holder$form2 === void 0 ? void 0 : _holder$form2.form_field,
+    relation_type: 'appointment_booking',
+    form_record: []
+  });
+
+  // 是Minor并且与Waiver关联
+  var isMinorAndWaiver = false;
+  if ((formDataConfig === null || formDataConfig === void 0 ? void 0 : formDataConfig.form_type) === 'minors') {
+    var _formDataConfig$form_;
+    var detail = formDataConfig === null || formDataConfig === void 0 || (_formDataConfig$form_ = formDataConfig.form_field) === null || _formDataConfig$form_ === void 0 ? void 0 : _formDataConfig$form_.find(function (item) {
+      return item.filed_type === 'form_to_form' && item.status === 'hide';
+    });
+    if (detail) {
+      var _detail$setting;
+      isMinorAndWaiver = detail === null || detail === void 0 || (_detail$setting = detail.setting) === null || _detail$setting === void 0 ? void 0 : _detail$setting.linkedTable;
+    }
+  }
+  return {
+    formDataConfig: formDataConfig,
+    isMinorAndWaiver: isMinorAndWaiver
+  };
+}
+
+/**
+ * 获取 holder 选项列表
+ */
+function getHolderOptions(state) {
+  var _state$pet, _state$bookingConfig2, _state$pet2, _state$pet3;
+  var holdersFromState = Array.isArray(state === null || state === void 0 || (_state$pet = state.pet) === null || _state$pet === void 0 ? void 0 : _state$pet.holders) ? state.pet.holders : [];
+  var formId = (state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.basic) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.appointment_subject) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.form_id) || 0;
+  var holdersFromValue = Array.isArray(state === null || state === void 0 || (_state$pet2 = state.pet) === null || _state$pet2 === void 0 || (_state$pet2 = _state$pet2.value) === null || _state$pet2 === void 0 ? void 0 : _state$pet2[formId]) ? state === null || state === void 0 || (_state$pet3 = state.pet) === null || _state$pet3 === void 0 || (_state$pet3 = _state$pet3.value) === null || _state$pet3 === void 0 ? void 0 : _state$pet3[formId] : [];
+  var rawList = holdersFromState.length > 0 ? holdersFromState : holdersFromValue;
+  return rawList.map(function (item) {
+    var id = (item === null || item === void 0 ? void 0 : item.id) || (item === null || item === void 0 ? void 0 : item.form_record_id) || (item === null || item === void 0 ? void 0 : item.value);
+    if (id === undefined || id === null) return null;
+    return {
+      label: (item === null || item === void 0 ? void 0 : item.main_field) || (item === null || item === void 0 ? void 0 : item.label) || (item === null || item === void 0 ? void 0 : item.name) || locales.getText('pisell-select-holder-please-select'),
+      value: id,
+      avatar: item === null || item === void 0 ? void 0 : item.avatar,
+      subtitle: (item === null || item === void 0 ? void 0 : item.subtitle) || (item === null || item === void 0 ? void 0 : item.second_field) || (item === null || item === void 0 ? void 0 : item.sub_field)
+    };
+  }).filter(Boolean);
+}
+
+/**
+ * 构建 displayConfig
+ */
+function buildDisplayConfig(state, holderOptions) {
+  var _state$bookingConfig3;
+  var maxSelectedCount = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  var selectType = maxSelectedCount > 1 ? 'multiple' : 'single';
+  return {
+    direction: 'vertical',
+    selectType: selectType,
+    showAvatar: true,
+    showTitle: true,
+    showSubtitle: Boolean(holderOptions.some(function (option) {
+      return option.subtitle;
+    })),
+    isSkipable: (state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.basic) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.subject_require) === 'optional'
+  };
+}
+
+/**
+ * SelectHolderModal 组件（单例模式）
+ * 使用 Portal 在 body 上渲染，确保全局只有一个实例
+ * 可以在多个地方挂载，但实际只会渲染一个实例
+ */
+export var SelectHolderModal = function SelectHolderModal() {
+  var _useState = useState(modalState),
+    _useState2 = _slicedToArray(_useState, 2),
+    localState = _useState2[0],
+    setLocalState = _useState2[1];
+  var _useState3 = useState(null),
+    _useState4 = _slicedToArray(_useState3, 2),
+    container = _useState4[0],
+    setContainer = _useState4[1];
+  var instanceIdRef = useRef(Symbol('SelectHolderModal'));
+  var isRenderingInstanceRef = useRef(false);
+  useEffect(function () {
+    // 创建或获取单例容器
+    var containerElement = document.getElementById('select-holder-modal-container');
+    if (!containerElement) {
+      containerElement = document.createElement('div');
+      containerElement.id = 'select-holder-modal-container';
+      document.body.appendChild(containerElement);
+    }
+    setContainer(containerElement);
+
+    // 如果还没有渲染实例，将当前实例设为渲染实例
+    if (renderingInstanceId === null) {
+      renderingInstanceId = instanceIdRef.current;
+      isRenderingInstanceRef.current = true;
+    } else {
+      isRenderingInstanceRef.current = renderingInstanceId === instanceIdRef.current;
+    }
+
+    // 注册当前实例的 setState
+    allSetStateCallbacks.add(setLocalState);
+
+    // 初始化时同步一次状态
+    if (modalState && modalState !== localState) {
+      setLocalState(modalState);
+    }
+    return function () {
+      // 移除当前实例的 setState
+      allSetStateCallbacks.delete(setLocalState);
+      // 如果当前实例是渲染实例，清理渲染实例标识
+      if (isRenderingInstanceRef.current) {
+        renderingInstanceId = null;
+      }
+    };
+  }, []);
+
+  // 如果 localState 不存在或 open 为 false，不渲染
+  if (!localState || !localState.open || !container) {
+    return null;
+  }
+
+  // 确保只有渲染实例才能渲染
+  if (!isRenderingInstanceRef.current) {
+    return null;
+  }
+  var state = localState.state,
+    dispatch = localState.dispatch,
+    initialValue = localState.initialValue,
+    maxSelectedCount = localState.maxSelectedCount,
+    resolve = localState.resolve;
+
+  // 使用 Portal 渲染到 body，确保单例
+  return /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement(SelectHolderModalContent, {
+    state: state,
+    dispatch: dispatch,
+    initialValue: initialValue,
+    maxSelectedCount: maxSelectedCount,
+    resolve: resolve,
+    onClose: function onClose() {
+      // 延迟清理全局状态，确保动画完成（300ms 动画 + 50ms 缓冲）
+      setTimeout(function () {
+        notifyAllInstances(null);
+      }, 350);
+    }
+  }), container);
+};
+
+/**
+ * SelectHolderModal 内容组件
+ */
+var SelectHolderModalContent = function SelectHolderModalContent(_ref) {
+  var _stateRef$current2, _stateRef$current3, _holderConfig$form;
+  var state = _ref.state,
+    dispatch = _ref.dispatch,
+    initialValue = _ref.initialValue,
+    maxSelectedCount = _ref.maxSelectedCount,
+    resolve = _ref.resolve,
+    onClose = _ref.onClose;
+  var _useState5 = useState(true),
+    _useState6 = _slicedToArray(_useState5, 2),
+    open = _useState6[0],
+    setOpen = _useState6[1];
+  var _useState7 = useState(function () {
+      return getHolderOptions(state);
+    }),
+    _useState8 = _slicedToArray(_useState7, 2),
+    holderOptions = _useState8[0],
+    setHolderOptions = _useState8[1];
+  var _useState9 = useState(function () {
+      if (Array.isArray(initialValue)) {
+        return initialValue.filter(function (item) {
+          return item !== undefined && item !== null;
+        });
+      }
+      if (initialValue === undefined || initialValue === null || initialValue === '') {
+        return [];
+      }
+      return [initialValue];
+    }),
+    _useState10 = _slicedToArray(_useState9, 2),
+    selectedValues = _useState10[0],
+    setSelectedValues = _useState10[1];
+
+  // 使用 ref 存储最新的 state，以便在组件内部访问
+  var stateRef = {
+    current: state
+  };
+
+  // 更新 stateRef
+  useEffect(function () {
+    stateRef.current = state;
+    // 当 state 更新时，同步更新 holderOptions
+    var newOptions = getHolderOptions(state);
+    setHolderOptions(newOptions);
+  }, [state]);
+  var displayConfig = useMemo(function () {
+    var _stateRef$current;
+    return buildDisplayConfig(stateRef.current, holderOptions, maxSelectedCount || ((_stateRef$current = stateRef.current) === null || _stateRef$current === void 0 || (_stateRef$current = _stateRef$current.bookingConfig) === null || _stateRef$current === void 0 || (_stateRef$current = _stateRef$current.holder) === null || _stateRef$current === void 0 ? void 0 : _stateRef$current.maxSelectedCount) || 1);
+  }, [holderOptions, maxSelectedCount, state]);
+
+  // 获取 formDataConfig
+  var _useMemo = useMemo(function () {
+      return getFormDataConfig(stateRef.current);
+    }, [(_stateRef$current2 = stateRef.current) === null || _stateRef$current2 === void 0 || (_stateRef$current2 = _stateRef$current2.bookingConfig) === null || _stateRef$current2 === void 0 ? void 0 : _stateRef$current2.holder]),
+    formDataConfig = _useMemo.formDataConfig,
+    isMinorAndWaiver = _useMemo.isMinorAndWaiver;
+  var holderConfig = ((_stateRef$current3 = stateRef.current) === null || _stateRef$current3 === void 0 || (_stateRef$current3 = _stateRef$current3.bookingConfig) === null || _stateRef$current3 === void 0 ? void 0 : _stateRef$current3.holder) || {};
+  var title = (holderConfig === null || holderConfig === void 0 || (_holderConfig$form = holderConfig.form) === null || _holderConfig$form === void 0 ? void 0 : _holderConfig$form.title) || (holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.title) || locales.getText('pisell2.text.holder');
+
+  // 更新 state 中的 holders
+  var updateStateHolders = function updateStateHolders(holders) {
+    dispatch({
+      type: 'setPet',
+      payload: {
+        holders: holders
+      }
+    });
+  };
+  var handleClose = function handleClose() {
+    setOpen(false);
+    // 先调用 resolve，再关闭
+    if (resolve) {
+      resolve(null);
+    }
+    // 延迟关闭，确保动画完成
+    setTimeout(function () {
+      onClose();
+    }, 300);
+  };
+  var handleConfirm = function handleConfirm(nextValues) {
+    setOpen(false);
+    // 先调用 resolve，再关闭
+    if (resolve) {
+      if (nextValues && nextValues.length > 0) {
+        var selectedIds = nextValues.map(function (val) {
+          return Number(val);
+        });
+        resolve(selectedIds);
+      } else {
+        resolve(null);
+      }
+    }
+    // 延迟关闭，确保动画完成
+    setTimeout(function () {
+      onClose();
+    }, 300);
+  };
+  var handleAdd = function handleAdd() {
+    var _currentState$pet, _currentState$client, _currentState$client2, _currentState$pet$for, _currentState$pet$for2;
+    var currentState = stateRef.current;
+    var waiverForm = currentState === null || currentState === void 0 || (_currentState$pet = currentState.pet) === null || _currentState$pet === void 0 ? void 0 : _currentState$pet.waiverForm;
+    currentState.action({
+      type: 'pisell1.goCustomFormAddData',
+      data: {
+        zIndex: 1101,
+        customerId: (_currentState$client = currentState.client) === null || _currentState$client === void 0 || (_currentState$client = _currentState$client.value) === null || _currentState$client === void 0 ? void 0 : _currentState$client.id,
+        formDataConfig: isMinorAndWaiver ? _objectSpread(_objectSpread({}, waiverForm), {}, {
+          customer_id: (_currentState$client2 = currentState.client) === null || _currentState$client2 === void 0 || (_currentState$client2 = _currentState$client2.value) === null || _currentState$client2 === void 0 ? void 0 : _currentState$client2.id,
+          is_franchisor: (_currentState$pet$for = currentState.pet.formData) === null || _currentState$pet$for === void 0 || (_currentState$pet$for = _currentState$pet$for[0]) === null || _currentState$pet$for === void 0 ? void 0 : _currentState$pet$for.is_franchisor
+        }) : _objectSpread({}, ((_currentState$pet$for2 = currentState.pet.formData) === null || _currentState$pet$for2 === void 0 ? void 0 : _currentState$pet$for2[0]) || {})
+      },
+      callback: function callback(res) {
+        var _currentState$client3;
+        var obj = {};
+        var _iterator = _createForOfIteratorHelper(res),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var item = _step.value;
+            obj[item.key] = item.value;
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+        var isWalkInBol = isWalkIn((_currentState$client3 = currentState.client) === null || _currentState$client3 === void 0 || (_currentState$client3 = _currentState$client3.value) === null || _currentState$client3 === void 0 ? void 0 : _currentState$client3.id);
+        var newHolders = !isWalkInBol ? [obj].concat(_toConsumableArray(currentState.pet.holders || [])) : currentState.pet.holders || [];
+        updateStateHolders(newHolders);
+
+        // 更新 stateRef 和 holderOptions
+        var updatedState = _objectSpread(_objectSpread({}, currentState), {}, {
+          pet: _objectSpread(_objectSpread({}, currentState.pet), {}, {
+            holders: newHolders
+          })
+        });
+        stateRef.current = updatedState;
+
+        // 更新 holderOptions
+        var newOptions = getHolderOptions(updatedState);
+        setHolderOptions(newOptions);
+      }
+    });
+    // 添加 holder 后，弹窗保持打开状态，等待用户选择新添加的 holder
+  };
+  var handleSkip = function handleSkip() {
+    setOpen(false);
+    // 先调用 resolve，再关闭
+    if (resolve) {
+      resolve(null);
+    }
+    // 延迟关闭，确保动画完成
+    setTimeout(function () {
+      onClose();
+    }, 300);
+  };
+  return /*#__PURE__*/React.createElement(PisellSelectHolder, {
+    open: open,
+    modalConfig: {
+      title: "".concat(locales.getText('pisell-select-holder-please-select'), " ").concat(maxSelectedCount || 1, " ").concat(title),
+      confirmText: locales.getText('pisell2.text.confirm')
+    },
+    dataSource: holderOptions,
+    value: selectedValues,
+    displayConfig: displayConfig,
+    maxSelectedCount: maxSelectedCount,
+    allowAdd: true,
+    onClose: handleClose,
+    onConfirm: handleConfirm,
+    onAdd: handleAdd,
+    onSkip: handleSkip
+  });
+};
+
+/**
+ * 通过 await 调用的 Holder 选择弹窗
+ * @param options 配置选项
+ * @returns Promise，resolve 时返回选中的 holder ID 数组，或 null（用户取消时）
+ */
+export function selectHolderModal(options) {
+  var state = options.state,
+    dispatch = options.dispatch,
+    initialValue = options.initialValue,
+    maxSelectedCount = options.maxSelectedCount;
+  return new Promise(function (resolve) {
+    // 先清理之前的状态，确保没有残留的 resolve
+    if (modalState && modalState.resolve) {
+      // 如果之前的状态还有未完成的 resolve，先 resolve null
+      modalState.resolve(null);
+    }
+
+    // 设置全局状态
+    var newState = {
+      open: true,
+      state: state,
+      dispatch: dispatch,
+      initialValue: initialValue,
+      maxSelectedCount: maxSelectedCount,
+      resolve: resolve
+    };
+
+    // 通知所有实例更新状态
+    notifyAllInstances(newState);
+  });
+}

package/es/components/booking/utils.d.ts

@@ -1,8 +1,4 @@
 import dayjs from 'dayjs';
-/**
- * @title: 高阶函数结果缓存（Memoization）
- */
-export declare function memoize<T extends (...args: any[]) => any>(fn: T): T;
 declare type RType = (url: string, data?: {} | undefined, config?: {} | undefined) => Promise<any>;
 declare class Request {
     private request;
@@ -27,8 +23,21 @@ export declare const request: Request;
  */
 export declare const getDiscountTime: (service_times: number, isDay?: boolean) => string;
 /**
- * @title: 时间切片（带缓存版本）
- * @description: 使用 memoize 高阶函数包裹 sliceDayIntoFiveMinutes，相同参数时直接返回缓存结果
+ * @title: 格式化跨日预约的时长用于展示
+ * @description:
+ * @param {number} days
+ * @param {number} minutes
+ * @return {*}
+ */
+export declare const getDiscountTimeByDayMinutes: (days: number, minutes: number) => string;
+/**
+ * @title: 时间切片
+ * @description:
+ * @param {any} config
+ * @param {string} locale
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-04-26 13:59
  */
 export declare const sliceDayIntoFiveMinutes: (config: any, locale: string, isDay?: boolean) => {
     timeSlices: {
@@ -112,7 +121,7 @@ export declare const flexibleObj: {
 export declare const getEndDate: (startDate: any, duration: string | number, endDate: any) => any;
 export declare const getServiceTimes: (service: any) => {
     startDate: dayjs.Dayjs;
-    endDate: dayjs.Dayjs;
+    endDate: any;
 };
 export declare const getErrorList: (resource: any, cacheItem: any, isDay?: boolean) => {
     label: any;

package/es/components/booking/utils.js

@@ -19,31 +19,7 @@ import { isDayBooking, formatDayDate } from "./info/service2/utils";
 import { intersectionBy } from 'lodash';
 import { getAppointmentTimingPreference } from "./info2/utilsByBooking";
 import Decimal from 'decimal.js';
-
-/**
- * @title: 高阶函数结果缓存（Memoization）
- */
-export function memoize(fn) {
-  // 使用 Map 存储缓存，支持任意类型的 key
-  var cache = new Map();
-  return function () {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    // 将参数序列化为字符串作为缓存的 key
-    var key = JSON.stringify(args);
-
-    // 如果缓存中存在该 key，直接返回缓存的结果
-    if (cache.has(key)) {
-      return cache.get(key);
-    }
-
-    // 否则执行函数并缓存结果
-    var result = fn.apply(this, args);
-    cache.set(key, result);
-    return result;
-  };
-}
+import { isMultiDayProduct } from "./info2/service/addService/utils";
 var Request = /*#__PURE__*/function () {
   function Request() {
     _classCallCheck(this, Request);
@@ -95,6 +71,20 @@ export var getDiscountTime = function getDiscountTime(service_times, isDay) {
   }
 };
 
+/**
+ * @title: 格式化跨日预约的时长用于展示
+ * @description:
+ * @param {number} days
+ * @param {number} minutes
+ * @return {*}
+ */
+export var getDiscountTimeByDayMinutes = function getDiscountTimeByDayMinutes(days, minutes) {
+  if (days === 0) {
+    return getDiscountTime(minutes);
+  }
+  return "".concat(days, " ").concat(locales.getText('pisell2.text.day')(days), " ").concat(getDiscountTime(minutes));
+};
+
 /**
  * @title: 时间切片
  * @description:
@@ -104,7 +94,7 @@ export var getDiscountTime = function getDiscountTime(service_times, isDay) {
  * @Author: zhiwei.Wang
  * @Date: 2024-04-26 13:59
  */
-var _sliceDayIntoFiveMinutes = function _sliceDayIntoFiveMinutes(config, locale, isDay) {
+export var sliceDayIntoFiveMinutes = function sliceDayIntoFiveMinutes(config, locale, isDay) {
   var _locale = locale;
   var dayjsLocale = _locale === 'en-US' || _locale === 'en' ? 'en' : 'zh-cn';
   dayjs.locale(dayjsLocale);
@@ -167,12 +157,6 @@ var _sliceDayIntoFiveMinutes = function _sliceDayIntoFiveMinutes(config, locale,
   };
 };
 
-/**
- * @title: 时间切片（带缓存版本）
- * @description: 使用 memoize 高阶函数包裹 sliceDayIntoFiveMinutes，相同参数时直接返回缓存结果
- */
-export var sliceDayIntoFiveMinutes = memoize(_sliceDayIntoFiveMinutes);
-
 //  获取当前时间
 export var getNowTime = function getNowTime() {
   return dayjs().format('HH:mm');
@@ -235,15 +219,12 @@ export var findNextSlice = function findNextSlice(_ref) {
   return timeSlices[index].value;
 };
 export var findNextDuration = function findNextDuration(current, array, defaultValue) {
-  if (defaultValue) {
-    return defaultValue;
-  }
   for (var i = 0; i < array.length; i++) {
     if (array[i].value == (current === null || current === void 0 ? void 0 : current.value)) {
       return array[i].value;
     }
   }
-  return array[0].value;
+  return defaultValue || array[0].value;
 };
 export var formatProductListByCategory = function formatProductListByCategory(list, filterItem) {
   var _list = list || [];
@@ -524,6 +505,14 @@ export var getEndDate = function getEndDate(startDate, duration, endDate) {
 export var getServiceTimes = function getServiceTimes(service) {
   var _service$_extend;
   var startDate = dayjs(dayjs(service._extend.start_date).format('YYYY-MM-DD ') + getServeStartTime(service._extend.start_time));
+
+  // 跨日预约
+  if (isMultiDayProduct(service)) {
+    return {
+      startDate: startDate,
+      endDate: service._extend.end_date
+    };
+  }
   var endDate = startDate.add(flexibleObj.getValue(service._extend.duration), 'minute');
   var session = service === null || service === void 0 || (_service$_extend = service._extend) === null || _service$_extend === void 0 || (_service$_extend = _service$_extend.other) === null || _service$_extend === void 0 ? void 0 : _service$_extend.session;
   if (isSessionProduct(service) && session) {
@@ -634,7 +623,7 @@ export var formatResource = function formatResource(resourceItem, cacheItem, for
 
 // 获取最后一个服务商品
 export var getLastServer = function getLastServer(list) {
-  return list === null || list === void 0 ? void 0 : list[0];
+  return list[list.length - 1];
 };
 export var getCacheParams = function getCacheParams() {
   // 从缓存里读默认参数,  如果有 则需要默认选中某些参数,  添加完商品后则删除