@pisell/private-materials 6.4.72 → 6.4.74

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

@@ -55,10 +55,6 @@ var import_utilsByBooking = require("../../utilsByBooking");
 var import_utils7 = require("../addService/utils");
 var import_noteModal = __toESM(require("../../../../../plus/noteModal"));
 var import_priceKeyboard = require("../../../../../pro/priceKeyboard");
-var import_EditTabs = __toESM(require("../../../info/service/editService/EditTabs"));
-var import_BookingList = __toESM(require("../../../info/service/editService/BookingList"));
-var import_dayjs = __toESM(require("dayjs"));
-var import_utils8 = require("../../../info/service2/Group/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, _D, _E, _F, _G, _H, _I;
@@ -68,14 +64,11 @@ var Info = (_, ref) => {
   const useStartTime = import_antd.Form.useWatch("start_time", form);
   const useDuration = import_antd.Form.useWatch("duration", form);
   const useNote = import_antd.Form.useWatch("note", form);
-  const useStartDate = import_antd.Form.useWatch("start_date", form);
-  const useEndDate = import_antd.Form.useWatch("end_date", form);
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const resourcesRef = (0, import_react.useRef)(null);
   const isChangeTotal = (0, import_react.useRef)(false);
   const [noteModalOpen, setNoteModalOpen] = (0, import_react.useState)(false);
   const [open, setOpen] = (0, import_react.useState)(false);
-  const [currentTab, setCurrentTab] = (0, import_react.useState)("batch_edit");
   (0, import_react.useEffect)(() => {
     window.openBookingEditModal = () => {
       setOpen(true);
@@ -130,7 +123,6 @@ var Info = (_, ref) => {
   }, [durationProps, import_utils.locales.locale]);
   const timeObj = (0, import_react.useMemo)(() => {
     const val2 = (0, import_utils7.getTimeObj)({
-      cacheItem: getCurrentCacheItem(),
       durationProps,
       useStartTime,
       currentResource,
@@ -195,7 +187,7 @@ var Info = (_, ref) => {
     form.setFieldsValue({ discount });
   };
   const onFinish = (values) => {
-    var _a2, _b2, _c2, _d2, _e2;
+    var _a2, _b2, _c2, _d2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -220,15 +212,9 @@ var Info = (_, ref) => {
       },
       ...values
     };
-    if (isEditGroup) {
-      _extend.quantity = 1;
-      _extend.startDate = _extend == null ? void 0 : _extend.start_date;
-      _extend.endDate = _extend == null ? void 0 : _extend.end_date;
-    } else {
-      const { startDate, endDate } = (0, import_utils6.getServiceTimes)({ _extend });
-      _extend.startDate = startDate;
-      _extend.endDate = endDate;
-    }
+    const { startDate, endDate } = (0, import_utils6.getServiceTimes)({ _extend });
+    _extend.startDate = startDate;
+    _extend.endDate = endDate;
     if (_extend.bundle_edit !== void 0) {
       _extend.bundle_edit = 1;
     }
@@ -236,28 +222,19 @@ var Info = (_, ref) => {
     _item._time = (/* @__PURE__ */ new Date()).getTime();
     _item._serviceKey = (0, import_utils3.genServiceKey)(_item);
     let _id = _item == null ? void 0 : _item._id;
-    let groupId = (_c2 = _item == null ? void 0 : _item._extend) == null ? void 0 : _c2.groupId;
-    if (groupId) {
-      _list = _list.filter((d) => {
-        var _a3;
-        return ((_a3 = d._extend) == null ? void 0 : _a3.groupId) !== groupId;
-      });
-      _list = _list.concat((0, import_utils8.createBookingItemsByGroup)(_item, true));
+    if (!_list.some((d) => d._id === _id)) {
+      const detail = (0, import_utils3.addService)(_list, _item, state);
+      _list = detail.list;
     } else {
-      if (!_list.some((d) => d._id === _id)) {
-        const detail = (0, import_utils3.addService)(_list, _item, state);
-        _list = detail.list;
-      } else {
-        if (isChangeTotal.current) {
-          delete _item.discount_list;
-        }
-        _list = _list.map((d) => d._id === _id ? { ..._item, new: 0 } : d);
+      if (isChangeTotal.current) {
+        delete _item.discount_list;
       }
+      _list = _list.map((d) => d._id === _id ? { ..._item, new: 0 } : d);
     }
     (0, import_utils6.deleteCacheParams)();
     console.log("_onFinish", _list);
     form.resetFields();
-    if (!!((_d2 = state.service.cacheItem) == null ? void 0 : _d2.new)) {
+    if (!!((_c2 = state.service.cacheItem) == null ? void 0 : _c2.new)) {
       window.dispatchEvent(
         new CustomEvent("onAddNewService", {
           detail: {
@@ -266,7 +243,7 @@ var Info = (_, ref) => {
         })
       );
     }
-    (_e2 = window.closeBookingEditModal) == null ? void 0 : _e2.call(window);
+    (_d2 = window.closeBookingEditModal) == null ? void 0 : _d2.call(window);
     dispatch({
       type: "setService",
       payload: {
@@ -293,7 +270,6 @@ var Info = (_, ref) => {
     (_cacheItem, open2, openProductDetail) => {
       console.timeEnd("handleChange");
       console.log("setEditDatasetEditData", _cacheItem, open2);
-      setCurrentTab("batch_edit");
       isChangeTotal.current = false;
       let cacheItem = _cacheItem || state.service.cacheItem;
       let values = cacheItem._extend;
@@ -301,9 +277,9 @@ var Info = (_, ref) => {
       console.log(startTime2, "startTime");
       form.resetFields();
       form.setFieldsValue(values);
-      const endTime2 = performance.now();
-      console.log(endTime2 - window.pp1, "打开商品5");
-      console.log("执行时间", endTime2 - startTime2, values);
+      const endTime = performance.now();
+      console.log(endTime - window.pp1, "打开商品5");
+      console.log("执行时间", endTime - startTime2, values);
       setTimeout(() => {
       }, 20);
       if (openProductDetail) {
@@ -320,10 +296,9 @@ var Info = (_, ref) => {
     return cPrice !== oPrice;
   }, [useTotal, (_i = (_h = state.service.cacheItem) == null ? void 0 : _h._extend) == null ? void 0 : _i.origin_total]);
   const getResources = () => {
-    var _a2, _b2;
     let res = (0, import_utils7.formatResources)({
       cacheItem: getCurrentCacheItem(),
-      resourcesOrigin: (_b2 = (_a2 = state.service.cacheItem) == null ? void 0 : _a2._data) == null ? void 0 : _b2.resourcesOrigin
+      resourcesOrigin: state.service.cacheItem._data.resourcesOrigin
     });
     dispatch({
       type: "setService",
@@ -507,18 +482,6 @@ var Info = (_, ref) => {
   }, [state.renderType, isNormalProduct]);
   const SelectTime = (_p = window.BaseMaterials) == null ? void 0 : _p.SelectTime;
   const isNoSpecAndPackage = (0, import_utilsByBooking.getIsNoSpecAndPackage)(state.service.cacheItem);
-  const items = (0, import_react.useMemo)(() => {
-    var _a2, _b2;
-    return ((_b2 = (_a2 = getCurrentCacheItem()) == null ? void 0 : _a2._extend) == null ? void 0 : _b2.items) || [];
-  }, [
-    getCurrentCacheItem(),
-    state.service.cacheItem,
-    currentResource,
-    useTotal
-  ]);
-  const isEditGroup = (0, import_react.useMemo)(() => {
-    return items.length;
-  }, [items]);
   const handleNoteConfirm = (noteValue) => {
     form.setFieldsValue({ note: noteValue });
     setNoteModalOpen(false);
@@ -601,28 +564,16 @@ var Info = (_, ref) => {
       /* @__PURE__ */ import_react.default.createElement(import_antd.Input.TextArea, { size: "large" })
     )) : null;
   }, [isReason]);
-  const DateCom = (position) => {
-    return /* @__PURE__ */ import_react.default.createElement(
-      import_antd.DatePicker,
-      {
-        className: "pisell-lowcode__booking-service-select-date",
-        disabledDate: (current) => (0, import_utils4.disabledDate)(current, position, state.date.value),
-        size: "large",
-        style: { width: "100%" },
-        format: state.locale === "en" ? "DD/MM/YYYY" : "YYYY-MM-DD"
-      }
-    );
-  };
   const startTime = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
     return /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Form.Item,
       {
-        label: import_utils.locales.getText(isEditGroup ? "pisell2.text.start_date" : "pisell2.text.start_time"),
-        name: isEditGroup ? "start_date" : "start_time",
+        label: import_utils.locales.getText("pisell2.text.start_time"),
+        name: "start_time",
         rules: [{ required: true }]
       },
-      isEditGroup ? DateCom("start") : SelectTime ? /* @__PURE__ */ import_react.default.createElement(
+      SelectTime ? /* @__PURE__ */ import_react.default.createElement(
         SelectTime,
         {
           slice: (_d2 = (_c2 = (_b2 = (_a2 = state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.service_time) == null ? void 0 : _d2.value,
@@ -635,23 +586,10 @@ var Info = (_, ref) => {
         }
       ) : null
     ));
-  }, [SelectTime, (_y = (_x = (_w = (_v = state.bookingConfig) == null ? void 0 : _v.config) == null ? void 0 : _w.basic) == null ? void 0 : _x.service_time) == null ? void 0 : _y.value, isEditGroup]);
-  const endTime = (0, import_react.useMemo)(() => {
-    if (!isEditGroup) {
-      return null;
-    }
-    return /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Form.Item,
-      {
-        label: import_utils.locales.getText("pisell2.text.end_date"),
-        name: "end_date"
-      },
-      DateCom("end")
-    ));
-  }, [isEditGroup]);
+  }, [SelectTime, (_y = (_x = (_w = (_v = state.bookingConfig) == null ? void 0 : _v.config) == null ? void 0 : _w.basic) == null ? void 0 : _x.service_time) == null ? void 0 : _y.value]);
   const duration = (0, import_react.useMemo)(() => {
     console.log("render form duration");
-    return /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: isEditGroup ? 24 : 12 }, /* @__PURE__ */ import_react.default.createElement(
+    return /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Form.Item,
       {
         label: import_utils.locales.getText("pisell2.text.duration"),
@@ -660,7 +598,7 @@ var Info = (_, ref) => {
       },
       /* @__PURE__ */ import_react.default.createElement(import_duration.default, { ...durationProps, timeObj })
     ));
-  }, [durationProps, timeObj, isEditGroup]);
+  }, [durationProps, timeObj]);
   const resource = (0, import_react.useMemo)(() => {
     console.log("render form resource");
     return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { noStyle: true, name: "resource" }, /* @__PURE__ */ import_react.default.createElement(
@@ -779,91 +717,6 @@ var Info = (_, ref) => {
       setVal(false);
     }
   }, [isShowTimeAndResource]);
-  const groupDom = (0, import_react.useMemo)(() => {
-    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, !!isEditGroup && /* @__PURE__ */ import_react.default.createElement(
-      import_EditTabs.default,
-      {
-        value: currentTab,
-        onChange: (e) => {
-          console.log(e);
-          setCurrentTab(e);
-        }
-      }
-    ), /* @__PURE__ */ import_react.default.createElement(
-      "div",
-      {
-        className: "",
-        style: {
-          display: currentTab === "booking_list" ? "block" : "none"
-        }
-      },
-      /* @__PURE__ */ import_react.default.createElement(import_BookingList.default, { items })
-    ));
-  }, [isEditGroup, currentTab, items]);
-  const updateMultiDay = async ({ start_date, end_date, duration: duration2 }) => {
-    const cacheItem = await (0, import_utils7.getMultiDay)({
-      start_date,
-      end_date,
-      state,
-      cacheItem: getCurrentCacheItem()
-    });
-    if (duration2 !== void 0) {
-      cacheItem._extend.duration = duration2;
-    }
-    cacheItem._extend.items = (0, import_utils8.createBookingItemsByGroup)(cacheItem);
-    cacheItem._extend = {
-      ...cacheItem._extend,
-      ...(0, import_utils8.getGroupTotalPrice)(cacheItem._extend.items)
-    };
-    dispatch({
-      type: "setService",
-      payload: {
-        cacheItem
-      }
-    });
-    let fieldsValues = {
-      total: cacheItem._extend.total
-    };
-    form.setFieldsValue(fieldsValues);
-  };
-  const onValuesChange = (changedValues) => {
-    if (isEditGroup) {
-      if (changedValues == null ? void 0 : changedValues.duration) {
-        const end_date = (0, import_dayjs.default)(useStartDate).add(
-          changedValues == null ? void 0 : changedValues.duration,
-          "day"
-        );
-        form.setFieldsValue({
-          end_date
-        });
-        return updateMultiDay({
-          start_date: useStartDate,
-          end_date,
-          duration: changedValues == null ? void 0 : changedValues.duration
-        });
-      }
-      if (changedValues == null ? void 0 : changedValues.start_date) {
-        const startDate = (0, import_dayjs.default)(changedValues == null ? void 0 : changedValues.start_date);
-        const endDate = (0, import_dayjs.default)(useEndDate);
-        if (startDate.isAfter(endDate)) {
-          return form.setFieldsValue({
-            duration: void 0,
-            end_date: void 0
-          });
-        }
-      }
-      if ((changedValues == null ? void 0 : changedValues.start_date) || (changedValues == null ? void 0 : changedValues.end_date)) {
-        const cacheItem = getCurrentCacheItem();
-        const duration2 = (0, import_utils6.getDays)(cacheItem, "days");
-        const start_date = (changedValues == null ? void 0 : changedValues.start_date) || useStartDate;
-        const end_date = (changedValues == null ? void 0 : changedValues.end_date) || useEndDate;
-        updateMultiDay({ start_date, end_date, duration: duration2 });
-        return form.setFieldsValue({
-          duration: duration2
-        });
-      }
-    }
-  };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
@@ -886,29 +739,16 @@ var Info = (_, ref) => {
         });
       }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, groupDom, /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Form,
+    /* @__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] }, productName, price, reason, val && isShowTimeAndResource && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, startTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity), /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { noStyle: true, name: "note" }, noteModalOpen && /* @__PURE__ */ import_react.default.createElement(
+      import_noteModal.default,
       {
-        layout: "vertical",
-        form,
-        onFinish,
-        onValuesChange,
-        style: {
-          display: currentTab === "batch_edit" ? "block" : "none"
-        }
-      },
-      /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, productName, price, reason, val && isShowTimeAndResource && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, startTime, endTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity),
-      /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { noStyle: true, name: "note" }, noteModalOpen && /* @__PURE__ */ import_react.default.createElement(
-        import_noteModal.default,
-        {
-          open: noteModalOpen,
-          value: form.getFieldValue("note"),
-          onConfirm: handleNoteConfirm,
-          onDelete: handleNoteDelete,
-          onCancel: handleNoteCancel
-        }
-      ))
-    ), footer)
+        open: noteModalOpen,
+        value: form.getFieldValue("note"),
+        onConfirm: handleNoteConfirm,
+        onDelete: handleNoteDelete,
+        onCancel: handleNoteCancel
+      }
+    ))), footer)
   ));
 };
 var editService_default = (0, import_react.forwardRef)(Info);

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

@@ -43,7 +43,6 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
 var import_utils2 = require("../utils");
 var import_utils3 = require("../../ticketBooking/components/addServiceVariant/utils");
-var import_utils4 = require("./service/addService/utils");
 var getUseableEventCount = (eventList, current) => {
   return (eventList || []).reduce((pre, event) => {
     return pre - event.pax;
@@ -220,20 +219,13 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
   }
   const appointmentTimingPreference = getAppointmentTimingPreference(state);
   let lastServer = (0, import_utils2.getLastServer)((_a = state.service.value) == null ? void 0 : _a.filter((item) => !item.isCustomItem));
-  const getDuration = (cacheItem2) => {
-    var _a2;
-    if ((0, import_utils4.isMultiDayProduct)(cacheItem2)) {
-      return (0, import_utils2.getDays)(cacheItem2, "days");
-    }
-    return (0, import_utils2.findNextDuration)(
-      cacheItem2.duration,
-      timeObj == null ? void 0 : timeObj.durationSlicesBasedOnTime,
-      (_a2 = cacheItem2 == null ? void 0 : cacheItem2.duration) == null ? void 0 : _a2.value
-    );
-  };
   let _extend = {
     // 时长: 当前商品时长 > 第一个时长
-    duration: getDuration(cacheItem)
+    duration: (0, import_utils2.findNextDuration)(
+      cacheItem.duration,
+      timeObj == null ? void 0 : timeObj.durationSlicesBasedOnTime,
+      (_b = cacheItem == null ? void 0 : cacheItem.duration) == null ? void 0 : _b.value
+    )
   };
   if (lastServer) {
     let lastServerStartDate = lastServer._extend.startDate;
@@ -242,9 +234,9 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
       _extend.start_time = lastServerStartDate.format("HH:mm");
     } else {
       if ((0, import_dayjs.default)(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
-        _extend.start_time = timeObj == null ? void 0 : timeObj.timeSlices[((_b = timeObj == null ? void 0 : timeObj.timeSlices) == null ? void 0 : _b.length) - 1].value;
+        _extend.start_time = timeObj == null ? void 0 : timeObj.timeSlices[((_c = timeObj == null ? void 0 : timeObj.timeSlices) == null ? void 0 : _c.length) - 1].value;
       } else {
-        _extend.start_time = (_c = lastServerEndDate || (0, import_dayjs.default)()) == null ? void 0 : _c.format("HH:mm");
+        _extend.start_time = lastServerEndDate.format("HH:mm");
       }
     }
   } else {
@@ -272,10 +264,7 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
     ..._extend,
     ...cacheItem._extend
   };
-  const { startDate, endDate } = (0, import_utils2.getServiceTimes)({
-    ...cacheItem,
-    _extend
-  });
+  const { startDate, endDate } = (0, import_utils2.getServiceTimes)({ _extend });
   _extend.startDate = startDate;
   _extend.endDate = endDate;
   const session = (_e = (_d = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.session;

package/lib/components/booking/utils.d.ts

@@ -22,14 +22,6 @@ export declare const request: Request;
  * @Date: 2024-04-26 14:00
  */
 export declare const getDiscountTime: (service_times: number, isDay?: boolean) => string;
-/**
- * @title: 格式化跨日预约的时长用于展示
- * @description:
- * @param {number} days
- * @param {number} minutes
- * @return {*}
- */
-export declare const getDiscountTimeByDayMinutes: (days: number, minutes: number) => string;
 /**
  * @title: 时间切片
  * @description:
@@ -121,7 +113,7 @@ export declare const flexibleObj: {
 export declare const getEndDate: (startDate: any, duration: string | number, endDate: any) => any;
 export declare const getServiceTimes: (service: any) => {
     startDate: dayjs.Dayjs;
-    endDate: any;
+    endDate: dayjs.Dayjs;
 };
 export declare const getErrorList: (resource: any, cacheItem: any, isDay?: boolean) => {
     label: any;

package/lib/components/booking/utils.js

@@ -39,7 +39,6 @@ __export(utils_exports, {
   getCacheParams: () => getCacheParams,
   getDays: () => getDays,
   getDiscountTime: () => getDiscountTime,
-  getDiscountTimeByDayMinutes: () => getDiscountTimeByDayMinutes,
   getDuration: () => getDuration,
   getEndDate: () => getEndDate,
   getErrorList: () => getErrorList,
@@ -68,7 +67,6 @@ var import_utils2 = require("./info/service2/utils");
 var import_lodash = require("lodash");
 var import_utilsByBooking = require("./info2/utilsByBooking");
 var import_decimal = __toESM(require("decimal.js"));
-var import_utils3 = require("./info2/service/addService/utils");
 var Request = class {
   request = {};
   constructor() {
@@ -101,12 +99,6 @@ var getDiscountTime = (service_times, isDay) => {
     return str;
   }
 };
-var getDiscountTimeByDayMinutes = (days, minutes) => {
-  if (days === 0) {
-    return getDiscountTime(minutes);
-  }
-  return `${days} ${import_utils.locales.getText("pisell2.text.day")(days)} ${getDiscountTime(minutes)}`;
-};
 var sliceDayIntoFiveMinutes = (config, locale, isDay) => {
   let _locale = locale;
   let dayjsLocale = _locale === "en-US" || _locale === "en" ? "en" : "zh-cn";
@@ -416,12 +408,6 @@ var getServiceTimes = (service) => {
   const startDate = (0, import_dayjs.default)(
     (0, import_dayjs.default)(service._extend.start_date).format("YYYY-MM-DD ") + getServeStartTime(service._extend.start_time)
   );
-  if ((0, import_utils3.isMultiDayProduct)(service)) {
-    return {
-      startDate,
-      endDate: service._extend.end_date
-    };
-  }
   const endDate = startDate.add(
     flexibleObj.getValue(service._extend.duration),
     "minute"
@@ -710,7 +696,6 @@ var getIsEdit = (state) => {
   getCacheParams,
   getDays,
   getDiscountTime,
-  getDiscountTimeByDayMinutes,
   getDuration,
   getEndDate,
   getErrorList,