@pisell/private-materials 6.0.25 → 6.2.1

package/es/components/booking/info2/service/editService/index.js

@@ -29,13 +29,16 @@ import CollapsibleList from "../../../components/collapsibleList";
 import { renderBundles } from "../../../components/collapsibleList/utils";
 import { useUpdateEffect, useMemoizedFn } from 'ahooks';
 // import SelectTime from "../../../../../../../materials/src/components/select-time";
-import { getServiceTimes, deleteCacheParams, getProductTotalPrice } from "../../../utils";
+import { getServiceTimes, deleteCacheParams, getProductTotalPrice, isSessionProduct } from "../../../utils";
 import { getErrorList } from "../../utilsByBooking";
-import { formatResources, getDurationProps, getFlexibleOption, getTimeObj } from "../addService/utils";
-import { PisellAdjustPriceInputNumber } from "@pisell/materials";
+import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/utils";
+import { PisellAdjustPriceInputNumber } from '@pisell/materials';
+import { editSessionProduct } from "../../../info/utils";
+import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
+import { addService, genServiceKey, getIsShowNumber } from "../../../../ticketBooking/utils";
 var submitLock = false;
 var Info = function Info(_, ref) {
-  var _state$bookingConfig2, _state$service$cacheI4, _state$service$cacheI5, _state$service3, _state$service5, _window$BaseMaterials, _state$service$cacheI6, _state$service6, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service$cacheI10, _state$bookingConfig3, _state$service$resour;
+  var _state$service3, _state$bookingConfig2, _state$service$cacheI4, _state$service$cacheI5, _state$service6, _state$service8, _window$BaseMaterials, _state$service$cacheI6, _state$service9, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service$cacheI10, _state$bookingConfig3, _state$service$resour;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -47,6 +50,11 @@ var Info = function Info(_, ref) {
     state = _useContext.state,
     dispatch = _useContext.dispatch;
   var resourcesRef = useRef(null);
+  var isChangeTotal = useRef(false);
+  var isNormalProduct = useMemo(function () {
+    var _state$service, _state$service2;
+    return (state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.cacheItem) && isNormalProductByDurationSchedule(state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.cacheItem);
+  }, [state === null || state === void 0 || (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.cacheItem]);
 
   // 当前商品信息+ 表单信息
   var getCurrentCacheItem = function getCurrentCacheItem(_cacheItem) {
@@ -201,9 +209,9 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 14:04
    */
   var onFinish = function onFinish(values) {
-    var _resourcesRef$current;
+    var _resourcesRef$current, _item$_extend;
     var isSuccess = (_resourcesRef$current = resourcesRef.current) === null || _resourcesRef$current === void 0 ? void 0 : _resourcesRef$current.check();
-    if (!isSuccess) {
+    if (isShowTimeAndResource && !isSuccess) {
       return;
     }
     // 防止多次提交, 增加锁
@@ -220,7 +228,11 @@ var Info = function Info(_, ref) {
     var _item = _objectSpread(_objectSpread({}, state.service.cacheItem), {}, {
       autoClose: false
     });
-    var _extend = _objectSpread(_objectSpread({}, _item._extend), values);
+    var _extend = _objectSpread(_objectSpread({}, _item._extend), {}, {
+      other: _objectSpread(_objectSpread({}, ((_item$_extend = _item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other) || {}), {}, {
+        quantity: values.quantity
+      })
+    }, values);
     var _getServiceTimes = getServiceTimes({
         _extend: _extend
       }),
@@ -233,14 +245,20 @@ var Info = function Info(_, ref) {
     }
     _item._extend = _extend;
     _item._time = new Date().getTime();
+    _item._serviceKey = genServiceKey(_item);
     var _id = _item === null || _item === void 0 ? void 0 : _item._id;
 
     // 判断是新增还是编辑
     if (!_list.some(function (d) {
       return d._id === _id;
     })) {
-      _list.push(_item);
+      var detail = addService(_list, _item, state);
+      _list = detail.list;
     } else {
+      // 手动改价时移除优惠券使用
+      if (isChangeTotal.current) {
+        delete _item.discount_list;
+      }
       _list = _list.map(function (d) {
         return d._id === _id ? _objectSpread(_objectSpread({}, _item), {}, {
           new: 0
@@ -262,11 +280,17 @@ var Info = function Info(_, ref) {
       }
     });
   };
-  var setEditData = useMemoizedFn(function (_cacheItem) {
+  var setEditData = useMemoizedFn(function (_cacheItem, open, openProductDetail) {
     form.resetFields();
+    isChangeTotal.current = false;
     var cacheItem = _cacheItem || state.service.cacheItem;
     var values = cacheItem._extend;
     form.setFieldsValue(values);
+    if (openProductDetail) {
+      setTimeout(function () {
+        handleEdit({});
+      }, 100);
+    }
   });
 
   /**
@@ -359,16 +383,16 @@ var Info = function Info(_, ref) {
     getDiscount();
   }, [useTotal, (_state$service$cacheI5 = state.service.cacheItem) === null || _state$service$cacheI5 === void 0 || (_state$service$cacheI5 = _state$service$cacheI5._extend) === null || _state$service$cacheI5 === void 0 ? void 0 : _state$service$cacheI5.origin_total]);
   var isDiscount = useMemo(function () {
-    var _state$service, _state$service2;
-    if (!((_state$service = state.service) !== null && _state$service !== void 0 && _state$service.cacheItem)) {
+    var _state$service4, _state$service5;
+    if (!((_state$service4 = state.service) !== null && _state$service4 !== void 0 && _state$service4.cacheItem)) {
       return false;
     }
-    return useTotal != ((_state$service2 = state.service) === null || _state$service2 === void 0 || (_state$service2 = _state$service2.cacheItem) === null || _state$service2 === void 0 ? void 0 : _state$service2._extend.origin_total);
-  }, [useTotal, (_state$service3 = state.service) === null || _state$service3 === void 0 || (_state$service3 = _state$service3.cacheItem) === null || _state$service3 === void 0 ? void 0 : _state$service3._extend.origin_total]);
+    return useTotal != ((_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.cacheItem) === null || _state$service5 === void 0 ? void 0 : _state$service5._extend.origin_total);
+  }, [useTotal, (_state$service6 = state.service) === null || _state$service6 === void 0 || (_state$service6 = _state$service6.cacheItem) === null || _state$service6 === void 0 ? void 0 : _state$service6._extend.origin_total]);
   var bundles = useMemo(function () {
-    var _state$service4;
-    return ((_state$service4 = state.service) === null || _state$service4 === void 0 || (_state$service4 = _state$service4.cacheItem) === null || _state$service4 === void 0 || (_state$service4 = _state$service4._extend) === null || _state$service4 === void 0 || (_state$service4 = _state$service4.other) === null || _state$service4 === void 0 ? void 0 : _state$service4.bundle) || [];
-  }, [(_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.cacheItem) === null || _state$service5 === void 0 || (_state$service5 = _state$service5._extend) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.other) === null || _state$service5 === void 0 ? void 0 : _state$service5.bundle]);
+    var _state$service7;
+    return ((_state$service7 = state.service) === null || _state$service7 === void 0 || (_state$service7 = _state$service7.cacheItem) === null || _state$service7 === void 0 || (_state$service7 = _state$service7._extend) === null || _state$service7 === void 0 || (_state$service7 = _state$service7.other) === null || _state$service7 === void 0 ? void 0 : _state$service7.bundle) || [];
+  }, [(_state$service8 = state.service) === null || _state$service8 === void 0 || (_state$service8 = _state$service8.cacheItem) === null || _state$service8 === void 0 || (_state$service8 = _state$service8._extend) === null || _state$service8 === void 0 || (_state$service8 = _state$service8.other) === null || _state$service8 === void 0 ? void 0 : _state$service8.bundle]);
 
   /**
    * @title: 编辑商品
@@ -379,11 +403,22 @@ var Info = function Info(_, ref) {
    * @Date: 2024-08-28 17:08
    */
   var handleEdit = function handleEdit(e) {
+    var _state$client;
     // 当前商品
     var item = state.service.cacheItem;
 
     // 表单数据
     var values = form.getFieldsValue();
+    var isSession = isSessionProduct(item);
+    var sessionValue = {};
+    if (isSession) {
+      var _item$_extend2, _item$_extend3, _item$_extend4;
+      sessionValue.startEndTime = {
+        startDate: item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.start_date,
+        endDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.end_date,
+        duration: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.duration
+      };
+    }
 
     // 打开商品详情弹窗
     state.action({
@@ -392,22 +427,33 @@ var Info = function Info(_, ref) {
         id: item.id,
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
-          option: false,
-          session: false,
-          variant: false,
-          package: true
+          option: true,
+          session: isSession,
+          variant: true,
+          package: true,
+          number: getIsShowNumber(item, state)
         },
-        value: item._extend.other
+        isOS: isSession,
+        customer_id: (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id,
+        value: _objectSpread(_objectSpread(_objectSpread({}, item._extend.other), sessionValue), {}, {
+          quantity: values.quantity || item._extend.quantity
+        })
       },
-      callback: function callback(e) {
+      callback: function callback(e, extension_type, detail) {
+        var _cacheItem$_extend;
+        var _detail = detail || item;
+        var other = JSON.parse(JSON.stringify(e));
+        other.session = e.session;
+
         // 重新生成商品
-        var cacheItem = _objectSpread(_objectSpread({}, item), {}, {
+        var cacheItem = _objectSpread(_objectSpread(_objectSpread({}, item), _detail), {}, {
           product_id: item.id,
           _id: item === null || item === void 0 ? void 0 : item._id,
           _key: e.key,
           _extend: _objectSpread(_objectSpread(_objectSpread({}, item._extend), values), {}, {
+            quantity: (e === null || e === void 0 ? void 0 : e.quantity) || (values === null || values === void 0 ? void 0 : values.quantity) || 1,
             // 覆盖选择的规格和套餐
-            other: JSON.parse(JSON.stringify(e))
+            other: other
           }),
           new: 0
         });
@@ -417,6 +463,21 @@ var Info = function Info(_, ref) {
 
         // 用于折扣 可修改
         cacheItem._extend.total = _total;
+        try {
+          cacheItem._extend.capacity = setDefaultCapacitys({
+            capacitys: cacheItem._data.capacitys,
+            cacheItem: cacheItem
+          });
+        } catch (err) {}
+        var sessionDetail = editSessionProduct(cacheItem, e.session);
+        if (sessionDetail) {
+          setTimeout(function () {
+            form.setFieldsValue({
+              start_time: sessionDetail.start_time,
+              duration: sessionDetail.duration
+            });
+          }, 200);
+        }
 
         // 用于储存原价
         cacheItem._extend.origin_total = _total;
@@ -431,7 +492,9 @@ var Info = function Info(_, ref) {
 
         // 更新表单内的商品价格
         form.setFieldsValue({
-          total: _total
+          total: _total,
+          capacity: (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.capacity,
+          quantity: (e === null || e === void 0 ? void 0 : e.quantity) || (values === null || values === void 0 ? void 0 : values.quantity) || 1
         });
       }
     });
@@ -466,7 +529,16 @@ var Info = function Info(_, ref) {
       init: setEditData
     };
   });
-  console.log('state.service.value', state.service.value);
+  var handleTotalChange = function handleTotalChange(number) {
+    isChangeTotal.current = true;
+  };
+  var isShowTimeAndResource = useMemo(function () {
+    // 非活动预约 非普通商品时展示
+    if (state.renderType !== 'eventBooking' && !isNormalProduct) {
+      return true;
+    }
+    return false;
+  }, [state.renderType, isNormalProduct]);
   var SelectTime = (_window$BaseMaterials = window.BaseMaterials) === null || _window$BaseMaterials === void 0 ? void 0 : _window$BaseMaterials.SelectTime;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     titleNoWrap: true
@@ -474,6 +546,7 @@ var Info = function Info(_, ref) {
     ,
     zIndex: state.service.changeService ? 999 : 1000,
     forceRender: true,
+    mask: state.drawerMask,
     open: state.service.editModal && !((_state$service$cacheI6 = state.service.cacheItem) !== null && _state$service$cacheI6 !== void 0 && _state$service$cacheI6.autoClose),
     title: locales.getText('pisell2.text.edit-service'),
     onClose: function onClose() {
@@ -507,7 +580,7 @@ var Info = function Info(_, ref) {
     className: "current-service-info-name-wrap"
   }, /*#__PURE__*/React.createElement("div", {
     className: "current-service-info-name"
-  }, ((_state$service6 = state.service) === null || _state$service6 === void 0 || (_state$service6 = _state$service6.cacheItem) === null || _state$service6 === void 0 || (_state$service6 = _state$service6._extend) === null || _state$service6 === void 0 ? void 0 : _state$service6.product_name) || '-'), /*#__PURE__*/React.createElement(Button, {
+  }, ((_state$service9 = state.service) === null || _state$service9 === void 0 || (_state$service9 = _state$service9.cacheItem) === null || _state$service9 === void 0 || (_state$service9 = _state$service9._extend) === null || _state$service9 === void 0 ? void 0 : _state$service9.product_name) || '-'), /*#__PURE__*/React.createElement(Button, {
     onClick: handleEdit
   }, locales.getText('pisell2.text.edit')), !state.isBookingCreatePage && /*#__PURE__*/React.createElement(Button, {
     onClick: handleChange
@@ -535,6 +608,7 @@ var Info = function Info(_, ref) {
     min: 0,
     precision: 2,
     prefix: state.amountSymbol,
+    onChange: handleTotalChange,
     disabled: state.channelDisabledEdit,
     originValue: ((_state$service$cacheI9 = state.service.cacheItem) === null || _state$service$cacheI9 === void 0 || (_state$service$cacheI9 = _state$service$cacheI9._extend) === null || _state$service$cacheI9 === void 0 ? void 0 : _state$service$cacheI9.origin_total) || 0,
     placeholder: ((_state$service$cacheI10 = state.service.cacheItem) === null || _state$service$cacheI10 === void 0 || (_state$service$cacheI10 = _state$service$cacheI10._extend) === null || _state$service$cacheI10 === void 0 ? void 0 : _state$service$cacheI10.origin_total) || '0'
@@ -545,7 +619,7 @@ var Info = function Info(_, ref) {
     name: "discount_reason"
   }, /*#__PURE__*/React.createElement(Input.TextArea, {
     size: "large"
-  }))) : null, state.renderType !== 'eventBooking' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Col, {
+  }))) : null, isShowTimeAndResource && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Col, {
     span: 12
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: locales.getText('pisell2.text.start_time'),
@@ -594,7 +668,29 @@ var Info = function Info(_, ref) {
   })), /*#__PURE__*/React.createElement(Form.Item, {
     hidden: true,
     name: "quantity"
-  }, /*#__PURE__*/React.createElement(InputNumber, null))))), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(InputNumber, null))), isNormalProduct && /*#__PURE__*/React.createElement(Col, {
+    span: 24
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: locales.getText('pisell2.text.quantity'),
+    name: "quantity",
+    rules: [{
+      required: true
+    }]
+  }, /*#__PURE__*/React.createElement(InputNumber, {
+    size: "large",
+    style: {
+      width: '100%'
+    },
+    min: 1,
+    max: 999999,
+    formatter: function formatter(value) {
+      if (value !== undefined) {
+        // 向下取整
+        return Math.floor(value);
+      }
+      return value;
+    }
+  }))))), /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-body-edit-footer"
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-delete-wrap",
@@ -604,7 +700,7 @@ var Info = function Info(_, ref) {
   })), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     className: "pisell-lowcode__booking-service-body-edit-footer-apple",
-    disabled: !((_state$service$resour = state.service.resourcesOrigin) !== null && _state$service$resour !== void 0 && _state$service$resour.length),
+    disabled: !isNormalProduct && !((_state$service$resour = state.service.resourcesOrigin) !== null && _state$service$resour !== void 0 && _state$service$resour.length),
     onClick: function onClick() {
       form.submit();
     }

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

@@ -7,5 +7,7 @@
 
 判断是否需要进入编辑服务页
  */
-declare const isNewService: (service: any) => any;
-declare const init: ({ cacheItem, state }: any) => any;
+export declare const getAutoAllocationStorage: (id: string | number) => any;
+export declare const setAutoAllocationStorage: (data: {
+    [key: string]: boolean;
+}) => void;

package/es/components/booking/info2/service/editService/utils.js

@@ -14,6 +14,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 判断是否需要进入编辑服务页
  */
 
+import { isBoolean } from "@pisell/utils";
 var isNewService = function isNewService(service) {
   return !service.new && service._extend.endDate;
 };
@@ -34,4 +35,21 @@ var init = function init(_ref) {
   var _isNewService = isNewService(cacheItem);
   if (!_isNewService) {}
   return _objectSpread({}, cacheItem);
+};
+export var getAutoAllocationStorage = function getAutoAllocationStorage(id) {
+  var value = localStorage.getItem('resource-auto-allocation');
+  if (value) {
+    var valueObj = JSON.parse(value);
+    return isBoolean(valueObj[id]) ? valueObj[id] : true;
+  }
+  return true;
+};
+export var setAutoAllocationStorage = function setAutoAllocationStorage(data) {
+  var value = localStorage.getItem('resource-auto-allocation');
+  if (value) {
+    var valueObj = JSON.parse(value);
+    localStorage.setItem('resource-auto-allocation', JSON.stringify(_objectSpread(_objectSpread({}, valueObj), data)));
+  } else {
+    localStorage.setItem('resource-auto-allocation', JSON.stringify(_objectSpread({}, data)));
+  }
 };

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

@@ -1,58 +1,42 @@
-import React, { useEffect, useContext, useMemo, useRef } from 'react';
+import React, { useEffect, useContext } from 'react';
 import AddService from "./addService";
 import { Context } from "../../info/model";
 import EditService from "./editService";
 import "../../info/service/index.less";
-import ServiceList from "./serviceList";
 import AddTimeModal from "./addTimeModal";
+import useInfoHolder from "../../info/hooks/useInfoHolder";
+import Lists from "../../info/service/Lists";
 import useClearCart from "../../hooks/useClearCart";
+import useQuotation from "../../hooks/useQuotation";
 var Service = function Service() {
-  var _state$bookingConfig2;
   var _useContext = useContext(Context),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
-  var detailRef = useRef();
+  var _useInfoHolder = useInfoHolder(state, dispatch),
+    detailRef = _useInfoHolder.detailRef,
+    handleEdit = _useInfoHolder.handleEdit,
+    handleAction = _useInfoHolder.handleAction,
+    dispatchService = _useInfoHolder.dispatchService,
+    showAddTimeModal = _useInfoHolder.showAddTimeModal;
   useEffect(function () {
     document.body.id = 'body';
   }, []);
-  var appointment_card = useMemo(function () {
-    var _state$bookingConfig;
-    return (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.information_tab) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.appointment_card) || {
-      quick_time: 1
-    };
-  }, [state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.information_tab]);
-  var showAddTimeModal = useMemo(function () {
-    // event预约不需要
-    if ((state === null || state === void 0 ? void 0 : state.renderType) === 'eventBooking') {
-      return false;
-    }
-
-    // 禁止编辑
-    if (state !== null && state !== void 0 && state.disabledEdit) {
-      return false;
-    }
-
-    // 未开启加时
-    if (appointment_card.quick_time !== 1) {
-      return false;
-    }
-    return true;
-  }, [state, appointment_card.quick_time]);
-  var handleEdit = function handleEdit(cacheItem) {
-    setTimeout(function () {
-      var _detailRef$current, _detailRef$current$in;
-      (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem);
-    }, 100);
-  };
   var clearCart = useClearCart(state, dispatch);
+  var _useQuotation = useQuotation(state, dispatch),
+    dom = _useQuotation.dom;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-wrap"
-  }, clearCart, /*#__PURE__*/React.createElement(ServiceList, {
-    onEdit: handleEdit
-  }), /*#__PURE__*/React.createElement(AddService, {
+  }, clearCart, /*#__PURE__*/React.createElement(Lists, {
+    isParallelResource: true,
+    onEdit: handleEdit,
+    onAction: handleAction,
+    onChange: function onChange(e, type) {
+      return dispatchService(type || 'setService', e);
+    }
+  }), !state.isBookingCreatePage ? /*#__PURE__*/React.createElement(AddService, {
     onEdit: handleEdit
-  })), /*#__PURE__*/React.createElement(EditService, {
+  }) : null), /*#__PURE__*/React.createElement(EditService, {
     ref: detailRef
-  }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null));
+  }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null), dom);
 };
 export default /*#__PURE__*/React.memo(Service);

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

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

