@pisell/private-materials 3.3.43 → 3.3.45

package/es/businessModel/SalesModel/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

package/es/components/Sales/Summary/utils.d.ts

@@ -25,7 +25,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/es/components/appointmentBooking/components/Cart/ContinueButton/index.js

@@ -104,41 +104,20 @@ var ContinueButton = function ContinueButton(_ref) {
    */
   var handleContinue = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var loginOk;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            if (!((currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 2 >= (stepList === null || stepList === void 0 ? void 0 : stepList.length))) {
-              _context2.next = 9;
-              break;
-            }
-            _context2.next = 4;
-            return handleLoginCheck();
-          case 4:
-            loginOk = _context2.sent;
-            if (loginOk) {
-              _context2.next = 7;
-              break;
-            }
-            return _context2.abrupt("return");
-          case 7:
-            if (!handleCheckAccount()) {
-              _context2.next = 9;
-              break;
-            }
-            return _context2.abrupt("return");
-          case 9:
             return _context2.abrupt("return", onNext && onNext());
-          case 12:
-            _context2.prev = 12;
+          case 4:
+            _context2.prev = 4;
             _context2.t0 = _context2["catch"](0);
             console.log(_context2.t0, 'handleContinue_error');
-          case 15:
+          case 7:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 12]]);
+      }, _callee2, null, [[0, 4]]);
     }));
     return function handleContinue() {
       return _ref4.apply(this, arguments);

package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts

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

package/es/components/appointmentBooking/components/Cart/Item/index.js

@@ -14,7 +14,7 @@ import ContinueButton from "../ContinueButton";
 import { useAppointmentBooking } from "../../../hooks";
 import { useAppointmentBookingContext } from "../../../context";
 import { useAppointmentBookingAccount, useAppointmentBookingResource, useAppointmentBookingSetting, useAppointmentBookingLogin, contextUtils } from "../../../hooks";
-import { formatHolder, formatCarts, formatCurrentUser, openForm } from "../../../utils";
+import { formatHolder, formatCurrentUser, openForm, getMultiResources, updateCartResources } from "../../../utils";
 import VoucherCard from "../../Voucher";
 import Total from "./Total";
 import Deposit from "../../Deposit";
@@ -27,15 +27,16 @@ var CartItem = function CartItem(_ref) {
   var _ref2 = useAppointmentBookingContext(),
     carts = _ref2.carts,
     currentStep = _ref2.currentStep,
-    resources = _ref2.resources,
     setResourceOtherParams = _ref2.setResourceOtherParams,
     resourceOtherParams = _ref2.resourceOtherParams,
     summary = _ref2.summary,
-    isLastStep = _ref2.isLastStep;
+    isLastStep = _ref2.isLastStep,
+    currentSelectedResources = _ref2.currentSelectedResources,
+    currentStepParams = _ref2.currentStepParams,
+    isErrorHolder = _ref2.isErrorHolder;
   var _useAppointmentBookin = useAppointmentBookingAccount(),
     accountLists = _useAppointmentBookin.accountLists,
     getHolders = _useAppointmentBookin.getHolders,
-    form_id = _useAppointmentBookin.form_id,
     addAccount = _useAppointmentBookin.addAccount;
   var _useAppointmentBookin2 = useAppointmentBookingResource(),
     getResourceList = _useAppointmentBookin2.getResourceList;
@@ -108,15 +109,11 @@ var CartItem = function CartItem(_ref) {
         errorList: null
       }));
 
-      // 清空资源
-      if (!val) {
-        appointmentBooking.deleteCartItemInfo('resource', e === null || e === void 0 ? void 0 : e._id);
-      } else {
-        appointmentBooking.updateCart({
-          _id: e === null || e === void 0 ? void 0 : e._id,
-          resources: val ? [val] : []
-        });
-      }
+      // 更新资源
+      appointmentBooking.updateCart({
+        _id: e === null || e === void 0 ? void 0 : e._id,
+        resources: updateCartResources(e, val, currentSelectedResources)
+      });
       getResourceList();
       return;
     }
