@pisell/private-materials 6.0.24 → 6.1.1

package/es/components/booking/info/pet/ChangePetModal/index.js

@@ -0,0 +1,134 @@
+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 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); }
+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 _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; }
+import React, { useState, forwardRef, useImperativeHandle } from 'react';
+import { locales } from '@pisell/utils';
+import { PisellModal } from '@pisell/materials';
+import { appointmentTypes } from "../../service2/status";
+import "./index.less";
+var ChangePetModal = function ChangePetModal(props, ref) {
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  var _useState3 = useState({}),
+    _useState4 = _slicedToArray(_useState3, 2),
+    params = _useState4[0],
+    setParams = _useState4[1];
+  useImperativeHandle(ref, function () {
+    return {
+      open: function open(e) {
+        setParams(e);
+        setOpen(true);
+      }
+    };
+  });
+
+  /**
+   * @title: 确认之后的操作
+   * @description:
+   * @param {string} type
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2024-12-12 22:56
+   */
+  var handleProduct = function handleProduct(type) {
+    var ids = params.ids,
+      service = params.service,
+      dispatch = params.dispatch,
+      setGlobalState = params.setGlobalState,
+      state = params.state,
+      source = params.source;
+    var _service = _toConsumableArray(service || []);
+
+    // 如果是更改客户信息，则删除所有的预约商品数据
+    if (source === 'changeClient') {
+      if (type === 'ok') {
+        var _service2;
+        _service = (_service2 = _service) === null || _service2 === void 0 ? void 0 : _service2.filter(function (item) {
+          return !appointmentTypes.includes(item.extension_type);
+        });
+      } else {
+        _service = [];
+      }
+    } else {
+      // 更改表单信息
+      if (type === 'ok') {
+        var _service3;
+        // 将商品放在open items中
+        _service = (_service3 = _service) === null || _service3 === void 0 ? void 0 : _service3.map(function (item) {
+          if (ids !== null && ids !== void 0 && ids.includes(item._extend.holder_id)) {
+            return _objectSpread(_objectSpread({}, item), {}, {
+              _extend: _objectSpread(_objectSpread({}, item._extend || {}), {}, {
+                holder_id: 0
+              })
+            });
+          }
+          return item;
+        });
+
+        // 预约商品不能放在open items中, 所以过滤掉 holder_id为0 并且是预约商品的数据
+        _service = _service.filter(function (item) {
+          var _item$_extend;
+          return !((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.holder_id) === 0 && appointmentTypes.includes(item.extension_type));
+        });
+      } else {
+        // 将商品数据清空
+        _service = _service.filter(function (item) {
+          return !ids.includes(item._extend.holder_id);
+        });
+      }
+    }
+
+    // 更新服务商品列表
+    if (dispatch) {
+      dispatch({
+        type: 'setService',
+        payload: {
+          value: _toConsumableArray(_service),
+          edit: true
+        }
+      });
+    } else {
+      setGlobalState({
+        service: _objectSpread(_objectSpread({}, state.service), {}, {
+          edit: true,
+          value: _toConsumableArray(_service)
+        })
+      });
+    }
+    setOpen(false);
+  };
+  return /*#__PURE__*/React.createElement(PisellModal.Information, {
+    open: open,
+    platform: "pc",
+    width: 432,
+    title: locales.getText('pisell2.text.change.pet.title'),
+    describe: /*#__PURE__*/React.createElement("div", {
+      className: "pisell2-change-pet-modal-content"
+    }, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.text.change.pet.content')), /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.text.change.pet.content1'))),
+    cancelText: locales.getText('pisell2.text.change.pet.cancel'),
+    okText: locales.getText('pisell2.text.change.pet.confirm'),
+    closable: true,
+    onOk: function onOk() {
+      return handleProduct('ok');
+    },
+    onCancel: function onCancel() {
+      return handleProduct('cancel');
+    }
+  });
+};
+export default /*#__PURE__*/forwardRef(ChangePetModal);

package/es/components/booking/info/pet/ChangePetModal/index.less

@@ -0,0 +1,4 @@
+.pisell2-change-pet-modal-content {
+  display: flex;
+  flex-direction: column;
+}

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

@@ -1,6 +1,6 @@
 import React from 'react';
