@pisell/private-materials 6.1.3 → 6.1.5

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

@@ -79,6 +79,7 @@ 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/editService/index.js

@@ -38,7 +38,7 @@ import { getErrorList } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/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$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI4, _state$service$cacheI5, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI10, _state$bookingConfig5, _state$service$cacheI11, _state$service$cacheI12, _state$service9, _state$service$resour2, _state$service$cacheI13, _state$service$cacheI14;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -64,9 +64,12 @@ var Info = function Info(_, ref) {
     };
   }, []);
   var isNormalProduct = useMemo(function () {
-    var _state$service, _state$service2;
-    return (state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.cacheItem) && isNormalProductByDurationSchedule(state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.cacheItem);
-  }, [state === null || state === void 0 || (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.cacheItem]);
+    var _state$service, _state$service2, _state$service3;
+    if (!(state !== null && state !== void 0 && (_state$service = state.service) !== null && _state$service !== void 0 && _state$service.cacheItem)) {
+      return true;
+    }
+    return (state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.cacheItem) && isNormalProductByDurationSchedule(state === null || state === void 0 || (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.cacheItem);
+  }, [state === null || state === void 0 || (_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : _state$service4.cacheItem]);
 
   // 当前商品信息+ 表单信息
   var getCurrentCacheItem = useMemoizedFn(function (_cacheItem) {
@@ -443,9 +446,9 @@ var Info = function Info(_, ref) {
     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 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$service5;
+    return ((_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) || [];
+  }, [(_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 || (_state$service6 = _state$service6.other) === null || _state$service6 === void 0 ? void 0 : _state$service6.bundle]);
 
   /**
    * @title: 编辑商品
@@ -596,7 +599,7 @@ var Info = function Info(_, ref) {
   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;
+    var _state$service7;
     return /*#__PURE__*/React.createElement(Col, {
       span: 24
     }, /*#__PURE__*/React.createElement(Form.Item, {
@@ -607,7 +610,7 @@ var Info = function Info(_, ref) {
       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, {
+    }, ((_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) || '-'), /*#__PURE__*/React.createElement(Button, {
       onClick: handleEdit
     }, locales.getText('pisell2.text.edit')), !state.isBookingCreatePage && /*#__PURE__*/React.createElement(Button, {
       onClick: handleChange
@@ -620,7 +623,7 @@ var Info = function Info(_, ref) {
         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]);
+  }, [(_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 ? void 0 : _state$service8.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, {
@@ -718,7 +721,7 @@ var Info = function Info(_, ref) {
       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]);
+  }, [state.locale, state.isTerminal, (_state$service9 = state.service) === null || _state$service9 === void 0 || (_state$service9 = _state$service9.cacheItem) === null || _state$service9 === void 0 || (_state$service9 = _state$service9._data) === null || _state$service9 === void 0 ? void 0 : _state$service9.capacitys]);
   var hiddenQuantity = useMemo(function () {
     return /*#__PURE__*/React.createElement(Form.Item, {
       hidden: true,
@@ -770,6 +773,19 @@ var Info = function Info(_, ref) {
   }, [(_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 _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    val = _useState4[0],
+    setVal = _useState4[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的方式控制  添加商品 和 编辑服务弹窗的上下层级
@@ -801,6 +817,6 @@ var Info = function Info(_, ref) {
       width: '100%'
     },
     gutter: [16, 0]
-  }, productName, price, reason, isShowTimeAndResource && /*#__PURE__*/React.createElement(React.Fragment, null, startTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity)), footer)));
+  }, productName, price, reason, val && isShowTimeAndResource && /*#__PURE__*/React.createElement(React.Fragment, null, startTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity)), footer)));
 };
 export default /*#__PURE__*/forwardRef(Info);

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -164,7 +164,7 @@ export var _formatBookingDetail = function _formatBookingDetail(data, modalState
   });
 };
 var TicketBooking = function TicketBooking() {
-  var _engineContext$appHel2;
+  var _engineContext$appHel2, _state$modalState2;
   var _useStore = useStore(),
     _useStore2 = _slicedToArray(_useStore, 2),
     state = _useStore2[0],
@@ -372,7 +372,7 @@ var TicketBooking = function TicketBooking() {
         fees: fees
       }
     });
-  }, [state.modalState]);
+  }, [state === null || state === void 0 || (_state$modalState2 = state.modalState) === null || _state$modalState2 === void 0 || (_state$modalState2 = _state$modalState2.service) === null || _state$modalState2 === void 0 ? void 0 : _state$modalState2.value]);
 
   /**
    * 设置弹窗内的状态

package/es/components/ticketBooking/components/timeBar/index.js

@@ -4,45 +4,49 @@ 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 from 'react';
+import React, { useMemo } from 'react';
 import { LeftOutlined, RightOutlined } from '@ant-design/icons';
 import { DatePicker, SelectTime } from '@pisell/materials';
+import { useMemoizedFn } from "ahooks";
 import { Button } from 'antd';
 import classNames from 'classnames';
 import { locales } from '@pisell/utils';
 import "./index.less";
 var TimeBar = function TimeBar(props) {
-  var _state$modalState4, _state$modalState5;
+  var _state$modalState7;
   var state = props.globalState,
     setGlobalState = props.setGlobalState,
     locale = props.locale;
-  var _onClickNext = function _onClickNext() {
+  var _onClickNext = useMemoizedFn(function () {
     var _state$modalState, _props$onDateChange, _props$setIntervalTim;
     var currentTime = (_state$modalState = state.modalState) === null || _state$modalState === void 0 || (_state$modalState = _state$modalState.date) === null || _state$modalState === void 0 ? void 0 : _state$modalState.value;
     var newTime = currentTime['add'](1, 'day');
     (_props$onDateChange = props.onDateChange) === null || _props$onDateChange === void 0 || _props$onDateChange.call(props, newTime, newTime.format('YYYY-MM-DD HH:mm:ss'));
     (_props$setIntervalTim = props.setIntervalTime) === null || _props$setIntervalTim === void 0 || _props$setIntervalTim.call(props, false);
-  };
-  var _onClickPre = function _onClickPre() {
+  });
+  var _onClickPre = useMemoizedFn(function () {
     var _state$modalState2, _props$onDateChange2, _props$setIntervalTim2;
     var currentTime = (_state$modalState2 = state.modalState) === null || _state$modalState2 === void 0 || (_state$modalState2 = _state$modalState2.date) === null || _state$modalState2 === void 0 ? void 0 : _state$modalState2.value;
     var newTime = currentTime['subtract'](1, 'day');
     (_props$onDateChange2 = props.onDateChange) === null || _props$onDateChange2 === void 0 || _props$onDateChange2.call(props, newTime, newTime.format('YYYY-MM-DD HH:mm:ss'));
     (_props$setIntervalTim2 = props.setIntervalTime) === null || _props$setIntervalTim2 === void 0 || _props$setIntervalTim2.call(props, false);
-  };
-  var _onClickToday = function _onClickToday() {
-    var _props$setIntervalTim3;
-    (_props$setIntervalTim3 = props.setIntervalTime) === null || _props$setIntervalTim3 === void 0 || _props$setIntervalTim3.call(props, true);
-  };
-  var _onClickNow = function _onClickNow() {
+  });
+  var _onClickToday = useMemoizedFn(function () {
+    var _state$modalState3, _props$onDateChange3, _props$setIntervalTim3;
+    var currentTime = (_state$modalState3 = state.modalState) === null || _state$modalState3 === void 0 || (_state$modalState3 = _state$modalState3.date) === null || _state$modalState3 === void 0 ? void 0 : _state$modalState3.value;
+    var newTime = currentTime['subtract'](1, 'day');
+    (_props$onDateChange3 = props.onDateChange) === null || _props$onDateChange3 === void 0 || _props$onDateChange3.call(props, newTime, newTime.format('YYYY-MM-DD HH:mm:ss'));
+    (_props$setIntervalTim3 = props.setIntervalTime) === null || _props$setIntervalTim3 === void 0 || _props$setIntervalTim3.call(props, false);
+  });
+  var _onClickNow = useMemoizedFn(function () {
     var _props$setIntervalTim4;
     (_props$setIntervalTim4 = props.setIntervalTime) === null || _props$setIntervalTim4 === void 0 || _props$setIntervalTim4.call(props, true);
-  };
+  });
 
   // 时间选择变更事件
-  var _onDateTimeChange = function _onDateTimeChange(timeString) {
-    var _state$modalState3, _props$onDateTimeChan, _props$setIntervalTim5;
-    var currentTime = (_state$modalState3 = state.modalState) === null || _state$modalState3 === void 0 || (_state$modalState3 = _state$modalState3.date) === null || _state$modalState3 === void 0 ? void 0 : _state$modalState3.value;
+  var _onDateTimeChange = useMemoizedFn(function (timeString) {
+    var _state$modalState4, _props$onDateTimeChan, _props$setIntervalTim5;
+    var currentTime = (_state$modalState4 = state.modalState) === null || _state$modalState4 === void 0 || (_state$modalState4 = _state$modalState4.date) === null || _state$modalState4 === void 0 ? void 0 : _state$modalState4.value;
     var _timeString$split$map = timeString.split(':').map(Number),
       _timeString$split$map2 = _slicedToArray(_timeString$split$map, 2),
       hours = _timeString$split$map2[0],
@@ -53,63 +57,66 @@ var TimeBar = function TimeBar(props) {
       isTimeChange: true
     });
     (_props$setIntervalTim5 = props.setIntervalTime) === null || _props$setIntervalTim5 === void 0 || _props$setIntervalTim5.call(props, false);
-  };
-  return /*#__PURE__*/React.createElement("div", {
-    className: "pisell-ticket-booking-time-bar"
-  }, /*#__PURE__*/React.createElement(Button, {
-    icon: /*#__PURE__*/React.createElement(LeftOutlined, null),
-    onClick: _onClickPre,
-    size: "large"
-  }), /*#__PURE__*/React.createElement(Button, {
-    onClick: _onClickToday,
-    size: "large",
-    style: state.intervalSetTime ? {
-      background: '#000',
-      color: '#fff'
-    } : undefined
-  }, locales.getText('pisell2.ticket-booking.today')), /*#__PURE__*/React.createElement("div", {
-    className: classNames({
-      'booking-page-date-picker-select': state.isDateChange
-    }),
-    style: {
-      width: 200,
-      flexShrink: 0
-    }
-  }, /*#__PURE__*/React.createElement(DatePicker, {
-    inputReadOnly: true,
-    value: state === null || state === void 0 || (_state$modalState4 = state.modalState) === null || _state$modalState4 === void 0 || (_state$modalState4 = _state$modalState4.date) === null || _state$modalState4 === void 0 ? void 0 : _state$modalState4.value,
-    format: locale === 'en' ? 'dddd, DD MMM YYYY' : 'YYYY年MM月DD日',
-    onChange: props === null || props === void 0 ? void 0 : props.onDateChange,
-    size: "large",
-    style: {
-      width: '100%'
-    }
-  })), /*#__PURE__*/React.createElement(Button, {
-    icon: /*#__PURE__*/React.createElement(RightOutlined, null),
-    onClick: _onClickNext,
-    size: "large"
-  }), /*#__PURE__*/React.createElement("div", {
-    className: classNames({
-      'booking-page-date-picker-select': state.isTimeChange
-    })
-  }, /*#__PURE__*/React.createElement(SelectTime, {
-    value: state === null || state === void 0 || (_state$modalState5 = state.modalState) === null || _state$modalState5 === void 0 || (_state$modalState5 = _state$modalState5.date) === null || _state$modalState5 === void 0 ? void 0 : _state$modalState5.value.format('HH:mm'),
-    onChange: _onDateTimeChange,
-    popoverProps: {
+  });
+  return useMemo(function () {
+    var _state$modalState5, _state$modalState6;
+    return /*#__PURE__*/React.createElement("div", {
+      className: "pisell-ticket-booking-time-bar"
+    }, /*#__PURE__*/React.createElement(Button, {
+      icon: /*#__PURE__*/React.createElement(LeftOutlined, null),
+      onClick: _onClickPre,
+      size: "large"
+    }), /*#__PURE__*/React.createElement(Button, {
+      onClick: _onClickToday,
+      size: "large",
+      style: state.intervalSetTime ? {
+        background: '#000',
+        color: '#fff'
+      } : undefined
+    }, locales.getText('pisell2.ticket-booking.today')), /*#__PURE__*/React.createElement("div", {
+      className: classNames({
+        'booking-page-date-picker-select': state.isDateChange
+      }),
+      style: {
+        width: 200,
+        flexShrink: 0
+      }
+    }, /*#__PURE__*/React.createElement(DatePicker, {
+      inputReadOnly: true,
+      value: state === null || state === void 0 || (_state$modalState5 = state.modalState) === null || _state$modalState5 === void 0 || (_state$modalState5 = _state$modalState5.date) === null || _state$modalState5 === void 0 ? void 0 : _state$modalState5.value,
+      format: locale === 'en' ? 'dddd, DD MMM YYYY' : 'YYYY年MM月DD日',
+      onChange: props === null || props === void 0 ? void 0 : props.onDateChange,
+      size: "large",
       style: {
-        zoom: 0.8
+        width: '100%'
       }
-    },
-    timePickerProps: {},
-    timeProps: {},
-    slice: 5
-  })), /*#__PURE__*/React.createElement(Button, {
-    onClick: _onClickNow,
-    size: "large",
-    style: state.intervalSetTime ? {
-      background: '#000',
-      color: '#fff'
-    } : undefined
-  }, locales.getText('pisell2.ticket-booking.now')));
+    })), /*#__PURE__*/React.createElement(Button, {
+      icon: /*#__PURE__*/React.createElement(RightOutlined, null),
+      onClick: _onClickNext,
+      size: "large"
+    }), /*#__PURE__*/React.createElement("div", {
+      className: classNames({
+        'booking-page-date-picker-select': state.isTimeChange
+      })
+    }, /*#__PURE__*/React.createElement(SelectTime, {
+      value: state === null || state === void 0 || (_state$modalState6 = state.modalState) === null || _state$modalState6 === void 0 || (_state$modalState6 = _state$modalState6.date) === null || _state$modalState6 === void 0 ? void 0 : _state$modalState6.value.format('HH:mm'),
+      onChange: _onDateTimeChange,
+      popoverProps: {
+        style: {
+          zoom: 0.8
+        }
+      },
+      timePickerProps: {},
+      timeProps: {},
+      slice: 5
+    })), /*#__PURE__*/React.createElement(Button, {
+      onClick: _onClickNow,
+      size: "large",
+      style: state.intervalSetTime ? {
+        background: '#000',
+        color: '#fff'
+      } : undefined
+    }, locales.getText('pisell2.ticket-booking.now')));
+  }, [(_state$modalState7 = state.modalState) === null || _state$modalState7 === void 0 || (_state$modalState7 = _state$modalState7.date) === null || _state$modalState7 === void 0 ? void 0 : _state$modalState7.value, state.intervalSetTime, state.isTimeChange, state.isDateChange, locale]);
 };
 export default TimeBar;

