@pisell/private-materials 6.2.11 → 6.2.13

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/utils.js

@@ -168,7 +168,23 @@ export var formatOptionsToOrigin = function formatOptionsToOrigin(options) {
 };
 export var handleProductDeposit = function handleProductDeposit(cartItem, eventDetail, num) {
   var _origin$custom_deposi;
-  var productDetail = eventDetail.productDetail;
+  var productDetail = eventDetail.productDetail,
+    bookingOptionItem = eventDetail.bookingOptionItem;
+
+  // 如果是普通商品
+  var normalProduct = bookingOptionItem === null || bookingOptionItem === void 0 ? void 0 : bookingOptionItem._originData;
+  if (!productDetail && normalProduct) {
+    var custom_deposit_data = normalProduct.custom_deposit_data;
+    if ((custom_deposit_data === null || custom_deposit_data === void 0 ? void 0 : custom_deposit_data.has_deposit) == 1) {
+      return getProductDeposit({
+        cartItem: cartItem,
+        product: normalProduct,
+        num: num
+      });
+    } else {
+      return null;
+    }
+  }
   if (!productDetail) {
     return null;
   }

package/es/components/Sales/Event/Detail.d.ts

@@ -14,6 +14,7 @@ interface EventDetailContextType {
     currentBookingOption: any;
     selectEventDetailProductDetail: (productDetail: any) => void;
     checkBeforeSelectEventDetail: () => boolean;
+    getProductDetailRequest: any;
 }
 interface EventDetailProviderProps {
     children: React.ReactNode;

package/es/components/Sales/Event/Detail.js

@@ -15,7 +15,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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, { createContext, useRef, useState } from 'react';
-import { getEventDetailBookingOptionsApi, getEventDetailIntroductionApi, getEventDetailSelectDateApi, getEventDetailTeacherApi } from "./serve";
+import { getEventDetailBookingOptionsApi, getEventDetailIntroductionApi, getEventDetailSelectDateApi, getEventDetailTeacherApi, getProductDetailApi } from "./serve";
 import { useRequest } from 'ahooks';
 import { useEvent } from "./index";
 import { getIamgeFromMedia } from "../utils";
@@ -219,22 +219,55 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
       selectEventDetailBookingOptions(current.value);
     }
   });
