@pisell/private-materials 3.3.43 → 3.3.44

package/es/components/appointmentBooking/components/Form/utils.js

@@ -0,0 +1,36 @@
+/**
+ * @title: 更新表单数据
+ * @description: 
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-05-26 16:58
+ */
+export var updateRelationForms = function updateRelationForms(carts, currentCart, values) {
+  var _cartItem$_origin;
+  if (!(currentCart !== null && currentCart !== void 0 && currentCart.cart_id)) return [];
+  var cartItem = carts === null || carts === void 0 ? void 0 : carts.find(function (item) {
+    return (item === null || item === void 0 ? void 0 : item._id) === (currentCart === null || currentCart === void 0 ? void 0 : currentCart.cart_id);
+  });
+  var oldLists = (cartItem === null || cartItem === void 0 || (_cartItem$_origin = cartItem._origin) === null || _cartItem$_origin === void 0 ? void 0 : _cartItem$_origin.relation_forms) || [];
+  var newData = {
+    form_id: Number(values === null || values === void 0 ? void 0 : values.form_id),
+    form_record_id: values === null || values === void 0 ? void 0 : values.form_record_id
+  };
+  var exist = oldLists.find(function (item) {
+    return item.form_id === (newData === null || newData === void 0 ? void 0 : newData.form_id);
+  });
+
+  // 如果在目前的数组中找到form_id相同的，则更新form_record_ids参数，否则新增一条数据
+  if (exist) {
+    var _exist$form_record_id;
+    if (!(exist !== null && exist !== void 0 && (_exist$form_record_id = exist.form_record_ids) !== null && _exist$form_record_id !== void 0 && _exist$form_record_id.includes(newData.form_record_id))) {
+      exist.form_record_ids.push(newData.form_record_id);
+    }
+  } else {
+    oldLists.push({
+      form_id: newData.form_id,
+      form_record_ids: [newData.form_record_id]
+    });
+  }
+  return oldLists;
+};

package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts

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

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

@@ -1,34 +1,41 @@
 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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import React, { useMemo } from 'react';
 import { locales } from '@pisell/utils';
 import ProgressBar from "../../../eventBooking/components/progressBar";
 import { useAppointmentBookingContext } from "../../context";
-import { useShopDiscount, useIsSkipResourceStep, useAppointmentBookingStep, useAppointmentBookingSetting, useAppointmentBookingProduct } from "../../hooks";
+import { useShopDiscount, useAppointmentBookingStep, useAppointmentBookingSetting, useAppointmentBookingProduct, contextUtils } from "../../hooks";
 import useEngineContext from "../../../../hooks/useEngineContext";
