@pisell/private-materials 6.2.25 → 6.2.26

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

@@ -20,6 +20,9 @@ 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: 时间切片
@@ -57,7 +60,7 @@ var Duration = function Duration(props) {
       });
     }
     return durationSlicesBasedOnTime;
-  }, [timeObj, slice, locale, duration, startDate, usableTime]);
+  }, [timeObj.durationSlicesBasedOnTime, slice, locale, duration, startDateStr, usableTime === null || usableTime === void 0 ? void 0 : usableTime.end_at]);
   useEffect(function () {
     timeObjChange === null || timeObjChange === void 0 || timeObjChange(times);
   }, [times]);
@@ -72,6 +75,10 @@ var Duration = function Duration(props) {
       }, d[label]);
     });
   }, []);
-  return /*#__PURE__*/React.createElement(Select, _extends({}, selectProps, resetProps), renderOptions(times));
+  var options = useMemo(function () {
+    console.log('render form options');
+    return renderOptions(times);
+  }, [times]);
+  return /*#__PURE__*/React.createElement(Select, _extends({}, selectProps, resetProps), options);
 };
 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;

package/es/components/shoppingCart/components/Cart/Product.js

@@ -6,6 +6,7 @@ import useClearCart from "../../hooks/useClearCart";
 import { useContext } from "../../hooks/useContext";
 import useAddService from "../../hooks/useAddService";
 import { isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
+import { useMemoizedFn } from "ahooks";
 var Product = function Product(props) {
   var id = props.id,
     lists = props.lists,
@@ -38,10 +39,10 @@ var Product = function Product(props) {
    * @Author: WangHan
    * @Date: 2024-11-28 22:02
    */
-  var handleChange = function handleChange(item, type, other) {
+  var handleChange = useMemoizedFn(function (item, type, other) {
     if (disabledEdit && !(other !== null && other !== void 0 && other.disabled)) return;
     onChange(item, type, other);
-  };
+  });
   var productParams = useMemo(function () {
     return {
       isShowNote: isShowNote,
@@ -62,51 +63,54 @@ var Product = function Product(props) {
       isShowDelete: conf === null || conf === void 0 ? void 0 : conf.show_remove_button
     };
   };
-  return /*#__PURE__*/React.createElement("div", {
-    className: "pisell-lowcode__shopping-cart-content"
-  }, clearCart, lists === null || lists === void 0 ? void 0 : lists.map(function (item) {
-    var Comp = ProductCard;
-    var isRetail;
-    if (state.scenario === 'booking2') {
-      isRetail = isNormalProductByDurationSchedule(item === null || item === void 0 ? void 0 : item._origin);
-      Comp = isRetail ? ProductCard.V2 : ProductCard;
-    }
-    return /*#__PURE__*/React.createElement(Comp, _extends({
-      type: isRetail ? 'a2' : undefined,
-      key: item._id,
-      dataSource: item,
-      onAction: function onAction(e) {
-        return _onAction === null || _onAction === void 0 ? void 0 : _onAction(e);
-      },
-      onDelete: function onDelete(e) {
-        return handleChange(e, 'delete', item);
-      },
-      onNote: function onNote(e) {
-        return handleChange(e, 'note', {
-          note: e.note
-        });
-      },
-      onLike: function onLike(e) {
-        return handleChange(e, 'like', {
-          like_status: e.like_status
-        });
-      },
-      onEditProduct: function onEditProduct(e) {
-        return handleChange === null || handleChange === void 0 ? void 0 : handleChange(e, 'edit_product');
-      },
-      onCard: function onCard(e) {
-        return handleChange === null || handleChange === void 0 ? void 0 : handleChange(e, 'view');
-      },
-      onChangeResource: function onChangeResource(e) {
-        return handleChange(item, 'change_resource', e);
-      },
-      onChangeHolder: function onChangeHolder(e) {
-        return handleChange(item, 'change_holder', e);
-      },
-      onAddHolder: function onAddHolder(e) {
-        return handleChange(item, 'add_holder', e);
+  return useMemo(function () {
+    console.log('render cart');
+    return /*#__PURE__*/React.createElement("div", {
+      className: "pisell-lowcode__shopping-cart-content"
+    }, clearCart, lists === null || lists === void 0 ? void 0 : lists.map(function (item) {
+      var Comp = ProductCard;
+      var isRetail;
+      if (state.scenario === 'booking2') {
+        isRetail = isNormalProductByDurationSchedule(item === null || item === void 0 ? void 0 : item._origin);
+        Comp = isRetail ? ProductCard.V2 : ProductCard;
       }
-    }, productParams, getProductCardStyleProps(isRetail ? 'retail' : 'appointment')));
-  }), !hideAddBtn && platform !== 'h5' && isAdd ? useAddService(id, 'more') : null);
+      return /*#__PURE__*/React.createElement(Comp, _extends({
+        type: isRetail ? 'a2' : undefined,
+        key: item._id,
+        dataSource: item,
+        onAction: function onAction(e) {
+          return _onAction === null || _onAction === void 0 ? void 0 : _onAction(e);
+        },
+        onDelete: function onDelete(e) {
+          return handleChange(e, 'delete', item);
+        },
+        onNote: function onNote(e) {
+          return handleChange(e, 'note', {
+            note: e.note
+          });
+        },
+        onLike: function onLike(e) {
+          return handleChange(e, 'like', {
+            like_status: e.like_status
+          });
+        },
+        onEditProduct: function onEditProduct(e) {
+          return handleChange === null || handleChange === void 0 ? void 0 : handleChange(e, 'edit_product');
+        },
+        onCard: function onCard(e) {
+          return handleChange === null || handleChange === void 0 ? void 0 : handleChange(e, 'view');
+        },
+        onChangeResource: function onChangeResource(e) {
+          return handleChange(item, 'change_resource', e);
+        },
+        onChangeHolder: function onChangeHolder(e) {
+          return handleChange(item, 'change_holder', e);
+        },
+        onAddHolder: function onAddHolder(e) {
+          return handleChange(item, 'add_holder', e);
+        }
+      }, productParams, getProductCardStyleProps(isRetail ? 'retail' : 'appointment')));
+    }), !hideAddBtn && platform !== 'h5' && isAdd ? useAddService(id, 'more') : null);
+  }, [clearCart, lists, productParams, hideAddBtn, isAdd, platform]);
 };
 export default Product;

package/es/components/shoppingCart/components/Cart/index.js

@@ -51,23 +51,26 @@ var Cart = function Cart() {
       });
     });
   }, [carts, platform]);
