@pisell/private-materials 3.4.8 → 3.4.9

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

@@ -12,6 +12,7 @@ export declare const restoreProductOtherData: (data: any) => {
     product_variant_id: number;
     quantity: number;
 } | undefined;
+export declare const isSameProduct: (a: any, b: any) => boolean;
 export declare const addService: (list: any[], addItem: any, state: any) => {
     list: any[];
     quantity: any;
@@ -21,3 +22,4 @@ export declare const getCartProductOverlay: (state: any) => any;
 export declare const getIsOverlayProduct: (item: any, state: any) => any;
 export declare const getIsShowNumber: (item: any, state: any) => any;
 export declare const genServiceKey: (item: any) => string;
+export declare const createSimpleCacheItem: (item: any, e: any, state: any) => any;

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

@@ -9,6 +9,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 dayjs from 'dayjs';
 import { isNormalProductByDurationSchedule } from "../../booking/info/service2/utils";
+import { getUniqueId } from "@pisell/utils";
 
 /** dayjs对象格式化为字符串时间 */
 export var formatDateToStr = function formatDateToStr(date) {
@@ -104,7 +105,7 @@ export var restoreProductOtherData = function restoreProductOtherData(data) {
 };
 
 // 是相同的商品
-var isSameProduct = function isSameProduct(a, b) {
+export var isSameProduct = function isSameProduct(a, b) {
   var _a$_extend2, _b$_extend2;
   if (isNormalProductByDurationSchedule(a) && isNormalProductByDurationSchedule(b)) {
     var _a$_extend, _b$_extend;
@@ -217,4 +218,20 @@ export var genServiceKey = function genServiceKey(item) {
     });
   });
   return "".concat(product_id, "-").concat(durationKey, "-").concat(resourceKey, "-").concat(start_time, "-").concat(total);
+};
+export var createSimpleCacheItem = function createSimpleCacheItem(item, e, state) {
+  var cacheItem = _objectSpread(_objectSpread({}, item), {}, {
+    product_id: item.id,
+    _id: getUniqueId(),
+    _key: e.key,
+    _extend: {
+      start_date: state.date.value,
+      quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
+      price: item.price,
+      product_name: item.title,
+      other: e
+    },
+    new: 1
+  });
+  return cacheItem;
 };

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

@@ -78,6 +78,7 @@ var CustomSelect = (props, ref) => {
     handleOpenModal: propsHandleOpenModal,
     handleDayChange
   } = props;
+  console.log("custom select");
   const searchRef = (0, import_react.useRef)();
   const [_value, set_value] = (0, import_react.useState)([]);
   const [search, setSearch] = (0, import_react.useState)("");

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

@@ -37,7 +37,7 @@ var import_classnames = __toESM(require("classnames"));
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var useClearCart = (state, dispatch) => {
-  var _a, _b, _c, _d;
+  var _a, _b;
   const handleClear = () => {
     dispatch({
       type: "setService",
@@ -46,17 +46,20 @@ var useClearCart = (state, dispatch) => {
       }
     });
   };
-  return !!((_b = (_a = state.service) == null ? void 0 : _a.value) == null ? void 0 : _b.length) && !state.channelDisabledEdit && /* @__PURE__ */ import_react.default.createElement(
-    "span",
-    {
-      className: (0, import_classnames.default)("pisell-lowcode__booking-service-clear-btn", {
-        ["pisell-lowcode__booking-service-clear-btn-disabled"]: !((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length)
-      }),
-      onClick: handleClear
-    },
-    /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }),
-    " ",
-    /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.booking.info.text.clear-cart"))
-  );
+  return (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c, _d;
+    return !!((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) && !state.channelDisabledEdit && /* @__PURE__ */ import_react.default.createElement(
+      "span",
+      {
+        className: (0, import_classnames.default)("pisell-lowcode__booking-service-clear-btn", {
+          ["pisell-lowcode__booking-service-clear-btn-disabled"]: !((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length)
+        }),
+        onClick: handleClear
+      },
+      /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }),
+      " ",
+      /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.booking.info.text.clear-cart"))
+    );
+  }, [(_b = (_a = state.service) == null ? void 0 : _a.value) == null ? void 0 : _b.length, state.channelDisabledEdit]);
 };
 var useClearCart_default = useClearCart;