package/es/components/ticketBooking/index.js

@@ -132,12 +132,12 @@ var initialState = {
   productExtensionType: ['appointment_ticket', 'session_ticket', 'product_appointment', 'service_product', 'session_product', 'normal', 'product_appointment']
 };
 export default (function (props) {
-  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3;
+  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4;
   var productExtensionType = props.productExtensionType,
     bookingConfigParams = props.bookingConfigParams;
   var storeRef = useRef(null);
   var context = useEngineContext();
-  locales.init(localeTexts, ((_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut = _context$appHelper$ut.getApp()) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut = _context$appHelper$ut.locales) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getLocale) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.call(_context$appHelper$ut)) || ((_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.storage) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.get('umi_locale')) || 'en');
+  locales.init(localeTexts, ((_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getApp) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.locales) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getLocale) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.call(_context$appHelper$ut2)) || ((_context$appHelper$ut4 = context.appHelper.utils) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut4.storage) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.get('umi_locale')) || 'en');
   useLayoutEffect(function () {
     request.setRequest(context.appHelper.utils.request);
   }, []);

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

@@ -73,8 +73,11 @@ var Info = (_, ref) => {
     };
   }, []);
   const isNormalProduct = (0, import_react.useMemo)(() => {
-    var _a2, _b2;
-    return ((_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.cacheItem) && (0, import_utils4.isNormalProductByDurationSchedule)((_b2 = state == null ? void 0 : state.service) == null ? void 0 : _b2.cacheItem);
+    var _a2, _b2, _c2;
+    if (!((_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.cacheItem)) {
+      return true;
+    }
+    return ((_b2 = state == null ? void 0 : state.service) == null ? void 0 : _b2.cacheItem) && (0, import_utils4.isNormalProductByDurationSchedule)((_c2 = state == null ? void 0 : state.service) == null ? void 0 : _c2.cacheItem);
   }, [(_a = state == null ? void 0 : state.service) == null ? void 0 : _a.cacheItem]);
   const getCurrentCacheItem = (0, import_ahooks.useMemoizedFn)((_cacheItem) => {
     let values = form.getFieldsValue();
@@ -93,13 +96,13 @@ var Info = (_, ref) => {
   const durationProps = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     let _cacheItem = getCurrentCacheItem();
-    const val = (0, import_utils7.getDurationProps)({
+    const val2 = (0, import_utils7.getDurationProps)({
       cacheItem: _cacheItem,
       useStartTime,
       // currentResource,
       slice: (_c2 = (_b2 = (_a2 = state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.service_time
     });
-    return val;
+    return val2;
   }, [
     // currentResource,
     state.service.cacheItem,
@@ -114,14 +117,14 @@ var Info = (_, ref) => {
     return op;
   }, [durationProps, import_utils.locales.locale]);
   const timeObj = (0, import_react.useMemo)(() => {
-    const val = (0, import_utils7.getTimeObj)({
+    const val2 = (0, import_utils7.getTimeObj)({
       durationProps,
       useStartTime,
       currentResource,
       state,
       useDuration
     });
-    return val;
+    return val2;
   }, [
     durationProps,
     useStartTime,
@@ -641,6 +644,16 @@ var Info = (_, ref) => {
     performance.now() - window.pp1,
     "打开商品1"
   );
+  const [val, setVal] = (0, import_react.useState)(false);
+  (0, import_react.useEffect)(() => {
+    if (isShowTimeAndResource) {
+      setTimeout(() => {
+        setVal(true);
+      }, 200);
+    } else {
+      setVal(false);
+    }
+  }, [isShowTimeAndResource]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
@@ -662,7 +675,7 @@ var Info = (_, ref) => {
         });
       }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, productName, price, reason, isShowTimeAndResource && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, startTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity)), footer)
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, productName, price, reason, val && isShowTimeAndResource && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, startTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity)), footer)
   ));
 };
 var editService_default = (0, import_react.forwardRef)(Info);

package/lib/components/ticketBooking/components/ticketBooking/index.js

@@ -188,7 +188,7 @@ var _formatBookingDetail = (data, modalState) => {
   };
 };
 var TicketBooking = () => {
-  var _a;
+  var _a, _b, _c;
   const [state, setState] = (0, import_miniRedux.useStore)();
   const engineContext = (0, import_useEngineContext.default)();
   const { props: engineProps } = engineContext.engine;
@@ -210,7 +210,7 @@ var TicketBooking = () => {
   const _timerRef = (0, import_react.useRef)();
   const _callbackFnRef = (0, import_react.useRef)();
   (0, import_react.useEffect)(() => {
-    var _a2, _b, _c, _d, _e, _f;
+    var _a2, _b2, _c2, _d, _e, _f;
     _persistentRef.current = storage.get(`drawer-booking`) === "true" ? true : isTerminal();
     if (lowcodeRef) {
       lowcodeRef.onReady(void 0);
@@ -235,7 +235,7 @@ var TicketBooking = () => {
     });
     setState(
       {
-        amountSymbol: (getData == null ? void 0 : getData("shop_symbol")) || ((_d = (_c = (_b = store == null ? void 0 : store.getState) == null ? void 0 : _b.call(store)) == null ? void 0 : _c.global) == null ? void 0 : _d.symbol) || "$"
+        amountSymbol: (getData == null ? void 0 : getData("shop_symbol")) || ((_d = (_c2 = (_b2 = store == null ? void 0 : store.getState) == null ? void 0 : _b2.call(store)) == null ? void 0 : _c2.global) == null ? void 0 : _d.symbol) || "$"
       },
       () => {
         _initStateRef.current = JSON.parse(JSON.stringify(state));
@@ -291,10 +291,10 @@ var TicketBooking = () => {
     });
   };
   (0, import_react.useEffect)(() => {
-    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-    const cartItems = (_b = (_a2 = state == null ? void 0 : state.modalState) == null ? void 0 : _a2.service) == null ? void 0 : _b.value;
+    var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i, _j;
+    const cartItems = (_b2 = (_a2 = state == null ? void 0 : state.modalState) == null ? void 0 : _a2.service) == null ? void 0 : _b2.value;
     if (!Array.isArray(cartItems) || cartItems.length === 0) {
-      (_d = (_c = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c.postMessageToApp) == null ? void 0 : _d.call(_c, {
+      (_d = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.postMessageToApp) == null ? void 0 : _d.call(_c2, {
         module: "cds",
         key: "cartUpdate",
         data: {
@@ -395,15 +395,15 @@ var TicketBooking = () => {
         fees
       }
     });
-  }, [state.modalState]);
+  }, [(_c = (_b = state == null ? void 0 : state.modalState) == null ? void 0 : _b.service) == null ? void 0 : _c.value]);
   const _setModalState = (props) => {
-    var _a2, _b;
+    var _a2, _b2;
     console.log("同步state到外层", props);
     let newVal = { ...props };
     if (newVal.service) {
       newVal.service.value = ((_a2 = newVal == null ? void 0 : newVal.service) == null ? void 0 : _a2.value) || [];
     }
-    console.log((_b = newVal == null ? void 0 : newVal.service) == null ? void 0 : _b.value, "newVal.service.value");
+    console.log((_b2 = newVal == null ? void 0 : newVal.service) == null ? void 0 : _b2.value, "newVal.service.value");
     setState({
       modalState: {
         ...state.modalState,
@@ -430,10 +430,10 @@ var TicketBooking = () => {
       }
     });
     setTimeout(() => {
-      var _a2, _b, _c, _d, _e;
-      if ((_b = (_a2 = state.modalState.service) == null ? void 0 : _a2.value) == null ? void 0 : _b.length) {
-        let _list = (_e = (_c = state.bookingFunctions) == null ? void 0 : _c.updateServiceDate) == null ? void 0 : _e.call(
-          _c,
+      var _a2, _b2, _c2, _d, _e;
+      if ((_b2 = (_a2 = state.modalState.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) {
+        let _list = (_e = (_c2 = state.bookingFunctions) == null ? void 0 : _c2.updateServiceDate) == null ? void 0 : _e.call(
+          _c2,
           (_d = state.modalState.service) == null ? void 0 : _d.value,
           date,
           false
@@ -449,8 +449,8 @@ var TicketBooking = () => {
     }, 100);
   };
   const _setShopOpeningHours = () => {
-    var _a2, _b, _c, _d, _e, _f;
-    let time = ((_a2 = getData == null ? void 0 : getData("operating_day_boundary")) == null ? void 0 : _a2.time) || ((_f = (_e = (_d = (_c = (_b = store == null ? void 0 : store.getState) == null ? void 0 : _b.call(store)) == null ? void 0 : _c.global) == null ? void 0 : _d.shopDetail) == null ? void 0 : _e.operating_day_boundary) == null ? void 0 : _f.time);
+    var _a2, _b2, _c2, _d, _e, _f;
+    let time = ((_a2 = getData == null ? void 0 : getData("operating_day_boundary")) == null ? void 0 : _a2.time) || ((_f = (_e = (_d = (_c2 = (_b2 = store == null ? void 0 : store.getState) == null ? void 0 : _b2.call(store)) == null ? void 0 : _c2.global) == null ? void 0 : _d.shopDetail) == null ? void 0 : _e.operating_day_boundary) == null ? void 0 : _f.time);
     if (time) {
       localStorage.setItem("shopOpeningHours", time);
     }
@@ -467,12 +467,12 @@ var TicketBooking = () => {
     });
   };
   const _getBoardConfig = async () => {
-    var _a2, _b, _c;
+    var _a2, _b2, _c2;
     const { bookingConfigParams } = state;
     const data = await (0, import_serve.getBookingConfig)({
       ...bookingConfigParams
     });
-    if ((_c = (_b = (_a2 = data == null ? void 0 : data.config) == null ? void 0 : _a2.information_tab) == null ? void 0 : _b.appointment_card) == null ? void 0 : _c.quick_time) {
+    if ((_c2 = (_b2 = (_a2 = data == null ? void 0 : data.config) == null ? void 0 : _a2.information_tab) == null ? void 0 : _b2.appointment_card) == null ? void 0 : _c2.quick_time) {
       _getAddTimeProducts();
     }
     setState({
@@ -566,7 +566,7 @@ var TicketBooking = () => {
     }
   };
   const _initBookingData = (type, data) => {
-    var _a2, _b, _c, _d, _e, _f, _g;
+    var _a2, _b2, _c2, _d, _e, _f, _g;
     let initState = _getInitState({
       bookingDetail: null,
       bookingConfig: state.bookingConfig,
@@ -588,14 +588,14 @@ var TicketBooking = () => {
     if (type === "create") {
       if ((_a2 = data == null ? void 0 : data.serviceParams) == null ? void 0 : _a2.start_date) {
         initState.modalState.date.value = (0, import_dayjs.default)(
-          (_b = data == null ? void 0 : data.serviceParams) == null ? void 0 : _b.start_date
+          (_b2 = data == null ? void 0 : data.serviceParams) == null ? void 0 : _b2.start_date
         );
         sessionStorage.setItem(
           "pisell2.booking.serviceParams",
           JSON.stringify(data)
         );
       } else {
-        let timezone = (_f = (_e = (_d = (_c = store == null ? void 0 : store.getState) == null ? void 0 : _c.call(store)) == null ? void 0 : _d.global) == null ? void 0 : _e.globalConfig) == null ? void 0 : _f.timezone;
+        let timezone = (_f = (_e = (_d = (_c2 = store == null ? void 0 : store.getState) == null ? void 0 : _c2.call(store)) == null ? void 0 : _d.global) == null ? void 0 : _e.globalConfig) == null ? void 0 : _f.timezone;
         initState.modalState.date.value = import_dayjs.default.tz(/* @__PURE__ */ new Date(), timezone);
         sessionStorage.removeItem("pisell2.booking.serviceParams");
       }
@@ -613,9 +613,9 @@ var TicketBooking = () => {
     });
   };
   const _rebook = () => {
-    var _a2, _b, _c;
+    var _a2, _b2, _c2;
     let date = (0, import_utils2.getNextTimeSlice)(
-      ((_c = (_b = (_a2 = state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.service_time.value) || 10
+      ((_c2 = (_b2 = (_a2 = state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.service_time.value) || 10
     );
     setState({
       rebookState: {
@@ -703,7 +703,7 @@ var TicketBooking = () => {
     );
   };
   const _scanBookingDetailResult = async (detail) => {
-    var _a2, _b, _c;
+    var _a2, _b2, _c2;
     (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast, import_utils.locales.getText("pisell2.ticket-booking.loading"), 6e4);
     let result = {};
     try {
@@ -711,7 +711,7 @@ var TicketBooking = () => {
     } catch (err) {
     }
     if (!(result == null ? void 0 : result.value)) {
-      (_b = import_antd.message) == null ? void 0 : _b.error(
+      (_b2 = import_antd.message) == null ? void 0 : _b2.error(
         import_utils.locales.getText("pisell2.ticket-booking.appointment-not-found")
       );
       Toast == null ? void 0 : Toast.hide();
@@ -720,7 +720,7 @@ var TicketBooking = () => {
     const objDetail = await (0, import_serve.getOrderInfoByCode)({ code: result.value });
     Toast == null ? void 0 : Toast.hide();
     if (!(objDetail == null ? void 0 : objDetail.order_id) || (objDetail == null ? void 0 : objDetail.event_id) === 0) {
-      (_c = import_antd.message) == null ? void 0 : _c.error(
+      (_c2 = import_antd.message) == null ? void 0 : _c2.error(
         import_utils.locales.getText("pisell2.ticket-booking.appointment-not-found")
       );
       return;