@pisell/private-materials 3.4.8 → 3.4.10

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

@@ -328,7 +328,7 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
   // 下一个商品的扩展参数
   var _extend = {
     // 时长: 当前商品时长 > 第一个时长
-    duration: findNextDuration(cacheItem.duration, timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value)
+    duration: findNextDuration(cacheItem.duration, timeObj === null || timeObj === void 0 ? void 0 : timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value)
   };
 
   // 如果有上一个商品, 将上一个商品的某些参数 设置到新商品上
@@ -342,7 +342,8 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
     } else {
       // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
       if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
-        _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+        var _timeObj$timeSlices;
+        _extend.start_time = timeObj === null || timeObj === void 0 ? void 0 : timeObj.timeSlices[(timeObj === null || timeObj === void 0 || (_timeObj$timeSlices = timeObj.timeSlices) === null || _timeObj$timeSlices === void 0 ? void 0 : _timeObj$timeSlices.length) - 1].value;
       } else {
         _extend.start_time = lastServerEndDate.format("HH:mm");
       }

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 === null || timeObj === void 0 ? void 0 : 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,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

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

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

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

@@ -25,7 +25,7 @@ var StartTime = function StartTime(props) {
     return sliceDayIntoFiveMinutes(slice, locale);
   }, [slice, locale]);
   useEffect(function () {
-    timeObjChange === null || timeObjChange === void 0 ? void 0 : timeObjChange(timeObj);
+    timeObjChange === null || timeObjChange === void 0 || timeObjChange(timeObj);
   }, [timeObj]);
   var renderOptions = useCallback(function (array) {
     var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "value";
@@ -37,6 +37,6 @@ var StartTime = function StartTime(props) {
       }, d[label]);
     });
   }, []);
-  return /*#__PURE__*/React.createElement(Select, _extends({}, selectProps, resetProps), renderOptions(timeObj.timeSlices));
+  return /*#__PURE__*/React.createElement(Select, _extends({}, selectProps, resetProps), renderOptions(timeObj === null || timeObj === void 0 ? void 0 : timeObj.timeSlices));
 };
 export default StartTime;

package/es/components/booking/utils.js

@@ -670,7 +670,7 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
     if (isSession) {
       return getDays(cacheItem, 'minutes');
     }
-    return findNextDuration(cacheItem.duration, timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value);
+    return findNextDuration(cacheItem.duration, timeObj === null || timeObj === void 0 ? void 0 : timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value);
   };
 
   // 获取上一个服务商品
@@ -694,7 +694,7 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
     } else {
       // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
       if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, 'day')) {
-        _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+        _extend.start_time = timeObj === null || timeObj === void 0 ? void 0 : timeObj.timeSlices[(timeObj === null || timeObj === void 0 ? void 0 : timeObj.timeSlices.length) - 1].value;
       } else {
         _extend.start_time = lastServerEndDate.format("HH:mm");
       }
@@ -704,7 +704,7 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
     // _extend.resource = 0;
 
     var findNextSliceProps = {
-      timeSlices: timeObj.timeSlices,
+      timeSlices: timeObj === null || timeObj === void 0 ? void 0 : timeObj.timeSlices,
       index: 0,
       date: ''
     };

package/es/components/schedules/components/CurrentDay/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type CurrentDayProps = {
     onClose: () => void;

package/es/components/schedules/products/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Products: () => JSX.Element;
 export default Products;

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

@@ -5,6 +5,7 @@ import { ProductCard } from '@pisell/materials';
 import useClearCart from "../../hooks/useClearCart";
 import { useContext } from "../../hooks/useContext";
 import useAddService from "../../hooks/useAddService";
+import { useMemoizedFn, useTrackedEffect } from "ahooks";
 var Product = function Product(props) {
   var id = props.id,
     lists = props.lists,
@@ -35,10 +36,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,
@@ -52,44 +53,50 @@ var Product = function Product(props) {
       isShowEditProduct: isShowEditProduct
     };
   }, [isShowNote, isShowPackageNote, disabledEdit, isShowChangeResource, isShowDelete, isShowHolder, isShowAddHolderButton, isShowChangeHolder, isShowEditProduct]);
-  return /*#__PURE__*/React.createElement("div", {
-    className: "pisell-lowcode__shopping-cart-content"
-  }, clearCart, lists === null || lists === void 0 ? void 0 : lists.map(function (item) {
-    return /*#__PURE__*/React.createElement(ProductCard, _extends({
-      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));
-  }), !hideAddBtn && platform !== 'h5' && isAdd ? useAddService(id, 'more') : null);
+  useTrackedEffect(function (changes) {
+    console.log('Index of changed dependencies: ', changes);
+  }, [clearCart, lists, productParams, hideAddBtn, isAdd, platform]);
+  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) {
+      return /*#__PURE__*/React.createElement(ProductCard, _extends({
+        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));
+    }), !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;