@pisell/private-materials 3.3.42 → 3.3.44

package/lib/components/appointmentBooking/components/Header/index.js

@@ -38,26 +38,41 @@ var import_progressBar = __toESM(require("../../../eventBooking/components/progr
 var import_context = require("../../context");
 var import_hooks = require("../../hooks");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var import_utils2 = require("../../utils");
 var import_index = require("./index.less");
 var Header = () => {
   var _a;
-  const { currentStep, appointmentBooking, resources, setTimes, carts } = (0, import_context.useAppointmentBookingContext)();
+  const {
+    currentStep,
+    appointmentBooking,
+    setTimes,
+    carts,
+    currentStepParams,
+    currentSelectedResources
+  } = (0, import_context.useAppointmentBookingContext)();
   const shopDiscount = (0, import_hooks.useShopDiscount)();
   const context = (0, import_useEngineContext.default)();
-  const { checkSkipResourceStep } = (0, import_hooks.useIsSkipResourceStep)();
-  const { getStepIndex, stepList, updateStep } = (0, import_hooks.useAppointmentBookingStep)();
-  const { setOtherData } = (0, import_hooks.useAppointmentBookingSetting)();
+  const { stepList, updateStep, removeStep } = (0, import_hooks.useAppointmentBookingStep)();
+  const { setOtherData, getOtherData } = (0, import_hooks.useAppointmentBookingSetting)();
   const { checkProductType } = (0, import_hooks.useAppointmentBookingProduct)();
+  const utils = (0, import_hooks.contextUtils)();
   const stepName = (0, import_react.useMemo)(() => {
-    var _a2, _b, _c, _d, _e;
+    var _a2, _b, _c;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     if (!key) return "";
-    if (key === "select-resource") {
-      const name = ((_d = (_c = (_b = resources == null ? void 0 : resources[0]) == null ? void 0 : _b.resources) == null ? void 0 : _c[0]) == null ? void 0 : _d.title) || "";
+    if (key.startsWith("select-resource")) {
+      const currentResource = (_b = currentSelectedResources == null ? void 0 : currentSelectedResources[0]) == null ? void 0 : _b.currentSelectedResource;
+      const resourceItem = (currentResource == null ? void 0 : currentResource.resourceItem) || {};
+      const name = (0, import_utils2.getResourceTitle)(
+        appointmentBooking,
+        resourceItem == null ? void 0 : resourceItem.code,
+        utils,
+        resourceItem
+      );
       return import_utils.locales.getText("pisell2.event.select.category")(name);
     }
-    return ((_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.description) || "";
-  }, [(_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key, resources]);
+    return ((_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.description) || "";
+  }, [(_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key, currentSelectedResources]);
   const handleBack = async () => {
     var _a2, _b;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
@@ -82,29 +97,44 @@ var Header = () => {
     if (key === "select-time") {
       setTimes([]);
     }
-    if (key === "fill-form") {
-      setOtherData("booking_form", {});
-    }
-    const resourceStep = stepList[(currentStep == null ? void 0 : currentStep.index) - 1];
-    if ((resourceStep == null ? void 0 : resourceStep.isSkip) && (resourceStep == null ? void 0 : resourceStep.key) === "select-resource") {
-      appointmentBooking.deleteCartItemInfo("resource");
+    if (key.startsWith("fill-form")) {
+      const form_key = "booking_form";
+      let booking_form = getOtherData(form_key);
+      setOtherData(form_key, { ...booking_form, [key]: {} });
     }
     appointmentBooking.back();
-    const prevStepData = stepList[(currentStep == null ? void 0 : currentStep.index) - 1];
-    const currentStepData = stepList[currentStep == null ? void 0 : currentStep.index];
+    const prevStepData = stepList[(currentStepParams == null ? void 0 : currentStepParams.index) - 1];
+    const currentStepData = stepList[currentStepParams == null ? void 0 : currentStepParams.index];
     if ((currentStepData == null ? void 0 : currentStepData.isSkip) || (prevStepData == null ? void 0 : prevStepData.isSkip)) {
       const key2 = (currentStepData == null ? void 0 : currentStepData.isSkip) ? currentStepData == null ? void 0 : currentStepData.key : prevStepData == null ? void 0 : prevStepData.key;
+      if (key2 === "select-resource") {
+        appointmentBooking.deleteCartItemInfo("resource");
+      }
       updateStep(key2, {
         isSkip: false
       });
     }
+    if ((prevStepData == null ? void 0 : prevStepData.key) === "select-service") {
+      stepList.forEach((item) => {
+        if (item.key.startsWith("select-resource_") || item.key.startsWith("fill-form_")) {
+          removeStep(item.key);
+        }
+      });
+    }
+    if ((currentStepData == null ? void 0 : currentStepData.key) === "select-resource") {
+      stepList.forEach((item) => {
+        if (item.key.startsWith("fill-form_")) {
+          removeStep(item.key);
+        }
+      });
+    }
   };
   const handleClose = () => {
     var _a2, _b;
     appointmentBooking.destroy();
     (_a2 = shopDiscount == null ? void 0 : shopDiscount.destroy) == null ? void 0 : _a2.call(shopDiscount);
-    const utils = context.appHelper.utils || {};
-    (_b = utils == null ? void 0 : utils.history) == null ? void 0 : _b.replace("/");
+    const utils2 = context.appHelper.utils || {};
+    (_b = utils2 == null ? void 0 : utils2.history) == null ? void 0 : _b.replace("/");
   };
   return /* @__PURE__ */ import_react.default.createElement(
     import_progressBar.default,

package/lib/components/appointmentBooking/components/Resource/index.js

@@ -39,10 +39,8 @@ var import_materials = require("@pisell/materials");
 var import_hooks = require("../../hooks");
 var import_context = require("../../context");
 var import_utils = require("../../utils");
-var import_utils2 = require("../../components/Cart/utils");
-var import_utils3 = require("./utils");
 var import_guests = __toESM(require("../../assets/guests.svg"));
-var import_utils4 = require("@pisell/utils");
+var import_utils2 = require("@pisell/utils");
 var import_index = require("./index.less");
 var Resource = (0, import_react.forwardRef)((props, ref) => {
   const [selectedResource, setSelectedResource] = (0, import_react.useState)(0);
@@ -50,63 +48,19 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
     appointmentBooking,
     carts,
     resourceOtherParams,
-    setCarts,
     currentStep,
     setResourceOtherParams,
-    setIsErrorHolder,
-    setPolicyIds
+    currentStepParams
   } = (0, import_context.useAppointmentBookingContext)();
-  const {
-    getResourceList,
-    autoSelectAllProductResources,
-    getResourceTimeSlot
-  } = (0, import_hooks.useAppointmentBookingResource)();
+  const { getResourceList } = (0, import_hooks.useAppointmentBookingResource)();
   const { checkSkipResourceStep } = (0, import_hooks.useIsSkipResourceStep)();
   const { updateStep, nextStep } = (0, import_hooks.useAppointmentBookingStep)();
-  const { openLoginModal, isLogin } = (0, import_hooks.useAppointmentBookingLogin)();
-  const { getHolders, checkAccount } = (0, import_hooks.useAppointmentBookingAccount)();
-  const { isFormSubject } = (0, import_hooks.useAppointmentBookingSetting)();
-  const utils = (0, import_hooks.contextUtils)();
   (0, import_react.useImperativeHandle)(ref, () => ({
     next: async () => {
-      var _a, _b, _c;
-      const result = (0, import_utils2.checkResource)({ carts, resources });
-      if (result) {
-        setCarts(result);
-      }
-      setIsErrorHolder(!!result);
-      if (!!result) {
-        (0, import_utils3.scrollToFirstErrorCard)();
-        return;
-      }
-      const resultCarts = (0, import_utils.formatCartsResources)(carts, resources, setPolicyIds);
-      const stepList = ((_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a.step) == null ? void 0 : _b.store) == null ? void 0 : _c.stepList) || [];
-      const accountLists = await appointmentBooking.getAccounts();
-      const checkResult = (0, import_utils.checkHasFormStep)({
-        setIsErrorHolder,
-        nextStep,
-        hasResourceFormId: (resultCarts == null ? void 0 : resultCarts.length) > 0,
-        currentStep,
-        stepList,
-        appointmentBooking,
-        locales: import_utils4.locales,
-        openLoginModal,
-        utils,
-        accountLists,
-        getHolders,
-        checkHolder: import_utils2.checkHolder,
-        checkAccount,
-        setCarts,
-        carts,
-        isFormSubject,
-        isLogin
-      });
-      if (checkResult) return;
       setResourceOtherParams({
         ...resourceOtherParams,
         errorList: null
       });
-      getResourceTimeSlot();
       nextStep();
     }
   }));
@@ -119,8 +73,6 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
       var _a;
       try {
         const _resources = getResourceList();
-        await autoSelectAllProductResources();
-        getResourceList();
         const skipResourceStep = await checkSkipResourceStep();
         const key = (_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key;
         updateStep(key, {
@@ -135,40 +87,70 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
       }
     };
     checkAndSkipResourceStep();
-  }, []);
+  }, [currentStepParams.key]);
   const anyResource = [
     {
       id: 0,
       image: import_guests.default,
-      title: import_utils4.locales.getText("pisell2.appointment.any.professional"),
-      subtitle: import_utils4.locales.getText("pisell2.appointment.for.maximum.availability")
+      title: import_utils2.locales.getText("pisell2.appointment.any.professional"),
+      subtitle: import_utils2.locales.getText("pisell2.appointment.for.maximum.availability")
     }
   ];
-  const currentResource = (0, import_react.useMemo)(() => {
-    var _a, _b;
-    if (resources.length && carts.length) {
-      if (carts.length === 1) {
-        return (_b = (_a = resources[0]) == null ? void 0 : _a.resources) == null ? void 0 : _b[0];
-      } else {
-        return {
-          renderList: []
-        };
-      }
+  const appointmentBoard = (0, import_react.useMemo)(() => {
+    return (0, import_utils.currentAppointmentBoard)(
+      currentStepParams.key,
+      resources,
+      appointmentBooking
+    );
+  }, [currentStepParams.key, resources]);
+  const renderLists = (0, import_react.useMemo)(() => {
+    if (carts.length > 1 || !(carts == null ? void 0 : carts.length)) {
+      return [];
     }
-  }, [resources, carts]);
+    return (0, import_utils.currentRenderLists)(resources, appointmentBoard == null ? void 0 : appointmentBoard.form_code);
+  }, [resources, appointmentBoard == null ? void 0 : appointmentBoard.form_code, carts]);
+  (0, import_react.useEffect)(() => {
+    const autoSelectResources = async () => {
+      if (!(appointmentBoard == null ? void 0 : appointmentBoard.form_code)) {
+        return;
+      }
+      const res = await appointmentBooking.autoSelectAllProductResources(
+        appointmentBoard == null ? void 0 : appointmentBoard.form_code
+      );
+      setResourceOtherParams({
+        ...resourceOtherParams,
+        ...res
+      });
+      getResourceList();
+      const cartItem = carts == null ? void 0 : carts[0];
+      appointmentBooking.updateCart({
+        _id: cartItem == null ? void 0 : cartItem._id,
+        ...cartItem
+      });
+    };
+    autoSelectResources();
+  }, [appointmentBoard]);
   const resourcesResult = (0, import_react.useMemo)(() => {
-    return anyResource.concat((currentResource == null ? void 0 : currentResource.renderList) || []);
-  }, [currentResource]);
+    let _anyResource = (appointmentBoard == null ? void 0 : appointmentBoard.isRequired) ? [] : [...anyResource];
+    return _anyResource.concat(renderLists || []);
+  }, [renderLists, appointmentBoard]);
   const onClick = (e) => {
     var _a;
     setSelectedResource(e.id);
     if (e.id) {
       return appointmentBooking.updateCart({
         _id: (_a = carts == null ? void 0 : carts[0]) == null ? void 0 : _a._id,
-        resources: [e]
+        resources: (0, import_utils.updateCartResources)(carts == null ? void 0 : carts[0], e)
       });
     }
   };
+  (0, import_react.useEffect)(() => {
+    var _a, _b, _c;
+    const selectedResource2 = (_c = (_b = (_a = carts == null ? void 0 : carts[0]) == null ? void 0 : _a._origin) == null ? void 0 : _b.resources) == null ? void 0 : _c.find(
+      (item) => (item == null ? void 0 : item.form_id) === (appointmentBoard == null ? void 0 : appointmentBoard.form_id)
+    );
+    setSelectedResource((selectedResource2 == null ? void 0 : selectedResource2.id) || 0);
+  }, [carts, appointmentBoard == null ? void 0 : appointmentBoard.form_id]);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-resource-wrap" }, !(resourcesResult == null ? void 0 : resourcesResult.length) ? /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: true, active: true }) : /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellCustomCheckboxGroup,
     {
@@ -188,7 +170,7 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
           }
         );
       },
-      columns: (0, import_utils4.isMobile)() ? 2 : 3,
+      columns: (0, import_utils2.isMobile)() ? 2 : 3,
       horizontalGap: 16,
       verticalGap: 16,
       onClick: (e) => onClick && onClick(e)

package/lib/components/appointmentBooking/components/Services/index.js

@@ -48,7 +48,7 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
   const { isDateSelectedFirst, isRetailTemplate } = (0, import_hooks.useAppointmentBookingSetting)();
   const { getProducts, checkProductType } = (0, import_hooks.useAppointmentBookingProduct)();
   const { removeStep, nextStep } = (0, import_hooks.useAppointmentBookingStep)();
-  const { currentStep, setLoading } = (0, import_context.useAppointmentBookingContext)();
+  const { currentStep, setLoading, carts } = (0, import_context.useAppointmentBookingContext)();
   const [products, setProducts] = (0, import_react.useState)(null);
   const [productLoading, setProductLoading] = (0, import_react.useState)(false);
   (0, import_react.useImperativeHandle)(ref, () => ({
@@ -57,7 +57,7 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
       setTimeout(() => {
         nextStep();
         setLoading(false);
-      }, 200);
+      }, 500);
     }
   }));
   (0, import_react.useEffect)(() => {
@@ -153,6 +153,17 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
       }
     });
   };