+import { getResourceTitle } from "../../utils";
 import "./index.less";
 var Header = function Header() {
   var _currentStep$step3;
-  var _useAppointmentBookin = useAppointmentBookingContext(),
-    currentStep = _useAppointmentBookin.currentStep,
-    appointmentBooking = _useAppointmentBookin.appointmentBooking,
-    resources = _useAppointmentBookin.resources,
-    setTimes = _useAppointmentBookin.setTimes,
-    carts = _useAppointmentBookin.carts;
+  var _ref = useAppointmentBookingContext(),
+    currentStep = _ref.currentStep,
+    appointmentBooking = _ref.appointmentBooking,
+    setTimes = _ref.setTimes,
+    carts = _ref.carts,
+    currentStepParams = _ref.currentStepParams,
+    currentSelectedResources = _ref.currentSelectedResources;
   var shopDiscount = useShopDiscount();
   var context = useEngineContext();
-  var _useIsSkipResourceSte = useIsSkipResourceStep(),
-    checkSkipResourceStep = _useIsSkipResourceSte.checkSkipResourceStep;
-  var _useAppointmentBookin2 = useAppointmentBookingStep(),
-    getStepIndex = _useAppointmentBookin2.getStepIndex,
-    stepList = _useAppointmentBookin2.stepList,
-    updateStep = _useAppointmentBookin2.updateStep;
-  var _useAppointmentBookin3 = useAppointmentBookingSetting(),
-    setOtherData = _useAppointmentBookin3.setOtherData;
-  var _useAppointmentBookin4 = useAppointmentBookingProduct(),
-    checkProductType = _useAppointmentBookin4.checkProductType;
+  var _useAppointmentBookin = useAppointmentBookingStep(),
+    stepList = _useAppointmentBookin.stepList,
+    updateStep = _useAppointmentBookin.updateStep,
+    removeStep = _useAppointmentBookin.removeStep;
+  var _useAppointmentBookin2 = useAppointmentBookingSetting(),
+    setOtherData = _useAppointmentBookin2.setOtherData,
+    getOtherData = _useAppointmentBookin2.getOtherData;
+  var _useAppointmentBookin3 = useAppointmentBookingProduct(),
+    checkProductType = _useAppointmentBookin3.checkProductType;
+  var utils = contextUtils();
 
   /**
    * @title: 获取资源名称
@@ -44,13 +51,15 @@ var Header = function Header() {
     if (!key) return '';
 
     // 选择资源则获取资源列表的第一个名称
-    if (key === 'select-resource') {
-      var _resources$;
-      var name = (resources === null || resources === void 0 || (_resources$ = resources[0]) === null || _resources$ === void 0 || (_resources$ = _resources$.resources) === null || _resources$ === void 0 || (_resources$ = _resources$[0]) === null || _resources$ === void 0 ? void 0 : _resources$.title) || '';
+    if (key.startsWith('select-resource')) {
+      var _currentSelectedResou;
+      var currentResource = currentSelectedResources === null || currentSelectedResources === void 0 || (_currentSelectedResou = currentSelectedResources[0]) === null || _currentSelectedResou === void 0 ? void 0 : _currentSelectedResou.currentSelectedResource;
+      var resourceItem = (currentResource === null || currentResource === void 0 ? void 0 : currentResource.resourceItem) || {};
+      var name = getResourceTitle(appointmentBooking, resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.code, utils, resourceItem);
       return locales.getText('pisell2.event.select.category')(name);
     }
     return (currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.description) || '';
-  }, [currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key, resources]);
+  }, [currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key, currentSelectedResources]);
 
   /**
    * @title: 返回
@@ -60,9 +69,9 @@ var Header = function Header() {
    * @Date: 2025-01-18 22:28
    */
   var handleBack = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _currentStep$step4;
-      var key, types, _carts$, type, resourceStep, prevStepData, currentStepData, _key;
+      var key, types, _carts$, type, form_key, booking_form, prevStepData, currentStepData, _key;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -99,40 +108,63 @@ var Header = function Header() {
             if (key === 'select-time') {
               setTimes([]);
             }
-            if (key === 'fill-form') {
-              setOtherData('booking_form', {});
-            }
-
-            // // 5. 判断是否需要跳过资源步骤
-            // const isHasForm = stepList?.some((item: any) => item.key === 'fill-form');
-            // const shouldCheckSkip =
-            //   (isHasForm && key === 'fill-form') || key === 'select-time';
 
-            // if (shouldCheckSkip) {
-            //   const skipResourceStep = await checkSkipResourceStep(true);
-            //   if (skipResourceStep) {
-            //     appointmentBooking.deleteCartItemInfo('resource');
-            //     const targetIndex = getStepIndex('prev', 2);
-            //     return appointmentBooking.gotoStep(targetIndex);
-            //   }
-            // }
+            // 5. 清空表单数据
+            if (key.startsWith('fill-form')) {
+              form_key = 'booking_form';
+              booking_form = getOtherData(form_key);
+              setOtherData(form_key, _objectSpread(_objectSpread({}, booking_form), {}, _defineProperty({}, key, {})));
+            }
 
             // 如果前一步是资源步骤，并且被跳过了，则清空资源
-            resourceStep = stepList[(currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) - 1];
-            if (resourceStep !== null && resourceStep !== void 0 && resourceStep.isSkip && (resourceStep === null || resourceStep === void 0 ? void 0 : resourceStep.key) === 'select-resource') {
-              appointmentBooking.deleteCartItemInfo('resource');
-            }
+            // const resourceStep = stepList[currentStep?.index - 1];
+            // if (resourceStep?.isSkip && resourceStep?.key === 'select-resource') {
+            //   appointmentBooking.deleteCartItemInfo('resource');
+            // }
 
             // 6. 默认回退一步
             appointmentBooking.back();
-            prevStepData = stepList[(currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) - 1];
-            currentStepData = stepList[currentStep === null || currentStep === void 0 ? void 0 : currentStep.index]; // 如果当前步骤或者前一步骤被跳过，则将步骤更新为false
+            prevStepData = stepList[(currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.index) - 1];
+            currentStepData = stepList[currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.index];
             if (currentStepData !== null && currentStepData !== void 0 && currentStepData.isSkip || prevStepData !== null && prevStepData !== void 0 && prevStepData.isSkip) {
               _key = currentStepData !== null && currentStepData !== void 0 && currentStepData.isSkip ? currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key : prevStepData === null || prevStepData === void 0 ? void 0 : prevStepData.key;
+              if (_key === 'select-resource') {
+                appointmentBooking.deleteCartItemInfo('resource');
+              }
               updateStep(_key, {
                 isSkip: false
               });
             }
+
+            // 如果前一步是选择服务步骤，则移除表单和资源开头的步骤, 防止每个商品配置的资源不一样，导致步骤会有上次的数据
+            if ((prevStepData === null || prevStepData === void 0 ? void 0 : prevStepData.key) === 'select-service') {
+              stepList.forEach(function (item) {
+                if (item.key.startsWith('select-resource_') || item.key.startsWith('fill-form_')) {
+                  removeStep(item.key);
+                }
+              });
+            }
+
+            // 如果当前步骤是选择资源，则清空表单步骤，不然表单步骤会累加
+            if ((currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key) === 'select-resource') {
+              stepList.forEach(function (item) {
+                if (item.key.startsWith('fill-form_')) {
+                  removeStep(item.key);
+                }
+              });
+            }
+
+            // 再次将步骤更新为false, 增加这个判断为了跳过那一步没有设置holder，但是直接后退了
+            // if (
+            //   resourceStep?.isSkip &&
+            //   (resourceStep?.key === 'select-resource' ||
+            //     resourceStep?.key === 'select-service')
+            // ) {
+            //   updateStep(resourceStep?.key, {
+            //     index: currentStep?.index,
+            //     isSkip: false,
+            //   });
+            // }
           case 18:
           case "end":
             return _context.stop();
@@ -140,7 +172,7 @@ var Header = function Header() {
       }, _callee);
     }));
     return function handleBack() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 

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

