@pisell/private-materials 6.2.11 → 6.2.12

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

@@ -15,7 +15,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, { useContext, useEffect, useMemo, useState, useImperativeHandle, forwardRef, useRef } from 'react';
+import React, { useContext, useEffect, useMemo, useImperativeHandle, forwardRef, useRef } from 'react';
 import Delete_wght300_24px from '@pisell/icon/es/Delete_wght300_24px';
 import Drawer from "../../../components/drawer";
 import { Context } from "../../../info/model";
@@ -27,7 +27,7 @@ import { Input, Button, Row, Col, Form, InputNumber } from 'antd';
 import "./index.less";
 import CollapsibleList from "../../../components/collapsibleList";
 import { renderBundles } from "../../../components/collapsibleList/utils";
-import { useUpdateEffect, useMemoizedFn, useDebounceFn } from 'ahooks';
+import { useUpdateEffect, useMemoizedFn } from 'ahooks';
 // import SelectTime from "../../../../../../../materials/src/components/select-time";
 import { getServiceTimes, deleteCacheParams, getProductTotalPrice, isSessionProduct } from "../../../utils";
 import { getErrorList } from "../../utilsByBooking";
@@ -38,7 +38,7 @@ import { isNormalProductByDurationSchedule } from "../../../info/service2/utils"
 import { addService, genServiceKey, getIsShowNumber } from "../../../../ticketBooking/utils";
 var submitLock = false;
 var Info = function Info(_, ref) {
-  var _state$service3, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI4, _state$service$cacheI5, _state$service5, _window$BaseMaterials, _state$service7, _state$service$cacheI10, _state$bookingConfig5, _state$service$cacheI11, _state$service$cacheI12, _state$service8, _state$service$resour2, _state$service$cacheI13, _state$service$cacheI14;
+  var _state$service3, _state$bookingConfig2, _state$service$cacheI4, _state$service$cacheI5, _state$service6, _state$service8, _window$BaseMaterials, _state$service$cacheI6, _state$service9, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service$cacheI10, _state$bookingConfig3, _state$service$resour;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -57,14 +57,14 @@ var Info = function Info(_, ref) {
   }, [state === null || state === void 0 || (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.cacheItem]);
 
   // 当前商品信息+ 表单信息
-  var getCurrentCacheItem = useMemoizedFn(function (_cacheItem) {
+  var getCurrentCacheItem = function getCurrentCacheItem(_cacheItem) {
     // 获取当前表单数据
     var values = form.getFieldsValue();
     var _item = _cacheItem || state.service.cacheItem;
     return _objectSpread(_objectSpread({}, _item), {}, {
       _extend: _objectSpread(_objectSpread({}, _item === null || _item === void 0 ? void 0 : _item._extend), values)
     });
-  });
+  };
 
   /**
    * @title: 当前的资源
@@ -78,7 +78,7 @@ var Info = function Info(_, ref) {
     // let item =
     //   resources.find((d: any) => d.form_record_id == useResource) || {};
     return null;
-  }, []);
+  }, [useResource]);
 
   /**
    * @title: 持续时长组件的props
@@ -91,16 +91,13 @@ var Info = function Info(_, ref) {
   var durationProps = useMemo(function () {
     var _state$bookingConfig;
     var _cacheItem = getCurrentCacheItem();
-    var val = getDurationProps({
+    return getDurationProps({
       cacheItem: _cacheItem,
       useStartTime: useStartTime,
-      // currentResource,
+      currentResource: currentResource,
       slice: (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.basic) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.service_time
     });
-    return val;
-  }, [
-  // currentResource,
-  state.service.cacheItem, useStartTime, useResource, (_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]);
+  }, [currentResource, state.service.cacheItem, useStartTime, useResource, (_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]);
 
   /**
    * @title: 灵活时长选项
@@ -111,10 +108,9 @@ var Info = function Info(_, ref) {
    * @Date: 2024-02-23 10:10
    */
   var flexibleOption = useMemo(function () {
-    var op = getFlexibleOption({
+    return getFlexibleOption({
       durationProps: durationProps
     });
-    return op;
   }, [durationProps, locales.locale]);
 
   /**
@@ -125,16 +121,14 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 13:37
    */
   var timeObj = useMemo(function () {
-    var val = getTimeObj({
+    return getTimeObj({
       durationProps: durationProps,
       useStartTime: useStartTime,
       currentResource: currentResource,
       state: state,
       useDuration: useDuration
     });
-    return val;
-  }, [durationProps, useStartTime, currentResource, (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.basic) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.service_time, useDuration]);
-
+  }, [durationProps, useStartTime, currentResource, state, useDuration]);
   // 由于灵活时长的结束时间随时变动, 这里发现如果当前选择的值没有在列表内,则选择最新的灵活时长值
   useEffect(function () {
     try {
@@ -286,51 +280,12 @@ var Info = function Info(_, ref) {
       }
     });
   };
-  var _useDebounceFn = useDebounceFn(function () {
-      setEditData.apply(void 0, arguments);
-    }, {
-      wait: 50,
-      leading: true,
-      trailing: false
-    }),
-    setEditDataRun = _useDebounceFn.run;
   var setEditData = useMemoizedFn(function (_cacheItem, open, openProductDetail) {
-    console.timeEnd('handleChange');
-    console.log('setEditDatasetEditData', _cacheItem, open);
+    form.resetFields();
     isChangeTotal.current = false;
     var cacheItem = _cacheItem || state.service.cacheItem;
     var values = cacheItem._extend;
-    var startTime = performance.now();
-    console.log(startTime, 'startTime');
-    form.resetFields();
     form.setFieldsValue(values);
-    // form.setFieldValue('resource', values.resource)
-
-    // values.resource[1117][0].times = [];
-    // values.resource[1117][0]._extend = {
-    //   usableTime: {
-    //     ...values.resource[1117][0]._extend.usableTime,
-    //     event_list: []
-    //   }
-    // };
-
-    // form.setFieldsValue({
-    //   capacity: values.capacity,
-    //   duration: values.duration,
-    //   endDate: values.endDate,
-    //   origin_total: values.origin_total,
-    //   price: values.price,
-    //   product_name: values.product_name,
-    //   quantity: values.quantity,
-    //   resource: values.resource,
-    //   startDate: values.startDate,
-    //   start_time: values.start_time,
-    //   total: values.total,
-    // });
-    var endTime = performance.now();
-    console.log(endTime - window.pp1, '打开商品5');
-    console.log('执行时间', endTime - startTime, values);
-    setTimeout(function () {}, 20);
     if (openProductDetail) {
       setTimeout(function () {
         handleEdit({});
@@ -413,7 +368,7 @@ var Info = function Info(_, ref) {
   useEffect(function () {
     // 预约创建页面并且打开了编辑弹窗
     if (state.isBookingCreatePage && state.service.editModal) {
-      setEditDataRun(null);
+      setEditData(null);
     }
   }, [state.service.editModal, state.isBookingCreatePage]);
 
@@ -427,10 +382,17 @@ var Info = function Info(_, ref) {
   useEffect(function () {
     getDiscount();
   }, [useTotal, (_state$service$cacheI5 = state.service.cacheItem) === null || _state$service$cacheI5 === void 0 || (_state$service$cacheI5 = _state$service$cacheI5._extend) === null || _state$service$cacheI5 === void 0 ? void 0 : _state$service$cacheI5.origin_total]);
+  var isDiscount = useMemo(function () {
+    var _state$service4, _state$service5;
+    if (!((_state$service4 = state.service) !== null && _state$service4 !== void 0 && _state$service4.cacheItem)) {
+      return false;
+    }
+    return useTotal != ((_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.cacheItem) === null || _state$service5 === void 0 ? void 0 : _state$service5._extend.origin_total);
+  }, [useTotal, (_state$service6 = state.service) === null || _state$service6 === void 0 || (_state$service6 = _state$service6.cacheItem) === null || _state$service6 === void 0 ? void 0 : _state$service6._extend.origin_total]);
   var bundles = useMemo(function () {
-    var _state$service4;
-    return ((_state$service4 = state.service) === null || _state$service4 === void 0 || (_state$service4 = _state$service4.cacheItem) === null || _state$service4 === void 0 || (_state$service4 = _state$service4._extend) === null || _state$service4 === void 0 || (_state$service4 = _state$service4.other) === null || _state$service4 === void 0 ? void 0 : _state$service4.bundle) || [];
-  }, [(_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.cacheItem) === null || _state$service5 === void 0 || (_state$service5 = _state$service5._extend) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.other) === null || _state$service5 === void 0 ? void 0 : _state$service5.bundle]);
+    var _state$service7;
+    return ((_state$service7 = state.service) === null || _state$service7 === void 0 || (_state$service7 = _state$service7.cacheItem) === null || _state$service7 === void 0 || (_state$service7 = _state$service7._extend) === null || _state$service7 === void 0 || (_state$service7 = _state$service7.other) === null || _state$service7 === void 0 ? void 0 : _state$service7.bundle) || [];
+  }, [(_state$service8 = state.service) === null || _state$service8 === void 0 || (_state$service8 = _state$service8.cacheItem) === null || _state$service8 === void 0 || (_state$service8 = _state$service8._extend) === null || _state$service8 === void 0 || (_state$service8 = _state$service8.other) === null || _state$service8 === void 0 ? void 0 : _state$service8.bundle]);
 
   /**
    * @title: 编辑商品
@@ -440,7 +402,7 @@ var Info = function Info(_, ref) {
    * @Author: zhiwei.Wang
    * @Date: 2024-08-28 17:08
    */
-  var handleEdit = useMemoizedFn(function (e) {
+  var handleEdit = function handleEdit(e) {
     var _state$client;
     // 当前商品
     var item = state.service.cacheItem;
@@ -536,7 +498,7 @@ var Info = function Info(_, ref) {
         });
       }
     });
-  });
+  };
 
   /**
    * @title: 更换商品
@@ -546,7 +508,7 @@ var Info = function Info(_, ref) {
    * @Author: zhiwei.Wang
    * @Date: 2024-08-28 17:10
    */
-  var handleChange = useMemoizedFn(function (e) {
+  var handleChange = function handleChange(e) {
     if (state.channelDisabledEdit) {
       return;
     }
@@ -561,10 +523,10 @@ var Info = function Info(_, ref) {
         // changeService: true,
       }
     });
-  });
+  };
   useImperativeHandle(ref, function () {
     return {
-      init: setEditDataRun
+      init: setEditData
     };
   });
   var handleTotalChange = function handleTotalChange(number) {
@@ -578,195 +540,6 @@ var Info = function Info(_, ref) {
     return false;
   }, [state.renderType, isNormalProduct]);
   var SelectTime = (_window$BaseMaterials = window.BaseMaterials) === null || _window$BaseMaterials === void 0 ? void 0 : _window$BaseMaterials.SelectTime;
-  console.log(isShowTimeAndResource, 'isShowTimeAndResource');
-  var productName = useMemo(function () {
-    var _state$service6;
-    return /*#__PURE__*/React.createElement(Col, {
-      span: 24
-    }, /*#__PURE__*/React.createElement(Form.Item, {
-      name: "product_name"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "current-service-info"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "current-service-info-name-wrap"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "current-service-info-name"
-    }, ((_state$service6 = state.service) === null || _state$service6 === void 0 || (_state$service6 = _state$service6.cacheItem) === null || _state$service6 === void 0 || (_state$service6 = _state$service6._extend) === null || _state$service6 === void 0 ? void 0 : _state$service6.product_name) || '-'), /*#__PURE__*/React.createElement(Button, {
-      onClick: handleEdit
-    }, locales.getText('pisell2.text.edit')), !state.isBookingCreatePage && /*#__PURE__*/React.createElement(Button, {
-      onClick: handleChange
-    }, locales.getText('pisell2.text.change'))), /*#__PURE__*/React.createElement(CollapsibleList, {
-      style: {
-        marginTop: bundles.length ? '8px' : 0
-      },
-      list: bundles,
-      renderItem: function renderItem(item) {
-        return renderBundles(item, state.amountSymbol);
-      }
-    }))));
-  }, [(_state$service7 = state.service) === null || _state$service7 === void 0 || (_state$service7 = _state$service7.cacheItem) === null || _state$service7 === void 0 || (_state$service7 = _state$service7._extend) === null || _state$service7 === void 0 ? void 0 : _state$service7.product_name, bundles, state.amountSymbol, state.isBookingCreatePage]);
-  var price = useMemo(function () {
-    var _state$service$cacheI6, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9;
-    return /*#__PURE__*/React.createElement(Col, {
-      span: 24
-    }, /*#__PURE__*/React.createElement(Form.Item, {
-      label: locales.getText('pisell2.text.price'),
-      name: "total",
-      rules: [{
-        required: true
-      }],
-      extra: useTotal !== ((_state$service$cacheI6 = state.service.cacheItem) === null || _state$service$cacheI6 === void 0 || (_state$service$cacheI6 = _state$service$cacheI6._extend) === null || _state$service$cacheI6 === void 0 ? void 0 : _state$service$cacheI6.origin_total) && locales.getText('page.booking.text.price-extra')(formatAmount((_state$service$cacheI7 = state.service.cacheItem) === null || _state$service$cacheI7 === void 0 || (_state$service$cacheI7 = _state$service$cacheI7._extend) === null || _state$service$cacheI7 === void 0 ? void 0 : _state$service$cacheI7.origin_total, 2, state.amountSymbol), formatAmount(useTotal, 2, state.amountSymbol))
-    }, /*#__PURE__*/React.createElement(PisellAdjustPriceInputNumber, {
-      style: {
-        width: '100%'
-      },
-      min: 0,
-      precision: 2,
-      prefix: state.amountSymbol,
-      onChange: handleTotalChange,
-      disabled: state.channelDisabledEdit,
-      originValue: ((_state$service$cacheI8 = state.service.cacheItem) === null || _state$service$cacheI8 === void 0 || (_state$service$cacheI8 = _state$service$cacheI8._extend) === null || _state$service$cacheI8 === void 0 ? void 0 : _state$service$cacheI8.origin_total) || 0,
-      placeholder: ((_state$service$cacheI9 = state.service.cacheItem) === null || _state$service$cacheI9 === void 0 || (_state$service$cacheI9 = _state$service$cacheI9._extend) === null || _state$service$cacheI9 === void 0 ? void 0 : _state$service$cacheI9.origin_total) || '0'
-    })));
-  }, [useTotal, (_state$service$cacheI10 = state.service.cacheItem) === null || _state$service$cacheI10 === void 0 || (_state$service$cacheI10 = _state$service$cacheI10._extend) === null || _state$service$cacheI10 === void 0 ? void 0 : _state$service$cacheI10.origin_total, state.amountSymbol, state.channelDisabledEdit]);
-  var reason = useMemo(function () {
-    return isReason ? /*#__PURE__*/React.createElement(Col, {
-      span: 24
-    }, /*#__PURE__*/React.createElement(Form.Item, {
-      label: locales.getText('pisell2.text.discount-reason'),
-      name: "discount_reason"
-    }, /*#__PURE__*/React.createElement(Input.TextArea, {
-      size: "large"
-    }))) : null;
-  }, [isReason]);
-  var startTime = useMemo(function () {
-    var _state$bookingConfig4;
-    return /*#__PURE__*/React.createElement(Col, {
-      span: 12
-    }, /*#__PURE__*/React.createElement(Form.Item, {
-      label: locales.getText('pisell2.text.start_time'),
-      name: "start_time",
-      rules: [{
-        required: true
-      }]
-    }, SelectTime ? /*#__PURE__*/React.createElement(SelectTime, {
-      slice: (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.config) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.basic) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.service_time) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.value,
-      timePickerProps: {
-        style: {
-          width: '100%'
-        }
-      },
-      timeProps: {
-        style: {
-          zoom: 0.8
-        }
-      }
-    }) : null));
-  }, [SelectTime, (_state$bookingConfig5 = state.bookingConfig) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.config) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.basic) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.service_time) === null || _state$bookingConfig5 === void 0 ? void 0 : _state$bookingConfig5.value]);
-  var duration = useMemo(function () {
-    console.log('render form duration');
-    return /*#__PURE__*/React.createElement(Col, {
-      span: 12
-    }, /*#__PURE__*/React.createElement(Form.Item, {
-      label: locales.getText('pisell2.text.duration'),
-      name: "duration",
-      rules: [{
-        required: true
-      }]
-    }, /*#__PURE__*/React.createElement(Duration, _extends({}, durationProps, {
-      timeObj: timeObj
-    }))));
-  }, [durationProps, timeObj]);
-  var resource = useMemo(function () {
-    console.log('render form resource');
-    return /*#__PURE__*/React.createElement(Form.Item, {
-      noStyle: true,
-      name: "resource"
-    }, /*#__PURE__*/React.createElement(Resources, {
-      ref: resourcesRef,
-      state: state,
-      cacheItem: state.service.cacheItem,
-      getCurrentCacheItem: getCurrentCacheItem
-      // 内部没有使用 useDuration useStartTime
-      // useDuration={useDuration}
-      // useStartTime={useStartTime}
-    }));
-    // 只监听内部使用值
-  }, [state.renderType, (_state$service$cacheI11 = state.service.cacheItem) === null || _state$service$cacheI11 === void 0 || (_state$service$cacheI11 = _state$service$cacheI11._data) === null || _state$service$cacheI11 === void 0 ? void 0 : _state$service$cacheI11.resources, (_state$service$cacheI12 = state.service.cacheItem) === null || _state$service$cacheI12 === void 0 || (_state$service$cacheI12 = _state$service$cacheI12._data) === null || _state$service$cacheI12 === void 0 ? void 0 : _state$service$cacheI12.resourceMaps]);
-  var capacity = useMemo(function () {
-    return /*#__PURE__*/React.createElement(Form.Item, {
-      noStyle: true,
-      name: "capacity"
-    }, /*#__PURE__*/React.createElement(Capacity, {
-      state: state,
-      cacheItem: state.service.cacheItem
-    }));
-    // 只监听Capacity 内部使用的 state.locale state.isTerminal, state.service?.cacheItem?._data?.capacitys
-  }, [state.locale, state.isTerminal, (_state$service8 = state.service) === null || _state$service8 === void 0 || (_state$service8 = _state$service8.cacheItem) === null || _state$service8 === void 0 || (_state$service8 = _state$service8._data) === null || _state$service8 === void 0 ? void 0 : _state$service8.capacitys]);
-  var hiddenQuantity = useMemo(function () {
-    return /*#__PURE__*/React.createElement(Form.Item, {
-      hidden: true,
-      name: "quantity"
-    }, /*#__PURE__*/React.createElement(InputNumber, null));
-  }, []);
-  var quantity = useMemo(function () {
-    return /*#__PURE__*/React.createElement(Col, {
-      span: 24
-    }, /*#__PURE__*/React.createElement(Form.Item, {
-      label: locales.getText('pisell2.text.quantity'),
-      name: "quantity",
-      rules: [{
-        required: true
-      }]
-    }, /*#__PURE__*/React.createElement(InputNumber, {
-      size: "large",
-      style: {
-        width: '100%'
-      },
-      min: 1,
-      max: 999999,
-      formatter: function formatter(value) {
-        if (value !== undefined) {
-          // 向下取整
-          return Math.floor(value);
-        }
-        return value;
-      }
-    })));
-  }, []);
-  var footer = useMemo(function () {
-    var _state$service$resour;
-    return /*#__PURE__*/React.createElement("div", {
-      className: "pisell-lowcode__booking-service-body-edit-footer"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "pisell-lowcode__booking-service-delete-wrap",
-      onClick: handleDeleteProduct
-    }, /*#__PURE__*/React.createElement(Delete_wght300_24px, {
-      className: "pisell-lowcode__booking-service-delete-icon"
-    })), /*#__PURE__*/React.createElement(Button, {
-      type: "primary",
-      className: "pisell-lowcode__booking-service-body-edit-footer-apple",
-      disabled: !isNormalProduct && !((_state$service$resour = state.service.resourcesOrigin) !== null && _state$service$resour !== void 0 && _state$service$resour.length),
-      onClick: function onClick() {
-        form.submit();
-      }
-    }, locales.getText('pisell2.text.apply')));
-  }, [isNormalProduct, (_state$service$resour2 = state.service.resourcesOrigin) === null || _state$service$resour2 === void 0 ? void 0 : _state$service$resour2.length]);
-  console.log('render edit');
-  console.log(state.service.editModal && !((_state$service$cacheI13 = state.service.cacheItem) !== null && _state$service$cacheI13 !== void 0 && _state$service$cacheI13.autoClose), performance.now() - window.pp1, '打开商品1');
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    val = _useState2[0],
-    setVal = _useState2[1];
-  useEffect(function () {
-    if (isShowTimeAndResource) {
-      setTimeout(function () {
-        setVal(true);
-      }, 200);
-    } else {
-      setVal(false);
-    }
-  }, [isShowTimeAndResource]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     titleNoWrap: true
     //通过zIndex的方式控制  添加商品 和 编辑服务弹窗的上下层级
@@ -774,7 +547,7 @@ var Info = function Info(_, ref) {
     zIndex: state.service.changeService ? 999 : 1000,
     forceRender: true,
     mask: state.drawerMask,
-    open: state.service.editModal && !((_state$service$cacheI14 = state.service.cacheItem) !== null && _state$service$cacheI14 !== void 0 && _state$service$cacheI14.autoClose),
+    open: state.service.editModal && !((_state$service$cacheI6 = state.service.cacheItem) !== null && _state$service$cacheI6 !== void 0 && _state$service$cacheI6.autoClose),
     title: locales.getText('pisell2.text.edit-service'),
     onClose: function onClose() {
       dispatch({
@@ -797,6 +570,140 @@ var Info = function Info(_, ref) {
       width: '100%'
     },
     gutter: [16, 0]
-  }, productName, price, reason, val && isShowTimeAndResource && /*#__PURE__*/React.createElement(React.Fragment, null, startTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity)), footer)));
+  }, /*#__PURE__*/React.createElement(Col, {
+    span: 24
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "product_name"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "current-service-info"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "current-service-info-name-wrap"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "current-service-info-name"
+  }, ((_state$service9 = state.service) === null || _state$service9 === void 0 || (_state$service9 = _state$service9.cacheItem) === null || _state$service9 === void 0 || (_state$service9 = _state$service9._extend) === null || _state$service9 === void 0 ? void 0 : _state$service9.product_name) || '-'), /*#__PURE__*/React.createElement(Button, {
+    onClick: handleEdit
+  }, locales.getText('pisell2.text.edit')), !state.isBookingCreatePage && /*#__PURE__*/React.createElement(Button, {
+    onClick: handleChange
+  }, locales.getText('pisell2.text.change'))), /*#__PURE__*/React.createElement(CollapsibleList, {
+    style: {
+      marginTop: bundles.length ? '8px' : 0
+    },
+    list: bundles,
+    renderItem: function renderItem(item) {
+      return renderBundles(item, state.amountSymbol);
+    }
+  })))), /*#__PURE__*/React.createElement(Col, {
+    span: 24
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: locales.getText('pisell2.text.price'),
+    name: "total",
+    rules: [{
+      required: true
+    }],
+    extra: useTotal !== ((_state$service$cacheI7 = state.service.cacheItem) === null || _state$service$cacheI7 === void 0 || (_state$service$cacheI7 = _state$service$cacheI7._extend) === null || _state$service$cacheI7 === void 0 ? void 0 : _state$service$cacheI7.origin_total) && locales.getText('page.booking.text.price-extra')(formatAmount((_state$service$cacheI8 = state.service.cacheItem) === null || _state$service$cacheI8 === void 0 || (_state$service$cacheI8 = _state$service$cacheI8._extend) === null || _state$service$cacheI8 === void 0 ? void 0 : _state$service$cacheI8.origin_total, 2, state.amountSymbol), formatAmount(useTotal, 2, state.amountSymbol))
+  }, /*#__PURE__*/React.createElement(PisellAdjustPriceInputNumber, {
+    style: {
+      width: '100%'
+    },
+    min: 0,
+    precision: 2,
+    prefix: state.amountSymbol,
+    onChange: handleTotalChange,
+    disabled: state.channelDisabledEdit,
+    originValue: ((_state$service$cacheI9 = state.service.cacheItem) === null || _state$service$cacheI9 === void 0 || (_state$service$cacheI9 = _state$service$cacheI9._extend) === null || _state$service$cacheI9 === void 0 ? void 0 : _state$service$cacheI9.origin_total) || 0,
+    placeholder: ((_state$service$cacheI10 = state.service.cacheItem) === null || _state$service$cacheI10 === void 0 || (_state$service$cacheI10 = _state$service$cacheI10._extend) === null || _state$service$cacheI10 === void 0 ? void 0 : _state$service$cacheI10.origin_total) || '0'
+  }))), isReason ? /*#__PURE__*/React.createElement(Col, {
+    span: 24
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: locales.getText('pisell2.text.discount-reason'),
+    name: "discount_reason"
+  }, /*#__PURE__*/React.createElement(Input.TextArea, {
+    size: "large"
+  }))) : null, isShowTimeAndResource && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Col, {
+    span: 12
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: locales.getText('pisell2.text.start_time'),
+    name: "start_time",
+    rules: [{
+      required: true
+    }]
+  }, SelectTime ? /*#__PURE__*/React.createElement(SelectTime, {
+    slice: (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.basic) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.service_time) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.value,
+    timePickerProps: {
+      style: {
+        width: '100%'
+      }
+    },
+    timeProps: {
+      style: {
+        zoom: 0.8
+      }
+    }
+  }) : null)), /*#__PURE__*/React.createElement(Col, {
+    span: 12
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: locales.getText('pisell2.text.duration'),
+    name: "duration",
+    rules: [{
+      required: true
+    }]
+  }, /*#__PURE__*/React.createElement(Duration, _extends({}, durationProps, {
+    timeObj: timeObj
+  })))), /*#__PURE__*/React.createElement(Form.Item, {
+    noStyle: true,
+    name: "resource"
+  }, /*#__PURE__*/React.createElement(Resources, {
+    ref: resourcesRef,
+    state: state,
+    cacheItem: state.service.cacheItem,
+    getCurrentCacheItem: getCurrentCacheItem,
+    useDuration: useDuration,
+    useStartTime: useStartTime
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    noStyle: true,
+    name: "capacity"
+  }, /*#__PURE__*/React.createElement(Capacity, {
+    state: state,
+    cacheItem: state.service.cacheItem
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    hidden: true,
+    name: "quantity"
+  }, /*#__PURE__*/React.createElement(InputNumber, null))), isNormalProduct && /*#__PURE__*/React.createElement(Col, {
+    span: 24
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: locales.getText('pisell2.text.quantity'),
+    name: "quantity",
+    rules: [{
+      required: true
+    }]
+  }, /*#__PURE__*/React.createElement(InputNumber, {
+    size: "large",
+    style: {
+      width: '100%'
+    },
+    min: 1,
+    max: 999999,
+    formatter: function formatter(value) {
+      if (value !== undefined) {
+        // 向下取整
+        return Math.floor(value);
+      }
+      return value;
+    }
+  }))))), /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-service-body-edit-footer"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-service-delete-wrap",
+    onClick: handleDeleteProduct
+  }, /*#__PURE__*/React.createElement(Delete_wght300_24px, {
+    className: "pisell-lowcode__booking-service-delete-icon"
+  })), /*#__PURE__*/React.createElement(Button, {
+    type: "primary",
+    className: "pisell-lowcode__booking-service-body-edit-footer-apple",
+    disabled: !isNormalProduct && !((_state$service$resour = state.service.resourcesOrigin) !== null && _state$service$resour !== void 0 && _state$service$resour.length),
+    onClick: function onClick() {
+      form.submit();
+    }
+  }, locales.getText('pisell2.text.apply'))))));
 };
 export default /*#__PURE__*/forwardRef(Info);

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