@@ -0,0 +1,4 @@
+export declare const getFormatResourceListAndMap: (data: any[], bookingId?: number[]) => {
+    list: any[];
+    listMap: any;
+};

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

@@ -0,0 +1,42 @@
+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); }
+import { getNoResource2 } from "../mock";
+export var getFormatResourceListAndMap = function getFormatResourceListAndMap(data) {
+  var bookingId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var resourceList = (data || {}).concat([getNoResource2({})]);
+  var map = resourceList.reduce(function (prev, item) {
+    prev[item.id] = item;
+    return prev;
+  }, {});
+  var getCapacity = function getCapacity(item) {
+    // if (item.combined_resource?.status === 1 && item.combined_resource?.resource_ids?.length) {
+    //   return item.combined_resource?.resource_ids.reduce((pre: any, cur: any) => {
+    //     let pax = 0;
+    //     (map[cur]?.times || []).forEach((time:any) => {
+    //       time.event_list.forEach((event: any) => {
+    //         if (!bookingId.includes(event.id)) {
+    //           pax += (event?.pax || 0)
+    //         }
+    //       })
+    //     })
+    //     return pre - pax;
+    //   },item.capacity)
+    // }
+    return item.capacity;
+  };
+  resourceList = resourceList.map(function (item) {
+    var newItem = _objectSpread(_objectSpread({}, item), {}, {
+      capacity: getCapacity(item)
+    });
+    map[item.id] = newItem;
+    return newItem;
+  });
+  return {
+    list: resourceList,
+    listMap: map
+  };
+};

