@pisell/private-materials 3.3.106 → 3.4.1

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/Cart/index.js

@@ -31,6 +31,7 @@ export var CartContext = /*#__PURE__*/createContext(undefined);
 export var CartProvider = function CartProvider(_ref) {
   var children = _ref.children;
   var _useCustomer = useCustomer(),
+    appContext = _useCustomer.appContext,
     appUtils = _useCustomer.appUtils,
     getUserInfo = _useCustomer.getUserInfo;
   var _useSales = useSales(),
@@ -228,12 +229,16 @@ export var CartProvider = function CartProvider(_ref) {
    */
   var checkBeforeAddToCart = function checkBeforeAddToCart() {
     return new Promise(function (resolve) {
+      var _appContext$appHelper;
       var _cartData = getCurrentData().cartData;
       var newCartItem = createCartItemData() || {};
       var params = formatValues({
-        cartData: {
-          cartItems: [].concat(_toConsumableArray(_cartData.cartItems || []), [newCartItem])
-        }
+        state: {
+          cartData: {
+            cartItems: [].concat(_toConsumableArray(_cartData.cartItems || []), [newCartItem])
+          }
+        },
+        platform: appContext === null || appContext === void 0 || (_appContext$appHelper = appContext.appHelper) === null || _appContext$appHelper === void 0 || (_appContext$appHelper = _appContext$appHelper.constants) === null || _appContext$appHelper === void 0 ? void 0 : _appContext$appHelper.platform
       });
       checkRef.current = {
         callback: function callback(res) {

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

@@ -24,7 +24,12 @@ export declare const formatProductBundle: (bundle: any) => any;
  * @Author: xiangfeng.xue
  * @Date: 2025-01-21 17:57
  */
-export declare const formatValues: (state: any, excludeDisabled?: boolean, otherValue?: Record<string, any>) => any;
+export declare const formatValues: (params: {
+    state: any;
+    platform: 'h5' | 'pc';
+    excludeDisabled?: boolean;
+    extra?: Record<string, any>;
+}) => any;
 /**
  * @title: 获取拉开表单弹窗参数
  * @param state

package/es/components/Sales/Checkout/utils.js

@@ -84,16 +84,21 @@ var formatBookings = function formatBookings(list) {
  * @Author: xiangfeng.xue
  * @Date: 2025-01-21 17:57
  */
-export var formatValues = function formatValues(state, excludeDisabled, otherValue) {
+export var formatValues = function formatValues(params) {
+  var state = params.state,
+    platform = params.platform,
+    excludeDisabled = params.excludeDisabled,
+    extra = params.extra;
   var values = _objectSpread({
     type: 'event_booking_v2',
-    platform: 'H5',
+    platform: platform === 'pc' ? 'PC' : 'H5',
     sales_channel: 'my_pisel',
     order_sales_channel: 'online_store',
     bookings: [],
     shop_note: '',
     schedule_date: ''
-  }, otherValue || {});
+  }, extra || {});
+  console.log('values', values);
   var data = [];
   if (excludeDisabled) {
     var _state$cartData$cartI, _state$cartData$cartI2;
@@ -121,6 +126,6 @@ export var getFormParams = function getFormParams(state) {
   });
   return {
     product_id: product_id,
-    appointment_type: "event_booking_v2"
+    appointment_type: 'event_booking_v2'
   };
 };

package/es/components/Sales/Customer/index.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 interface CustomerData {
 }
 interface CustomerContextType {
+    appContext: any;
     appUtils: any;
     isLogin: () => boolean;
     openLoginModal: (params: any) => void;

package/es/components/Sales/Customer/index.js

@@ -34,6 +34,7 @@ export var CustomerProvider = function CustomerProvider(_ref) {
     return userInfo !== null && userInfo !== void 0 && userInfo.id ? userInfo : localUserInfo;
   };
   var contextValue = {
+    appContext: context,
     appUtils: utils,
     isLogin: isLogin,
     openLoginModal: openLoginModal,

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

@@ -104,7 +104,7 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
     // 更新表单购物车
     appointmentBooking.updateCart({
       _id: appointmentBoard === null || appointmentBoard === void 0 ? void 0 : appointmentBoard.cart_id,
-      relationForms: updateRelationForms(carts, appointmentBoard, values)
+      relationForms: updateRelationForms(carts, appointmentBoard, values, currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key)
     });
   };
 

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

@@ -5,4 +5,4 @@
  * @Author: WangHan
  * @Date: 2025-05-26 16:58
  */
-export declare const updateRelationForms: (carts: any[], currentCart: any, values: any) => any;
+export declare const updateRelationForms: (carts: any[], currentCart: any, values: any, currentStepKey?: string) => any;

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

@@ -5,32 +5,34 @@
  * @Author: WangHan
  * @Date: 2025-05-26 16:58
  */
-export var updateRelationForms = function updateRelationForms(carts, currentCart, values) {
+export var updateRelationForms = function updateRelationForms(carts, currentCart, values, currentStepKey) {
   var _cartItem$_origin;
   if (!(currentCart !== null && currentCart !== void 0 && currentCart.cart_id)) return [];
+  // 不同情况如下：
+  // 1. 一个商品，一个资源，一个表单
+  // 2. 一个商品，多个资源，多个表单
+  // 3. 多个商品，一个资源，一个表单
+  // 4. 多个商品，多个资源，多个表单
+
   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
+    form_record_ids: [values === null || values === void 0 ? void 0 : values.form_record_id],
+    cartId: currentCart === null || currentCart === void 0 ? void 0 : currentCart.cart_id,
+    currentStepKey: currentStepKey
   };
-  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);
-    }
+  // 查找是否有相同 cartId 和 form_id 的项
+  var existIndex = oldLists.findIndex(function (item) {
+    return item.cartId === newData.cartId && item.form_id === newData.form_id && item.currentStepKey === newData.currentStepKey;
+  });
+  if (existIndex > -1) {
+    oldLists[existIndex].form_record_ids = newData.form_record_ids;
   } else {
-    oldLists.push({
-      form_id: newData.form_id,
-      form_record_ids: [newData.form_record_id]
-    });
+    oldLists = oldLists.concat(newData);
   }
   return oldLists;
 };

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

@@ -106,7 +106,8 @@ var Header = function Header() {
             // 5. 清空表单数据
             if (key.startsWith('fill-form')) {
               form_key = 'booking_form';
-              booking_form = getOtherData(form_key);
+              booking_form = getOtherData(form_key); // 移除表单步骤
+              removeStep(key);
               setOtherData(form_key, _objectSpread(_objectSpread({}, booking_form), {}, _defineProperty({}, key, {})));
             }
 

package/es/components/booking/components/formItemChildrenWrap/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;

package/es/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/es/components/booking/info/service/like/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

package/es/components/booking/info/service/serviceManager/index.js

@@ -166,10 +166,10 @@ export var useService = function useService(_ref) {
               _extend.endDate = endDate;
             }
             resourceItem = currentResource(changeValues.resource);
-            _ref6 = (resourceItem === null || resourceItem === void 0 || (_resourceItem$_extend = resourceItem._extend) === null || _resourceItem$_extend === void 0 ? void 0 : _resourceItem$_extend.usableTime) || {}, relation_type = _ref6.relation_type, item_id = _ref6.item_id, schedule_id = _ref6.schedule_id;
-            _extend.relation_type = relation_type || 'form';
-            _extend.relation_id = item_id || (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.form_record_id) || 0;
-            _extend.schedule_id = schedule_id || 0;
+            _ref6 = (resourceItem === null || resourceItem === void 0 || (_resourceItem$_extend = resourceItem._extend) === null || _resourceItem$_extend === void 0 ? void 0 : _resourceItem$_extend.usableTime) || {}, relation_type = _ref6.relation_type, item_id = _ref6.item_id, schedule_id = _ref6.schedule_id; // 资源item中的数据  > 原数据 >  兜底
+            _extend.relation_type = relation_type || (_extend === null || _extend === void 0 ? void 0 : _extend.relation_type) || 'form';
+            _extend.relation_id = item_id || (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.form_record_id) || (_extend === null || _extend === void 0 ? void 0 : _extend.relation_id) || 0;
+            _extend.schedule_id = schedule_id || (_extend === null || _extend === void 0 ? void 0 : _extend.schedule_id) || 0;
             if (_extend.bundle_edit !== undefined) {
               _extend.bundle_edit = 1;
             }

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

@@ -700,7 +700,7 @@ var Info = function Info(_, ref) {
   })), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     className: "pisell-lowcode__booking-service-body-edit-footer-apple",
-    disabled: !((_state$service$resour = state.service.resourcesOrigin) !== null && _state$service$resour !== void 0 && _state$service$resour.length),
+    disabled: !isNormalProduct && !((_state$service$resour = state.service.resourcesOrigin) !== null && _state$service$resour !== void 0 && _state$service$resour.length),
     onClick: function onClick() {
       form.submit();
     }

package/es/components/booking/info2/utils.d.ts

@@ -0,0 +1,4 @@
+export declare const getFormatResourceListAndMap: (data: any[], bookingId?: number[]) => {
+    list: any[];
+    listMap: any;
+};

package/es/components/eftpos/deviceList/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const _default: ({ input, ...formItemProps }: any) => JSX.Element;
 export default _default;

package/es/components/eftpos/form/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang

package/es/components/eftpos/group/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { RadioGroupProps } from 'antd';
 export declare const CheckboxGroup: ({ direction, options, ...props }: any) => JSX.Element;
 export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {

package/es/components/eftpos/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/es/components/eftpos/icon/apiKey.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/es/components/eftpos/icon/device.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/es/components/eftpos/receipt/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 自定义组件设置
  * @description: 自定义组件设置

package/es/components/eftpos/surcharge/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.css';
 /**
  * @title: 自定义组件设置

package/es/components/eftposPay/component/alert/warn.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/header/titlebar.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",

package/es/components/eftposPay/component/step/step.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string;

package/es/components/eftposPay/tyro/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description:

package/es/components/eventBooking/components/Provider/Cart/ContinueButton/index.js

@@ -90,6 +90,7 @@ var ContinueButton = function ContinueButton() {
               data: params,
               callback: function () {
                 var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e) {
+                  var _context$appHelper2;
                   var value, result, _result$err;
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
@@ -100,8 +101,13 @@ var ContinueButton = function ContinueButton() {
                         }
                         return _context.abrupt("return");
                       case 2:
-                        value = formatValues(data, false, {
-                          relation_forms: e
+                        value = formatValues({
+                          state: data,
+                          platform: context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.constants) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.platform,
+                          excludeDisabled: false,
+                          extra: {
+                            relation_forms: e
+                          }
                         }); // 如果检测成功，则直接下单
                         _context.next = 5;
                         return onCheckout(value);
@@ -384,7 +390,7 @@ var ContinueButton = function ContinueButton() {
    */
   var handleContinue = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-      var value, checkRes, emptyHolders;
+      var _context$appHelper3, value, checkRes, emptyHolders;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -392,7 +398,10 @@ var ContinueButton = function ContinueButton() {
               _context6.next = 14;
               break;
             }
-            value = formatValues(data); // 检测商品是否可以下单
+            value = formatValues({
+              state: data,
+              platform: context === null || context === void 0 || (_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.constants) === null || _context$appHelper3 === void 0 ? void 0 : _context$appHelper3.platform
+            }); // 检测商品是否可以下单
             _context6.next = 4;
             return onCheckBeforeBooking(value);
           case 4:

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { CalendarItemProps } from '../../../../../type';
 declare const Item: (props: CalendarItemProps) => JSX.Element;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const StripePayment: () => JSX.Element;
 export default StripePayment;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/SDK.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const PageLoading: () => JSX.Element;
 export default PageLoading;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/PaymentRequestForm.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const PaymentRequestForm: () => JSX.Element | null;
 export default PaymentRequestForm;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts

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

package/es/components/schedules/components/ScheduleList/RenderScheduleItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { ScheduleItem } from '../../../type';
 declare type Item = any;

package/es/components/schedules/resources/relationProduct/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const RelationProduct: ({ value, onChange, }: {
     value?: any;

package/es/components/ticketBooking/components/addServiceVariant/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

package/lib/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/lib/components/Sales/Cart/index.js

@@ -52,7 +52,7 @@ var CartContext = (0, import_react.createContext)(
   void 0
 );
 var CartProvider = ({ children }) => {
-  const { appUtils, getUserInfo } = (0, import_Customer.useCustomer)();
+  const { appContext, appUtils, getUserInfo } = (0, import_Customer.useCustomer)();
   const { data, setData, hooks, getCurrentData } = (0, import_SalesModel.useSales)();
   const [openCart, setOpen] = (0, import_react.useState)(false);
   const checkRef = (0, import_react.useRef)(null);
@@ -203,12 +203,16 @@ var CartProvider = ({ children }) => {
   });
   const checkBeforeAddToCart = () => {
     return new Promise((resolve) => {
+      var _a, _b;
       const _cartData = getCurrentData().cartData;
       const newCartItem = createCartItemData() || {};
       const params = (0, import_utils2.formatValues)({
-        cartData: {
-          cartItems: [..._cartData.cartItems || [], newCartItem]
-        }
+        state: {
+          cartData: {
+            cartItems: [..._cartData.cartItems || [], newCartItem]
+          }
+        },
+        platform: (_b = (_a = appContext == null ? void 0 : appContext.appHelper) == null ? void 0 : _a.constants) == null ? void 0 : _b.platform
       });
       checkRef.current = {
         callback: (res) => {

package/lib/components/Sales/Checkout/utils.d.ts

@@ -24,7 +24,12 @@ export declare const formatProductBundle: (bundle: any) => any;
  * @Author: xiangfeng.xue
  * @Date: 2025-01-21 17:57
  */
-export declare const formatValues: (state: any, excludeDisabled?: boolean, otherValue?: Record<string, any>) => any;
+export declare const formatValues: (params: {
+    state: any;
+    platform: 'h5' | 'pc';
+    excludeDisabled?: boolean;
+    extra?: Record<string, any>;
+}) => any;
 /**
  * @title: 获取拉开表单弹窗参数
  * @param state

package/lib/components/Sales/Checkout/utils.js

@@ -61,18 +61,20 @@ var formatBookings = (list) => {
   });
   return bookings;
 };
-var formatValues = (state, excludeDisabled, otherValue) => {
+var formatValues = (params) => {
   var _a, _b;
+  const { state, platform, excludeDisabled, extra } = params;
   let values = {
     type: "event_booking_v2",
-    platform: "H5",
+    platform: platform === "pc" ? "PC" : "H5",
     sales_channel: "my_pisel",
     order_sales_channel: "online_store",
     bookings: [],
     shop_note: "",
     schedule_date: "",
-    ...otherValue || {}
+    ...extra || {}
   };
+  console.log("values", values);
   let data = [];
   if (excludeDisabled) {
     data = (_b = (_a = state.cartData.cartItems) == null ? void 0 : _a.filter) == null ? void 0 : _b.call(_a, (v) => v.disabled !== true);

package/lib/components/Sales/Customer/index.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 interface CustomerData {
 }
 interface CustomerContextType {
+    appContext: any;
     appUtils: any;
     isLogin: () => boolean;
     openLoginModal: (params: any) => void;

package/lib/components/Sales/Customer/index.js

@@ -67,6 +67,7 @@ var CustomerProvider = ({
     return (userInfo == null ? void 0 : userInfo.id) ? userInfo : localUserInfo;
   };
   const contextValue = {
+    appContext: context,
     appUtils: utils,
     isLogin,
     openLoginModal,

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

@@ -87,7 +87,12 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
     setOtherData(key, { ...newData });
     appointmentBooking.updateCart({
       _id: appointmentBoard == null ? void 0 : appointmentBoard.cart_id,
-      relationForms: (0, import_utils2.updateRelationForms)(carts, appointmentBoard, values)
+      relationForms: (0, import_utils2.updateRelationForms)(
+        carts,
+        appointmentBoard,
+        values,
+        currentStepParams == null ? void 0 : currentStepParams.key
+      )
     });
   };
   const handleFormFinish = (status, values) => {

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

@@ -5,4 +5,4 @@
  * @Author: WangHan
  * @Date: 2025-05-26 16:58
  */
-export declare const updateRelationForms: (carts: any[], currentCart: any, values: any) => any;
+export declare const updateRelationForms: (carts: any[], currentCart: any, values: any, currentStepKey?: string) => any;

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

@@ -22,24 +22,21 @@ __export(utils_exports, {
   updateRelationForms: () => updateRelationForms
 });
 module.exports = __toCommonJS(utils_exports);
-var updateRelationForms = (carts, currentCart, values) => {
-  var _a, _b;
+var updateRelationForms = (carts, currentCart, values, currentStepKey) => {
+  var _a;
   if (!(currentCart == null ? void 0 : currentCart.cart_id)) return [];
   const cartItem = carts == null ? void 0 : carts.find(
     (item) => (item == null ? void 0 : item._id) === (currentCart == null ? void 0 : currentCart.cart_id)
   );
   let oldLists = ((_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.relation_forms) || [];
-  const newData = { form_id: Number(values == null ? void 0 : values.form_id), form_record_id: values == null ? void 0 : values.form_record_id };
-  const exist = oldLists.find((item) => item.form_id === (newData == null ? void 0 : newData.form_id));
-  if (exist) {
-    if (!((_b = exist == null ? void 0 : exist.form_record_ids) == null ? void 0 : _b.includes(newData.form_record_id))) {
-      exist.form_record_ids.push(newData.form_record_id);
-    }
+  const newData = { form_id: Number(values == null ? void 0 : values.form_id), form_record_ids: [values == null ? void 0 : values.form_record_id], cartId: currentCart == null ? void 0 : currentCart.cart_id, currentStepKey };
+  const existIndex = oldLists.findIndex(
+    (item) => item.cartId === newData.cartId && item.form_id === newData.form_id && item.currentStepKey === newData.currentStepKey
+  );
+  if (existIndex > -1) {
+    oldLists[existIndex].form_record_ids = newData.form_record_ids;
   } else {
-    oldLists.push({
-      form_id: newData.form_id,
-      form_record_ids: [newData.form_record_id]
-    });
+    oldLists = oldLists.concat(newData);
   }
   return oldLists;
 };

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

@@ -99,6 +99,7 @@ var Header = () => {
     if (key.startsWith("fill-form")) {
       const form_key = "booking_form";
       let booking_form = getOtherData(form_key);
+      removeStep(key);
       setOtherData(form_key, { ...booking_form, [key]: {} });
     }
     appointmentBooking.back();

package/lib/components/booking/components/formItemChildrenWrap/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;

package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/lib/components/booking/info/service/like/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

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

@@ -143,9 +143,9 @@ var useService = ({
     }
     const resourceItem = currentResource(changeValues.resource);
     const { relation_type, item_id, schedule_id } = ((_a2 = resourceItem == null ? void 0 : resourceItem._extend) == null ? void 0 : _a2.usableTime) || {};
-    _extend.relation_type = relation_type || "form";
-    _extend.relation_id = item_id || (resourceItem == null ? void 0 : resourceItem.form_record_id) || 0;
-    _extend.schedule_id = schedule_id || 0;
+    _extend.relation_type = relation_type || (_extend == null ? void 0 : _extend.relation_type) || "form";
+    _extend.relation_id = item_id || (resourceItem == null ? void 0 : resourceItem.form_record_id) || (_extend == null ? void 0 : _extend.relation_id) || 0;
+    _extend.schedule_id = schedule_id || (_extend == null ? void 0 : _extend.schedule_id) || 0;
     if (_extend.bundle_edit !== void 0) {
       _extend.bundle_edit = 1;
     }

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

@@ -568,7 +568,7 @@ var Info = (_, ref) => {
       {
         type: "primary",
         className: "pisell-lowcode__booking-service-body-edit-footer-apple",
-        disabled: !((_F = state.service.resourcesOrigin) == null ? void 0 : _F.length),
+        disabled: !isNormalProduct && !((_F = state.service.resourcesOrigin) == null ? void 0 : _F.length),
         onClick: () => {
           form.submit();
         }

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

@@ -0,0 +1,4 @@
+export declare const getFormatResourceListAndMap: (data: any[], bookingId?: number[]) => {
+    list: any[];
+    listMap: any;
+};