+  var getProductDetailRequest = useRequest(getProductDetailApi, {
+    manual: true,
+    loadingDelay: 200
+  });
+
+  /**
+   * @title: 选择活动关联的商品
+   * @param id 活动关联的商品id
+   */
   var selectEventDetailBookingOptions = function selectEventDetailBookingOptions(id) {
-    var _bookingOptions$filte;
+    var _bookingOptions$filte, _option$_originData;
     var _ref2 = detailRef.current || {},
       introduction = _ref2.introduction,
       bookingOptions = _ref2.bookingOptions;
     var option = bookingOptions === null || bookingOptions === void 0 || (_bookingOptions$filte = bookingOptions.filter(function (v) {
       return v.value === id;
     })) === null || _bookingOptions$filte === void 0 ? void 0 : _bookingOptions$filte[0];
-    _setDetail({
-      introduction: _objectSpread(_objectSpread({}, introduction), {}, {
-        price: option.price,
-        origin_price: option.original_price
-      }),
-      selectedProduct: option // 选中的活动关联的商品
-    });
-    _setCurrentBookingOption(id);
+    var setSelectedData = function setSelectedData(data) {
+      _setDetail({
+        introduction: _objectSpread(_objectSpread({}, introduction), {}, {
+          price: data === null || data === void 0 ? void 0 : data.price,
+          origin_price: data === null || data === void 0 ? void 0 : data.original_price
+        }),
+        selectedProduct: data // 选中的活动关联的商品
+      });
+      _setCurrentBookingOption(id);
+    };
+
+    // 普通商品需要单独查询商品详情
+    if ((option === null || option === void 0 || (_option$_originData = option._originData) === null || _option$_originData === void 0 ? void 0 : _option$_originData.is_eject) === 0) {
+      var _introduction$_origin;
+      getProductDetailRequest.runAsync(id, {
+        open_deposit: 1,
+        front_end_cache_id: (introduction === null || introduction === void 0 || (_introduction$_origin = introduction._originData) === null || _introduction$_origin === void 0 ? void 0 : _introduction$_origin.id) + '_' + id
+      }).then(function (res) {
+        var _res$data2;
+        // 定金相关信息
+        var custom_deposit_data = res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.custom_deposit_data;
+        var newOption = _objectSpread({}, option);
+        if (custom_deposit_data && newOption._originData) {
+          newOption._originData.custom_deposit_data = custom_deposit_data;
+        }
+        setSelectedData(newOption);
+      }).catch(function () {
+        setSelectedData(option);
+      });
+    } else {
+      setSelectedData(option);
+    }
   };
 
   /**
@@ -272,7 +305,8 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
     getEventDetailSelectDate: getEventDetailSelectDate,
     currentBookingOption: currentBookingOption,
     selectEventDetailProductDetail: selectEventDetailProductDetail,
-    checkBeforeSelectEventDetail: checkBeforeSelectEventDetail
+    checkBeforeSelectEventDetail: checkBeforeSelectEventDetail,
+    getProductDetailRequest: getProductDetailRequest
   };
   return /*#__PURE__*/React.createElement(EventDetailContext.Provider, {
     value: contextValue

package/es/components/Sales/Event/serve.d.ts

@@ -37,3 +37,13 @@ export declare const getProductPrice: (params: {
     customer_id: number;
     schedule_date?: string;
 }) => Promise<any>;
+/**
+ * 获取商品详情
+ * @param id 商品id
+ * @param params 参数
+ * @returns
+ */
+export declare const getProductDetailApi: (id: number, params: {
+    open_deposit?: string | number;
+    front_end_cache_id?: string;
+}) => Promise<any>;

package/es/components/Sales/Event/serve.js

@@ -55,4 +55,29 @@ export var getProductPrice = /*#__PURE__*/function () {
   return function getProductPrice(_x) {
     return _ref.apply(this, arguments);
   };
+}();
+
+/**
+ * 获取商品详情
+ * @param id 商品id
+ * @param params 参数
+ * @returns
+ */
+export var getProductDetailApi = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(id, params) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          return _context2.abrupt("return", request.getRequest().get("/h5/product/standard/show/".concat(id), params, {
+            useCache: true
+          }));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function getProductDetailApi(_x2, _x3) {
+    return _ref2.apply(this, arguments);
+  };
 }();

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

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

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/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/booking/components/TabProduct/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/es/components/booking/components/customSelect/index.js

@@ -74,7 +74,6 @@ var CustomSelect = function CustomSelect(props, ref) {
     showDropDown = _props$showDropDown === void 0 ? true : _props$showDropDown,
     propsHandleOpenModal = props.handleOpenModal,
     handleDayChange = props.handleDayChange;
-  console.log('custom select');
   var searchRef = useRef();
 
   // 当前选择的值

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/forms/table/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

package/es/components/booking/hooks/useClearCart.js

@@ -2,12 +2,12 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 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); }
-import React, { useMemo } from 'react';
+import React from 'react';
 import classNames from 'classnames';
 import { Iconfont } from '@pisell/materials';
 import { locales } from "@pisell/utils";
 var useClearCart = function useClearCart(state, dispatch) {
-  var _state$service3;
+  var _state$service, _state$service2;
   var handleClear = function handleClear() {
     // 清除购物车
     dispatch({
@@ -17,14 +17,11 @@ var useClearCart = function useClearCart(state, dispatch) {
       }
     });
   };
-  return useMemo(function () {
-    var _state$service, _state$service2;
-    return !!((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length) && !state.channelDisabledEdit && /*#__PURE__*/React.createElement("span", {
-      className: classNames('pisell-lowcode__booking-service-clear-btn', _defineProperty({}, 'pisell-lowcode__booking-service-clear-btn-disabled', !((_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length))),
-      onClick: handleClear
-    }, /*#__PURE__*/React.createElement(Iconfont, {
-      type: "pisell2-trash-01"
-    }), " ", /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.booking.info.text.clear-cart')));
-  }, [(_state$service3 = state.service) === null || _state$service3 === void 0 || (_state$service3 = _state$service3.value) === null || _state$service3 === void 0 ? void 0 : _state$service3.length, state.channelDisabledEdit]);
+  return !!((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length) && !state.channelDisabledEdit && /*#__PURE__*/React.createElement("span", {
+    className: classNames('pisell-lowcode__booking-service-clear-btn', _defineProperty({}, 'pisell-lowcode__booking-service-clear-btn-disabled', !((_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length))),
+    onClick: handleClear
+  }, /*#__PURE__*/React.createElement(Iconfont, {
+    type: "pisell2-trash-01"
+  }), " ", /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.booking.info.text.clear-cart')));
 };
 export default useClearCart;

package/es/components/booking/info/client/index.js

@@ -36,7 +36,7 @@ import { getWaiverTitle } from "../clientVariant/utils";
 import useGetHolderList from "../hooks/useGetHolderList";
 var isLoadClient = false;
 var Client = function Client() {
-  var _state$client$value2, _state$client4, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11;
+  var _state$client$value2, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11;
   var modalRef = useRef();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -397,7 +397,6 @@ var Client = function Client() {
     }, locales.getText('pisell2.text.load-more'))) : null;
   }, [loadLoading, params, state.client.clients.length]);
   var customSelect = useMemo(function () {
-    console.log('render customSelect');
     return /*#__PURE__*/React.createElement(CustomSelect, {
       autoFocus: !state.isTerminal,
       modalOpen: state.modalOpen,
@@ -460,7 +459,7 @@ var Client = function Client() {
         return true;
       }
     });
-  }, [state.isTerminal, state.modalOpen, (_state$client4 = state.client) === null || _state$client4 === void 0 ? void 0 : _state$client4.value, state.drawerMask, renderList, loading, franchiseeLoading, params.search, loadMore]);
+  }, [state, renderList, loading, franchiseeLoading, params.search, loadMore]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-client",
     onClick: function onClick() {

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/dateRange/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

package/es/components/booking/info/hooks/useInfoHolder.js

@@ -4,7 +4,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
-import { useMemoizedFn } from "ahooks";
 import { useEffect, useMemo, useRef } from "react";
 import useHolderConfig from "./useHolderConfig";
 import { isOpenAddTime } from "../utils";
@@ -30,27 +29,21 @@ var useInfoHolder = function useInfoHolder(state, dispatch) {
     };
   }, [state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.information_tab]);
   var showAddTimeModal = useMemo(function () {
-    return isOpenAddTime(state) && !state.isBookingTicket2;
+    return isOpenAddTime(state);
   }, [state, appointment_card.quick_time]);
-  var handleEdit = useMemoizedFn(function (cacheItem, type) {
-    var _detailRef$current, _detailRef$current$in;
-    // console.timeEnd('handleChange');
-    console.time('handleEdit');
-    console.log(performance.now() - window.pp1, '打开商品4');
-    (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem, false, type === 'edit_product');
-    // setTimeout(() => {
-    //   console.log(performance.now() - window.pp1, '打开商品5');
-    //   console.timeEnd('handleEdit')
-    //   detailRef.current?.init?.(cacheItem, false, type === 'edit_product');
-    // }, );
-  });
+  var handleEdit = function handleEdit(cacheItem, type) {
+    setTimeout(function () {
+      var _detailRef$current, _detailRef$current$in;
+      (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem, false, type === 'edit_product');
+    }, 100);
+  };
   var dispatchService = function dispatchService(type, payload) {
     dispatch({
       type: type,
       payload: _objectSpread({}, payload)
     });
   };
-  var handleAction = useMemoizedFn(function (dataSource) {
+  var handleAction = function handleAction(dataSource) {
     var cacheItem = getProductExtend({
       cacheItem: _objectSpread(_objectSpread({}, dataSource._origin), {}, {
         new: 0
@@ -64,7 +57,7 @@ var useInfoHolder = function useInfoHolder(state, dispatch) {
         cacheItem: cacheItem
       }
     });
-  });
+  };
   return {
     detailRef: detailRef,
     handleEdit: handleEdit,

package/es/components/booking/info/service/Lists.js

@@ -14,7 +14,7 @@ import { useMemoizedFn } from 'ahooks';
 import { getProductExtend } from "../../info2/service/addService/utils";
 import useAddHolder from "../hooks/useAddHolder";
 var Lists = function Lists(_ref) {
-  var _state$service2;
+  var _state$service;
   var onEdit = _ref.onEdit,
     onChange = _ref.onChange,
     onAction = _ref.onAction,
@@ -36,8 +36,6 @@ var Lists = function Lists(_ref) {
    * @Date: 2024-11-29 16:35
    */
   var handleChange = useMemoizedFn(function (currentItem, type, other) {
-    console.time('handleChange');
-    console.log(window.pp1 = performance.now(), '打开商品');
     if (state.disabledEdit || state.disableEventBookingEdit) {
       return;
     }
@@ -61,7 +59,9 @@ var Lists = function Lists(_ref) {
         editModal: true,
         cacheItem: cacheItem
       });
-      return onEdit === null || onEdit === void 0 ? void 0 : onEdit(cacheItem, type);
+      return onEdit === null || onEdit === void 0 ? void 0 : onEdit(_objectSpread(_objectSpread({}, product), {}, {
+        new: 0
+      }), type);
     }
     var params = {
       editModal: false,
@@ -95,37 +95,27 @@ var Lists = function Lists(_ref) {
       isShowEditProduct: !state.isBookingCreatePage
     };
   }, [state === null || state === void 0 ? void 0 : state.bookingId, state === null || state === void 0 ? void 0 : state.disabledEdit, isShowChangeHolder, state.isBookingCreatePage]);
-  var products = useMemo(function () {
-    var _state$service;
-    console.time('products');
-    var p = formatProducts((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [], state, false, true, isParallelResource);
-    console.timeEnd('products');
-    return p;
-  }, [state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value]);
-  return useMemo(function () {
-    console.log('render List');
-    return /*#__PURE__*/React.createElement(CartContext.Provider, {
-      value: {
-        state: state
-      }
-    }, /*#__PURE__*/React.createElement(ShoppingCart, {
-      isParallelResource: isParallelResource,
-      onAction: onAction,
-      onChange: handleChange,
-      isOpenGroup: false,
-      isHideClearCart: true,
-      onAddProduct: function onAddProduct() {
-        return onChange({
-          addModal: true
-        });
-      }
-      // onActiveKey={handleActiveKey}
-      // collapseParams={CollapseParams}
-      ,
-      productParams: _objectSpread(_objectSpread({}, productParams), {}, {
-        products: products
-      })
-    }));
-  }, [products, state, productParams]);
+  return /*#__PURE__*/React.createElement(CartContext.Provider, {
+    value: {
+      state: state
+    }
+  }, /*#__PURE__*/React.createElement(ShoppingCart, {
+    isParallelResource: isParallelResource,
+    onAction: onAction,
+    onChange: handleChange,
+    isOpenGroup: false,
+    isHideClearCart: true,
+    onAddProduct: function onAddProduct() {
+      return onChange({
+        addModal: true
+      });
+    }
+    // onActiveKey={handleActiveKey}
+    // collapseParams={CollapseParams}
+    ,
+    productParams: _objectSpread(_objectSpread({}, productParams), {}, {
+      products: formatProducts((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [], state, false, true, isParallelResource)
+    })
+  }));
 };
 export default Lists;

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

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const BookingList: ({ items }: {
     items: any[];
 }) => JSX.Element;

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/service2/utils.js

@@ -691,28 +691,29 @@ export var formatProducts = function formatProducts(lists, state) {
       _origin: item
     });
   };
+
+  // 将商品分为组商品和非组商品
+  lists.forEach(function (item) {
+    var _item$_extend28;
+    if (!(item !== null && item !== void 0 && (_item$_extend28 = item._extend) !== null && _item$_extend28 !== void 0 && _item$_extend28.groupId)) {
+      normalList.push(formItem(item));
+    } else {
+      groupList.push(item);
+    }
+  });
+
+  // 根据item._extend.groupId 进行分组
+  var groups = groupList.reduce(function (prev, item) {
+    var _item$_extend29;
+    var groupId = item === null || item === void 0 || (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.groupId;
+    if (!prev[groupId]) {
+      prev[groupId] = [];
+    }
+    prev[groupId].push(item);
+    return prev;
+  }, {});
   console.log(normalList, 'normalList');
   if (isRenderGroup) {
-    // 将商品分为组商品和非组商品
-    lists.forEach(function (item) {
-      var _item$_extend28;
-      if (!(item !== null && item !== void 0 && (_item$_extend28 = item._extend) !== null && _item$_extend28 !== void 0 && _item$_extend28.groupId)) {
-        normalList.push(formItem(item));
-      } else {
-        groupList.push(item);
-      }
-    });
-
-    // 根据item._extend.groupId 进行分组
-    var groups = groupList.reduce(function (prev, item) {
-      var _item$_extend29;
-      var groupId = item === null || item === void 0 || (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.groupId;
-      if (!prev[groupId]) {
-        prev[groupId] = [];
-      }
-      prev[groupId].push(item);
-      return prev;
-    }, {});
     return Object.values(groups).map(function (d) {
       return formItem(concatBookings(d));
     }).concat(normalList);

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

@@ -81,7 +81,6 @@ var Info = Provider(function (props) {
   }, []);
   useMemo(function () {
     var _context$appHelper, _context$appHelper$ge, _context$appHelper2, _context$appHelper2$i, _context$appHelper3;
-    // TODO: 优化 内部每次设置state会触发两次渲染
     var isFranchisee = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.businessUtils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getAppByModal) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'franchisee');
     modal.dispatch({
       type: 'setState',

package/es/components/booking/info2/service/addService/utils.js

@@ -128,8 +128,7 @@ export var getTimeObj = function getTimeObj(_ref4) {
     cacheItem: cacheItem,
     useStartTime: useStartTime,
     currentResource: currentResource,
-    // 没有使用该参数
-    // state,
+    state: state,
     durationProps: durationProps
   });
   var obj = sliceDayIntoFiveMinutes((_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.basic) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.service_time, locales.locale);
@@ -287,9 +286,7 @@ export var setDefaultResource = function setDefaultResource(_ref6) {
         defaultOriginalResource = renderList;
       }
       var defaultResource = defaultOriginalResource.map(function (d) {
-        return {
-          // ...d,
-          children: d.children,
+        return _objectSpread(_objectSpread({}, d), {}, {
           relation_type: d.relation_type,
           form_id: item.form_id,
           relation_id: d.id,
@@ -300,7 +297,7 @@ export var setDefaultResource = function setDefaultResource(_ref6) {
             form_name: item.title,
             resource_name: d.main_field
           }
-        };
+        });
       });
       obj[item.form_id] = defaultResource;
     };

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

@@ -70,7 +70,6 @@ var AddTimeModal = function AddTimeModal() {
     _useState10 = _slicedToArray(_useState9, 2),
     renderList = _useState10[0],
     setRenderList = _useState10[1];
-  console.log(renderList, 'renderListrenderList');
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     interaction = _context$appHelper$ut.interaction;
@@ -149,7 +148,6 @@ var AddTimeModal = function AddTimeModal() {
     }
     return arr.filter(Boolean);
   }, [(_state$service = state.service) === null || _state$service === void 0 || (_state$service = _state$service.cacheItem) === null || _state$service === void 0 || (_state$service = _state$service._extend) === null || _state$service === void 0 ? void 0 : _state$service.resource]);
-  console.log(currentResource, 'currentResource');
   var getTimeUsableStatus = function getTimeUsableStatus(time) {
     var _state$service$cacheI3;
     if (!((_state$service$cacheI3 = state.service.cacheItem) !== null && _state$service$cacheI3 !== void 0 && _state$service$cacheI3._extend) || !currentResource.length) {
@@ -272,7 +270,6 @@ var AddTimeModal = function AddTimeModal() {
           case 3:
             newList = _context2.sent;
             list = newList.map(function (d) {
-              debugger;
               // 是否可用
               var isUsable = isUsableProduct(d.add_time, state.service.cacheItem);
               return _objectSpread(_objectSpread({}, d), {}, {

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

@@ -189,14 +189,9 @@ var Resources = function Resources(_ref, ref) {
   var getIsAutoAllocation = function getIsAutoAllocation(id) {
     return getAutoAllocationStorage(id);
   };
-  console.log('resourcesss');
-
-  /* todo: 此处value变化渲染三次 */
-
   return /*#__PURE__*/React.createElement(React.Fragment, null, data.map(function (item) {
     var _cur$2;
     var cur = _value[item.form_id];
-    console.log(cur, 'curcur');
     var errors = (cur || []).reduce(function (pre, d) {
       return pre.concat((d === null || d === void 0 ? void 0 : d.errors) || []);
     }, []);