package/es/components/booking/info2/utilsByBooking.d.ts

@@ -1,5 +1,5 @@
 export declare const getResourceTimeIsUsable: (item: any, cacheItem: any, resourceItem: any) => any;
-export declare const getSumCapacity: ({ cacheItem }: any) => number;
+export declare const getSumCapacity: ({ cacheItem }: any, isCalcQuantity?: boolean) => number;
 /**
  * @title: 查找是否有可用的time
  * @description:
@@ -22,6 +22,7 @@ export declare const getErrorList: (resource: any, cacheItem: any) => {
  * @Date: 2024-01-09 13:40
  */
 export declare const formatResource: (resourceItem: any, cacheItem?: any, formatLabel?: any) => any;
+export declare const getAppointmentTimingPreference: (state: any) => any;
 /**
  * @title: 创建服务的开始时间和结束时间
  * @description:

package/es/components/booking/info2/utilsByBooking.js

@@ -9,7 +9,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 dayjs from 'dayjs';
 import { locales } from "@pisell/utils";
-import { getCacheParams, getServeStartTime, getLastServer, flexibleObj, getServiceTimes, findNextDuration } from "../utils";
+import { getCacheParams, getServeStartTime, getLastServer, flexibleObj, getServiceTimes, findNextDuration, getDays, isSessionProduct } from "../utils";
 
 // 获取当前剩余量
 var getUseableEventCount = function getUseableEventCount(eventList, current) {
@@ -39,7 +39,7 @@ var isConflict = function isConflict(event, current) {
 // 从times中找可用的time
 export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cacheItem, resourceItem) {
   // 当前资源的开始时间
-  var startDate = dayjs(cacheItem._extend.start_date.format("YYYY-MM-DD") + ' ' + getServeStartTime(cacheItem._extend.start_time));
+  var startDate = dayjs(dayjs(cacheItem._extend.start_date).format("YYYY-MM-DD") + ' ' + getServeStartTime(cacheItem._extend.start_time));
 
   // 是否为灵活时长
   var isFlexible = flexibleObj.isFlexible(cacheItem._extend.duration);
@@ -69,7 +69,9 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
   });
 
   // 已预约的列表
-  var eventList = time.event_list || [];
+  var eventList = (time.event_list || []).filter(function (event) {
+    return event.id !== (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.booking_id);
+  });
   var endDate = null;
   // 是否去计算数量
   var isCalcCount = true;
@@ -79,12 +81,13 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
    */
   if (isFlexible) {
     // 如果有event, 那么灵活时长时间只能在 最后一个event的结束时间 ~ time的结束时间内
-    if (eventList.length) {
-      timeStartDate = eventList.reduce(function (max, event) {
-        var endAt = dayjs(event.end_at);
-        return endAt.isAfter(max) ? endAt : max;
-      }, dayjs(eventList[0].end_at));
-    }
+    // if (eventList.length) {
+    //   timeStartDate = (eventList).reduce((max: any, event: any) => {
+    //     const endAt = dayjs(event.end_at);
+    //     return endAt.isAfter(max) ? endAt : max;
+    //   }, dayjs(eventList[0].end_at));
+    // }
+
     isDateRange = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
 
     // 如果灵活时长不在范围内, 则认为是已约满
@@ -113,7 +116,7 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
     */
 
     // 取出已预约列表和当前预约重叠的时间段
-    var conflict = (time.event_list || []).filter(function (d) {
+    var conflict = (eventList || []).filter(function (d) {
       return isConflict({
         start_at: d.start_at,
         end_at: d.end_at
@@ -159,7 +162,9 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
   return time;
 };
 export var getSumCapacity = function getSumCapacity(_ref) {
+  var _cacheItem$_extend;
   var cacheItem = _ref.cacheItem;
+  var isCalcQuantity = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   var sum = 0;
   var _iterator = _createForOfIteratorHelper(cacheItem._extend.capacity || []),
     _step;
@@ -173,7 +178,7 @@ export var getSumCapacity = function getSumCapacity(_ref) {
   } finally {
     _iterator.f();
   }
-  return sum;
+  return sum * (isCalcQuantity ? (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.quantity) || 1 : 1);
 };
 
 /**
@@ -255,6 +260,15 @@ export var getErrorList = function getErrorList(resource, cacheItem) {
       }
     }
   }
+
+  // 平行资源日历拖动优化需求
+  // 拖入到未绑定的资源中
+  if (resource.unbound) {
+    list.push({
+      label: locales.getText('pisell1.text.resource-error-message-unbound'),
+      type: "time"
+    });
+  }
   return list;
 };
 
@@ -283,6 +297,12 @@ export var formatResource = function formatResource(resourceItem, cacheItem, for
   return _resourceItem;
 };
 
+// 获取预约时间偏好设置
+export var getAppointmentTimingPreference = function getAppointmentTimingPreference(state) {
+  var _state$bookingConfig;
+  return (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.information_tab) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.appointment_timing_preference) || "sequential";
+};
+
 /**
  * @title: 创建服务的开始时间和结束时间
  * @description: 
@@ -293,7 +313,9 @@ export var formatResource = function formatResource(resourceItem, cacheItem, for
  * @Date: 2024-01-26 14:09
  */
 export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTime(state, cacheItem, timeObj) {
-  var _cacheItem$duration;
+  var _cacheItem$duration, _cacheItem$_extend2;
+  var appointmentTimingPreference = getAppointmentTimingPreference(state);
+
   // 获取上一个服务商品
   var lastServer = getLastServer(state.service.value);
 
@@ -307,11 +329,17 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
   if (lastServer) {
     var lastServerStartDate = lastServer._extend.startDate;
     var lastServerEndDate = lastServer._extend.endDate;
-    // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
-    if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
-      _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+
+    // 同时预约模式
+    if (appointmentTimingPreference === 'parallel') {
+      _extend.start_time = lastServerStartDate.format('HH:mm');
     } else {
-      _extend.start_time = lastServerEndDate.format("HH:mm");
+      // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
+      if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
+        _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+      } else {
+        _extend.start_time = lastServerEndDate.format("HH:mm");
+      }
     }
   } else {
     // 没有上一个商品  资源为 0
@@ -353,5 +381,16 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
     endDate = _getServiceTimes2.endDate;
   _extend.startDate = startDate;
   _extend.endDate = endDate;
+  var session = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 || (_cacheItem$_extend2 = _cacheItem$_extend2.other) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.session;
+  if (isSessionProduct(cacheItem) && session) {
+    _extend.start_date = session.start_at;
+    _extend.startDate = session.start_at;
+    _extend.start_time = session.start_time;
+    _extend.end_date = session.end_at;
+    _extend.endDate = session.end_at;
+    _extend.duration = getDays({
+      _extend: _extend
+    }, 'minutes');
+  }
   return _extend;
 };