-import './index.less';
 import { InfoProps } from '../../forms/forms';
+import './index.less';
 interface PetProps {
     state?: any;
     dispatch?: any;

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

@@ -18,17 +18,23 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
-import React, { useContext, useEffect, useMemo, useState } from 'react';
 import User01 from '@pisell/icon/es/User01';
-import { Context } from "../model";
-import { Avatar, Skeleton, Button } from 'antd';
-import "./index.less";
 import { locales } from '@pisell/utils';
-import FormsCom from "../../forms/forms";
+import { useMemoizedFn } from 'ahooks';
+import { Avatar, Button, Skeleton, Tag } from 'antd';
+import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
+import useEngineContext from "../../../../hooks/useEngineContext";
 import { changeFormValues, sortFormValues } from "../../forms/format";
+import FormsCom from "../../forms/forms";
+import { isDayBooking, isEventBooking } from "../../info/service2/utils";
 import { isWalkIn } from "../../utils";
-import useEngineContext from "../../../../hooks/useEngineContext";
-import { useMemoizedFn } from "ahooks";
+import { Context } from "../model";
+import ChangePetModal from "./ChangePetModal";
+import "./index.less";
+import useAddHolder, { useFormDataConfig } from "../hooks/useAddHolder";
+import useGetHolderList from "../hooks/useGetHolderList";
+import dayjs from 'dayjs';
+import { formatDate } from "../../../../utils/date";
 var defaultParams = {
   skip: 1,
   num: 20,
@@ -36,7 +42,7 @@ var defaultParams = {
   keyword: ''
 };
 var Pet = function Pet(props) {
-  var _context$appHelper, _state2, _state$bookingConfig2, _state$client$value, _state$client10, _state$pet9, _state$client12;
+  var _context$appHelper, _state2, _state$bookingConfig2, _state$client$value, _state$client10, _state$pet10, _state$client12;
   var hideTitle = props.hideTitle,
     addButtonProps = props.addButtonProps,
     handleOpenModal = props.handleOpenModal,
@@ -64,8 +70,15 @@ var Pet = function Pet(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     params = _useState8[0],
     setParams = _useState8[1];
+  var changePetRef = useRef(null);
   state = state || (props === null || props === void 0 ? void 0 : props.state);
   dispatch = dispatch || (props === null || props === void 0 ? void 0 : props.dispatch);
+  var _useAddHolder = useAddHolder(state, dispatch),
+    waiverForm = _useAddHolder.waiverForm;
+  var _useFormDataConfig = useFormDataConfig(state),
+    isMinorAndWaiver = _useFormDataConfig.isMinorAndWaiver;
+  var getHolders = useGetHolderList(state, dispatch);
+  console.log('waiver', props, state);
   // board设置, 获取预约主体
   var boardParams = useMemo(function () {
     var _state;
@@ -81,15 +94,15 @@ var Pet = function Pet(props) {
    * @Date: 2024-01-27 14:22
    */
   var petForm = useMemo(function () {
-    var _state$bookingConfig;
+    var _state$bookingConfig, _holder$form, _holder$form2;
     var _holder = (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.holder;
     if (!_holder) {
       return null;
     }
     return _objectSpread(_objectSpread(_objectSpread({}, _holder), _holder === null || _holder === void 0 ? void 0 : _holder.form), {}, {
       options: [],
-      form_id: _holder.form.id,
-      field: _holder.form.form_field,
+      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: []
     });
@@ -142,7 +155,16 @@ var Pet = function Pet(props) {
             if (_params.skip === 1) {
               _list = (data === null || data === void 0 ? void 0 : data.list) || [];
             } else {
-              _list = _list.concat((data === null || data === void 0 ? void 0 : data.list) || []);
+              ((data === null || data === void 0 ? void 0 : data.list) || []).forEach(function (item) {
+                var index = _list.findIndex(function (old) {
+                  return old.id === item.id;
+                });
+                if (index > -1) {
+                  _list[index] = item;
+                } else {
+                  _list.push(item);
+                }
+              });
             }
             setParams(_objectSpread(_objectSpread(_objectSpread({}, params), _params), {}, {
               total: (data === null || data === void 0 ? void 0 : data.count) || 0
@@ -177,7 +199,7 @@ var Pet = function Pet(props) {
     };
   }();
   var setPetOptions = function setPetOptions(options) {
-    var _state$pet, _state$client3, _state$pet2;
+    var _state$pet, _state$client3, _state$pet2, _state$pet3;
     var noClient = ((_state$pet = state.pet) === null || _state$pet === void 0 || (_state$pet = _state$pet.formData) === null || _state$pet === void 0 ? void 0 : _state$pet[0].data_range) === 'customer' && 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);
     if (noClient) {
       return;
@@ -188,7 +210,8 @@ var Pet = function Pet(props) {
         formData: [_objectSpread(_objectSpread({}, (_state$pet2 = state.pet) === null || _state$pet2 === void 0 || (_state$pet2 = _state$pet2.formData) === null || _state$pet2 === void 0 ? void 0 : _state$pet2[0]), {}, {
           options: options
         })],
-        pets: options
+        pets: options,
+        holders: [options[0]].concat(_toConsumableArray((_state$pet3 = state.pet) === null || _state$pet3 === void 0 ? void 0 : _state$pet3.holders))
       }
     });
   };
@@ -202,14 +225,16 @@ var Pet = function Pet(props) {
    */
   var getForms = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _state$bookingDetail;
+      var _recordIds;
       var isUpdateValue,
         values,
+        recordIds,
+        _state$bookingDetail,
+        _state$bookingDetail2,
         isSetValue,
         formData,
-        _state$bookingDetail2,
-        payload,
         _state$bookingDetail3,
+        payload,
         _state$client4,
         records,
         _args2 = arguments;
@@ -219,23 +244,31 @@ var Pet = function Pet(props) {
             isUpdateValue = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : true;
             // setLoading(true);
             values = _objectSpread({}, state.pet.value);
-            isSetValue = isUpdateValue && values[boardParams === null || boardParams === void 0 ? void 0 : boardParams.form_id] === undefined && ((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 || (_state$bookingDetail = _state$bookingDetail.holder) === null || _state$bookingDetail === void 0 || (_state$bookingDetail = _state$bookingDetail.form_record) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.length);
+            recordIds = [];
+            if (isEventBooking(state)) {
+              recordIds = (_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.bookings.list.reduce(function (acc, cur) {
+                return Array.from(new Set([].concat(_toConsumableArray(acc), _toConsumableArray(cur.holder.form_record))));
+              }, []);
+            } else {
+              recordIds = ((_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 || (_state$bookingDetail2 = _state$bookingDetail2.holder) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.form_record) || [];
+            }
+            isSetValue = isUpdateValue && values[boardParams === null || boardParams === void 0 ? void 0 : boardParams.form_id] === undefined && ((_recordIds = recordIds) === null || _recordIds === void 0 ? void 0 : _recordIds.length);
             if (isSetValue) {
               setValueLoading(true);
             }
-            _context2.prev = 4;
+            _context2.prev = 6;
             formData = petForm;
             if (!(state.renderType === 'eventBooking')) {
-              _context2.next = 12;
+              _context2.next = 14;
               break;
             }
-            _context2.next = 9;
+            _context2.next = 11;
             return state.apis.getForms({
               relation_type: 'event_booking_v2',
-              relation_id: ((_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 || (_state$bookingDetail2 = _state$bookingDetail2.bookings) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.id) || 0
+              relation_id: ((_state$bookingDetail3 = state.bookingDetail) === null || _state$bookingDetail3 === void 0 || (_state$bookingDetail3 = _state$bookingDetail3.bookings) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.id) || 0
               // _config: { useCache: true },
             });
-          case 9:
+          case 11:
             formData = _context2.sent;
             // 只要预约主体
             formData = (formData || []).filter(function (d) {
@@ -246,58 +279,67 @@ var Pet = function Pet(props) {
               options: [],
               type: formData.type
             });
-          case 12:
+          case 14:
             // 获取当前预约中填写的值, 只在第一次执行
             payload = {
               formData: [formData]
             };
             if (!isSetValue) {
-              _context2.next = 21;
+              _context2.next = 23;
               break;
             }
-            _context2.next = 16;
+            _context2.next = 18;
             return state.apis.getFormRecords({
-              form_record_ids: (_state$bookingDetail3 = state.bookingDetail) === null || _state$bookingDetail3 === void 0 || (_state$bookingDetail3 = _state$bookingDetail3.holder) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.form_record,
+              form_record_ids: recordIds,
               with: ['customer']
             });
-          case 16:
+          case 18:
             records = _context2.sent;
             console.log('records', records);
             values[boardParams === null || boardParams === void 0 ? void 0 : boardParams.form_id] = sortFormValues(records, (_state$client4 = state.client) === null || _state$client4 === void 0 || (_state$client4 = _state$client4.value) === null || _state$client4 === void 0 ? void 0 : _state$client4.id);
             payload.value = values;
             setValueLoading(false);
-          case 21:
+          case 23:
             dispatch({
               type: 'setPet',
               payload: payload
             });
-            _context2.next = 29;
+            _context2.next = 31;
             break;
-          case 24:
-            _context2.prev = 24;
-            _context2.t0 = _context2["catch"](4);
+          case 26:
+            _context2.prev = 26;
+            _context2.t0 = _context2["catch"](6);
             setValueLoading(false);
             setLoading(false);
             console.log('form_error', _context2.t0);
-          case 29:
+          case 31:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[4, 24]]);
+      }, _callee2, null, [[6, 26]]);
     }));
     return function getForms() {
       return _ref4.apply(this, arguments);
     };
   }();
   var updateResult = function updateResult(res, item) {
-    var _state$pet3;
+    var _state$pet4;
     var cur = _toConsumableArray(state.pet.value[petForm.form_id] || []);
-    var options = ((_state$pet3 = state.pet) === null || _state$pet3 === void 0 || (_state$pet3 = _state$pet3.formData) === null || _state$pet3 === void 0 || (_state$pet3 = _state$pet3[0]) === null || _state$pet3 === void 0 ? void 0 : _state$pet3.options) || [];
+    var options = ((_state$pet4 = state.pet) === null || _state$pet4 === void 0 || (_state$pet4 = _state$pet4.formData) === null || _state$pet4 === void 0 || (_state$pet4 = _state$pet4[0]) === null || _state$pet4 === void 0 ? void 0 : _state$pet4.options) || [];
     if (res.type === 'delete') {
+      var isDay = isDayBooking(state);
+
+      // 跨日预约在不能编辑情况下不能删除
+      if (isDay && state.disabledEdit) return cur;
       cur = cur.filter(function (d) {
         return d.form_record_id !== item.form_record_id;
       });
       _addCallback();
+
+      // 跨日预约移除的时候则删除商品数据
+      if (isDay) {
+        handleDayChange(item);
+      }
     } else {
       var obj = {
         customer: item === null || item === void 0 ? void 0 : item.customer,
@@ -385,8 +427,8 @@ var Pet = function Pet(props) {
 
     // 如果传入options
     if (options) {
-      var _state$pet4;
-      updateObj.formData = [_objectSpread(_objectSpread({}, (_state$pet4 = state.pet) === null || _state$pet4 === void 0 || (_state$pet4 = _state$pet4.formData) === null || _state$pet4 === void 0 ? void 0 : _state$pet4[0]), {}, {
+      var _state$pet5;
+      updateObj.formData = [_objectSpread(_objectSpread({}, (_state$pet5 = state.pet) === null || _state$pet5 === void 0 || (_state$pet5 = _state$pet5.formData) === null || _state$pet5 === void 0 ? void 0 : _state$pet5[0]), {}, {
         options: options
       })];
       updateObj.pets = options;
@@ -402,12 +444,12 @@ var Pet = function Pet(props) {
 
   // 当客户id 发生改变时, 检测当前表单是否是该客户的, 如果不是则移除
   useEffect(function () {
-    var _state$pet5, _state$client9, _state$pet6;
+    var _state$pet6, _state$client9, _state$pet7;
     if (clientChangeNotSetPet) return;
     var changeFormValuesData = changeFormValues({
-      values: ((_state$pet5 = state.pet) === null || _state$pet5 === void 0 ? void 0 : _state$pet5.value) || {},
+      values: ((_state$pet6 = state.pet) === null || _state$pet6 === void 0 ? void 0 : _state$pet6.value) || {},
       clientId: (_state$client9 = state.client) === null || _state$client9 === void 0 || (_state$client9 = _state$client9.value) === null || _state$client9 === void 0 ? void 0 : _state$client9.id,
-      forms: ((_state$pet6 = state.pet) === null || _state$pet6 === void 0 ? void 0 : _state$pet6.formData) || []
+      forms: ((_state$pet7 = state.pet) === null || _state$pet7 === void 0 ? void 0 : _state$pet7.formData) || []
     });
     setTimeout(function () {
       dispatch({
@@ -437,12 +479,12 @@ var Pet = function Pet(props) {
     }, 10);
   }, [state.bookingId, state.bookingDetail, boardParams.form_id, boardParams.type, state.renderType, petForm, clientChangeNotSetPet ? (_state$client10 = state.client) === null || _state$client10 === void 0 || (_state$client10 = _state$client10.value) === null || _state$client10 === void 0 ? void 0 : _state$client10.id : undefined]);
   var _addCallback = useMemoizedFn(function (_params) {
-    var _state$pet7;
-    var _formData = (_state$pet7 = state.pet) === null || _state$pet7 === void 0 || (_state$pet7 = _state$pet7.formData) === null || _state$pet7 === void 0 ? void 0 : _state$pet7[0];
+    var _state$pet8;
+    var _formData = (_state$pet8 = state.pet) === null || _state$pet8 === void 0 || (_state$pet8 = _state$pet8.formData) === null || _state$pet8 === void 0 ? void 0 : _state$pet8[0];
     // if (_formData?.type === "multiple" || _formData?.type === "single") {
     getFormData({
       formData: _formData
-    }, _params);
+    }, _params || params);
     // }
   });
   var searchChange = useMemoizedFn(function (keyword) {
@@ -453,8 +495,8 @@ var Pet = function Pet(props) {
     _addCallback(_params);
   });
   var loadMore = useMemo(function () {
-    var _state$pet8;
-    var show = ((_state$pet8 = state.pet) === null || _state$pet8 === void 0 || (_state$pet8 = _state$pet8.formData) === null || _state$pet8 === void 0 || (_state$pet8 = _state$pet8[0]) === null || _state$pet8 === void 0 || (_state$pet8 = _state$pet8.options) === null || _state$pet8 === void 0 ? void 0 : _state$pet8.length) < params.total || 0;
+    var _state$pet9;
+    var show = ((_state$pet9 = state.pet) === null || _state$pet9 === void 0 || (_state$pet9 = _state$pet9.formData) === null || _state$pet9 === void 0 || (_state$pet9 = _state$pet9[0]) === null || _state$pet9 === void 0 || (_state$pet9 = _state$pet9.options) === null || _state$pet9 === void 0 ? void 0 : _state$pet9.length) < params.total || 0;
     return show ? /*#__PURE__*/React.createElement("div", {
       className: "",
       style: {
@@ -470,9 +512,98 @@ var Pet = function Pet(props) {
         _addCallback(_params);
       }
     }, locales.getText('pisell2.text.load-more'))) : null;
-  }, [loadLoading, params, (_state$pet9 = state.pet) === null || _state$pet9 === void 0 || (_state$pet9 = _state$pet9.formData) === null || _state$pet9 === void 0 || (_state$pet9 = _state$pet9[0]) === null || _state$pet9 === void 0 || (_state$pet9 = _state$pet9.options) === null || _state$pet9 === void 0 ? void 0 : _state$pet9.length]);
+  }, [loadLoading, params, (_state$pet10 = state.pet) === null || _state$pet10 === void 0 || (_state$pet10 = _state$pet10.formData) === null || _state$pet10 === void 0 || (_state$pet10 = _state$pet10[0]) === null || _state$pet10 === void 0 || (_state$pet10 = _state$pet10.options) === null || _state$pet10 === void 0 ? void 0 : _state$pet10.length]);
+  var handleDayChange = function handleDayChange(e) {
+    var _state$service$value;
+    var id = e === null || e === void 0 ? void 0 : e.form_record_id;
+    var service = (_state$service$value = state.service.value) === null || _state$service$value === void 0 ? void 0 : _state$service$value.filter(function (item) {
+      return item._extend.holder_id === id;
+    });
+
+    // 有form_id 并且购物车下有商品数据
+    if (id && service !== null && service !== void 0 && service.length) {
+      var _state$service;
+      changePetRef === null || changePetRef === void 0 || changePetRef.current.open({
+        ids: [id],
+        dispatch: dispatch,
+        service: ((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || []
+      });
+    }
+  };
+
+  /**
+   * @title: 跨日预约其他自定义方法
+   * @description:
+   * @param {*} useMemo
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2024-12-12 22:30
+   */
+  var dayCustomSelect = useMemo(function () {
+    var isDay = isDayBooking(state);
+    if (isDay) {
+      return {
+        handleDayChange: handleDayChange
+      };
+    }
+    return {};
+  }, [state.renderType, state.service.value]);
+  var ignoreValidity = useMemo(function () {
+    var _petForm$setting;
+    return !(petForm !== null && petForm !== void 0 && (_petForm$setting = petForm.setting) !== null && _petForm$setting !== void 0 && _petForm$setting.validity) || petForm.setting.validity.type === 'no_expiry';
+  }, [petForm]);
+  var getExpireStatus = function getExpireStatus(expiredAt) {
+    if (ignoreValidity || !expiredAt) return null;
+    var now = dayjs();
+    // 将过期时间设置为当天的最后一秒
+    var expireDate = dayjs(expiredAt).endOf('day');
+    var diffDays = expireDate.diff(now, 'day');
+    // 格式化显示日期（不显示时间）
+    var cnDate = 'YYYY-MM-DD';
+    var enDate = 'DD/MM/YYYY';
+    var formattedDate = formatDate(expireDate, cnDate, enDate);
+    if (now.isAfter(expireDate)) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          color: '#999999',
+          fontSize: '14px',
+          lineHeight: '20px'
+        }
+      }, /*#__PURE__*/React.createElement(Tag, {
+        color: "red",
+        style: {
+          borderRadius: 16,
+          marginRight: 8
+        }
+      }, locales.getText('pisell2.text.status.expired')), locales.getText('pisell2.text.validity.expired')(formattedDate));
+    }
+    if (diffDays < 7) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          color: '#FFA940',
+          fontSize: '14px',
+          lineHeight: '20px'
+        }
+      }, locales.getText('pisell2.text.validity.expiring_soon')(formattedDate));
+    }
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        color: '#999999',
+        fontSize: '14px',
+        lineHeight: '20px'
+      }
+    }, locales.getText('pisell2.text.validity.valid_through')(formattedDate));
+  };
   return useMemo(function () {
-    var _state$client11;
+    var _petForm$setting2, _state$client11;
+    var canEdit = true;
+    if (petForm !== null && petForm !== void 0 && (_petForm$setting2 = petForm.setting) !== null && _petForm$setting2 !== void 0 && _petForm$setting2.permissions) {
+      var _petForm$setting3;
+      var _ref6 = (petForm === null || petForm === void 0 || (_petForm$setting3 = petForm.setting) === null || _petForm$setting3 === void 0 ? void 0 : _petForm$setting3.permissions) || {},
+        _ref6$staff = _ref6.staff,
+        staff = _ref6$staff === void 0 ? [] : _ref6$staff;
+      canEdit = staff.includes('edit');
+    }
     return /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__booking-pet-wraps"
     }, /*#__PURE__*/React.createElement(Skeleton, {
@@ -480,16 +611,23 @@ var Pet = function Pet(props) {
       active: true,
       round: true
     }, /*#__PURE__*/React.createElement(FormsCom, {
+      isMinorAndWaiver: isMinorAndWaiver,
+      waiverForm: waiverForm,
       hideTitle: hideTitle,
       watch: {
         value: state.pet.value
       },
       addCallback: function addCallback(formDataConfig, data) {
-        var _state$pet10;
+        var _state$pet11;
         setPetOptions([_objectSpread(_objectSpread({}, data), {}, {
           form_id: formDataConfig === null || formDataConfig === void 0 ? void 0 : formDataConfig.form_id
-        })].concat(_toConsumableArray(((_state$pet10 = state.pet) === null || _state$pet10 === void 0 || (_state$pet10 = _state$pet10.formData) === null || _state$pet10 === void 0 || (_state$pet10 = _state$pet10[0]) === null || _state$pet10 === void 0 ? void 0 : _state$pet10.options) || [])));
+        })].concat(_toConsumableArray(((_state$pet11 = state.pet) === null || _state$pet11 === void 0 || (_state$pet11 = _state$pet11.formData) === null || _state$pet11 === void 0 || (_state$pet11 = _state$pet11[0]) === null || _state$pet11 === void 0 ? void 0 : _state$pet11.options) || [])));
       },
+      drawerProps: {
+        mask: state.drawerMask
+      },
+      getHolders: getHolders,
+      addCallbackService: _addCallback,
       loading: valueLoading,
       forms: state.pet.formData,
       action: state.action,
@@ -497,7 +635,7 @@ var Pet = function Pet(props) {
       value: state.pet.value,
       onChange: onValueChange,
       client: (_state$client11 = state.client) === null || _state$client11 === void 0 ? void 0 : _state$client11.value,
-      customSelectProps: {
+      customSelectProps: _objectSpread({
         loading: loading,
         handleViewItem: handleViewItem,
         virtualListHeight: window.innerHeight - 213 - 57 - 16,
@@ -515,8 +653,9 @@ var Pet = function Pet(props) {
         },
         handleOpenModal: handleOpenModal,
         previewItemTitleRender: previewItemTitleRender
-      },
+      }, dayCustomSelect),
       optionRender: function optionRender(item) {
+        console.log('waiver', petForm, item);
         return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Avatar, {
           className: "pisell-lowcode__booking-pet-list-item-avatar",
           src: item.cover,
@@ -531,7 +670,7 @@ var Pet = function Pet(props) {
           className: "pisell-lowcode__booking-pet-list-item-info-desc"
         }, /*#__PURE__*/React.createElement("div", {
           className: ""
-        }, item.key_age))), /*#__PURE__*/React.createElement("div", {
+        }, item.key_age)), /*#__PURE__*/React.createElement("div", null, getExpireStatus(item.expired_at))), /*#__PURE__*/React.createElement("div", {
           className: "pisell-lowcode__booking-pet-list-item-actions"
         }, /*#__PURE__*/React.createElement("div", {
           className: "pisell-lowcode__booking-pet-list-item-actions-view",
@@ -540,14 +679,14 @@ var Pet = function Pet(props) {
             e.stopPropagation();
             handleViewItem(item);
           }
-        }, locales.getText('pisell2.text.view')), /*#__PURE__*/React.createElement("div", {
+        }, locales.getText('pisell2.text.view')), canEdit ? /*#__PURE__*/React.createElement("div", {
           className: "pisell-lowcode__booking-pet-list-item-actions-edit",
           onClick: function onClick(e) {
             e.preventDefault();
             e.stopPropagation();
             handleEditItem(item);
           }
-        }, locales.getText('pisell2.text.edit'))));
+        }, locales.getText('pisell2.text.edit')) : null));
       },
       addButtonProps: _objectSpread({
         style: {
@@ -573,7 +712,9 @@ var Pet = function Pet(props) {
           return addCallback;
         }()
       }, addButtonProps)
-    })));
-  }, [valueLoading, hideTitle, state.pet.value, state.pet.formData, state.action, state.modalOpen, state.pet.value, (_state$client12 = state.client) === null || _state$client12 === void 0 ? void 0 : _state$client12.value, loading, state.disabledEdit, state.isTerminal, state.disableEventBookingEdit, params.search, loadMore, addButtonProps, state.isBookingCreatePage]);
+    })), /*#__PURE__*/React.createElement(ChangePetModal, {
+      ref: changePetRef
+    }));
+  }, [valueLoading, hideTitle, state.pet.value, state.pet.formData, state.action, state.modalOpen, state.pet.value, (_state$client12 = state.client) === null || _state$client12 === void 0 ? void 0 : _state$client12.value, loading, state.disabledEdit, state.isTerminal, state.disableEventBookingEdit, params.search, loadMore, addButtonProps, state.isBookingCreatePage, isMinorAndWaiver, waiverForm, petForm]);
 };
 export default Pet;

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

@@ -0,0 +1 @@
+export declare const getFormDetail: (id: number) => Promise<any>;