@@ -1,4 +1,4 @@
-import React, { useEffect, useContext, useMemo } from 'react';
+import React, { useEffect, useContext } from 'react';
 import AddService from "./addService";
 import { Context } from "../../info/model";
 import EditService from "./editService";
@@ -24,23 +24,19 @@ var Service = function Service() {
   var clearCart = useClearCart(state, dispatch);
   var _useQuotation = useQuotation(state, dispatch),
     dom = _useQuotation.dom;
-  var renderMemo = useMemo(function () {
-    console.log('render info22222');
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-      className: "pisell-lowcode__booking-service-wrap"
-    }, clearCart, /*#__PURE__*/React.createElement(Lists, {
-      isParallelResource: true,
-      onEdit: handleEdit,
-      onAction: handleAction,
-      onChange: function onChange(e, type) {
-        return dispatchService(type || 'setService', e);
-      }
-    }), !state.isBookingCreatePage ? /*#__PURE__*/React.createElement(AddService, {
-      onEdit: handleEdit
-    }) : null), /*#__PURE__*/React.createElement(EditService, {
-      ref: detailRef
-    }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null), dom);
-  }, [clearCart, dom, showAddTimeModal, clearCart]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, renderMemo);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-service-wrap"
+  }, clearCart, /*#__PURE__*/React.createElement(Lists, {
+    isParallelResource: true,
+    onEdit: handleEdit,
+    onAction: handleAction,
+    onChange: function onChange(e, type) {
+      return dispatchService(type || 'setService', e);
+    }
+  }), !state.isBookingCreatePage ? /*#__PURE__*/React.createElement(AddService, {
+    onEdit: handleEdit
+  }) : null), /*#__PURE__*/React.createElement(EditService, {
+    ref: detailRef
+  }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null), dom);
 };
 export default /*#__PURE__*/React.memo(Service);

