@pisell/private-materials 6.0.25 → 6.2.1

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

@@ -1,4 +1,8 @@
 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 _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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function 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; }
@@ -17,7 +21,9 @@ import { getServiceStartTimeAndEndTime, formatResource, getErrorList } from "../
 import dayjs from 'dayjs';
 import { locales } from '@pisell/utils';
 import AlertTriangle from '@pisell/icon/es/AlertTriangle';
+import { getAutoAllocationStorage } from "../editService/utils";
 import { getNoResource2 } from "../../../mock";
+import { cloneDeep } from 'lodash';
 export var getUsableTime = function getUsableTime(cacheItem) {
   try {
     var items = [];
@@ -160,45 +166,46 @@ export var getTimeObj = function getTimeObj(_ref4) {
  */
 export var formatResources = function formatResources(_ref5) {
   var cacheItem = _ref5.cacheItem,
-    resourcesOrigin = _ref5.resourcesOrigin;
+    resourcesOrigin = _ref5.resourcesOrigin,
+    id = _ref5.id;
   try {
     // 合并无资源
-    var _list = _toConsumableArray(resourcesOrigin);
+    var _list = [];
     var maps = {};
     var _cacheItem = cacheItem;
-    var _iterator = _createForOfIteratorHelper(_list),
-      _step;
-    try {
-      var _loop2 = function _loop2() {
-        var item = _step.value;
-        var renderListMaps = {};
-        item.renderList = item.renderList.map(function (d) {
-          var res = formatResource(d, _cacheItem, function (newData) {
-            return /*#__PURE__*/React.createElement("div", {
-              className: "resource-option"
-            }, /*#__PURE__*/React.createElement("div", {
-              className: "like-wrap"
-            }), newData.labelText, !newData.usable && /*#__PURE__*/React.createElement(AlertTriangle, {
-              className: "resource-option-alert-icon"
-            }));
-          });
-          renderListMaps[res.id] = res;
-          return res;
-        }).sort(function (a, b) {
-          return b.usable ? 1 : -1;
-        });
-        maps[item.form_id] = _objectSpread(_objectSpread({}, item), {}, {
-          renderListMaps: renderListMaps
+    _list = resourcesOrigin.map(function (item) {
+      var renderListMaps = {};
+      // 深拷贝item
+      var _item = cloneDeep(item);
+      _item.renderList = _item.renderList.map(function (d) {
+        var res = formatResource(d, _cacheItem, function (newData) {
+          var unbound = !item.optional_resource.includes(newData.id) && !item.default_resource.includes(newData.id) && newData.id !== 0;
+          return /*#__PURE__*/React.createElement("div", {
+            className: "resource-option"
+          }, /*#__PURE__*/React.createElement("div", {
+            className: "like-wrap"
+          }), /*#__PURE__*/React.createElement("span", {
+            className: "resource-option-label-text"
+          }, newData.labelText), (!newData.usable || unbound) && /*#__PURE__*/React.createElement(AlertTriangle, {
+            className: "resource-option-alert-icon"
+          }));
         });
-      };
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        _loop2();
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
+        // 平行资源日历拖拽需求
+        // 当拖入为绑定的资源中时，为了展示，会临时创建目标资源对应的resourceItem
+        // 但是在 item.optional_resource 中并不包含目标资源id
+        if (!item.optional_resource.includes(d.id) && !item.default_resource.includes(d.id) && d.id !== 0) {
+          res.unbound = true;
+        }
+        renderListMaps[res.id] = res;
+        return res;
+      }).sort(function (a, b) {
+        return b.usable ? 1 : -1;
+      });
+      maps[_item.form_id] = _objectSpread(_objectSpread({}, _item), {}, {
+        renderListMaps: renderListMaps
+      });
+      return _item;
+    });
     return {
       list: _list,
       maps: maps
@@ -211,6 +218,38 @@ export var formatResources = function formatResources(_ref5) {
     maps: []
   };
 };
+
+// 取可用资源空闲时长最大的
+var getResourceMaxFreeTime = function getResourceMaxFreeTime(resource) {
+  var renderList = resource.renderList,
+    form_id = resource.form_id;
+  if (!getAutoAllocationStorage(form_id)) {
+    return [];
+  }
+  // 可用列表
+  var usableList = renderList.filter(function (d) {
+    return d.usable && d.id !== 0;
+  });
+  var defaultResource = [];
+  var maxFreeTime = 0;
+  usableList.forEach(function (d) {
+    var times = d.times;
+    var currentMaxFreeTime = times.reduce(function (pre, cur) {
+      var _cur$event_list, _cur$event_list2;
+      // 开始时间使用预约的最后时间或者资源开始时间
+      var start = ((_cur$event_list = cur.event_list) === null || _cur$event_list === void 0 || (_cur$event_list = _cur$event_list[((_cur$event_list2 = cur.event_list) === null || _cur$event_list2 === void 0 ? void 0 : _cur$event_list2.length) - 1]) === null || _cur$event_list === void 0 ? void 0 : _cur$event_list.end_at) || cur.start_at;
+      // 结束时间使用资源结束时间
+      var end = cur.end_at;
+      var diff = dayjs(end).diff(dayjs(start), 'minute');
+      return diff > pre ? diff : pre;
+    }, 0);
+    if (currentMaxFreeTime > maxFreeTime) {
+      maxFreeTime = currentMaxFreeTime;
+      defaultResource = [d];
+    }
+  });
+  return defaultResource;
+};
 export var setDefaultResource = function setDefaultResource(_ref6) {
   var cacheItem = _ref6.cacheItem,
     resources = _ref6.resources;
@@ -232,14 +271,21 @@ export var setDefaultResource = function setDefaultResource(_ref6) {
 
   // 从日历选中资源
   var resourceId = Number(serviceParams === null || serviceParams === void 0 ? void 0 : serviceParams.resource_id);
-  var _iterator2 = _createForOfIteratorHelper(resources),
-    _step2;
+  var _iterator = _createForOfIteratorHelper(resources),
+    _step;
   try {
-    var _loop3 = function _loop3() {
-      var item = _step2.value;
-      var defaultResource = item.renderList.filter(function (d) {
+    var _loop2 = function _loop2() {
+      var item = _step.value;
+      var renderList = item.renderList.filter(function (d) {
         return d.is_default == 1 || d.id === resourceId;
-      }).map(function (d) {
+      });
+      var defaultOriginalResource = [];
+      if (renderList.length === 0) {
+        defaultOriginalResource = getResourceMaxFreeTime(item);
+      } else {
+        defaultOriginalResource = renderList;
+      }
+      var defaultResource = defaultOriginalResource.map(function (d) {
         return _objectSpread(_objectSpread({}, d), {}, {
           relation_type: d.relation_type,
           form_id: item.form_id,
@@ -255,14 +301,14 @@ export var setDefaultResource = function setDefaultResource(_ref6) {
       });
       obj[item.form_id] = defaultResource;
     };
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      _loop3();
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      _loop2();
     }
     // }
   } catch (err) {
-    _iterator2.e(err);
+    _iterator.e(err);
   } finally {
-    _iterator2.f();
+    _iterator.f();
   }
   return obj;
 };
@@ -275,7 +321,7 @@ export var setDefaultResource = function setDefaultResource(_ref6) {
  * @Author: zhiwei.Wang
  * @Date: 2024-09-19 20:26
  */
-var setDefaultCapacitys = function setDefaultCapacitys(_ref7) {
+export var setDefaultCapacitys = function setDefaultCapacitys(_ref7) {
   var capacitys = _ref7.capacitys,
     cacheItem = _ref7.cacheItem;
   if ((capacitys === null || capacitys === void 0 ? void 0 : capacitys.type) === 'package') {
@@ -319,35 +365,64 @@ var setDefaultCapacitys = function setDefaultCapacitys(_ref7) {
  * @Author: zhiwei.Wang
  * @Date: 2024-09-19 20:23
  */
-var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem) {
+export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem, extraParams) {
   var _cacheItem$product_re;
   var _resources = _toConsumableArray((cacheItem === null || cacheItem === void 0 || (_cacheItem$product_re = cacheItem.product_resource) === null || _cacheItem$product_re === void 0 ? void 0 : _cacheItem$product_re.resources) || []);
-
+  var _ref8 = extraParams || {},
+    _ref8$extraResources = _ref8.extraResources,
+    extraResources = _ref8$extraResources === void 0 ? [] : _ref8$extraResources;
   // 过滤出开启的资源
   _resources = _resources.filter(function (d) {
     return d.status == 1;
   });
-  var _iterator3 = _createForOfIteratorHelper(_resources),
-    _step3;
+  var _iterator2 = _createForOfIteratorHelper(_resources),
+    _step2;
   try {
-    var _loop4 = function _loop4() {
-      var item = _step3.value;
+    var _loop3 = function _loop3() {
+      var item = _step2.value;
       var form_id = item.id;
 
+      // 将未绑定的资源，也放入 SelectOption 列表，避免出现仅展示id的情况
+      var extraResourceIds = extraResources.filter(function (_extraItem) {
+        return _extraItem.form_id === form_id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
+      }).map(function (_extraItem) {
+        return _extraItem.id;
+      });
+      extraResourceIds = Array.from(new Set(extraResourceIds));
+
       // 去重
       item.optional_resource = (item.optional_resource || []).filter(function (d) {
         return item.default_resource.indexOf(d) == -1;
       });
+      var getChildrenMetadata = function getChildrenMetadata(d) {
+        var combiningResources = [];
+        if (resourcesOriginMap[d].combined_resource && resourcesOriginMap[d].combined_resource.status === 1) {
+          resourcesOriginMap[d].combined_resource.resource_ids.forEach(function (id) {
+            if (resourcesOriginMap[id]) {
+              var _resourcesOriginMap$i, _resourcesOriginMap$i2;
+              combiningResources.push(_objectSpread(_objectSpread({}, resourcesOriginMap[id]), {}, {
+                relation_id: ((_resourcesOriginMap$i = resourcesOriginMap[id]) === null || _resourcesOriginMap$i === void 0 ? void 0 : _resourcesOriginMap$i.relation_id) || ((_resourcesOriginMap$i2 = resourcesOriginMap[id]) === null || _resourcesOriginMap$i2 === void 0 ? void 0 : _resourcesOriginMap$i2.id)
+              }));
+            }
+          });
+        }
+        return {
+          children: combiningResources,
+          metadata: _objectSpread(_objectSpread({}, resourcesOriginMap[d].metadata), {}, {
+            combined_resource: resourcesOriginMap[d].combined_resource
+          })
+        };
+      };
 
       // 可选项
-      var optional_resource = item.optional_resource.map(function (d) {
-        return (
-          // 合并数据, 将资源配置项添加到每一条内
-          resourcesOriginMap[d] ? Object.assign({}, resourcesOriginMap[d], {
-            form_id: form_id,
-            resourceType: item.type
-          }) : null
-        );
+      var optional_resource = [].concat(_toConsumableArray(item.optional_resource), _toConsumableArray(extraResourceIds)).map(function (d) {
+        if (!resourcesOriginMap[d]) {
+          return null;
+        }
+        return Object.assign({}, resourcesOriginMap[d], _objectSpread({
+          form_id: form_id,
+          resourceType: item.type
+        }, getChildrenMetadata(d)));
       }).filter(function (d) {
         return d;
       }).concat(getNoResource2({
@@ -359,10 +434,10 @@ var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem)
         var item = resourcesOriginMap[d];
         if (item) {
           item.is_default = 1;
-          return Object.assign({}, item, {
+          return Object.assign({}, item, _objectSpread({
             form_id: form_id,
             resourceType: item.type
-          });
+          }, getChildrenMetadata(d)));
         } else {
           return null;
         }
@@ -376,23 +451,24 @@ var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem)
       // 统一字段 将id改为form_id
       item.form_id = form_id;
     };
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      _loop4();
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      _loop3();
     }
   } catch (err) {
-    _iterator3.e(err);
+    _iterator2.e(err);
   } finally {
-    _iterator3.f();
+    _iterator2.f();
   }
   console.log('_resources', _resources);
   return _resources;
 };
 var getIsAutoClose = function getIsAutoClose(cacheItem) {
-  if (cacheItem._data.capacitys.type !== 'custom') {
-    var _cacheItem$_data;
-    if ((cacheItem === null || cacheItem === void 0 || (_cacheItem$_data = cacheItem._data) === null || _cacheItem$_data === void 0 ? void 0 : _cacheItem$_data.resources.length) === 1) {
-      var _cacheItem$_data2, _first$select_type;
-      var first = cacheItem === null || cacheItem === void 0 || (_cacheItem$_data2 = cacheItem._data) === null || _cacheItem$_data2 === void 0 ? void 0 : _cacheItem$_data2.resources[0];
+  var _cacheItem$_data;
+  if (((_cacheItem$_data = cacheItem._data) === null || _cacheItem$_data === void 0 || (_cacheItem$_data = _cacheItem$_data.capacitys) === null || _cacheItem$_data === void 0 ? void 0 : _cacheItem$_data.type) !== 'custom') {
+    var _cacheItem$_data2;
+    if ((cacheItem === null || cacheItem === void 0 || (_cacheItem$_data2 = cacheItem._data) === null || _cacheItem$_data2 === void 0 ? void 0 : _cacheItem$_data2.resources.length) === 1) {
+      var _cacheItem$_data3, _first$select_type;
+      var first = cacheItem === null || cacheItem === void 0 || (_cacheItem$_data3 = cacheItem._data) === null || _cacheItem$_data3 === void 0 ? void 0 : _cacheItem$_data3.resources[0];
       if (((_first$select_type = first.select_type) === null || _first$select_type === void 0 ? void 0 : _first$select_type.type) === 'single') {
         if (first.default_resource.length > 0) {
           return true;
@@ -400,6 +476,12 @@ var getIsAutoClose = function getIsAutoClose(cacheItem) {
       }
     }
   }
+  return Object.entries(cacheItem._extend.resource).every(function (_ref9) {
+    var _ref10 = _slicedToArray(_ref9, 2),
+      key = _ref10[0],
+      value = _ref10[1];
+    return getAutoAllocationStorage(key) && (value === null || value === void 0 ? void 0 : value.length);
+  });
 };
 
 /**
@@ -410,9 +492,10 @@ var getIsAutoClose = function getIsAutoClose(cacheItem) {
  * @Author: zhiwei.Wang
  * @Date: 2024-06-01 13:25
  */
-export var getProductExtend = function getProductExtend(_ref8) {
-  var cacheItem = _ref8.cacheItem,
-    state = _ref8.state;
+export var getProductExtend = function getProductExtend(_ref11) {
+  var cacheItem = _ref11.cacheItem,
+    state = _ref11.state,
+    isDisabledTime = _ref11.isDisabledTime;
   // 有endDate 说明是在编辑已经保存过的商品, 没有则是编辑还没保存过的商品
   var isNew = cacheItem.new || !cacheItem._extend.endDate;
   var _cacheItem = _objectSpread({}, cacheItem);
@@ -486,11 +569,15 @@ export var getProductExtend = function getProductExtend(_ref8) {
     }
 
     // 如果只有一种类型的资源 & 单选，还按照之前的逻辑处理：自动选中，不会打开Edit service抽屉。
+    // 或
+    // 如果开启自动分派 并且 资源列表中每个资源都有默认值，自动关闭。
     _cacheItem.autoClose = getIsAutoClose(_cacheItem);
     if (_cacheItem._extend.bundle_edit !== undefined) {
       _cacheItem._extend.bundle_edit = 1;
     }
-    _cacheItem._time = new Date().getTime();
+    if (!isDisabledTime) {
+      _cacheItem._time = new Date().getTime();
+    }
   } else {
     // if (!_cacheItem._data.timeObj) {
     // _cacheItem._data.timeObj = getTimeObj({
@@ -505,7 +592,19 @@ export var getProductExtend = function getProductExtend(_ref8) {
       _cacheItem._data.capacitys = cacheItem.capacity;
     }
     if (!_cacheItem._data.resourcesOrigin) {
-      _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem);
+      var extraResources = [];
+      // 日历中可以将预约拖入未绑定的资源中，需要兼容未绑定资源的 selectOption展示
+      if (Array.isArray(_cacheItem._extend.event_resources)) {
+        _cacheItem._extend.event_resources.forEach(function (_item) {
+          extraResources.push({
+            form_id: _item.form_id,
+            id: _item.relation_id
+          });
+        });
+      }
+      _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem, {
+        extraResources: extraResources
+      });
     }
     if (!_cacheItem._data.resources) {
       // 资源
@@ -530,4 +629,22 @@ export var getProductExtend = function getProductExtend(_ref8) {
   }
   console.log('_cacheItem_cacheItem', _cacheItem);
   return _cacheItem;
+};
+
+/**
+ * @title: 格式化服务列表
+ * @description: 后端列表返回的product_resource.resources 的optional_resource等不是最新数据
+ * 使用with resourceRelation后 返回的resource_relation是实时数据
+ * 这里做一次转换
+ * @param list
+ */
+export var transServiceList = function transServiceList(list) {
+  return list.map(function (item) {
+    var _item$product_resourc;
+    return _objectSpread(_objectSpread({}, item), {}, {
+      product_resource: _objectSpread(_objectSpread({}, item.product_resource), {}, {
+        resources: (item === null || item === void 0 ? void 0 : item.resource_relation) || (item === null || item === void 0 || (_item$product_resourc = item.product_resource) === null || _item$product_resourc === void 0 ? void 0 : _item$product_resourc.resources)
+      })
+    });
+  });
 };

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../../../info/service/addTimeModal/index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

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

@@ -51,6 +51,7 @@ var AddTimeModal = function AddTimeModal() {
     _useState2 = _slicedToArray(_useState, 2),
     isEdit = _useState2[0],
     setIsEdit = _useState2[1];
+  var loadingRef = useRef(false);
   var _useState3 = useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
@@ -139,15 +140,14 @@ var AddTimeModal = function AddTimeModal() {
     var _loop = function _loop(form_id) {
       arr = [].concat(_toConsumableArray(arr), _toConsumableArray(resource[form_id].map(function (d) {
         var _state$service$cacheI2;
-        return (_state$service$cacheI2 = state.service.cacheItem) === null || _state$service$cacheI2 === void 0 ? void 0 : _state$service$cacheI2._data.resourceMaps[form_id].renderListMaps[d.relation_id];
+        return (_state$service$cacheI2 = state.service.cacheItem) === null || _state$service$cacheI2 === void 0 || (_state$service$cacheI2 = _state$service$cacheI2._data) === null || _state$service$cacheI2 === void 0 || (_state$service$cacheI2 = _state$service$cacheI2.resourceMaps) === null || _state$service$cacheI2 === void 0 || (_state$service$cacheI2 = _state$service$cacheI2[form_id]) === null || _state$service$cacheI2 === void 0 || (_state$service$cacheI2 = _state$service$cacheI2.renderListMaps) === null || _state$service$cacheI2 === void 0 ? void 0 : _state$service$cacheI2[d.relation_id];
       })));
     };
     for (var form_id in resource) {
       _loop(form_id);
     }
-    return arr;
+    return arr.filter(Boolean);
   }, [(_state$service = state.service) === null || _state$service === void 0 || (_state$service = _state$service.cacheItem) === null || _state$service === void 0 || (_state$service = _state$service._extend) === null || _state$service === void 0 ? void 0 : _state$service.resource]);
-  console.log('currentResource', currentResource);
   var getTimeUsableStatus = function getTimeUsableStatus(time) {
     var _state$service$cacheI3;
     if (!((_state$service$cacheI3 = state.service.cacheItem) !== null && _state$service$cacheI3 !== void 0 && _state$service$cacheI3._extend) || !currentResource.length) {
@@ -237,7 +237,11 @@ var AddTimeModal = function AddTimeModal() {
               extension_type: ['product_add_time'],
               status: 'published'
             }, {
-              useCache: true
+              useCache: true,
+              retry: {
+                count: 3,
+                delay: 500
+              }
             });
           case 2:
             data = _context.sent;
@@ -305,6 +309,7 @@ var AddTimeModal = function AddTimeModal() {
       var productId = list[0].id;
       var time = list[0].times[0].value;
       setRecordKey(addTimeRowKey.create(productId, time));
+      updateServices.run();
     } catch (err) {}
   };
 
@@ -312,6 +317,7 @@ var AddTimeModal = function AddTimeModal() {
   useUpdateEffect(function () {
     if (state.service.addTimeModal) {
       getTimeProducts();
+      loadingRef.current = false; // 打开弹窗时重置loading
       originServices.current = state.service;
     } else {
       updateServices.run();
@@ -506,16 +512,32 @@ var AddTimeModal = function AddTimeModal() {
             }
             return _context5.abrupt("return");
           case 3:
+            if (!loadingRef.current) {
+              _context5.next = 5;
+              break;
+            }
+            return _context5.abrupt("return");
+          case 5:
+            loadingRef.current = true;
             setLoading(loadingType);
-            api = isBooking4Shop((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.global) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.globalConfig) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.id, state.renderType) ? saveAddTimeProduct2 : saveAddTimeProduct; // save
-            _context5.next = 7;
+            api = isBooking4Shop((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.global) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.globalConfig) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.id, state.renderType) ? saveAddTimeProduct2 : saveAddTimeProduct;
+            _context5.prev = 8;
+            _context5.next = 11;
             return api({
               orderId: state.bookingId,
               params: _objectSpread(_objectSpread({}, newService), {}, {
                 _extend: undefined
               })
             });
-          case 7:
+          case 11:
+            loadingRef.current = false;
+            _context5.next = 17;
+            break;
+          case 14:
+            _context5.prev = 14;
+            _context5.t0 = _context5["catch"](8);
+            loadingRef.current = false;
+          case 17:
             // 更新外部预约列表
             setLoading('');
             message.success(locales.getText('page.booking.text.add-time-success'));
@@ -523,18 +545,18 @@ var AddTimeModal = function AddTimeModal() {
             // close
             onCancel();
             if (!(loadingType === 'checkout')) {
-              _context5.next = 12;
+              _context5.next = 22;
               break;
             }
             return _context5.abrupt("return");
-          case 12:
+          case 22:
             // 回调关闭弹窗
             state === null || state === void 0 || state.action('init');
-          case 13:
+          case 23:
           case "end":
             return _context5.stop();
         }
-      }, _callee5);
+      }, _callee5, null, [[8, 14]]);
     }));
     return function handleSave() {
       return _ref5.apply(this, arguments);

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

@@ -19,10 +19,8 @@ var MaxLengthSelect = function MaxLengthSelect(props, ref) {
   };
   return /*#__PURE__*/React.createElement(Select, _extends({}, props, {
     onChange: handleChange,
-    popupMatchSelectWidth: false,
-    getPopupContainer: function getPopupContainer() {
-      return document.querySelector('#main') || document.body;
-    }
+    popupMatchSelectWidth: false
+    // getPopupContainer={() => document.querySelector('#main') || document.body}
   }), props.children);
 };
 export default /*#__PURE__*/forwardRef(MaxLengthSelect);