@pisell/private-materials 3.0.197 → 3.0.199

package/lib/components/booking/info/service/addService/index.js

@@ -43,14 +43,10 @@ var import_index = require("./index.less");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_serve = require("../serve");
 var import_utils = require("../../utils");
-var import_dateRange = __toESM(require("../../dateRange"));
 var import_utils2 = require("./utils");
 var import_utils3 = require("../../../utils");
-var import_utils4 = require("../../service2/utils");
-var import_status = require("../../service2/status");
-var import_utils5 = require("@pisell/utils");
+var import_utils4 = require("@pisell/utils");
 var import_ahooks = require("ahooks");
-var import_debounce = __toESM(require("lodash/debounce"));
 var shopList = [
   2886,
   4422,
@@ -74,31 +70,10 @@ var Info = (props) => {
   let { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const searchRef = (0, import_react.useRef)();
-  const headerRef = (0, import_react.useRef)(null);
-  const [headerHeight, setHeaderHeight] = (0, import_react.useState)(0);
   const context = (0, import_useEngineContext.default)();
   state = state || (props == null ? void 0 : props.state);
   dispatch = dispatch || (props == null ? void 0 : props.dispatch);
   import_utils3.request.setRequest(context.appHelper.utils.request);
-  const isDay = (0, import_react.useMemo)(() => {
-    return (0, import_utils4.isDayBooking)(state);
-  }, [state.renderType]);
-  const handleResize = () => {
-    var _a2;
-    if (headerRef == null ? void 0 : headerRef.current) {
-      setHeaderHeight((_a2 = headerRef.current) == null ? void 0 : _a2.offsetHeight);
-    }
-  };
-  const debouncedHandleResize = (0, import_debounce.default)(handleResize, 100);
-  (0, import_react.useEffect)(() => {
-    if (isDay && state.isTerminalDayBookingPage) {
-      handleResize();
-      window.addEventListener("resize", debouncedHandleResize);
-    }
-    return () => {
-      window.removeEventListener("resize", debouncedHandleResize);
-    };
-  }, [debouncedHandleResize]);
   const setDefaultService = async (list) => {
     if (state.renderType !== "eventBooking") {
       return;
@@ -125,11 +100,11 @@ var Info = (props) => {
     let _item = {
       ...product,
       product_id: product.id,
-      _id: (0, import_utils5.getUniqueId)(),
+      _id: (0, import_utils4.getUniqueId)(),
       _extend: {
         start_date: state.date.value,
         startDate: state.date.value,
-        endDate: isDay ? state.date.end_date : state.date.value,
+        endDate: state.date.value,
         start_time: "00:00:00",
         duration: 10,
         quantity: 1,
@@ -161,10 +136,6 @@ var Info = (props) => {
       setLoading(false);
       return;
     }
-    let dayParams = {};
-    if (isDay) {
-      dayParams.extension_type = ["normal", "product_appointment"];
-    }
     let data = await state.apis.getServices({
       skip: 1,
       num: 500,
@@ -180,22 +151,16 @@ var Info = (props) => {
         _config: {
           useCache: true
         }
-      },
-      ...dayParams
+      }
     });
     setLoading(false);
-    let lists = (data == null ? void 0 : data.list) || [];
-    if (isDay) {
-      const id = (0, import_utils4.holderId)(state);
-      lists = (0, import_utils4.getDayProducts)(id, lists, state == null ? void 0 : state.isTerminalDayBookingPage);
-    }
     if (!state.service.addModal) {
-      setDefaultService(lists);
+      setDefaultService(data == null ? void 0 : data.list);
     }
     dispatch({
       type: "setService",
       payload: {
-        services: lists
+        services: (data == null ? void 0 : data.list) || []
       }
     });
   };
@@ -242,7 +207,7 @@ var Info = (props) => {
           let cacheItem = {
             ...item,
             product_id: item.id,
-            _id: (0, import_utils5.getUniqueId)(),
+            _id: (0, import_utils4.getUniqueId)(),
             _key: e.key,
             _extend: {
               start_date: state.date.value,
@@ -253,11 +218,6 @@ var Info = (props) => {
             },
             new: 1
           };
-          if (isDay) {
-            cacheItem._extend.holder_id = (0, import_utils4.holderId)(state);
-            cacheItem._extend.end_date = state.date.end_date;
-            cacheItem._extend.sub_type = "days";
-          }
           let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
           cacheItem._extend.total = _total;
           cacheItem._extend.origin_total = _total;
@@ -270,9 +230,7 @@ var Info = (props) => {
             cacheItem.currentDefaultTime = state.date.value.format("HH:mm");
           }
           cacheItem._extend = (0, import_utils2.getProductExtend)({ cacheItem, state });
-          if (isDay && !(0, import_utils4.isAppointment)(item, state)) {
-            cacheItem.autoClose = !_isEdit;
-          } else if (state.renderType === "eventBooking") {
+          if (state.renderType === "eventBooking") {
             cacheItem.autoClose = false;
           } else {
             cacheItem.autoClose = !_isEdit && (cacheItem._extend.resource || cacheItem._extend.resource === 0 || (((_b2 = state.service) == null ? void 0 : _b2.resourcesOrigin) || []).length === 1);
@@ -294,13 +252,6 @@ var Info = (props) => {
   const renderList = (0, import_react.useMemo)(() => {
     var _a2;
     let _list = ((_a2 = state.service) == null ? void 0 : _a2.services) || [];
-    if (isDay) {
-      if (!(0, import_utils4.holderId)(state)) {
-        _list = _list.filter(
-          (item) => !import_status.appointmentTypes.includes(item.extension_type)
-        );
-      }
-    }
     const isIncludes = (str) => {
       return str.toLowerCase().indexOf(search.toLowerCase()) !== -1;
     };
@@ -308,7 +259,7 @@ var Info = (props) => {
       _list,
       search ? (item) => isIncludes(item.title) : void 0
     );
-  }, [search, (_a = state.service) == null ? void 0 : _a.services, state == null ? void 0 : state.activeCartId]);
+  }, [search, (_a = state.service) == null ? void 0 : _a.services]);
   console.log("state.service.renderList", renderList);
   const isService = (0, import_react.useMemo)(() => {
     var _a2, _b2;
@@ -351,9 +302,6 @@ var Info = (props) => {
     }
   }, [state.renderType, state.modalOpen]);
   const addButton = (0, import_react.useMemo)(() => {
-    if (isDay) {
-      return;
-    }
     if (state.isBookingCreatePage) {
       return /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } });
     }
@@ -363,8 +311,8 @@ var Info = (props) => {
         {
           loading,
           showSub: false,
-          title: import_utils5.locales.getText("pisell2.text.add-a-service"),
-          subTitle: import_utils5.locales.getText("pisell2.text.add-another-service"),
+          title: import_utils4.locales.getText("pisell2.text.add-a-service"),
+          subTitle: import_utils4.locales.getText("pisell2.text.add-another-service"),
           onClick: handleSelectService
         }
       );
@@ -373,8 +321,8 @@ var Info = (props) => {
       import_addButton.default,
       {
         showSub: isService,
-        title: import_utils5.locales.getText("pisell2.text.add-a-service"),
-        subTitle: import_utils5.locales.getText("pisell2.text.add-another-service"),
+        title: import_utils4.locales.getText("pisell2.text.add-a-service"),
+        subTitle: import_utils4.locales.getText("pisell2.text.add-another-service"),
         onClick: handleSelectService
       }
     ) : /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } });
@@ -388,42 +336,31 @@ var Info = (props) => {
   const isRenderCurrent = (0, import_react.useMemo)(() => {
     return renderMode === "current";
   }, [renderMode]);
-  const colSpan = (0, import_react.useMemo)(() => {
-    const isTerminal = state.isTerminalDayBookingPage;
-    const showDate = !!(isDay && (0, import_utils4.holderId)(state));
-    return (0, import_status.inputDateCol)(showDate, isTerminal);
-  }, [state.isTerminalDayBookingPage, isDay, (0, import_utils4.holderId)(state)]);
   return (0, import_react.useMemo)(() => {
     var _a2, _b2;
-    const header = /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-header", ref: headerRef }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { gutter: [16, 16] }, isDay && (0, import_utils4.holderId)(state) ? /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { ...colSpan.date }, /* @__PURE__ */ import_react.default.createElement(import_dateRange.default, { state, dispatch })) : null, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { ...colSpan.input }, /* @__PURE__ */ import_react.default.createElement(
+    const header = /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-header" }, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Input,
       {
         ref: searchRef,
         prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
         style: { marginTop: 16, height: 44 },
-        placeholder: import_utils5.locales.getText("pisell2.text.search"),
+        placeholder: import_utils4.locales.getText("pisell2.text.search"),
         allowClear: true,
         value: search,
         onChange: (e) => {
           setSearch(e.target.value);
         }
       }
-    ))));
-    const content = /* @__PURE__ */ import_react.default.createElement(
-      "div",
+    ));
+    const content = /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body" }, /* @__PURE__ */ import_react.default.createElement(
+      import_TabProduct.default,
       {
-        className: isDay && headerHeight > 76 ? "pisell-lowcode__booking-service-date-body" : "pisell-lowcode__booking-service-body"
-      },
-      /* @__PURE__ */ import_react.default.createElement(
-        import_TabProduct.default,
-        {
-          list: renderList,
-          amountSymbol: state.amountSymbol,
-          onChange: handleSelectProduct,
-          scrollDom: isRenderCurrent ? ".pisell-lowcode__booking-vertical-add-service-wrap" : ".booking-server-wrap .pisell-lowcode-drawer-body "
-        }
-      )
-    );
+        list: renderList,
+        amountSymbol: state.amountSymbol,
+        onChange: handleSelectProduct,
+        scrollDom: isRenderCurrent ? ".pisell-lowcode__booking-vertical-add-service-wrap" : ".booking-server-wrap .pisell-lowcode-drawer-body "
+      }
+    ));
     if (renderMode === "current") {
       return /* @__PURE__ */ import_react.default.createElement(
         "div",
@@ -439,8 +376,8 @@ var Info = (props) => {
       import_drawer.default,
       {
         titleNoWrap: true,
-        open: state.service.addModal && !state.isBookingCreatePage && !state.isTerminalDayBookingPage,
-        title: isDay ? import_utils5.locales.getText("pisell2.text.select.items") : import_utils5.locales.getText("pisell2.text.select-service"),
+        open: state.service.addModal && !state.isBookingCreatePage,
+        title: import_utils4.locales.getText("pisell2.text.select-service"),
         rootClassName: "booking-server-wrap",
         onClose: () => {
           dispatch({
@@ -460,14 +397,10 @@ var Info = (props) => {
     (_d = (_c = state.service) == null ? void 0 : _c.cacheItem) == null ? void 0 : _d.autoClose,
     addButton,
     state.service.addModal,
-    import_utils5.locales,
+    import_utils4.locales,
     search,
     renderList,
-    state.amountSymbol,
-    state.renderType,
-    state == null ? void 0 : state.activeCartId,
-    headerHeight,
-    (0, import_utils4.holderId)(state)
+    state.amountSymbol
   ]);
 };
 var addService_default = Info;

package/lib/components/booking/info/service/addService/index.less

@@ -3,9 +3,8 @@
   // border-bottom: 1px solid var(--gray-300, #D0D5DD);
 }
 
-.pisell-lowcode__booking-service-body,
-.pisell-lowcode__booking-service-date-body {
-  background: var(--gray-50, #f9fafb);
+.pisell-lowcode__booking-service-body {
+  background: var(--gray-50, #F9FAFB);
 }
 
 .pisell-lowcode__booking-vertical-add-service-wrap {
@@ -26,7 +25,6 @@
   .booking-category-list {
     padding: 0 16px !important;
   }
-
   .pisell-lowcode__booking-service-body {
     .booking-tab-product {
       .booking-tabs-wrap {
@@ -34,12 +32,4 @@
       }
     }
   }
-
-  .pisell-lowcode__booking-service-date-body {
-    .booking-tab-product {
-      .booking-tabs-wrap {
-        top: 136px !important;
-      }
-    }
-  }
-}
+}

package/lib/components/booking/info/service/addService/utils.d.ts

@@ -1,4 +1,4 @@
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 export declare const getDurationProps: ({ cacheItem, useStartTime, currentResource, slice, }: any) => {
     startDate: dayjs.Dayjs;
     usableTime: any;
@@ -48,7 +48,7 @@ export declare const getTimeObj: ({ cacheItem, useStartTime, currentResource, st
  * @Author: zhiwei.Wang
  * @Date: 2024-01-09 13:38
  */
-export declare const formatResources: ({ cacheItem, resourcesOrigin, isDay }: any) => any[];
+export declare const formatResources: ({ cacheItem, resourcesOrigin }: any) => any[];
 export declare const checkCacheItemResource: ({ cacheItem, resources }: any) => any;
 /**
  * @title: 预生成服务的 extend
@@ -59,12 +59,3 @@ export declare const checkCacheItemResource: ({ cacheItem, resources }: any) =>
  * @Date: 2024-06-01 13:25
  */
 export declare const getProductExtend: ({ cacheItem, state }: any) => any;
-/**
- * @title: 获取资源标题
- * @description:
- * @param {any} param1
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-09 15:53
- */
-export declare const getResourceTitle: ({ state, id }: any) => any;

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

@@ -34,7 +34,6 @@ __export(utils_exports, {
   getDurationProps: () => getDurationProps,
   getFlexibleOption: () => getFlexibleOption,
   getProductExtend: () => getProductExtend,
-  getResourceTitle: () => getResourceTitle,
   getTimeObj: () => getTimeObj
 });
 module.exports = __toCommonJS(utils_exports);
@@ -43,7 +42,6 @@ var import_utils = require("../../../utils");
 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("../../service2/utils");
 var getDurationProps = ({
   cacheItem,
   useStartTime,
@@ -110,8 +108,7 @@ var getTimeObj = ({
   });
   let obj = (0, import_utils.sliceDayIntoFiveMinutes)(
     (_c = (_b = (_a = state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.service_time,
-    import_utils2.locales.locale,
-    (0, import_utils3.isDayBooking)(state)
+    import_utils2.locales.locale
   );
   let timeSlices = [...obj.timeSlices];
   let durationSlicesBasedOnTime = [...obj.durationSlicesBasedOnTime];
@@ -120,7 +117,7 @@ var getTimeObj = ({
   }
   if (useDuration && !durationSlicesBasedOnTime.some((d) => d.value === useDuration)) {
     durationSlicesBasedOnTime.unshift({
-      label: (0, import_utils.getDiscountTime)(useDuration, (0, import_utils3.isDayBooking)(state)),
+      label: (0, import_utils.getDiscountTime)(useDuration),
       value: useDuration,
       //@ts-ignore
       disabled: true
@@ -142,19 +139,14 @@ var getTimeObj = ({
     durationSlicesBasedOnTime
   };
 };
-var formatResources = ({ cacheItem, resourcesOrigin, isDay }) => {
+var formatResources = ({ cacheItem, resourcesOrigin }) => {
   try {
     let _list = [...resourcesOrigin];
     const _cacheItem = cacheItem;
     _list = _list.map(
-      (d) => (0, import_utils.formatResource)(
-        d,
-        _cacheItem,
-        (item) => {
-          return /* @__PURE__ */ import_react.default.createElement("div", { className: "resource-option" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "like-wrap" }), item.labelText, !item.usable && /* @__PURE__ */ import_react.default.createElement(import_AlertTriangle.default, { className: "resource-option-alert-icon" }));
-        },
-        isDay
-      )
+      (d) => (0, import_utils.formatResource)(d, _cacheItem, (item) => {
+        return /* @__PURE__ */ import_react.default.createElement("div", { className: "resource-option" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "like-wrap" }), item.labelText, !item.usable && /* @__PURE__ */ import_react.default.createElement(import_AlertTriangle.default, { className: "resource-option-alert-icon" }));
+      })
     );
     _list = _list.sort((a, b) => b.usable ? 1 : -1);
     return _list;
@@ -164,23 +156,22 @@ var formatResources = ({ cacheItem, resourcesOrigin, isDay }) => {
   return [];
 };
 var checkCacheItemResource = ({ cacheItem, resources }) => {
-  var _a, _b;
   let resourceId = cacheItem._extend.resource;
   if (resourceId || resourceId === 0) {
-    if (!resources.find((d) => (d == null ? void 0 : d.form_record_id) === resourceId)) {
+    if (!resources.find((d) => d.form_record_id === resourceId)) {
       resourceId = void 0;
     }
   } else {
     if (cacheItem.new) {
       if (resources.length <= 2) {
-        resourceId = (_a = resources == null ? void 0 : resources[(resources == null ? void 0 : resources.length) - 1]) == null ? void 0 : _a.form_record_id;
+        resourceId = resources[resources.length - 1].form_record_id;
       }
       if (resources.length > 2) {
         const usableList = resources.filter(
           (d) => d.usable && d.form_id !== 0
         );
         if (usableList.length === 1) {
-          resourceId = (_b = usableList == null ? void 0 : usableList[0]) == null ? void 0 : _b.form_record_id;
+          resourceId = usableList[0].form_record_id;
         }
       }
     }
@@ -195,10 +186,7 @@ var getProductExtend = ({ cacheItem, state }) => {
   let currentResource = null;
   if (!cacheItem.new) {
     const resources2 = formatResources({ cacheItem, resourcesOrigin });
-    let item = resources2.find((d) => {
-      var _a;
-      return (d == null ? void 0 : d.form_record_id) == ((_a = cacheItem._extend) == null ? void 0 : _a.resource);
-    }) || {};
+    let item = resources2.find((d) => d.form_record_id == cacheItem._extend.resource) || {};
     if (item) {
       currentResource = item;
     }
@@ -215,14 +203,6 @@ var getProductExtend = ({ cacheItem, state }) => {
   });
   return _extend;
 };
-var getResourceTitle = ({ state, id }) => {
-  var _a;
-  const resources = ((_a = state == null ? void 0 : state.client) == null ? void 0 : _a.value) || [];
-  if (!resources.length)
-    return "";
-  const resource = resources.find((d) => d.id === id);
-  return (resource == null ? void 0 : resource.main_field) || "-";
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCacheItemResource,
@@ -230,6 +210,5 @@ var getResourceTitle = ({ state, id }) => {
   getDurationProps,
   getFlexibleOption,
   getProductExtend,
-  getResourceTitle,
   getTimeObj
 });