@pisell/private-materials 6.0.24 → 6.1.1

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

@@ -36,7 +36,9 @@ __export(utils_exports, {
   getTimeObj: () => getTimeObj,
   getTimeSlices: () => getTimeSlices,
   getUsableTime: () => getUsableTime,
-  setDefaultResource: () => setDefaultResource
+  setDefaultCapacitys: () => setDefaultCapacitys,
+  setDefaultResource: () => setDefaultResource,
+  transServiceList: () => transServiceList
 });
 module.exports = __toCommonJS(utils_exports);
 var import_react = __toESM(require("react"));
@@ -45,7 +47,9 @@ var import_utilsByBooking = require("../../utilsByBooking");
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils2 = require("@pisell/utils");
 var import_AlertTriangle = __toESM(require("@pisell/icon/es/AlertTriangle"));
+var import_utils3 = require("../editService/utils");
 var import_mock = require("../../../mock");
+var import_lodash = require("lodash");
 var getUsableTime = (cacheItem) => {
   try {
     let items = [];
@@ -163,25 +167,27 @@ var getTimeObj = ({
     durationSlicesBasedOnTime
   };
 };
-var formatResources = ({ cacheItem, resourcesOrigin }) => {
+var formatResources = ({ cacheItem, resourcesOrigin, id }) => {
   try {
-    let _list = [...resourcesOrigin];
+    let _list = [];
     let maps = {};
     const _cacheItem = cacheItem;
-    for (let item of _list) {
+    _list = resourcesOrigin.map((item) => {
       let renderListMaps = {};
-      item.renderList = item.renderList.map((d) => {
+      let _item = (0, import_lodash.cloneDeep)(item);
+      _item.renderList = _item.renderList.map((d) => {
         let res = (0, import_utilsByBooking.formatResource)(d, _cacheItem, (newData) => {
           return /* @__PURE__ */ import_react.default.createElement("div", { className: "resource-option" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "like-wrap" }), newData.labelText, !newData.usable && /* @__PURE__ */ import_react.default.createElement(import_AlertTriangle.default, { className: "resource-option-alert-icon" }));
         });
         renderListMaps[res.id] = res;
         return res;
       }).sort((a, b) => b.usable ? 1 : -1);
-      maps[item.form_id] = {
-        ...item,
+      maps[_item.form_id] = {
+        ..._item,
         renderListMaps
       };
-    }
+      return _item;
+    });
     return { list: _list, maps };
   } catch (err) {
     console.log("formatResourcesErr", err);
@@ -191,12 +197,45 @@ var formatResources = ({ cacheItem, resourcesOrigin }) => {
     maps: []
   };
 };
+var getResourceMaxFreeTime = (resource) => {
+  const { renderList, form_id } = resource;
+  if (!(0, import_utils3.getAutoAllocationStorage)(form_id)) {
+    return [];
+  }
+  const usableList = renderList.filter((d) => d.usable && d.id !== 0);
+  let defaultResource = [];
+  let maxFreeTime = 0;
+  usableList.forEach((d) => {
+    const { times } = d;
+    const currentMaxFreeTime = times.reduce((pre, cur) => {
+      var _a, _b, _c;
+      const start = ((_c = (_b = cur.event_list) == null ? void 0 : _b[((_a = cur.event_list) == null ? void 0 : _a.length) - 1]) == null ? void 0 : _c.end_at) || cur.start_at;
+      const end = cur.end_at;
+      const diff = (0, import_dayjs.default)(end).diff((0, import_dayjs.default)(start), "minute");
+      return diff > pre ? diff : pre;
+    }, 0);
+    if (currentMaxFreeTime > maxFreeTime) {
+      maxFreeTime = currentMaxFreeTime;
+      defaultResource = [d];
+    }
+  });
+  return defaultResource;
+};
 var setDefaultResource = ({ cacheItem, resources }) => {
   let obj = {};
   const serviceParams = (0, import_utils.getCacheParams)();
   let resourceId = Number(serviceParams == null ? void 0 : serviceParams.resource_id);
   for (let item of resources) {
-    let defaultResource = item.renderList.filter((d) => d.is_default == 1 || d.id === resourceId).map((d) => {
+    const renderList = item.renderList.filter(
+      (d) => d.is_default == 1 || d.id === resourceId
+    );
+    let defaultOriginalResource = [];
+    if (renderList.length === 0) {
+      defaultOriginalResource = getResourceMaxFreeTime(item);
+    } else {
+      defaultOriginalResource = renderList;
+    }
+    const defaultResource = defaultOriginalResource.map((d) => {
       return {
         ...d,
         relation_type: d.relation_type,
@@ -250,22 +289,43 @@ var getResourceByIds = (resourcesOriginMap, cacheItem) => {
     item.optional_resource = (item.optional_resource || []).filter(
       (d) => item.default_resource.indexOf(d) == -1
     );
-    let optional_resource = item.optional_resource.map(
-      (d) => (
-        // 合并数据, 将资源配置项添加到每一条内
-        resourcesOriginMap[d] ? Object.assign({}, resourcesOriginMap[d], {
-          form_id,
-          resourceType: item.type
-        }) : null
-      )
-    ).filter((d) => d).concat((0, import_mock.getNoResource2)({ form_id }));
+    const getChildrenMetadata = (d) => {
+      const combiningResources = [];
+      if (resourcesOriginMap[d].combined_resource && resourcesOriginMap[d].combined_resource.status === 1) {
+        resourcesOriginMap[d].combined_resource.resource_ids.forEach(
+          (id) => {
+            if (resourcesOriginMap[id]) {
+              combiningResources.push(resourcesOriginMap[id]);
+            }
+          }
+        );
+      }
+      return {
+        children: combiningResources,
+        metadata: {
+          ...resourcesOriginMap[d].metadata,
+          combined_resource: resourcesOriginMap[d].combined_resource
+        }
+      };
+    };
+    let optional_resource = item.optional_resource.map((d) => {
+      if (!resourcesOriginMap[d]) {
+        return null;
+      }
+      return Object.assign({}, resourcesOriginMap[d], {
+        form_id,
+        resourceType: item.type,
+        ...getChildrenMetadata(d)
+      });
+    }).filter((d) => d).concat((0, import_mock.getNoResource2)({ form_id }));
     let default_resource = item.default_resource.map((d) => {
       let item2 = resourcesOriginMap[d];
       if (item2) {
         item2.is_default = 1;
         return Object.assign({}, item2, {
           form_id,
-          resourceType: item2.type
+          resourceType: item2.type,
+          ...getChildrenMetadata(d)
         });
       } else {
         return null;
@@ -278,19 +338,24 @@ var getResourceByIds = (resourcesOriginMap, cacheItem) => {
   return _resources;
 };
 var getIsAutoClose = (cacheItem) => {
-  var _a, _b, _c;
-  if (cacheItem._data.capacitys.type !== "custom") {
-    if (((_a = cacheItem == null ? void 0 : cacheItem._data) == null ? void 0 : _a.resources.length) === 1) {
-      const first = (_b = cacheItem == null ? void 0 : cacheItem._data) == null ? void 0 : _b.resources[0];
-      if (((_c = first.select_type) == null ? void 0 : _c.type) === "single") {
+  var _a, _b, _c, _d, _e;
+  if (((_b = (_a = cacheItem._data) == null ? void 0 : _a.capacitys) == null ? void 0 : _b.type) !== "custom") {
+    if (((_c = cacheItem == null ? void 0 : cacheItem._data) == null ? void 0 : _c.resources.length) === 1) {
+      const first = (_d = cacheItem == null ? void 0 : cacheItem._data) == null ? void 0 : _d.resources[0];
+      if (((_e = first.select_type) == null ? void 0 : _e.type) === "single") {
         if (first.default_resource.length > 0) {
           return true;
         }
       }
     }
   }
+  return Object.entries(cacheItem._extend.resource).every(
+    ([key, value]) => {
+      return (0, import_utils3.getAutoAllocationStorage)(key) && (value == null ? void 0 : value.length);
+    }
+  );
 };
-var getProductExtend = ({ cacheItem, state }) => {
+var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
   const isNew = cacheItem.new || !cacheItem._extend.endDate;
   let _cacheItem = { ...cacheItem };
   const resourcesOriginMap = state.service.resourcesOriginMap || {};
@@ -344,7 +409,9 @@ var getProductExtend = ({ cacheItem, state }) => {
     if (_cacheItem._extend.bundle_edit !== void 0) {
       _cacheItem._extend.bundle_edit = 1;
     }
-    _cacheItem._time = (/* @__PURE__ */ new Date()).getTime();
+    if (!isDisabledTime) {
+      _cacheItem._time = (/* @__PURE__ */ new Date()).getTime();
+    }
   } else {
     if (!_cacheItem._data.capacitys) {
       _cacheItem._data.capacitys = cacheItem.capacity;
@@ -373,6 +440,18 @@ var getProductExtend = ({ cacheItem, state }) => {
   console.log("_cacheItem_cacheItem", _cacheItem);
   return _cacheItem;
 };
+var transServiceList = (list) => {
+  return list.map((item) => {
+    var _a;
+    return {
+      ...item,
+      product_resource: {
+        ...item.product_resource,
+        resources: (item == null ? void 0 : item.resource_relation) || ((_a = item == null ? void 0 : item.product_resource) == null ? void 0 : _a.resources)
+      }
+    };
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   formatResources,
@@ -382,5 +461,7 @@ var getProductExtend = ({ cacheItem, state }) => {
   getTimeObj,
   getTimeSlices,
   getUsableTime,
-  setDefaultResource
+  setDefaultCapacitys,
+  setDefaultResource,
+  transServiceList
 });

package/lib/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/lib/components/booking/info2/service/addTimeModal/index.js

@@ -118,14 +118,13 @@ var AddTimeModal = () => {
       arr = [
         ...arr,
         ...resource[form_id].map((d) => {
-          var _a3;
-          return (_a3 = state.service.cacheItem) == null ? void 0 : _a3._data.resourceMaps[form_id].renderListMaps[d.relation_id];
+          var _a3, _b3, _c2, _d2, _e2;
+          return (_e2 = (_d2 = (_c2 = (_b3 = (_a3 = state.service.cacheItem) == null ? void 0 : _a3._data) == null ? void 0 : _b3.resourceMaps) == null ? void 0 : _c2[form_id]) == null ? void 0 : _d2.renderListMaps) == null ? void 0 : _e2[d.relation_id];
         })
       ];
     }
-    return arr;
+    return arr.filter(Boolean);
   }, [(_f = (_e = (_d = state.service) == null ? void 0 : _d.cacheItem) == null ? void 0 : _e._extend) == null ? void 0 : _f.resource]);
-  console.log("currentResource", currentResource);
   const getTimeUsableStatus = (time) => {
     var _a2, _b2;
     if (!((_a2 = state.service.cacheItem) == null ? void 0 : _a2._extend) || !currentResource.length) {
@@ -383,13 +382,13 @@ var AddTimeModal = () => {
     goCheckout();
   };
   const handleSave = async (loadingType = "save") => {
-    var _a2, _b2, _c2, _d2, _e2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
     if (currentTime === null) {
       return;
     }
     setLoading(loadingType);
     const api = (0, import_utils4.isBooking4Shop)(
-      (_e2 = (_d2 = (_c2 = (_b2 = (_a2 = context.appHelper.utils.store) == null ? void 0 : _a2.getState) == null ? void 0 : _b2.call(_a2)) == null ? void 0 : _c2.global) == null ? void 0 : _d2.globalConfig) == null ? void 0 : _e2.id,
+      ((_c2 = (_b2 = (_a2 = context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.getData) == null ? void 0 : _c2.call(_b2, "shop_id")) || ((_h2 = (_g2 = (_f2 = (_e2 = (_d2 = context.appHelper.utils.store) == null ? void 0 : _d2.getState) == null ? void 0 : _e2.call(_d2)) == null ? void 0 : _f2.global) == null ? void 0 : _g2.globalConfig) == null ? void 0 : _h2.id),
       state.renderType
     ) ? import_serve.saveAddTimeProduct2 : import_serve.saveAddTimeProduct;
     await api({

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

@@ -45,8 +45,7 @@ var MaxLengthSelect = (props, ref) => {
     {
       ...props,
       onChange: handleChange,
-      popupMatchSelectWidth: false,
-      getPopupContainer: () => document.querySelector("#main") || document.body
+      popupMatchSelectWidth: false
     },
     props.children
   );

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

@@ -40,9 +40,13 @@ var import_index = require("./index.less");
 var import_utils = require("@pisell/utils");
 var import_utilsByBooking = require("../../../utilsByBooking");
 var import_lodash = require("lodash");
+var import_utils2 = require("../utils");
+var import_ahooks = require("ahooks");
+var import_icons = require("@ant-design/icons");
 var Resources = ({ state, cacheItem, getCurrentCacheItem, onChange, value }, ref) => {
   var _a, _b;
   const [showError, setShowError] = (0, import_react.useState)(false);
+  const update = (0, import_ahooks.useUpdate)();
   const data = (0, import_react.useMemo)(() => {
     var _a2;
     return ((_a2 = cacheItem == null ? void 0 : cacheItem._data) == null ? void 0 : _a2.resources) || [];
@@ -60,6 +64,10 @@ var Resources = ({ state, cacheItem, getCurrentCacheItem, onChange, value }, ref
   const _value = (0, import_react.useMemo)(() => {
     return value || defaultValue;
   }, [value, defaultValue]);
+  const handleCheckAutoAllocation = (id, checked) => {
+    (0, import_utils2.setAutoAllocationStorage)({ [id]: checked });
+    update();
+  };
   const _onChange = (val, form_id, key) => {
     let _val = { ..._value };
     let maps = _val[form_id] ? _val[form_id].reduce((pre, cur) => {
@@ -67,7 +75,7 @@ var Resources = ({ state, cacheItem, getCurrentCacheItem, onChange, value }, ref
       return pre;
     }, {}) : {};
     _val[form_id] = val.map((d) => {
-      var _a2, _b2, _c, _d2;
+      var _a2, _b2, _c, _d2, _e, _f, _g, _h;
       let _d = maps[d];
       if (_d) {
         if (key === "like_status") {
@@ -82,14 +90,16 @@ var Resources = ({ state, cacheItem, getCurrentCacheItem, onChange, value }, ref
           form_id,
           relation_id: d,
           like_status: "common",
+          children: (_d2 = (_c = currentForm.renderListMaps) == null ? void 0 : _c[d]) == null ? void 0 : _d2.children,
           // 新添加的数据补充错误信息
           errors: (0, import_utilsByBooking.getErrorList)(
-            (_c = currentForm.renderListMaps) == null ? void 0 : _c[d],
+            (_e = currentForm.renderListMaps) == null ? void 0 : _e[d],
             getCurrentCacheItem()
           ),
           metadata: {
+            ...(_g = (_f = currentForm.renderListMaps) == null ? void 0 : _f[d]) == null ? void 0 : _g.metadata,
             form_name: currentForm.title,
-            resource_name: (_d2 = currentForm.renderListMaps[d]) == null ? void 0 : _d2.main_field
+            resource_name: (_h = currentForm.renderListMaps[d]) == null ? void 0 : _h.main_field
           }
         }
       );
@@ -142,6 +152,9 @@ var Resources = ({ state, cacheItem, getCurrentCacheItem, onChange, value }, ref
       check
     };
   });
+  const getIsAutoAllocation = (id) => {
+    return (0, import_utils2.getAutoAllocationStorage)(id);
+  };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, data.map((item) => {
     var _a2;
     const cur = _value[item.form_id];
@@ -194,7 +207,11 @@ var Resources = ({ state, cacheItem, getCurrentCacheItem, onChange, value }, ref
           }
         },
         renderOptions(item.renderList, "id", "label", "resource")
-      ))
+      ), /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, { checked: getIsAutoAllocation(item.form_id), onChange: (e) => {
+        handleCheckAutoAllocation(item.form_id, e.target.checked);
+      } }), /* @__PURE__ */ import_react.default.createElement(import_antd.Tooltip, { title: import_utils.locales.getText(
+        "page.booking.text.resource.check-auto-allocation-tip"
+      ) }, /* @__PURE__ */ import_react.default.createElement(import_icons.QuestionCircleOutlined, null)))
     ), state.renderType !== "eventBooking" && (errors || []).map((d) => {
       return /* @__PURE__ */ import_react.default.createElement(
         import_antd.Alert,