@pisell/private-materials 3.0.166 → 3.0.168

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

@@ -177,7 +177,7 @@ var formatBookings = function formatBookings(data) {
       "duration": flexibleObj.getValue(item._extend.duration),
       "number": item._extend.capacity ? getSumCapacity({
         cacheItem: item
-      }) : 1,
+      }) : item._extend.number || 1,
       "resources": formatResource(item),
       "metadata": item._extend.capacity ? {
         capacity: item._extend.capacity

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

@@ -88,6 +88,6 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007];
+  var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320];
   return booking4Shops.includes(shopId);
 };

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

@@ -80,9 +80,9 @@ export var getFlexibleOption = function getFlexibleOption(_ref2) {
   });
   var _duration = _durationProps.duration;
   if (_duration === 'flexible') {
-    var _durationProps$usable, _durationProps$usable2;
+    var _durationProps$usable, _durationProps$usable2, _durationProps$usable3, _durationProps$usable4, _durationProps$usable5, _durationProps$usable6;
     // 获取结束时间
-    var endDate = getEndDate(_durationProps.startDate, _duration, (_durationProps$usable = _durationProps.usableTime) !== null && _durationProps$usable !== void 0 && _durationProps$usable.end_at ? dayjs((_durationProps$usable2 = _durationProps.usableTime) === null || _durationProps$usable2 === void 0 ? void 0 : _durationProps$usable2.end_at) : null);
+    var endDate = getEndDate(_durationProps.startDate, _duration, (_durationProps$usable = _durationProps.usableTime) !== null && _durationProps$usable !== void 0 && (_durationProps$usable2 = _durationProps$usable._extend) !== null && _durationProps$usable2 !== void 0 && (_durationProps$usable3 = _durationProps$usable2.usableTime) !== null && _durationProps$usable3 !== void 0 && _durationProps$usable3.end_at ? dayjs((_durationProps$usable4 = _durationProps.usableTime) === null || _durationProps$usable4 === void 0 ? void 0 : (_durationProps$usable5 = _durationProps$usable4._extend) === null || _durationProps$usable5 === void 0 ? void 0 : (_durationProps$usable6 = _durationProps$usable5.usableTime) === null || _durationProps$usable6 === void 0 ? void 0 : _durationProps$usable6.end_at) : null);
     // 转换为分钟
     var timeValue = endDate.diff(_durationProps.startDate, 'minute');
     return {
@@ -239,7 +239,7 @@ export var setDefaultResource = function setDefaultResource(_ref6) {
       var defaultResource = item.renderList.filter(function (d) {
         return d.is_default == 1 || d.id === resourceId;
       }).map(function (d) {
-        return {
+        return _objectSpread(_objectSpread({}, d), {}, {
           relation_type: d.relation_type,
           form_id: item.form_id,
           relation_id: d.id,
@@ -250,7 +250,7 @@ export var setDefaultResource = function setDefaultResource(_ref6) {
             form_name: item.title,
             resource_name: d.main_field
           }
-        };
+        });
       });
       obj[item.form_id] = defaultResource;
     };
@@ -465,11 +465,13 @@ export var getProductExtend = function getProductExtend(_ref8) {
 
     // 再次计算, 灵活时长
     if (getDuration(_cacheItem === null || _cacheItem === void 0 ? void 0 : _cacheItem.duration)) {
-      _cacheItem._data._timeObj = getTimeObj({
-        cacheItem: cacheItem,
+      _cacheItem._data.timeObj = getTimeObj({
+        cacheItem: _cacheItem,
+        useStartTime: _cacheItem._extend.start_time,
         currentResource: _cacheItem._extend.resource,
         state: state
       });
+      _cacheItem._extend.duration = _cacheItem._data.timeObj.durationSlicesBasedOnTime[0].value;
     }
 
     // 如果只有一种类型的资源 & 单选，还按照之前的逻辑处理：自动选中，不会打开Edit service抽屉。
@@ -479,13 +481,14 @@ export var getProductExtend = function getProductExtend(_ref8) {
     }
     _cacheItem._time = new Date().getTime();
   } else {
-    if (!_cacheItem._data._timeObj) {
-      _cacheItem._data._timeObj = getTimeObj({
-        cacheItem: cacheItem,
-        currentResource: _cacheItem._extend.resource,
-        state: state
-      });
-    }
+    // if (!_cacheItem._data.timeObj) {
+    // _cacheItem._data.timeObj = getTimeObj({
+    //   cacheItem: _cacheItem,
+    //   currentResource: _cacheItem._extend.resource,
+    //   state,
+    // });
+    // }
+
     if (!_cacheItem._data.capacitys) {
       // 容量
       _cacheItem._data.capacitys = cacheItem.capacity;
@@ -504,7 +507,17 @@ export var getProductExtend = function getProductExtend(_ref8) {
       _cacheItem._data.resources = _list2;
       _cacheItem._data.resourceMaps = _maps;
     }
+
+    // if (!_cacheItem._data.timeObj) {
+    _cacheItem._data.timeObj = getTimeObj({
+      cacheItem: _cacheItem,
+      useStartTime: _cacheItem._extend.start_time,
+      currentResource: _cacheItem._extend.resource,
+      state: state
+    });
+    // }
   }
+
   console.log('_cacheItem_cacheItem', _cacheItem);
   return _cacheItem;
 };

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

@@ -31,10 +31,10 @@ import { useUpdateEffect, useMemoizedFn } from 'ahooks';
 // import SelectTime from "../../../../../../../materials/src/components/select-time";
 import { getServiceTimes, deleteCacheParams, getProductTotalPrice } from "../../../utils";
 import { getErrorList } from "../../utilsByBooking";
-import { formatResources, getDurationProps, getFlexibleOption } from "../addService/utils";
+import { formatResources, getDurationProps, getFlexibleOption, getTimeObj } from "../addService/utils";
 var submitLock = false;
 var Info = function Info(_, ref) {
-  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service2, _state$service2$cache, _state$service$cacheI5, _state$service$cacheI6, _state$service$cacheI7, _state$service$cacheI8, _state$service5, _state$service5$cache, _state$service7, _state$service7$cache, _state$service7$cache2, _state$service7$cache3, _window$BaseMaterials, _state$service$cacheI9, _state$service8, _state$service8$cache, _state$service8$cache2, _state$service$cacheI10, _state$service$cacheI11, _state$service$cacheI12, _state$service$cacheI13, _state$bookingConfig5, _state$bookingConfig6, _state$bookingConfig7, _state$bookingConfig8, _state$service$resour;
+  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service$cacheI4, _state$service$cacheI5, _state$service$cacheI6, _state$service$cacheI7, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _window$BaseMaterials, _state$service$cacheI8, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI9, _state$service$cacheI10, _state$service$cacheI11, _state$service$cacheI12, _state$bookingConfig5, _state$bookingConfig6, _state$bookingConfig7, _state$bookingConfig8, _state$service$resour;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -112,10 +112,14 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 13:37
    */
   var timeObj = useMemo(function () {
-    var _state$service, _state$service$cacheI;
-    return (_state$service = state.service) === null || _state$service === void 0 ? void 0 : (_state$service$cacheI = _state$service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._data.timeObj;
-  }, [(_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : (_state$service2$cache = _state$service2.cacheItem) === null || _state$service2$cache === void 0 ? void 0 : _state$service2$cache._data.timeObj]);
-
+    return getTimeObj({
+      durationProps: durationProps,
+      useStartTime: useStartTime,
+      currentResource: currentResource,
+      state: state,
+      useDuration: useDuration
+    });
+  }, [durationProps, useStartTime, currentResource, state, useDuration]);
   // 由于灵活时长的结束时间随时变动, 这里发现如果当前选择的值没有在列表内,则选择最新的灵活时长值
   useEffect(function () {
     try {
@@ -137,12 +141,12 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 13:59
    */
   var handleDeleteProduct = function handleDeleteProduct() {
-    var _state$service$cacheI2;
+    var _state$service$cacheI;
     if (state.channelDisabledEdit) {
       return;
     }
     var _list = _toConsumableArray(state.service.value);
-    var _id = (_state$service$cacheI2 = state.service.cacheItem) === null || _state$service$cacheI2 === void 0 ? void 0 : _state$service$cacheI2._id;
+    var _id = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._id;
     _list = _list.filter(function (d) {
       return d._id !== _id;
     });
@@ -165,8 +169,8 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 14:03
    */
   var getDiscount = function getDiscount() {
-    var _state$service$cacheI3;
-    var oPrice = Number(((_state$service$cacheI3 = state.service.cacheItem) === null || _state$service$cacheI3 === void 0 ? void 0 : _state$service$cacheI3._extend.origin_total) || 0);
+    var _state$service$cacheI2;
+    var oPrice = Number(((_state$service$cacheI2 = state.service.cacheItem) === null || _state$service$cacheI2 === void 0 ? void 0 : _state$service$cacheI2._extend.origin_total) || 0);
     var cPrice = Number(useTotal || 0);
     var discount = '';
     // 原价 = 现价 为无折扣
@@ -273,12 +277,12 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 14:06
    */
   var isReason = useMemo(function () {
-    var _state$service$cacheI4;
-    var oPrice = Number(((_state$service$cacheI4 = state.service.cacheItem) === null || _state$service$cacheI4 === void 0 ? void 0 : _state$service$cacheI4._extend.origin_total) || 0);
+    var _state$service$cacheI3;
+    var oPrice = Number(((_state$service$cacheI3 = state.service.cacheItem) === null || _state$service$cacheI3 === void 0 ? void 0 : _state$service$cacheI3._extend.origin_total) || 0);
     var cPrice = Number(useTotal || 0);
     // 原价 !== 现价
     return cPrice !== oPrice;
-  }, [useTotal, (_state$service$cacheI5 = state.service.cacheItem) === null || _state$service$cacheI5 === void 0 ? void 0 : (_state$service$cacheI6 = _state$service$cacheI5._extend) === null || _state$service$cacheI6 === void 0 ? void 0 : _state$service$cacheI6.origin_total]);
+  }, [useTotal, (_state$service$cacheI4 = state.service.cacheItem) === null || _state$service$cacheI4 === void 0 ? void 0 : (_state$service$cacheI5 = _state$service$cacheI4._extend) === null || _state$service$cacheI5 === void 0 ? void 0 : _state$service$cacheI5.origin_total]);
   var getResources = function getResources() {
     var res = formatResources({
       cacheItem: getCurrentCacheItem(),
@@ -352,18 +356,18 @@ var Info = function Info(_, ref) {
    */
   useEffect(function () {
     getDiscount();
-  }, [useTotal, (_state$service$cacheI7 = state.service.cacheItem) === null || _state$service$cacheI7 === void 0 ? void 0 : (_state$service$cacheI8 = _state$service$cacheI7._extend) === null || _state$service$cacheI8 === void 0 ? void 0 : _state$service$cacheI8.origin_total]);
+  }, [useTotal, (_state$service$cacheI6 = state.service.cacheItem) === null || _state$service$cacheI6 === void 0 ? void 0 : (_state$service$cacheI7 = _state$service$cacheI6._extend) === null || _state$service$cacheI7 === void 0 ? void 0 : _state$service$cacheI7.origin_total]);
   var isDiscount = useMemo(function () {
-    var _state$service3, _state$service4, _state$service4$cache;
-    if (!((_state$service3 = state.service) !== null && _state$service3 !== void 0 && _state$service3.cacheItem)) {
+    var _state$service, _state$service2, _state$service2$cache;
+    if (!((_state$service = state.service) !== null && _state$service !== void 0 && _state$service.cacheItem)) {
       return false;
     }
-    return useTotal != ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : (_state$service4$cache = _state$service4.cacheItem) === null || _state$service4$cache === void 0 ? void 0 : _state$service4$cache._extend.origin_total);
-  }, [useTotal, (_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : (_state$service5$cache = _state$service5.cacheItem) === null || _state$service5$cache === void 0 ? void 0 : _state$service5$cache._extend.origin_total]);
+    return useTotal != ((_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : (_state$service2$cache = _state$service2.cacheItem) === null || _state$service2$cache === void 0 ? void 0 : _state$service2$cache._extend.origin_total);
+  }, [useTotal, (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : (_state$service3$cache = _state$service3.cacheItem) === null || _state$service3$cache === void 0 ? void 0 : _state$service3$cache._extend.origin_total]);
   var bundles = useMemo(function () {
-    var _state$service6, _state$service6$cache, _state$service6$cache2, _state$service6$cache3;
-    return ((_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : (_state$service6$cache = _state$service6.cacheItem) === null || _state$service6$cache === void 0 ? void 0 : (_state$service6$cache2 = _state$service6$cache._extend) === null || _state$service6$cache2 === void 0 ? void 0 : (_state$service6$cache3 = _state$service6$cache2.other) === null || _state$service6$cache3 === void 0 ? void 0 : _state$service6$cache3.bundle) || [];
-  }, [(_state$service7 = state.service) === null || _state$service7 === void 0 ? void 0 : (_state$service7$cache = _state$service7.cacheItem) === null || _state$service7$cache === void 0 ? void 0 : (_state$service7$cache2 = _state$service7$cache._extend) === null || _state$service7$cache2 === void 0 ? void 0 : (_state$service7$cache3 = _state$service7$cache2.other) === null || _state$service7$cache3 === void 0 ? void 0 : _state$service7$cache3.bundle]);
+    var _state$service4, _state$service4$cache, _state$service4$cache2, _state$service4$cache3;
+    return ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : (_state$service4$cache = _state$service4.cacheItem) === null || _state$service4$cache === void 0 ? void 0 : (_state$service4$cache2 = _state$service4$cache._extend) === null || _state$service4$cache2 === void 0 ? void 0 : (_state$service4$cache3 = _state$service4$cache2.other) === null || _state$service4$cache3 === void 0 ? void 0 : _state$service4$cache3.bundle) || [];
+  }, [(_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : (_state$service5$cache = _state$service5.cacheItem) === null || _state$service5$cache === void 0 ? void 0 : (_state$service5$cache2 = _state$service5$cache._extend) === null || _state$service5$cache2 === void 0 ? void 0 : (_state$service5$cache3 = _state$service5$cache2.other) === null || _state$service5$cache3 === void 0 ? void 0 : _state$service5$cache3.bundle]);
 
   /**
    * @title: 编辑商品
@@ -470,7 +474,7 @@ var Info = function Info(_, ref) {
     ,
     zIndex: state.service.changeService ? 999 : 1000,
     forceRender: true,
-    open: state.service.editModal && !((_state$service$cacheI9 = state.service.cacheItem) !== null && _state$service$cacheI9 !== void 0 && _state$service$cacheI9.autoClose),
+    open: state.service.editModal && !((_state$service$cacheI8 = state.service.cacheItem) !== null && _state$service$cacheI8 !== void 0 && _state$service$cacheI8.autoClose),
     title: locales.getText('pisell2.text.edit-service'),
     onClose: function onClose() {
       dispatch({
@@ -503,7 +507,7 @@ var Info = function Info(_, ref) {
     className: "current-service-info-name-wrap"
   }, /*#__PURE__*/React.createElement("div", {
     className: "current-service-info-name"
-  }, ((_state$service8 = state.service) === null || _state$service8 === void 0 ? void 0 : (_state$service8$cache = _state$service8.cacheItem) === null || _state$service8$cache === void 0 ? void 0 : (_state$service8$cache2 = _state$service8$cache._extend) === null || _state$service8$cache2 === void 0 ? void 0 : _state$service8$cache2.product_name) || '-'), /*#__PURE__*/React.createElement(Button, {
+  }, ((_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : (_state$service6$cache = _state$service6.cacheItem) === null || _state$service6$cache === void 0 ? void 0 : (_state$service6$cache2 = _state$service6$cache._extend) === null || _state$service6$cache2 === void 0 ? void 0 : _state$service6$cache2.product_name) || '-'), /*#__PURE__*/React.createElement(Button, {
     onClick: handleEdit
   }, locales.getText('pisell2.text.edit')), !state.isBookingCreatePage && /*#__PURE__*/React.createElement(Button, {
     onClick: handleChange
@@ -532,8 +536,8 @@ var Info = function Info(_, ref) {
       width: '100%'
     },
     min: 0,
-    max: ((_state$service$cacheI10 = state.service.cacheItem) === null || _state$service$cacheI10 === void 0 ? void 0 : (_state$service$cacheI11 = _state$service$cacheI10._extend) === null || _state$service$cacheI11 === void 0 ? void 0 : _state$service$cacheI11.origin_total) || 0,
-    placeholder: ((_state$service$cacheI12 = state.service.cacheItem) === null || _state$service$cacheI12 === void 0 ? void 0 : (_state$service$cacheI13 = _state$service$cacheI12._extend) === null || _state$service$cacheI13 === void 0 ? void 0 : _state$service$cacheI13.origin_total) || '0'
+    max: ((_state$service$cacheI9 = state.service.cacheItem) === null || _state$service$cacheI9 === void 0 ? void 0 : (_state$service$cacheI10 = _state$service$cacheI9._extend) === null || _state$service$cacheI10 === void 0 ? void 0 : _state$service$cacheI10.origin_total) || 0,
+    placeholder: ((_state$service$cacheI11 = state.service.cacheItem) === null || _state$service$cacheI11 === void 0 ? void 0 : (_state$service$cacheI12 = _state$service$cacheI11._extend) === null || _state$service$cacheI12 === void 0 ? void 0 : _state$service$cacheI12.origin_total) || '0'
   }))), /*#__PURE__*/React.createElement(Col, {
     span: 12
   }, /*#__PURE__*/React.createElement(Form.Item, {

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

@@ -71,6 +71,8 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
   // 已预约的列表
   var eventList = time.event_list || [];
   var endDate = null;
+  // 是否去计算数量
+  var isCalcCount = true;
 
   /**
    * 从这里为判断是否在时间范围内
@@ -84,6 +86,14 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
       }, dayjs(eventList[0].end_at));
     }
     isDateRange = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
+
+    // 如果灵活时长不在范围内, 则认为是已约满
+    if (!isDateRange && eventList.length) {
+      isCalcCount = false;
+      isDateRange = true;
+      isCountRange = false;
+    }
+    // debugger
   } else {
     // 其余判断 开始时间 和 结束时间 是否都在范围内
     endDate = startDate.add(flexibleObj.getValue(cacheItem._extend.duration), "minute");
@@ -94,46 +104,48 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
       isDateRange = true;
     }
   }
-  // 如果 预约人数超过总容量, 则不可用
-  // if (totalCount < currentCount) {
-  // isCountRange = false;
-  // } else {
-  /**
-  * 从这里判断预约量
-  */
-
-  // 取出已预约列表和当前预约重叠的时间段
-  var conflict = (time.event_list || []).filter(function (d) {
-    return isConflict({
-      start_at: d.start_at,
-      end_at: d.end_at
-    }, {
-      start_at: startDate,
-      end_at: endDate
+  if (isCalcCount) {
+    // 如果 预约人数超过总容量, 则不可用
+    // if (totalCount < currentCount) {
+    // isCountRange = false;
+    // } else {
+    /**
+    * 从这里判断预约量
+    */
+
+    // 取出已预约列表和当前预约重叠的时间段
+    var conflict = (time.event_list || []).filter(function (d) {
+      return isConflict({
+        start_at: d.start_at,
+        end_at: d.end_at
+      }, {
+        start_at: startDate,
+        end_at: endDate
+      });
     });
-  });
 
-  // 同一时间段内只能进行一个预约，无论容量是否已满。
-  if (resourceItem.resourceType === 'single') {
-    // 0代表着不重叠,则满足条件
-    if (conflict.length === 0) {
-      isCountRange = true;
+    // 同一时间段内只能进行一个预约，无论容量是否已满。
+    if (resourceItem.resourceType === 'single') {
+      // 0代表着不重叠,则满足条件
+      if (conflict.length === 0) {
+        isCountRange = true;
+      } else {
+        isCountRange = false;
+      }
     } else {
-      isCountRange = false;
-    }
-  } else {
-    // 减去重叠的总量
-    var conflictCount = getUseableEventCount(conflict, resourceItem.capacity);
+      // 减去重叠的总量
+      var conflictCount = getUseableEventCount(conflict, resourceItem.capacity);
 
-    // 当前预约量 <= 总剩余容量
-    if (currentCount <= conflictCount) {
-      isCountRange = true;
-    } else {
-      isCountRange = false;
+      // 当前预约量 <= 总剩余容量
+      if (currentCount <= conflictCount) {
+        isCountRange = true;
+      } else {
+        isCountRange = false;
+      }
     }
-  }
 
-  // }
+    // }
+  }
 
   // 是否可用  只判断是否在日期范围内, 
   var isUsable = isDateRange && isCountRange;

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

@@ -1,5 +1,5 @@
-import { SelectProps } from "antd";
-import React from "react";
+import { SelectProps } from 'antd';
+import React from 'react';
 interface DurationProps extends SelectProps {
     locale?: string;
     slice?: number;

package/es/components/booking/materiels/duration/index.js

@@ -3,14 +3,14 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { Select } from "antd";
-import React, { useCallback, useEffect, useMemo } from "react";
+import { Select } from 'antd';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import { sliceDayIntoFiveMinutes, getEndDate, flexibleObj, getDiscountTime } from "../../utils";
-import dayjs from "dayjs";
-import { locales } from "@pisell/utils";
+import dayjs from 'dayjs';
+import { locales } from '@pisell/utils';
 var Duration = function Duration(props) {
   var _props$locale = props.locale,
-    locale = _props$locale === void 0 ? "en" : _props$locale,
+    locale = _props$locale === void 0 ? 'en' : _props$locale,
     _props$slice = props.slice,
     slice = _props$slice === void 0 ? 5 : _props$slice,
     timeObjChange = props.timeObjChange,
@@ -34,15 +34,15 @@ var Duration = function Duration(props) {
     }
     var _sliceDayIntoFiveMinu = sliceDayIntoFiveMinutes(slice, locale),
       durationSlicesBasedOnTime = _sliceDayIntoFiveMinu.durationSlicesBasedOnTime;
-    var _duration = _typeof(duration) === "object" ? duration.type : duration;
+    var _duration = _typeof(duration) === 'object' ? duration.type : duration;
     // 灵活时长
-    if (_duration === "flexible") {
+    if (_duration === 'flexible') {
       var endDate = getEndDate(startDate, _duration, usableTime !== null && usableTime !== void 0 && usableTime.end_at ? dayjs(usableTime === null || usableTime === void 0 ? void 0 : usableTime.end_at) : null);
-      var timeValue = endDate.diff(startDate, "minute");
+      var timeValue = endDate.diff(startDate, 'minute');
 
       // 动态获取结束时间
       durationSlicesBasedOnTime.unshift({
-        label: locales.getText("pisell2.text.flexible"),
+        label: locales.getText('pisell2.text.flexible'),
         value: flexibleObj.create(timeValue)
       });
     }
@@ -62,8 +62,8 @@ var Duration = function Duration(props) {
     timeObjChange === null || timeObjChange === void 0 ? void 0 : timeObjChange(times);
   }, [times]);
   var renderOptions = useCallback(function (array) {
-    var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "value";
-    var label = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "label";
+    var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'value';
+    var label = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'label';
     return array.map(function (d) {
       return /*#__PURE__*/React.createElement(Select.Option, {
         value: d[value],

package/lib/components/booking/components/footer/utils.js

@@ -160,7 +160,7 @@ var formatBookings = (data) => {
       "end_date": end_date,
       "start_date": start_date,
       "duration": import_utils.flexibleObj.getValue(item._extend.duration),
-      "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }) : 1,
+      "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }) : item._extend.number || 1,
       "resources": formatResource(item),
       "metadata": item._extend.capacity ? {
         capacity: item._extend.capacity

package/lib/components/booking/info/utils.js

@@ -83,7 +83,7 @@ var isBooking4Shop = (shopId, renderType) => {
   if (renderType === "eventBooking") {
     return false;
   }
-  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007];
+  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320];
   return booking4Shops.includes(shopId);
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/booking/info2/service/addService/utils.js

@@ -90,7 +90,7 @@ var getFlexibleOption = ({
   slice,
   durationProps
 }) => {
-  var _a, _b;
+  var _a, _b, _c, _d, _e, _f;
   const _durationProps = durationProps || getDurationProps({
     cacheItem,
     useStartTime,
@@ -102,7 +102,7 @@ var getFlexibleOption = ({
     let endDate = (0, import_utils.getEndDate)(
       _durationProps.startDate,
       _duration,
-      ((_a = _durationProps.usableTime) == null ? void 0 : _a.end_at) ? (0, import_dayjs.default)((_b = _durationProps.usableTime) == null ? void 0 : _b.end_at) : null
+      ((_c = (_b = (_a = _durationProps.usableTime) == null ? void 0 : _a._extend) == null ? void 0 : _b.usableTime) == null ? void 0 : _c.end_at) ? (0, import_dayjs.default)((_f = (_e = (_d = _durationProps.usableTime) == null ? void 0 : _d._extend) == null ? void 0 : _e.usableTime) == null ? void 0 : _f.end_at) : null
     );
     let timeValue = endDate.diff(_durationProps.startDate, "minute");
     return {
@@ -197,6 +197,7 @@ var setDefaultResource = ({ cacheItem, resources }) => {
   for (let item of resources) {
     let defaultResource = item.renderList.filter((d) => d.is_default == 1 || d.id === resourceId).map((d) => {
       return {
+        ...d,
         relation_type: d.relation_type,
         form_id: item.form_id,
         relation_id: d.id,
@@ -324,11 +325,13 @@ var getProductExtend = ({ cacheItem, state }) => {
       resources: _cacheItem._data.resources
     });
     if ((0, import_utils.getDuration)(_cacheItem == null ? void 0 : _cacheItem.duration)) {
-      _cacheItem._data._timeObj = getTimeObj({
-        cacheItem,
+      _cacheItem._data.timeObj = getTimeObj({
+        cacheItem: _cacheItem,
+        useStartTime: _cacheItem._extend.start_time,
         currentResource: _cacheItem._extend.resource,
         state
       });
+      _cacheItem._extend.duration = _cacheItem._data.timeObj.durationSlicesBasedOnTime[0].value;
     }
     _cacheItem.autoClose = getIsAutoClose(_cacheItem);
     if (_cacheItem._extend.bundle_edit !== void 0) {
@@ -336,13 +339,6 @@ var getProductExtend = ({ cacheItem, state }) => {
     }
     _cacheItem._time = (/* @__PURE__ */ new Date()).getTime();
   } else {
-    if (!_cacheItem._data._timeObj) {
-      _cacheItem._data._timeObj = getTimeObj({
-        cacheItem,
-        currentResource: _cacheItem._extend.resource,
-        state
-      });
-    }
     if (!_cacheItem._data.capacitys) {
       _cacheItem._data.capacitys = cacheItem.capacity;
     }
@@ -360,6 +356,12 @@ var getProductExtend = ({ cacheItem, state }) => {
       _cacheItem._data.resources = list;
       _cacheItem._data.resourceMaps = maps;
     }
+    _cacheItem._data.timeObj = getTimeObj({
+      cacheItem: _cacheItem,
+      useStartTime: _cacheItem._extend.start_time,
+      currentResource: _cacheItem._extend.resource,
+      state
+    });
   }
   console.log("_cacheItem_cacheItem", _cacheItem);
   return _cacheItem;

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

@@ -50,7 +50,7 @@ var import_utilsByBooking = require("../../utilsByBooking");
 var import_utils4 = require("../addService/utils");
 var submitLock = false;
 var Info = (_, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A;
   const [form] = import_antd.Form.useForm();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useResource = import_antd.Form.useWatch("resource", form);
@@ -94,9 +94,14 @@ var Info = (_, ref) => {
     });
   }, [durationProps, import_utils.locales.locale]);
   const timeObj = (0, import_react.useMemo)(() => {
-    var _a2, _b2;
-    return (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._data.timeObj;
-  }, [(_e = (_d = state.service) == null ? void 0 : _d.cacheItem) == null ? void 0 : _e._data.timeObj]);
+    return (0, import_utils4.getTimeObj)({
+      durationProps,
+      useStartTime,
+      currentResource,
+      state,
+      useDuration
+    });
+  }, [durationProps, useStartTime, currentResource, state, useDuration]);
   (0, import_react.useEffect)(() => {
     try {
       if (useDuration.indexOf("flexible_") == 0) {
@@ -206,7 +211,7 @@ var Info = (_, ref) => {
     let oPrice = Number(((_a2 = state.service.cacheItem) == null ? void 0 : _a2._extend.origin_total) || 0);
     let cPrice = Number(useTotal || 0);
     return cPrice !== oPrice;
-  }, [useTotal, (_g = (_f = state.service.cacheItem) == null ? void 0 : _f._extend) == null ? void 0 : _g.origin_total]);
+  }, [useTotal, (_e = (_d = state.service.cacheItem) == null ? void 0 : _d._extend) == null ? void 0 : _e.origin_total]);
   const getResources = () => {
     let res = (0, import_utils4.formatResources)({
       cacheItem: getCurrentCacheItem(),
@@ -269,18 +274,18 @@ var Info = (_, ref) => {
   }, [state.service.editModal, state.isBookingCreatePage]);
   (0, import_react.useEffect)(() => {
     getDiscount();
-  }, [useTotal, (_i = (_h = state.service.cacheItem) == null ? void 0 : _h._extend) == null ? void 0 : _i.origin_total]);
+  }, [useTotal, (_g = (_f = state.service.cacheItem) == null ? void 0 : _f._extend) == null ? void 0 : _g.origin_total]);
   const isDiscount = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     if (!((_a2 = state.service) == null ? void 0 : _a2.cacheItem)) {
       return false;
     }
     return useTotal != ((_c2 = (_b2 = state.service) == null ? void 0 : _b2.cacheItem) == null ? void 0 : _c2._extend.origin_total);
-  }, [useTotal, (_k = (_j = state.service) == null ? void 0 : _j.cacheItem) == null ? void 0 : _k._extend.origin_total]);
+  }, [useTotal, (_i = (_h = state.service) == null ? void 0 : _h.cacheItem) == null ? void 0 : _i._extend.origin_total]);
   const bundles = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
     return ((_d2 = (_c2 = (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.bundle) || [];
-  }, [(_o = (_n = (_m = (_l = state.service) == null ? void 0 : _l.cacheItem) == null ? void 0 : _m._extend) == null ? void 0 : _n.other) == null ? void 0 : _o.bundle]);
+  }, [(_m = (_l = (_k = (_j = state.service) == null ? void 0 : _j.cacheItem) == null ? void 0 : _k._extend) == null ? void 0 : _l.other) == null ? void 0 : _m.bundle]);
   const handleEdit = (e) => {
     const item = state.service.cacheItem;
     let values = form.getFieldsValue();
@@ -348,14 +353,14 @@ var Info = (_, ref) => {
     };
   });
   console.log("state.service.value", state.service.value);
-  const SelectTime = (_p = window.BaseMaterials) == null ? void 0 : _p.SelectTime;
+  const SelectTime = (_n = window.BaseMaterials) == null ? void 0 : _n.SelectTime;
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
       titleNoWrap: true,
       zIndex: state.service.changeService ? 999 : 1e3,
       forceRender: true,
-      open: state.service.editModal && !((_q = state.service.cacheItem) == null ? void 0 : _q.autoClose),
+      open: state.service.editModal && !((_o = state.service.cacheItem) == null ? void 0 : _o.autoClose),
       title: import_utils.locales.getText("pisell2.text.edit-service"),
       onClose: () => {
         dispatch({
@@ -368,7 +373,7 @@ var Info = (_, ref) => {
         });
       }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "product_name" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_t = (_s = (_r = state.service) == null ? void 0 : _r.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.product_name) || "-"), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleEdit }, import_utils.locales.getText("pisell2.text.edit")), !state.isBookingCreatePage && /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleChange }, import_utils.locales.getText("pisell2.text.change"))), /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "product_name" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_r = (_q = (_p = state.service) == null ? void 0 : _p.cacheItem) == null ? void 0 : _q._extend) == null ? void 0 : _r.product_name) || "-"), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleEdit }, import_utils.locales.getText("pisell2.text.edit")), !state.isBookingCreatePage && /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleChange }, import_utils.locales.getText("pisell2.text.change"))), /* @__PURE__ */ import_react.default.createElement(
       import_collapsibleList.default,
       {
         style: { marginTop: bundles.length ? "8px" : 0 },
@@ -391,8 +396,8 @@ var Info = (_, ref) => {
           precision: 2,
           style: { width: "100%" },
           min: 0,
-          max: ((_v = (_u = state.service.cacheItem) == null ? void 0 : _u._extend) == null ? void 0 : _v.origin_total) || 0,
-          placeholder: ((_x = (_w = state.service.cacheItem) == null ? void 0 : _w._extend) == null ? void 0 : _x.origin_total) || "0"
+          max: ((_t = (_s = state.service.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.origin_total) || 0,
+          placeholder: ((_v = (_u = state.service.cacheItem) == null ? void 0 : _u._extend) == null ? void 0 : _v.origin_total) || "0"
         }
       )
     )), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
@@ -432,7 +437,7 @@ var Info = (_, ref) => {
       SelectTime ? /* @__PURE__ */ import_react.default.createElement(
         SelectTime,
         {
-          slice: (_B = (_A = (_z = (_y = state.bookingConfig) == null ? void 0 : _y.config) == null ? void 0 : _z.basic) == null ? void 0 : _A.service_time) == null ? void 0 : _B.value,
+          slice: (_z = (_y = (_x = (_w = state.bookingConfig) == null ? void 0 : _w.config) == null ? void 0 : _x.basic) == null ? void 0 : _y.service_time) == null ? void 0 : _z.value,
           timePickerProps: {
             style: { width: "100%" }
           },
@@ -477,7 +482,7 @@ var Info = (_, ref) => {
       {
         type: "primary",
         className: "pisell-lowcode__booking-service-body-edit-footer-apple",
-        disabled: !((_C = state.service.resourcesOrigin) == null ? void 0 : _C.length),
+        disabled: !((_A = state.service.resourcesOrigin) == null ? void 0 : _A.length),
         onClick: () => {
           form.submit();
         }