@@ -17,11 +17,9 @@ import React, { useState, useEffect, useMemo, forwardRef, useImperativeHandle }
 import { Skeleton } from 'antd';
 import ResourceDisplay from "../../../eventBooking/components/resourceDisplay";
 import { PisellCustomCheckboxGroup } from '@pisell/materials';
-import { useAppointmentBookingResource, useIsSkipResourceStep, useAppointmentBookingStep, useAppointmentBookingLogin, contextUtils, useAppointmentBookingAccount, useAppointmentBookingSetting } from "../../hooks";
+import { useAppointmentBookingResource, useIsSkipResourceStep, useAppointmentBookingStep } from "../../hooks";
 import { useAppointmentBookingContext } from "../../context";
-import { checkHasFormStep, formatCartsResources } from "../../utils";
-import { checkResource, checkHolder } from "../../components/Cart/utils";
-import { scrollToFirstErrorCard } from "./utils";
+import { currentAppointmentBoard, currentRenderLists, updateCartResources } from "../../utils";
 import guestsImg from "../../assets/guests.svg";
 import { isMobile, locales } from '@pisell/utils';
 import "./index.less";
@@ -30,99 +28,33 @@ var Resource = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     selectedResource = _useState2[0],
     setSelectedResource = _useState2[1];
-  var _useAppointmentBookin = useAppointmentBookingContext(),
-    appointmentBooking = _useAppointmentBookin.appointmentBooking,
-    carts = _useAppointmentBookin.carts,
-    resourceOtherParams = _useAppointmentBookin.resourceOtherParams,
-    setCarts = _useAppointmentBookin.setCarts,
-    currentStep = _useAppointmentBookin.currentStep,
-    setResourceOtherParams = _useAppointmentBookin.setResourceOtherParams,
-    setIsErrorHolder = _useAppointmentBookin.setIsErrorHolder,
-    setPolicyIds = _useAppointmentBookin.setPolicyIds;
-  var _useAppointmentBookin2 = useAppointmentBookingResource(),
-    getResourceList = _useAppointmentBookin2.getResourceList,
-    autoSelectAllProductResources = _useAppointmentBookin2.autoSelectAllProductResources,
-    getResourceTimeSlot = _useAppointmentBookin2.getResourceTimeSlot;
+  var _ref = useAppointmentBookingContext(),
+    appointmentBooking = _ref.appointmentBooking,
+    carts = _ref.carts,
+    resourceOtherParams = _ref.resourceOtherParams,
+    currentStep = _ref.currentStep,
+    setResourceOtherParams = _ref.setResourceOtherParams,
+    currentStepParams = _ref.currentStepParams;
+  var _useAppointmentBookin = useAppointmentBookingResource(),
+    getResourceList = _useAppointmentBookin.getResourceList;
   var _useIsSkipResourceSte = useIsSkipResourceStep(),
     checkSkipResourceStep = _useIsSkipResourceSte.checkSkipResourceStep;