-  return /*#__PURE__*/React.createElement("div", {
-    className: classNames('pisell-lowcode__shopping-cart')
-  }, isProductList ? /*#__PURE__*/React.createElement(Product, {
-    id: undefined,
-    lists: state === null || state === void 0 ? void 0 : state.products
-  }) : /*#__PURE__*/React.createElement(Collapse, _extends({
-    items: cartsMap,
-    showHeader: true,
-    panelBackground: "#ffffff",
-    collapsible: platform !== 'shop' ? 'disabled' : '-',
-    accordion: platform === 'shop',
-    onChange: function onChange(key) {
-      updateState({
-        activeKey: key
-      });
-      onActiveKey(key);
-    }
-  }, collapseParams)));
+  return useMemo(function () {
+    console.log('render cart 22222');
+    return /*#__PURE__*/React.createElement("div", {
+      className: classNames('pisell-lowcode__shopping-cart')
+    }, isProductList ? /*#__PURE__*/React.createElement(Product, {
+      id: undefined,
+      lists: state === null || state === void 0 ? void 0 : state.products
+    }) : /*#__PURE__*/React.createElement(Collapse, _extends({
+      items: cartsMap,
+      showHeader: true,
+      panelBackground: "#ffffff",
+      collapsible: platform !== 'shop' ? 'disabled' : '-',
+      accordion: platform === 'shop',
+      onChange: function onChange(key) {
+        updateState({
+          activeKey: key
+        });
+        onActiveKey(key);
+      }
+    }, collapseParams)));
+  }, [isProductList, cartsMap, platform, collapseParams, state === null || state === void 0 ? void 0 : state.products]);
 };
 export default Cart;

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -34,7 +34,7 @@ import dayjs from 'dayjs';
 import { useProducts } from "../../hooks/pisellos";
 import { createCacheItem, genValues, isBundle, isOption, setHandleSetService } from "./utils";
 var AddSerivce = function AddSerivce(props) {
-  var _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _state$bookingConfig2, _state$client2, _state$service2;
+  var _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _state$bookingConfig2, _state$client2;
   var onEdit = props.onEdit,
     state = props.state,
     dispatch = props.dispatch,
@@ -221,10 +221,178 @@ var AddSerivce = function AddSerivce(props) {
     var isEject = getIsEject(item, type);
     var isOnlySession = getIsOnlySession(item);
     var lock = false;
+    // 对于不需要打开弹窗的商品, 直接模拟数据, 不走弹窗
+    var cacheValues = null;
     if (isEject) {
       setCurrentProduct(item);
     } else {
       setCurrentProduct(null);
+      if (!isSession) {
+        cacheValues = {
+          bundle: [],
+          key: item.id,
+          option: [],
+          product_id: item.id,
+          product_variant_id: 0,
+          quantity: 1,
+          rowKey: item.id,
+          session: null,
+          unique: '08974625397'
+        };
+      }
+    }
+    var callback = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e, extension_type, detail) {
+        var data, _detail, other, cacheItem, _total, _isEdit, _state$service$cacheI, _addService2, _list, quantity, _context$appHelper$ut4, _context$appHelper$ut5, val, sendData;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              setCurrentProduct(null);
+              // 防止选择商品弹窗多次触发callback
+              if (!lock) {
+                _context.next = 3;
+                break;
+              }
+              return _context.abrupt("return");
+            case 3:
+              lock = true;
+
+              // 2秒后解除
+              setTimeout(function () {
+                lock = false;
+              }, 2000);
+              if (isBooking4) {
+                _context.next = 11;
+                break;
+              }
+              _context.next = 8;
+              return createBookingData({
+                product: _objectSpread(_objectSpread({}, detail || item), {}, {
+                  _params: e
+                })
+              });
+            case 8:
+              data = _context.sent;
+              // 创建预约
+              createBooking({
+                booking: data
+              });
+              return _context.abrupt("return");
+            case 11:
+              // info2 addService 逻辑
+              _detail = detail || item;
+              other = JSON.parse(JSON.stringify(e));
+              other.session = e.session;
+              cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
+                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: _detail.price,
+                  product_name: item.title,
+                  other: other
+                },
+                new: 1
+              });
+              _total = getProductTotalPrice(cacheItem); // 用于折扣 可修改
+              cacheItem._extend.total = _total;
+              // 用于储存原价
+              cacheItem._extend.origin_total = _total;
+              _isEdit = !!state.service.cacheItem;
+              if (_isEdit) {
+                cacheItem._id = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._id;
+                cacheItem.new = 0;
+              }
+              // 渲染到当前位置模式时，默认无资源 时间默认取顶部设置的时间
+              if (renderMode === 'current') {
+                // cacheItem._extend.resource = 0;
+                cacheItem.currentDefaultTime = state.date.value.format('HH:mm');
+              }
+              cacheItem = getProductExtend({
+                cacheItem: cacheItem,
+                state: state,
+                isDisabledTime: true
+              });
+              if (state.renderType === 'eventBooking') {
+                cacheItem.autoClose = false;
+              }
+              if (cacheItem.autoClose) {
+                cacheItem.autoClose = false;
+                cacheItem._serviceKey = genServiceKey(cacheItem);
+                _addService2 = addService(_toConsumableArray(state.service.value), cacheItem, state), _list = _addService2.list, quantity = _addService2.quantity;
+                handleAddToast(cacheItem.title, quantity || 1);
+                addServiceScroll(e.rowKey, cacheItem);
+                try {
+                  if (((_context$appHelper$ut4 = context.appHelper.utils.store) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut4.getState) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.call(_context$appHelper$ut4)) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.global) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id) === 2155) {
+                    val = _list === null || _list === void 0 ? void 0 : _list.map(function (s) {
+                      return {
+                        product_id: s === null || s === void 0 ? void 0 : s.product_id,
+                        detailId: s === null || s === void 0 ? void 0 : s.id,
+                        detailProductId: s === null || s === void 0 ? void 0 : s.product_id,
+                        product_name: s === null || s === void 0 ? void 0 : s.title,
+                        price: s === null || s === void 0 ? void 0 : s.price,
+                        _id: s === null || s === void 0 ? void 0 : s._id,
+                        _key: s === null || s === void 0 ? void 0 : s._key,
+                        _serviceKey: s === null || s === void 0 ? void 0 : s._serviceKey
+                      };
+                    });
+                    sendData = {
+                      product_id: item === null || item === void 0 ? void 0 : item.id,
+                      detailId: _detail === null || _detail === void 0 ? void 0 : _detail.id,
+                      detailProductId: _detail === null || _detail === void 0 ? void 0 : _detail.product_id,
+                      product_name: item === null || item === void 0 ? void 0 : item.title,
+                      price: _detail === null || _detail === void 0 ? void 0 : _detail.price,
+                      serviceVal: val
+                    };
+                    sendWarningLog({
+                      title: 'addService',
+                      content: [{
+                        key: '添加数据',
+                        value: JSON.stringify(sendData)
+                      }, {
+                        key: '日期',
+                        value: dayjs().format('YYYY-MM-DD HH:mm:ss')
+                      }]
+                    });
+                  }
+                } catch (error) {}
+                dispatch({
+                  type: 'setService',
+                  payload: {
+                    addModal: false,
+                    value: _list,
+                    edit: true,
+                    changeService: false
+                  }
+                });
+              } else {
+                dispatch({
+                  type: 'setService',
+                  payload: {
+                    editModal: true,
+                    cacheItem: cacheItem,
+                    addModal: !cacheItem.autoClose,
+                    changeService: false
+                  }
+                });
+                onEdit === null || onEdit === void 0 || onEdit(cacheItem);
+              }
+            case 24:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function callback(_x, _x2, _x3) {
+        return _ref.apply(this, arguments);
+      };
+    }();
+    // 如果不需要打开弹窗, 直接添加数据
+    if (cacheValues) {
+      callback(cacheValues, '', item);
+      return;
     }
     state.action({
       type: 'pisell1.handleOpenProductModal',
@@ -246,155 +414,7 @@ var AddSerivce = function AddSerivce(props) {
       onCancel: function onCancel() {
         setCurrentProduct(null);
       },
-      callback: function () {
-        var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e, extension_type, detail) {
-          var data, _detail, other, cacheItem, _total, _isEdit, _state$service$cacheI, _addService2, _list, quantity, _context$appHelper$ut4, _context$appHelper$ut5, val, sendData;
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                setCurrentProduct(null);
-                // 防止选择商品弹窗多次触发callback
-                if (!lock) {
-                  _context.next = 3;
-                  break;
-                }
-                return _context.abrupt("return");
-              case 3:
-                lock = true;
-
-                // 2秒后解除
-                setTimeout(function () {
-                  lock = false;
-                }, 2000);
-                if (isBooking4) {
-                  _context.next = 11;
-                  break;
-                }
-                _context.next = 8;
-                return createBookingData({
-                  product: _objectSpread(_objectSpread({}, detail || item), {}, {
-                    _params: e
-                  })
-                });
-              case 8:
-                data = _context.sent;
-                // 创建预约
-                createBooking({
-                  booking: data
-                });
-                return _context.abrupt("return");
-              case 11:
-                // info2 addService 逻辑
-                _detail = detail || item;
-                other = JSON.parse(JSON.stringify(e));
-                other.session = e.session;
-                cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
-                  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: _detail.price,
-                    product_name: item.title,
-                    other: other
-                  },
-                  new: 1
-                });
-                _total = getProductTotalPrice(cacheItem); // 用于折扣 可修改
-                cacheItem._extend.total = _total;
-                // 用于储存原价
-                cacheItem._extend.origin_total = _total;
-                _isEdit = !!state.service.cacheItem;
-                if (_isEdit) {
-                  cacheItem._id = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._id;
-                  cacheItem.new = 0;
-                }
-                // 渲染到当前位置模式时，默认无资源 时间默认取顶部设置的时间
-                if (renderMode === 'current') {
-                  // cacheItem._extend.resource = 0;
-                  cacheItem.currentDefaultTime = state.date.value.format('HH:mm');
-                }
-                cacheItem = getProductExtend({
-                  cacheItem: cacheItem,
-                  state: state,
-                  isDisabledTime: true
-                });
-                if (state.renderType === 'eventBooking') {
-                  cacheItem.autoClose = false;
-                }
-                if (cacheItem.autoClose) {
-                  cacheItem.autoClose = false;
-                  cacheItem._serviceKey = genServiceKey(cacheItem);
-                  _addService2 = addService(_toConsumableArray(state.service.value), cacheItem, state), _list = _addService2.list, quantity = _addService2.quantity;
-                  handleAddToast(cacheItem.title, quantity || 1);
-                  addServiceScroll(e.rowKey, cacheItem);
-                  try {
-                    if (((_context$appHelper$ut4 = context.appHelper.utils.store) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut4.getState) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.call(_context$appHelper$ut4)) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.global) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id) === 2155) {
-                      val = _list === null || _list === void 0 ? void 0 : _list.map(function (s) {
-                        return {
-                          product_id: s === null || s === void 0 ? void 0 : s.product_id,
-                          detailId: s === null || s === void 0 ? void 0 : s.id,
-                          detailProductId: s === null || s === void 0 ? void 0 : s.product_id,
-                          product_name: s === null || s === void 0 ? void 0 : s.title,
-                          price: s === null || s === void 0 ? void 0 : s.price,
-                          _id: s === null || s === void 0 ? void 0 : s._id,
-                          _key: s === null || s === void 0 ? void 0 : s._key,
-                          _serviceKey: s === null || s === void 0 ? void 0 : s._serviceKey
-                        };
-                      });
-                      sendData = {
-                        product_id: item === null || item === void 0 ? void 0 : item.id,
-                        detailId: _detail === null || _detail === void 0 ? void 0 : _detail.id,
-                        detailProductId: _detail === null || _detail === void 0 ? void 0 : _detail.product_id,
-                        product_name: item === null || item === void 0 ? void 0 : item.title,
-                        price: _detail === null || _detail === void 0 ? void 0 : _detail.price,
-                        serviceVal: val
-                      };
-                      sendWarningLog({
-                        title: 'addService',
-                        content: [{
-                          key: '添加数据',
-                          value: JSON.stringify(sendData)
-                        }, {
-                          key: '日期',
-                          value: dayjs().format('YYYY-MM-DD HH:mm:ss')
-                        }]
-                      });
-                    }
-                  } catch (error) {}
-                  dispatch({
-                    type: 'setService',
-                    payload: {
-                      addModal: false,
-                      value: _list,
-                      edit: true,
-                      changeService: false
-                    }
-                  });
-                } else {
-                  dispatch({
-                    type: 'setService',
-                    payload: {
-                      editModal: true,
-                      cacheItem: cacheItem,
-                      addModal: !cacheItem.autoClose,
-                      changeService: false
-                    }
-                  });
-                  onEdit === null || onEdit === void 0 || onEdit(cacheItem);
-                }
-              case 24:
-              case "end":
-                return _context.stop();
-            }
-          }, _callee);
-        }));
-        function callback(_x, _x2, _x3) {
-          return _callback.apply(this, arguments);
-        }
-        return callback;
-      }()
+      callback: callback
     });
   });
   var renderList = useMemo(function () {
@@ -451,6 +471,6 @@ var AddSerivce = function AddSerivce(props) {
       }));
     }
     return null;
-  }, [(_state$service2 = state.service) === null || _state$service2 === void 0 || (_state$service2 = _state$service2.cacheItem) === null || _state$service2 === void 0 ? void 0 : _state$service2.autoClose, state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4]);
+  }, [state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4]);
 };
 export default AddSerivce;