+  const productListSetting = (0, import_react.useMemo)(() => {
+    var _a;
+    const { customPageData } = ((_a = context.engine) == null ? void 0 : _a.props) || {};
+    let productListBlock;
+    if (Array.isArray(customPageData == null ? void 0 : customPageData.block)) {
+      productListBlock = customPageData.block.find(
+        (b) => "product_list" === b.type
+      );
+    }
+    return (productListBlock == null ? void 0 : productListBlock.setting) || {};
+  }, [context]);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-service-wrap" }, /* @__PURE__ */ import_react.default.createElement(
     import_productSelect.default,
     {
@@ -171,7 +182,9 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
         tabItemActiveBg: "var(--theme-color)",
         categoryTextColor: "#1B1B1B",
         cardSelectedBg: "var(--theme-color)"
-      }
+      },
+      productListSetting,
+      selectedItems: carts
     }
   ));
 });

package/lib/components/appointmentBooking/components/TimeSlicing/index.js

@@ -65,13 +65,7 @@ var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
   }, []);
   const getAutoSelect = async (val) => {
     setSelectedTime(val);
-    const { resourceCodes } = getResourceList();
-    const { errorList } = await appointmentBooking.autoSelectAllProductResources(
-      resourceCodes == null ? void 0 : resourceCodes[1],
-      val
-    );
     const result = await appointmentBooking.submitTimeSlot(val);
-    console.log(errorList, result, "wh9896788");
   };
   (0, import_react.useEffect)(() => {
     var _a, _b, _c;
@@ -81,7 +75,7 @@ var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
       if ((_c = carts == null ? void 0 : carts[0]) == null ? void 0 : _c.start_time) return;
       getAutoSelect(times == null ? void 0 : times[0]);
     }
-  }, [times]);
+  }, [times, carts]);
   const onClick = async (e) => {
     setSelectedResource(e == null ? void 0 : e.start_time);
     getAutoSelect(e);

package/lib/components/appointmentBooking/components/Voucher/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../../../booking/components/voucher/index.less';
 import './index.less';
 declare const VoucherCard: (props: any) => JSX.Element;

package/lib/components/appointmentBooking/context.js

@@ -37,11 +37,12 @@ var import_react = __toESM(require("react"));
 var import_hooks = require("./hooks");
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var import_tasks = require("../../utils/tasks");
+var import_utils = require("./utils");
 var AppointmentBookingContext = (0, import_react.createContext)(void 0);
 var AppointmentBookingProvider = ({
   children
 }) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const policyIdsRef = (0, import_react.useRef)([]);
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const [summary, setSummary] = (0, import_react.useState)({});
@@ -57,6 +58,7 @@ var AppointmentBookingProvider = ({
   const [isErrorHolder, setIsErrorHolder] = (0, import_react.useState)(false);
   const [tasksManager] = (0, import_react.useState)(() => new import_tasks.TasksManager());
   const [policyParams, setPolicyParams] = (0, import_react.useState)(null);
+  const [currentSelectedResources, setCurrentSelectedResources] = (0, import_react.useState)();
   const { appHelper } = (0, import_useEngineContext.default)();
   const symbolic = (_a = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a.getSymbolic();
   (0, import_react.useEffect)(() => {
@@ -75,14 +77,57 @@ var AppointmentBookingProvider = ({
       policyParams.callback();
     }
   };
+  const stepLists = (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c2;
+    return ((_c2 = (_b2 = (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a2.step) == null ? void 0 : _b2.store) == null ? void 0 : _c2.stepList) || [];
+  }, [(_d = (_c = (_b = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _b.step) == null ? void 0 : _c.store) == null ? void 0 : _d.stepList]);
   const isLastStep = (0, import_react.useMemo)(() => {
     var _a2;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     return key === "confirm-information";
   }, [
-    (_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key,
-    (_e = (_d = (_c = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _c.step) == null ? void 0 : _d.store) == null ? void 0 : _e.stepList
+    (_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key,
+    (_h = (_g = (_f = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _f.step) == null ? void 0 : _g.store) == null ? void 0 : _h.stepList
   ]);
+  const currentStepParams = (0, import_react.useMemo)(() => {
+    var _a2;
+    const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
+    const index = stepLists.findIndex((item) => item.key === key);
+    return {
+      key,
+      index,
+      stepLists
+    };
+  }, [(_i = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _i.key, stepLists]);
+  (0, import_react.useEffect)(() => {
+    var _a2, _b2;
+    if (((_a2 = currentStepParams == null ? void 0 : currentStepParams.key) == null ? void 0 : _a2.startsWith("select-resource")) || ((_b2 = currentStepParams == null ? void 0 : currentStepParams.key) == null ? void 0 : _b2.startsWith("fill-form"))) {
+      if (!(carts == null ? void 0 : carts.length) || !(resources == null ? void 0 : resources.length)) {
+        return setCurrentSelectedResources(null);
+      }
+      const currentSelectedResources2 = carts.map((item) => {
+        return {
+          _id: item == null ? void 0 : item._id,
+          currentSelectedResource: (0, import_utils.getCartCurrentResourceData)(
+            item,
+            currentStepParams == null ? void 0 : currentStepParams.key,
+            resources
+          )
+        };
+      });
+      setCurrentSelectedResources(currentSelectedResources2);
+      appointmentBooking.setOtherData(
+        "current_selected_resources",
+        currentSelectedResources2
+      );
+    }
+  }, [currentStepParams == null ? void 0 : currentStepParams.key, carts, resources]);
+  (0, import_react.useEffect)(() => {
+    const currentSelectedResources2 = appointmentBooking.getOtherData(
+      "current_selected_resources"
+    );
+    setCurrentSelectedResources(currentSelectedResources2 || []);
+  }, []);
   const value = {
     appointmentBooking,
     times,
@@ -116,7 +161,10 @@ var AppointmentBookingProvider = ({
     policyIdsRef,
     setPolicyIds,
     openPolicy,
-    closePolicy
+    closePolicy,
+    currentStepParams,
+    currentSelectedResources,
+    setCurrentSelectedResources
   };
   return /* @__PURE__ */ import_react.default.createElement(AppointmentBookingContext.Provider, { value }, children);
 };

package/lib/components/appointmentBooking/deposit/index.d.ts

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

package/lib/components/appointmentBooking/hooks.d.ts

@@ -75,7 +75,6 @@ export declare const useAppointmentBookingResource: () => {
         resources: any;
         resourceCodes: any;
     };
-    autoSelectAllProductResources: (index?: number) => Promise<any>;
 };
 /**
  * @title: 是否跳过资源选择步骤
@@ -85,7 +84,7 @@ export declare const useAppointmentBookingResource: () => {
  * @Date: 2025-04-21 11:47
  */
 export declare const useIsSkipResourceStep: () => {
-    checkSkipResourceStep: (isSkipUpdateFormStep?: boolean) => Promise<boolean>;
+    checkSkipResourceStep: () => Promise<boolean>;
 };
 /**
  * @title: 获取预约配置