-  var _useAppointmentBookin3 = useAppointmentBookingStep(),
-    updateStep = _useAppointmentBookin3.updateStep,
-    nextStep = _useAppointmentBookin3.nextStep;
-  var _useAppointmentBookin4 = useAppointmentBookingLogin(),
-    openLoginModal = _useAppointmentBookin4.openLoginModal,
-    isLogin = _useAppointmentBookin4.isLogin;
-  var _useAppointmentBookin5 = useAppointmentBookingAccount(),
-    getHolders = _useAppointmentBookin5.getHolders,
-    checkAccount = _useAppointmentBookin5.checkAccount;
-  var _useAppointmentBookin6 = useAppointmentBookingSetting(),
-    isFormSubject = _useAppointmentBookin6.isFormSubject;
-  var utils = contextUtils();
+  var _useAppointmentBookin2 = useAppointmentBookingStep(),
+    updateStep = _useAppointmentBookin2.updateStep,
+    nextStep = _useAppointmentBookin2.nextStep;
   useImperativeHandle(ref, function () {
     return {
       next: function () {
         var _next2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-          var _appointmentBooking$s;
-          var result, resultCarts, stepList, accountLists, checkResult;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                result = checkResource({
-                  carts: carts,
-                  resources: resources
-                });
-                if (result) {
-                  setCarts(result);
-                }
-                setIsErrorHolder(!!result);
-
-                // 验证购物车是否有资源
-                if (!result) {
-                  _context.next = 6;
-                  break;
-                }
-                scrollToFirstErrorCard();
-                return _context.abrupt("return");
-              case 6:
-                resultCarts = formatCartsResources(carts, resources, setPolicyIds);
-                stepList = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s = appointmentBooking.store) === null || _appointmentBooking$s === void 0 || (_appointmentBooking$s = _appointmentBooking$s.step) === null || _appointmentBooking$s === void 0 || (_appointmentBooking$s = _appointmentBooking$s.store) === null || _appointmentBooking$s === void 0 ? void 0 : _appointmentBooking$s.stepList) || [];
-                _context.next = 10;
-                return appointmentBooking.getAccounts();
-              case 10:
-                accountLists = _context.sent;
-                checkResult = checkHasFormStep({
-                  setIsErrorHolder: setIsErrorHolder,
-                  nextStep: nextStep,
-                  hasResourceFormId: (resultCarts === null || resultCarts === void 0 ? void 0 : resultCarts.length) > 0,
-                  currentStep: currentStep,
-                  stepList: stepList,
-                  appointmentBooking: appointmentBooking,
-                  locales: locales,
-                  openLoginModal: openLoginModal,
-                  utils: utils,
-                  accountLists: accountLists,
-                  getHolders: getHolders,
-                  checkHolder: checkHolder,
-                  checkAccount: checkAccount,
-                  setCarts: setCarts,
-                  carts: carts,
-                  isFormSubject: isFormSubject,
-                  isLogin: isLogin
-                });
-                if (!checkResult) {
-                  _context.next = 14;
-                  break;
-                }
-                return _context.abrupt("return");
-              case 14:
                 // 清空资源分配失败数据
                 setResourceOtherParams(_objectSpread(_objectSpread({}, resourceOtherParams), {}, {
                   errorList: null
                 }));
-
-                // 获取时间切片
-                getResourceTimeSlot();
                 nextStep();
-              case 17:
+              case 2:
               case "end":
                 return _context.stop();
             }
@@ -143,24 +75,17 @@ var Resource = /*#__PURE__*/forwardRef(function (props, ref) {
   useEffect(function () {
     // 检查是否可以跳过资源选择步骤
     var checkAndSkipResourceStep = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
         var _currentStep$step, _resources, skipResourceStep, key;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.prev = 0;
               // 获取资源列表数据
-              _resources = getResourceList(); // 获取自动分配资源
+              _resources = getResourceList(); // 检测资源步骤是否跳过
               _context2.next = 4;
-              return autoSelectAllProductResources();
-            case 4:
-              // 根据自动分配之后的资源重新拉取资源列表
-              getResourceList();
-
-              // 检测资源步骤是否跳过
-              _context2.next = 7;
               return checkSkipResourceStep();
-            case 7:
+            case 4:
               skipResourceStep = _context2.sent;
               // 更新步骤是否有跳过标识
               key = currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key;
@@ -169,58 +94,110 @@ var Resource = /*#__PURE__*/forwardRef(function (props, ref) {
                 isSkip: skipResourceStep
               });
               if (!skipResourceStep) {
-                _context2.next = 12;
+                _context2.next = 9;
                 break;
               }
               return _context2.abrupt("return", true);
-            case 12:
+            case 9:
               return _context2.abrupt("return", false);
-            case 15:
-              _context2.prev = 15;
+            case 12:
+              _context2.prev = 12;
               _context2.t0 = _context2["catch"](0);
-            case 17:
+            case 14:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[0, 15]]);
+        }, _callee2, null, [[0, 12]]);
       }));
       return function checkAndSkipResourceStep() {
-        return _ref.apply(this, arguments);
+        return _ref2.apply(this, arguments);
       };
     }();
     checkAndSkipResourceStep();