package/lib/components/booking/hooks/useQuotation.js

@@ -35,7 +35,7 @@ __export(useQuotation_exports, {
 module.exports = __toCommonJS(useQuotation_exports);
 var import_react = __toESM(require("react"));
 var import_utils = require("../utils");
-var import_useEngineContext = __toESM(require("../../../../es/hooks/useEngineContext"));
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var import_utils2 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
 var import_serve = require("../info/service/serve");

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

@@ -48,7 +48,7 @@ var import_utils3 = require("../clientVariant/utils");
 var import_useGetHolderList = __toESM(require("../hooks/useGetHolderList"));
 var isLoadClient = false;
 var Client = () => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const modalRef = (0, import_react.useRef)();
   const [loadLoading, setLoadLoading] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
@@ -298,6 +298,7 @@ var Client = () => {
     )) : null;
   }, [loadLoading, params, state.client.clients.length]);
   const customSelect = (0, import_react.useMemo)(() => {
+    console.log("render customSelect");
     return /* @__PURE__ */ import_react.default.createElement(
       import_customSelect.default,
       {
@@ -340,7 +341,7 @@ var Client = () => {
         }
       }
     );
-  }, [state, renderList, loading, franchiseeLoading, params.search, loadMore]);
+  }, [state.isTerminal, state.modalOpen, (_b = state.client) == null ? void 0 : _b.value, state.drawerMask, renderList, loading, franchiseeLoading, params.search, loadMore]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -357,11 +358,11 @@ var Client = () => {
       import_antd.Avatar,
       {
         className: "pisell-lowcode__booking-client-list-item-avatar",
-        src: import_utils.image.ali((_b = state.client.value) == null ? void 0 : _b.cover, 100),
+        src: import_utils.image.ali((_c = state.client.value) == null ? void 0 : _c.cover, 100),
         icon: /* @__PURE__ */ import_react.default.createElement(import_User01.default, { className: "pisell-lowcode__booking-client-list-item-avatar-icon" })
       }
     ),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-left" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-name" }, getNickname(state.client.value)), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in")) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_c = state.client.value) == null ? void 0 : _c.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-email" }, (_d = state.client.value) == null ? void 0 : _d.email) : null, ((_e = state.client.value) == null ? void 0 : _e.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-phone" }, (_f = state.client.value) == null ? void 0 : _f.phone) : null, !!((_h = (_g = state.client.value) == null ? void 0 : _g.waiver_form) == null ? void 0 : _h.length) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-waiver", title: (0, import_utils3.getWaiverTitle)((_i = state.client.value) == null ? void 0 : _i.waiver_form) }, (_l = (_k = (_j = state.client.value) == null ? void 0 : _j.waiver_form) == null ? void 0 : _k.map) == null ? void 0 : _l.call(_k, (item) => {
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-left" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-name" }, getNickname(state.client.value)), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in")) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_d = state.client.value) == null ? void 0 : _d.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-email" }, (_e = state.client.value) == null ? void 0 : _e.email) : null, ((_f = state.client.value) == null ? void 0 : _f.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-phone" }, (_g = state.client.value) == null ? void 0 : _g.phone) : null, !!((_i = (_h = state.client.value) == null ? void 0 : _h.waiver_form) == null ? void 0 : _i.length) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-waiver", title: (0, import_utils3.getWaiverTitle)((_j = state.client.value) == null ? void 0 : _j.waiver_form) }, (_m = (_l = (_k = state.client.value) == null ? void 0 : _k.waiver_form) == null ? void 0 : _l.map) == null ? void 0 : _m.call(_l, (item) => {
       return /* @__PURE__ */ import_react.default.createElement("span", null, item.form_title, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-client-waiver-colon" }, ":"), item.is_filled ? /* @__PURE__ */ import_react.default.createElement(
         "span",
         {

package/lib/components/booking/info/dateRange/index.d.ts

@@ -1,3 +1,4 @@
+/// <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/lib/components/booking/info/hooks/useInfoHolder.js

@@ -32,6 +32,7 @@ __export(useInfoHolder_exports, {
   default: () => useInfoHolder_default
 });
 module.exports = __toCommonJS(useInfoHolder_exports);
+var import_ahooks = require("ahooks");
 var import_react = require("react");
 var import_useHolderConfig = __toESM(require("./useHolderConfig"));
 var import_utils = require("../utils");
@@ -54,21 +55,21 @@ var useInfoHolder = (state, dispatch) => {
     };
   }, [(_d = (_c = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _c.config) == null ? void 0 : _d.information_tab]);
   const showAddTimeModal = (0, import_react.useMemo)(() => {
-    return (0, import_utils.isOpenAddTime)(state);
+    return (0, import_utils.isOpenAddTime)(state) && !state.isBookingTicket2;
   }, [state, appointment_card.quick_time]);
-  const handleEdit = (cacheItem, type) => {
-    setTimeout(() => {
-      var _a2, _b2;
-      (_b2 = (_a2 = detailRef.current) == null ? void 0 : _a2.init) == null ? void 0 : _b2.call(_a2, cacheItem, false, type === "edit_product");
-    }, 100);
-  };
+  const handleEdit = (0, import_ahooks.useMemoizedFn)((cacheItem, type) => {
+    var _a2, _b2;
+    console.time("handleEdit");
+    console.log(performance.now() - window.pp1, "打开商品4");
+    (_b2 = (_a2 = detailRef.current) == null ? void 0 : _a2.init) == null ? void 0 : _b2.call(_a2, cacheItem, false, type === "edit_product");
+  });
   const dispatchService = (type, payload) => {
     dispatch({
       type,
       payload: { ...payload }
     });
   };
-  const handleAction = (dataSource) => {
+  const handleAction = (0, import_ahooks.useMemoizedFn)((dataSource) => {
     const cacheItem = (0, import_utils2.getProductExtend)({
       cacheItem: { ...dataSource._origin, new: 0 },
       state
@@ -80,7 +81,7 @@ var useInfoHolder = (state, dispatch) => {
         cacheItem
       }
     });
-  };
+  });
   return {
     detailRef,
     handleEdit,

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

@@ -48,10 +48,12 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
   const { handleAddHolder } = (0, import_useAddHolder.default)(state, dispatch);
   const handleChange = (0, import_ahooks.useMemoizedFn)(
     (currentItem, type, other) => {
+      console.time("handleChange");
+      console.log(window.pp1 = performance.now(), "打开商品");
       if (state.disabledEdit || state.disableEventBookingEdit) {
         return;
       }
-      let products = (0, import_utils.updateServices)(state, currentItem, type, other, {
+      let products2 = (0, import_utils.updateServices)(state, currentItem, type, other, {
         handleAddHolder
       });
       if (type === "view" || type === "edit_product") {
@@ -64,11 +66,11 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
           });
         }
         onChange({ editModal: true, cacheItem });
-        return onEdit == null ? void 0 : onEdit({ ...product, new: 0 }, type);
+        return onEdit == null ? void 0 : onEdit(cacheItem, type);
       }
       const params = {
         editModal: false,
-        value: products,
+        value: products2,
         edit: true,
         cacheItem: null
       };
@@ -95,26 +97,36 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
     isShowChangeHolder,
     state.isBookingCreatePage
   ]);
-  return /* @__PURE__ */ import_react.default.createElement(import_Provider.CartContext.Provider, { value: { state } }, /* @__PURE__ */ import_react.default.createElement(
-    import_shoppingCart.default,
-    {
-      isParallelResource,
-      onAction,
-      onChange: handleChange,
-      isOpenGroup: false,
-      isHideClearCart: true,
-      onAddProduct: () => onChange({ addModal: true }),
-      productParams: {
-        ...productParams,
-        products: (0, import_utils.formatProducts)(
-          ((_a = state == null ? void 0 : state.service) == null ? void 0 : _a.value) || [],
-          state,
-          false,
-          true,
-          isParallelResource
-        )
+  const products = (0, import_react.useMemo)(() => {
+    var _a2;
+    console.time("products");
+    const p = (0, import_utils.formatProducts)(
+      ((_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) || [],
+      state,
+      false,
+      true,
+      isParallelResource
+    );
+    console.timeEnd("products");
+    return p;
+  }, [(_a = state == null ? void 0 : state.service) == null ? void 0 : _a.value, state]);
+  return (0, import_react.useMemo)(() => {
+    console.log("render List");
+    return /* @__PURE__ */ import_react.default.createElement(import_Provider.CartContext.Provider, { value: { state } }, /* @__PURE__ */ import_react.default.createElement(
+      import_shoppingCart.default,
+      {
+        isParallelResource,
+        onAction,
+        onChange: handleChange,
+        isOpenGroup: false,
+        isHideClearCart: true,
+        onAddProduct: () => onChange({ addModal: true }),
+        productParams: {
+          ...productParams,
+          products
+        }
       }
-    }
-  ));
+    ));
+  }, [products, state, productParams]);
 };
 var Lists_default = Lists;

package/lib/components/booking/info/service2/utils.js

@@ -579,25 +579,25 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       _origin: item
     };
   };
-  lists.forEach((item) => {
-    var _a;
-    if (!((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId)) {
-      normalList.push(formItem(item));
-    } else {
-      groupList.push(item);
-    }
-  });
-  let groups = groupList.reduce((prev, item) => {
-    var _a;
-    const groupId = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId;
-    if (!prev[groupId]) {
-      prev[groupId] = [];
-    }
-    prev[groupId].push(item);
-    return prev;
-  }, {});
   console.log(normalList, "normalList");
   if (isRenderGroup) {
+    lists.forEach((item) => {
+      var _a;
+      if (!((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId)) {
+        normalList.push(formItem(item));
+      } else {
+        groupList.push(item);
+      }
+    });
+    let groups = groupList.reduce((prev, item) => {
+      var _a;
+      const groupId = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId;
+      if (!prev[groupId]) {
+        prev[groupId] = [];
+      }
+      prev[groupId].push(item);
+      return prev;
+    }, {});
     return Object.values(groups).map((d) => formItem((0, import_utils3.concatBookings)(d))).concat(normalList);
   } else {
     return lists == null ? void 0 : lists.map((item) => formItem(item));

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

@@ -142,7 +142,8 @@ var getTimeObj = ({
     cacheItem,
     useStartTime,
     currentResource,
-    state,
+    // 没有使用该参数
+    // state,
     durationProps
   });
   let obj = (0, import_utils.sliceDayIntoFiveMinutes)(
@@ -242,7 +243,8 @@ var setDefaultResource = ({ cacheItem, resources }) => {
     }
     const defaultResource = defaultOriginalResource.map((d) => {
       return {
-        ...d,
+        // ...d,
+        children: d.children,
         relation_type: d.relation_type,
         form_id: item.form_id,
         relation_id: d.id,

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

@@ -65,6 +65,7 @@ var AddTimeModal = () => {
   const [number, setNumber] = (0, import_react.useState)(1);
   const originServices = (0, import_react.useRef)([]);
   const [renderList, setRenderList] = (0, import_react.useState)([]);
+  console.log(renderList, "renderListrenderList");
   const context = (0, import_useEngineContext.default)();
   const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const statusMap = {
@@ -126,6 +127,7 @@ var AddTimeModal = () => {
     }
     return arr.filter(Boolean);
   }, [(_f = (_e = (_d = state.service) == null ? void 0 : _d.cacheItem) == null ? void 0 : _e._extend) == null ? void 0 : _f.resource]);
+  console.log(currentResource, "currentResource");
   const getTimeUsableStatus = (time) => {
     var _a2, _b2;
     if (!((_a2 = state.service.cacheItem) == null ? void 0 : _a2._extend) || !currentResource.length) {
@@ -206,6 +208,7 @@ var AddTimeModal = () => {
     setLoading("list");
     const newList = await _getAddTimeProducts();
     let list = newList.map((d) => {
+      debugger;
       let isUsable = (0, import_utils2.isUsableProduct)(d.add_time, state.service.cacheItem);
       return {
         ...d,

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

@@ -168,9 +168,11 @@ var Resources = ({
   const getIsAutoAllocation = (id) => {
     return (0, import_utils2.getAutoAllocationStorage)(id);
   };
+  console.log("resourcesss");
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, data.map((item) => {
     var _a2;
     const cur = _value[item.form_id];
+    console.log(cur, "curcur");
     const errors = (cur || []).reduce((pre, d) => {
       return pre.concat((d == null ? void 0 : d.errors) || []);
     }, []);