package/es/components/booking/materiels/duration/index.js

@@ -20,9 +20,6 @@ var Duration = function Duration(props) {
     startDate = props.startDate,
     timeObj = props.timeObj,
     resetProps = _objectWithoutProperties(props, _excluded);
-  var startDateStr = useMemo(function () {
-    return dayjs(startDate).format('YYYY-MM-DD HH:mm:ss');
-  }, [startDate]);
 
   /**
    * @title: 时间切片
@@ -60,7 +57,7 @@ var Duration = function Duration(props) {
       });
     }
     return durationSlicesBasedOnTime;
-  }, [timeObj.durationSlicesBasedOnTime, slice, locale, duration, startDateStr, usableTime === null || usableTime === void 0 ? void 0 : usableTime.end_at]);
+  }, [timeObj, slice, locale, duration, startDate, usableTime]);
   useEffect(function () {
     timeObjChange === null || timeObjChange === void 0 || timeObjChange(times);
   }, [times]);
@@ -75,10 +72,6 @@ var Duration = function Duration(props) {
       }, d[label]);
     });
   }, []);
-  var options = useMemo(function () {
-    console.log('render form options');
-    return renderOptions(times);
-  }, [times]);
-  return /*#__PURE__*/React.createElement(Select, _extends({}, selectProps, resetProps), options);
+  return /*#__PURE__*/React.createElement(Select, _extends({}, selectProps, resetProps), renderOptions(times));
 };
 export default Duration;

package/es/components/booking/materiels/holder/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;