-  }, []);
+  }, [currentStepParams.key]);
   var anyResource = [{
     id: 0,
     image: guestsImg,
     title: locales.getText('pisell2.appointment.any.professional'),
     subtitle: locales.getText('pisell2.appointment.for.maximum.availability')
   }];
-  var currentResource = useMemo(function () {
-    if (resources.length && carts.length) {
-      if (carts.length === 1) {
-        var _resources$;
-        return (_resources$ = resources[0]) === null || _resources$ === void 0 || (_resources$ = _resources$.resources) === null || _resources$ === void 0 ? void 0 : _resources$[0];
-      } else {
-        return {
-          renderList: []
-        };
-      }
+  var appointmentBoard = useMemo(function () {
+    return currentAppointmentBoard(currentStepParams.key, resources, appointmentBooking);
+  }, [currentStepParams.key, resources]);
+  var renderLists = useMemo(function () {
+    // 如果购物车有多个，则不显示左侧内容
+    if (carts.length > 1 || !(carts !== null && carts !== void 0 && carts.length)) {
+      return [];
     }
-  }, [resources, carts]);
+    return currentRenderLists(resources, appointmentBoard === null || appointmentBoard === void 0 ? void 0 : appointmentBoard.form_code);
+  }, [resources, appointmentBoard === null || appointmentBoard === void 0 ? void 0 : appointmentBoard.form_code, carts]);
+
+  /**
+   * @title: 获取自动分派
+   * @description:
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-05-26 15:10
+   */
+  useEffect(function () {
+    var autoSelectResources = /*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var res, cartItem;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              if (appointmentBoard !== null && appointmentBoard !== void 0 && appointmentBoard.form_code) {
+                _context3.next = 2;
+                break;
+              }
+              return _context3.abrupt("return");
+            case 2:
+              _context3.next = 4;
+              return appointmentBooking.autoSelectAllProductResources(appointmentBoard === null || appointmentBoard === void 0 ? void 0 : appointmentBoard.form_code);
+            case 4:
+              res = _context3.sent;
+              setResourceOtherParams(_objectSpread(_objectSpread({}, resourceOtherParams), res));
+
+              // 自动分派之后获取重新获取资源列表数据;
+              getResourceList();
+              cartItem = carts === null || carts === void 0 ? void 0 : carts[0];
+              appointmentBooking.updateCart(_objectSpread({
+                _id: cartItem === null || cartItem === void 0 ? void 0 : cartItem._id
+              }, cartItem));
+            case 9:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }));
+      return function autoSelectResources() {
+        return _ref3.apply(this, arguments);
+      };
+    }();
+    autoSelectResources();
+  }, [appointmentBoard]);
   var resourcesResult = useMemo(function () {
-    return anyResource.concat((currentResource === null || currentResource === void 0 ? void 0 : currentResource.renderList) || []);
-  }, [currentResource]);
+    // 如果是必选资源，则不显示随机分配选项
+    var _anyResource = appointmentBoard !== null && appointmentBoard !== void 0 && appointmentBoard.isRequired ? [] : [].concat(anyResource);
+    return _anyResource.concat(renderLists || []);
+  }, [renderLists, appointmentBoard]);
   var _onClick = function onClick(e) {
     setSelectedResource(e.id);
     if (e.id) {
       var _carts$;
       return appointmentBooking.updateCart({
         _id: carts === null || carts === void 0 || (_carts$ = carts[0]) === null || _carts$ === void 0 ? void 0 : _carts$._id,
-        resources: [e]
+        resources: updateCartResources(carts === null || carts === void 0 ? void 0 : carts[0], e)
       });
     }
   };
+  useEffect(function () {
+    var _carts$2;
+    var selectedResource = carts === null || carts === void 0 || (_carts$2 = carts[0]) === null || _carts$2 === void 0 || (_carts$2 = _carts$2._origin) === null || _carts$2 === void 0 || (_carts$2 = _carts$2.resources) === null || _carts$2 === void 0 ? void 0 : _carts$2.find(function (item) {
+      return (item === null || item === void 0 ? void 0 : item.form_id) === (appointmentBoard === null || appointmentBoard === void 0 ? void 0 : appointmentBoard.form_id);
+    });
+    setSelectedResource((selectedResource === null || selectedResource === void 0 ? void 0 : selectedResource.id) || 0);
+  }, [carts, appointmentBoard === null || appointmentBoard === void 0 ? void 0 : appointmentBoard.form_id]);
   return /*#__PURE__*/React.createElement("div", {
     className: 'appointment-resource-wrap'
   }, !(resourcesResult !== null && resourcesResult !== void 0 && resourcesResult.length) ? /*#__PURE__*/React.createElement(Skeleton, {

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

@@ -13,7 +13,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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; }
-import React, { useState, useEffect, forwardRef, useImperativeHandle } from 'react';
+import React, { useState, useEffect, forwardRef, useImperativeHandle, useMemo } from 'react';
 import dayjs from 'dayjs';
 import { isMobile, locales } from '@pisell/utils';
 import ProductSelect from "../../../productSelect";
@@ -38,7 +38,8 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
     nextStep = _useAppointmentBookin3.nextStep;
   var _ref2 = useAppointmentBookingContext(),
     currentStep = _ref2.currentStep,
-    setLoading = _ref2.setLoading;
+    setLoading = _ref2.setLoading,
+    carts = _ref2.carts;
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     products = _useState2[0],
@@ -54,7 +55,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
         setTimeout(function () {
           nextStep();
           setLoading(false);
-        }, 200);
+        }, 500);
       }
     };
   });
@@ -215,6 +216,18 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
       return _ref3.apply(this, arguments);
     };
   }();
+  var productListSetting = useMemo(function () {
+    var _context$engine, _productListBlock;
+    var _ref4 = ((_context$engine = context.engine) === null || _context$engine === void 0 ? void 0 : _context$engine.props) || {},
+      customPageData = _ref4.customPageData;
+    var productListBlock;
+    if (Array.isArray(customPageData === null || customPageData === void 0 ? void 0 : customPageData.block)) {
+      productListBlock = customPageData.block.find(function (b) {
+        return 'product_list' === b.type;
+      });
+    }
+    return ((_productListBlock = productListBlock) === null || _productListBlock === void 0 ? void 0 : _productListBlock.setting) || {};
+  }, [context]);
   return /*#__PURE__*/React.createElement("div", {
     className: "appointment-service-wrap"
   }, /*#__PURE__*/React.createElement(ProductSelect, {
@@ -231,7 +244,9 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
       tabItemActiveBg: 'var(--theme-color)',
       categoryTextColor: '#1B1B1B',
       cardSelectedBg: 'var(--theme-color)'
-    }
+    },
+    productListSetting: productListSetting,
+    selectedItems: carts
   }));
 });
 export default Services;