@@ -199,8 +196,26 @@ var CartItem = function CartItem(_ref) {
     }
   };
   var products = useMemo(function () {
-    return formatCarts(carts, resources, utils, accountLists);
-  }, [carts, resources, accountLists]);
+    if (!(carts !== null && carts !== void 0 && carts.length)) return [];
+    if ((currentSelectedResources === null || currentSelectedResources === void 0 ? void 0 : currentSelectedResources.length) > 0) {
+      var newCarts = carts.map(function (item) {
+        var currentResourceData = currentSelectedResources.find(function (resource) {
+          return (resource === null || resource === void 0 ? void 0 : resource._id) === (item === null || item === void 0 ? void 0 : item._id);
+        });
+
+        // 可选资源列表
+        var multiResources = getMultiResources(item, currentResourceData === null || currentResourceData === void 0 ? void 0 : currentResourceData.currentSelectedResource, currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key);
+        return _objectSpread(_objectSpread({}, item), {}, {
+          isMultipleResource: true,
+          multiResources: multiResources,
+          isErrorHolder: isErrorHolder || false
+        });
+      });
+      return newCarts;
+    } else {
+      return carts;
+    }
+  }, [carts, currentSelectedResources, currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key, isErrorHolder]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "appointment-cart-item-wrap ".concat(isMobile() ? 'appointment-cart-mobile-item-wrap' : '')
   }, /*#__PURE__*/React.createElement("div", {
@@ -211,7 +226,7 @@ var CartItem = function CartItem(_ref) {
       hideAddBtn: false,
       holders: holders,
       disabledEdit: isLastStep,
-      isShowChangeResource: (currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key) === 'select-resource',
+      isShowChangeResource: currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 || (_currentStep$step = _currentStep$step.key) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.startsWith('select-resource'),
       isShowDelete: (currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key) === 'select-service',
       isShowPackageNote: false,
       isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,

package/es/components/appointmentBooking/components/Cart/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Cart: ({ open, onCancel, onNext }: any) => JSX.Element;
 export default Cart;

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

@@ -29,7 +29,6 @@ import "./index.less";
 var Layout = function Layout() {
   var _currentStep$step, _currentStep$step3, _currentStep$step4, _currentStep$step6, _currentStep$step8;
   var stepRef = useRef();
-  var formRef = useRef();
   var _ref = useAppointmentBookingContext(),
     currentStep = _ref.currentStep,
     setResourceOtherParams = _ref.setResourceOtherParams,
@@ -38,7 +37,9 @@ var Layout = function Layout() {
     appointmentBooking = _ref.appointmentBooking,
     setLoading = _ref.setLoading,
     policyParams = _ref.policyParams,
-    closePolicy = _ref.closePolicy;
+    closePolicy = _ref.closePolicy,
+    currentStepParams = _ref.currentStepParams,
+    setIsErrorHolder = _ref.setIsErrorHolder;
   var _useAppointmentBookin = useAppointmentBookingSetting(),
     isDateSelectedFirst = _useAppointmentBookin.isDateSelectedFirst,
     isFormSubject = _useAppointmentBookin.isFormSubject,
@@ -48,8 +49,7 @@ var Layout = function Layout() {
   var _useAppointmentBookin3 = useAppointmentBookingAccount(),
     getHolders = _useAppointmentBookin3.getHolders;
   var _useAppointmentBookin4 = useAppointmentBookingStep(),
-    removeStep = _useAppointmentBookin4.removeStep,
-    stepList = _useAppointmentBookin4.stepList;
+    removeStep = _useAppointmentBookin4.removeStep;
   var _useShopDiscount = useShopDiscount(),
     shopDiscount = _useShopDiscount.shopDiscount;
 
@@ -61,6 +61,7 @@ var Layout = function Layout() {
     params = _useState2[0],
     setParams = _useState2[1];
   useEffect(function () {
+    appointmentBooking.removeStep('fill-form');
     return function () {
       var _shopDiscount$destroy;
       setIsAgreeDepositPolicy(false);
@@ -68,6 +69,18 @@ var Layout = function Layout() {
       shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$destroy = shopDiscount.destroy) === null || _shopDiscount$destroy === void 0 || _shopDiscount$destroy.call(shopDiscount);
     };
   }, []);
+  useEffect(function () {
+    var _currentStepParams$st;
+    if ((currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.index) < 0) return;
+    var resourceStepIndex = currentStepParams === null || currentStepParams === void 0 || (_currentStepParams$st = currentStepParams.stepLists) === null || _currentStepParams$st === void 0 ? void 0 : _currentStepParams$st.findIndex(function (item) {
+      return item.key === 'select-resource';
+    });
+
+    // 清空当前所选择的资源
+    if ((currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.index) < resourceStepIndex) {
+      appointmentBooking.setOtherData('current_selected_resources', null);
+    }
+  }, [currentStepParams]);
   useEffect(function () {
     try {
       if (!(appointmentBooking !== null && appointmentBooking !== void 0 && appointmentBooking.otherParams) || isRetailTemplate) return;
@@ -96,38 +109,44 @@ var Layout = function Layout() {
     setResourceOtherParams(_objectSpread(_objectSpread({}, resourceOtherParams), {}, {
       errorList: null
     }));
+    setIsErrorHolder(false);
     window.scrollTo({
       top: 0,
       behavior: 'smooth'
     });
   }, [currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key]);
+  var components = {
+    // 选择服务
+    'select-service': Services,
+    // 添加客户
+    'select-guest': Guest,
+    // 选择时间
+    'select-date': Date,
+    // 时间切片
+    'select-time': TimeSlicing,
+    // 确认信息
+    'confirm-information': ConfirmInformation
+  };
   var Com = useMemo(function () {
     var _currentStep$step2;
     var key = currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key;
     if (!key) return null;
-    var components = {
-      // 选择服务
-      'select-service': Services,
-      // 添加客户
-      'select-guest': Guest,
-      // 选择时间
-      'select-date': Date,
+    var Com;
+    if (key.startsWith('select-resource')) {
       // 选择资源
-      'select-resource': Resource,
-      // 时间切片
-      'select-time': TimeSlicing,
+      Com = Resource;
+    } else if (key.startsWith('fill-form')) {
       // 填写表单
-      'fill-form': Form,
-      // 确认信息
-      'confirm-information': ConfirmInformation
-    };
-    var Com = components[key];
+      Com = Form;
+    } else {
+      Com = components[key];
+    }
     return /*#__PURE__*/React.createElement(Com, {
       onChange: setParams,
       params: params,
       ref: stepRef
     });
-  }, [currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key, stepRef]);
+  }, [currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key]);
 
   /**
    * @title: 动态计算中间内容区域的高度

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

@@ -71,7 +71,7 @@ var Date = /*#__PURE__*/forwardRef(function (props, ref) {
    */
   var handleNext = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var data, result;
+      var data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -85,19 +85,8 @@ var Date = /*#__PURE__*/forwardRef(function (props, ref) {
             }
             return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unselect.date')));
           case 5:
-            if (isDateSelectedFirst) {
-              _context.next = 9;
-              break;
-            }
-            result = appointmentBooking.checkResourceListForDate();
-            if (result) {
-              _context.next = 9;
-              break;
-            }
-            return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.date')));
-          case 9:
             nextStep();
-          case 10:
+          case 6:
           case "end":
             return _context.stop();
         }

package/es/components/appointmentBooking/components/Deposit/index.d.ts

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

package/es/components/appointmentBooking/components/Footer/index.d.ts

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

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

@@ -10,122 +10,69 @@ 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, { useMemo, useRef, useState, useImperativeHandle, forwardRef, useEffect } from 'react';
+import React, { useMemo, useRef, useImperativeHandle, forwardRef } from 'react';
 import useComponents from "../../../../hooks/useComponents";
-import { formatForms, formatCarts, updateLists, updateBookingFormStorage } from "../../utils";
+import { updateBookingFormStorage, currentAppointmentBoard } from "../../utils";
 import { useAppointmentBookingContext } from "../../context";
-import { useAppointmentBookingResource, useAppointmentBookingSetting, useAppointmentBookingStep, contextUtils } from "../../hooks";
-import PolicyModal from "../../deposit/components/PolicyModal";
+import { useAppointmentBookingResource, useAppointmentBookingSetting, useAppointmentBookingStep, useAppointmentBookingLogin, useAppointmentBookingAccount } from "../../hooks";
+import { updateRelationForms } from "./utils";
 import "./index.less";
 var Form = /*#__PURE__*/forwardRef(function (props, ref) {
   var manualRef = useRef();
-  var _useState = useState(0),
-    _useState2 = _slicedToArray(_useState, 2),
-    currentFormIndex = _useState2[0],
-    setCurrentFormIndex = _useState2[1];
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    showAgreement = _useState4[0],
-    setShowAgreement = _useState4[1];
-  var _useState5 = useState({}),
-    _useState6 = _slicedToArray(_useState5, 2),
-    agreementContent = _useState6[0],
-    setAgreementContent = _useState6[1];
-  var _useState7 = useState([]),
-    _useState8 = _slicedToArray(_useState7, 2),
-    formStatus = _useState8[0],
-    setFormStatus = _useState8[1];
-  var _useState9 = useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    isClearData = _useState10[0],
-    setIsClearData = _useState10[1];
-  var _useState11 = useState(0),
-    _useState12 = _slicedToArray(_useState11, 2),
-    formId = _useState12[0],
-    setFormId = _useState12[1];
-  var _useAppointmentBookin = useAppointmentBookingContext(),
-    carts = _useAppointmentBookin.carts,
-    appointmentBooking = _useAppointmentBookin.appointmentBooking,
-    setLoading = _useAppointmentBookin.setLoading;
-  var _useAppointmentBookin2 = useAppointmentBookingResource(),
-    getResourceList = _useAppointmentBookin2.getResourceList;
-  var _useAppointmentBookin3 = useAppointmentBookingSetting(),
-    setOtherData = _useAppointmentBookin3.setOtherData,
-    getOtherData = _useAppointmentBookin3.getOtherData;
-  var _useAppointmentBookin4 = useAppointmentBookingStep(),
-    nextStep = _useAppointmentBookin4.nextStep;
-  var utils = contextUtils();
+  var _ref = useAppointmentBookingContext(),
+    appointmentBooking = _ref.appointmentBooking,
+    setLoading = _ref.setLoading,
+    currentStepParams = _ref.currentStepParams,
+    carts = _ref.carts;
+  var _useAppointmentBookin = useAppointmentBookingResource(),
+    getResourceList = _useAppointmentBookin.getResourceList;
+  var _useAppointmentBookin2 = useAppointmentBookingSetting(),
+    setOtherData = _useAppointmentBookin2.setOtherData,
+    getOtherData = _useAppointmentBookin2.getOtherData,
+    isFormSubject = _useAppointmentBookin2.isFormSubject;
+  var _useAppointmentBookin3 = useAppointmentBookingStep(),
+    nextStep = _useAppointmentBookin3.nextStep;
+  var _useAppointmentBookin4 = useAppointmentBookingLogin(),
+    isLogin = _useAppointmentBookin4.isLogin;
+  var _useAppointmentBookin5 = useAppointmentBookingAccount(),
+    checkAccount = _useAppointmentBookin5.checkAccount;
   useImperativeHandle(ref, function () {
     return {
       next: function next() {
-        var _manualRef$current, _manualRef$current$su;
+        var _stepLists, _manualRef$current, _manualRef$current$su;
+        var stepLists = (currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.stepLists) || [];
+        var nextStepKey = (_stepLists = stepLists[(currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.index) + 1]) === null || _stepLists === void 0 ? void 0 : _stepLists.key;
+        // 如果下一步是确认页，则验证数据，有错误或者没有登录则不进行表单的提交
+
+        // if (nextStepKey === 'confirm-information') {
+        //   const { hasError } = checkAndGoNext(isFormSubject, checkAccount, carts);
+        //   if (hasError || !isLogin) {
+        //     return nextStep(formStatus);
+        //   }
+        // }
+
         setLoading(true);
         (_manualRef$current = manualRef.current) === null || _manualRef$current === void 0 || (_manualRef$current$su = _manualRef$current.submit) === null || _manualRef$current$su === void 0 || _manualRef$current$su.call(_manualRef$current);
       }
     };
   });
-  var key = 'booking_form';
-
-  // 获取本地存储
-  var formStorage = getOtherData('booking_form') || {};
-
-  /**
-   * @title: 获取资源列表
-   * @description:
-   * @param {*} useMemo
-   * @return {*}
-   * @Author: WangHan
-   * @Date: 2025-05-06 10:00
-   */
-  var resources = useMemo(function () {
-    var _resource = getResourceList();
-    return (_resource === null || _resource === void 0 ? void 0 : _resource.resources) || [];
-  }, []);
-  var forms = useMemo(function () {
-    var newCarts = formatCarts(carts, resources, utils);
-    if (!(newCarts !== null && newCarts !== void 0 && newCarts.length) || !(resources !== null && resources !== void 0 && resources.length)) return [];
-    return formatForms(newCarts) || [];
-  }, [carts, resources]);
-  useEffect(function () {
-    var _forms$currentFormInd;
-    if (!(forms !== null && forms !== void 0 && forms.length)) return;
-    setFormId((forms === null || forms === void 0 || (_forms$currentFormInd = forms[currentFormIndex]) === null || _forms$currentFormInd === void 0 ? void 0 : _forms$currentFormInd.form_id) || 0);
-  }, [forms, currentFormIndex]);
   var _useComponents = useComponents({
       components: ['FormCard']
     }),
     _useComponents2 = _slicedToArray(_useComponents, 1),
     FormCard = _useComponents2[0];
+  var key = 'booking_form';
 
-  /**
-   * @title: 获取下一个表单
-   * @description:
-   * @return {*}
-   * @Author: WangHan
-   * @Date: 2025-04-26 11:04
-   */
-  var goToNextForm = function goToNextForm() {
-    var nextIndex = currentFormIndex + 1;
-    if (nextIndex < forms.length) {
-      var _forms$nextIndex, _forms$nextIndex2;
-      setIsClearData(true);
-      setCurrentFormIndex(nextIndex);
-
-      // 如果下一个表单没有id但有协议，直接弹协议
-      if (!(forms !== null && forms !== void 0 && (_forms$nextIndex = forms[nextIndex]) !== null && _forms$nextIndex !== void 0 && _forms$nextIndex.form_id) && forms !== null && forms !== void 0 && (_forms$nextIndex2 = forms[nextIndex]) !== null && _forms$nextIndex2 !== void 0 && _forms$nextIndex2.policy_id) {
-        var _forms$nextIndex3;
-        setLoading(true);
-        setAgreementContent({
-          id: forms === null || forms === void 0 || (_forms$nextIndex3 = forms[nextIndex]) === null || _forms$nextIndex3 === void 0 ? void 0 : _forms$nextIndex3.policy_id
-        });
-        setShowAgreement(true);
-      } else {
-        setLoading(false);
-      }
-    } else {
-      nextStep();
-    }
-  };
+  // 获取本地存储
+  var formStorage = getOtherData('booking_form') || {};
+  var appointmentBoard = useMemo(function () {
+    var _getResourceList = getResourceList(),
+      resources = _getResourceList.resources;
+    return currentAppointmentBoard(currentStepParams.key, resources, appointmentBooking);
+  }, [currentStepParams.key]);
+  var formId = useMemo(function () {
+    return (appointmentBoard === null || appointmentBoard === void 0 ? void 0 : appointmentBoard.resource_form_id) || 0;
+  }, [appointmentBoard === null || appointmentBoard === void 0 ? void 0 : appointmentBoard.resource_form_id]);
 
   /**
    * @title: 更新表单状态
@@ -139,10 +86,6 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
     if (status === 'error') {
       setLoading(false);
     }
-    var newFormStatus = updateLists(formStatus, 'id', formId, {
-      status: status
-    });
-    setFormStatus(newFormStatus);
   };
 
   /**
@@ -154,19 +97,14 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
    * @Date: 2025-04-28 11:32
    */
   var setFormStorage = function setFormStorage(values) {
-    var _forms$currentFormInd2;
-    var cart_id = forms === null || forms === void 0 || (_forms$currentFormInd2 = forms[currentFormIndex]) === null || _forms$currentFormInd2 === void 0 ? void 0 : _forms$currentFormInd2.cart_id;
     var oldData = getOtherData(key);
-    var newData = updateBookingFormStorage(oldData, cart_id, values);
+    var newData = updateBookingFormStorage(oldData, currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key, values);
     setOtherData(key, _objectSpread({}, newData));
 
     // 更新表单购物车
     appointmentBooking.updateCart({
-      _id: cart_id,
-      relationForms: [{
-        form_id: formId,
-        form_record_ids: [values === null || values === void 0 ? void 0 : values.form_record_id]
-      }]
+      _id: appointmentBoard === null || appointmentBoard === void 0 ? void 0 : appointmentBoard.cart_id,
+      relationForms: updateRelationForms(carts, appointmentBoard, values)
     });
   };
 
@@ -180,69 +118,40 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
    * @Date: 2025-04-28 11:34
    */
   var handleFormFinish = function handleFormFinish(status, values) {
-    setIsClearData(false);
-    updateFormStatus(status);
-    if (status === 'success') {
-      var _forms$currentFormInd3;
-      setFormStorage(values);
-
-      // 判断当前表单是否有协议
-      if (forms !== null && forms !== void 0 && (_forms$currentFormInd3 = forms[currentFormIndex]) !== null && _forms$currentFormInd3 !== void 0 && _forms$currentFormInd3.policy_id) {
-        var _forms$currentFormInd4;
-        setAgreementContent({
-          id: forms === null || forms === void 0 || (_forms$currentFormInd4 = forms[currentFormIndex]) === null || _forms$currentFormInd4 === void 0 ? void 0 : _forms$currentFormInd4.policy_id
-        });
-        setShowAgreement(true);
-      } else {
-        goToNextForm();
+    try {
+      updateFormStatus(status);
+      if (status === 'success') {
+        setFormStorage(values);
+        nextStep();
       }
+    } catch (error) {
+      setLoading(false);
     }
   };
-  var handleAgreementOk = function handleAgreementOk() {
-    setShowAgreement(false);
-    goToNextForm();
-  };
-  var formCom = useMemo(function () {
-    var _forms$currentFormInd5;
-    if (!formId) return;
-    return /*#__PURE__*/React.createElement("div", {
-      className: "appointment-form-wrap"
-    }, /*#__PURE__*/React.createElement(FormCard, {
-      id: formId,
-      ref: manualRef,
-      isGetLastData: false,
-      setting: {
-        isHidden: 1
-      },
-      formWrapStyle: {
-        padding: '16px'
-      },
-      isV2API: true,
-      isShowSkeleton: true,
-      onSubmit: function onSubmit(status, values) {
-        handleFormFinish(status, values);
-      },
-      onFinishFailed: function onFinishFailed(e) {
-        updateFormStatus('error');
-      },
-      onFormValueChange: function onFormValueChange(values) {},
-      defaultValues: (formStorage === null || formStorage === void 0 ? void 0 : formStorage[forms === null || forms === void 0 || (_forms$currentFormInd5 = forms[currentFormIndex]) === null || _forms$currentFormInd5 === void 0 ? void 0 : _forms$currentFormInd5.cart_id]) || {},
-      isClearData: false
-    }));
-  }, [currentFormIndex, formId]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, formCom, showAgreement ? /*#__PURE__*/React.createElement(PolicyModal, {
-    open: showAgreement,
-    onCancel: function onCancel() {
-      return setShowAgreement(false);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "appointment-form-wrap",
+    key: currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key
+  }, /*#__PURE__*/React.createElement(FormCard, {
+    id: formId,
+    ref: manualRef,
+    isGetLastData: false,
+    setting: {
+      isHidden: 1
+    },
+    formWrapStyle: {
+      padding: '16px'
     },
-    onConfirm: function onConfirm() {
-      return handleAgreementOk();
+    isV2API: true,
+    isShowSkeleton: true,
+    onSubmit: function onSubmit(status, values) {
+      handleFormFinish(status, values);
     },
-    item: agreementContent,
-    onChange: function onChange() {
-      return setLoading(false);
+    onFinishFailed: function onFinishFailed(e) {
+      updateFormStatus('error');
     },
-    isHideCheckout: false
-  }) : null);
+    onFormValueChange: function onFormValueChange(values) {},
+    defaultValues: (formStorage === null || formStorage === void 0 ? void 0 : formStorage[currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key]) || {},
+    isClearData: false
+  })));
 });
 export default Form;

package/es/components/appointmentBooking/components/Form/utils.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @title: 更新表单数据
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-05-26 16:58
+ */
+export declare const updateRelationForms: (carts: any[], currentCart: any, values: any) => any;