@pisell/private-materials 3.0.108 → 3.0.109

package/es/components/booking/info/service/addService/index.js

@@ -32,7 +32,7 @@ import { getProductExtend } from "./utils";
 import { formatProductListByCategory, getProductTotalPrice, request } from "../../../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import { useUpdateEffect } from 'ahooks';
-var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848];
+var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848, 6305];
 var Info = function Info() {
   var _state$service3, _state$service5, _state$service6, _state$service6$cache;
   var _useState = useState(''),

package/es/components/booking/info/utils.d.ts

@@ -1,5 +1,23 @@
 export declare const getIsBundleOrCombination: (productDetail: any) => boolean;
 export declare const uniqueByField: (arr: any[], field: string) => any[];
 export declare const moveItemToFront: (arr: any[], targetId: string | number) => any[];
+/**
+ * @title:  判断两个时间是否在同一个时间段内
+ * @description:
+ * @param {number} time1 开始时间
+ * @param {number} time2 结束时间
+ * @param {number} interval 时间间隔
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-13 19:37
+ */
 export declare const isInterval: (time1: number, time2: number, interval?: number) => boolean;
+/**
+ * @title: 根据时间间隔格式化服务列表
+ * @description: 防止短时间内添加多个相同服务, 如果两个服务的时间间隔小于1秒，则合并为一个服务
+ * @param {any} list 服务列表
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-13 19:36
+ */
 export declare const formatServiceListByTime: (list: any[]) => any[];

package/es/components/booking/info/utils.js

@@ -35,18 +35,42 @@ export var moveItemToFront = function moveItemToFront(arr, targetId) {
   }
   return arr;
 };
+
+/**
+ * @title:  判断两个时间是否在同一个时间段内
+ * @description: 
+ * @param {number} time1 开始时间
+ * @param {number} time2 结束时间
+ * @param {number} interval 时间间隔
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-13 19:37
+ */
 export var isInterval = function isInterval(time1, time2) {
   var interval = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1000;
   return time2 - time1 < interval;
 };
+
+/**
+ * @title: 根据时间间隔格式化服务列表
+ * @description: 防止短时间内添加多个相同服务, 如果两个服务的时间间隔小于1秒，则合并为一个服务
+ * @param {any} list 服务列表
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-13 19:36
+ */
 export var formatServiceListByTime = function formatServiceListByTime(list) {
   try {
     var _list = _toConsumableArray(list);
     var length = _list.length;
+
+    // 如果只有一个服务，则直接返回
     if (length > 1) {
       var _list2, _list3;
       var start = (_list2 = _list[length - 2]) === null || _list2 === void 0 ? void 0 : _list2._time;
       var end = (_list3 = _list[length - 1]) === null || _list3 === void 0 ? void 0 : _list3._time;
+
+      // 如果两个服务都有time  并且在同一个时间段内，则合并为一个服务
       if (start && end && isInterval(start, end)) {
         _list.pop();
         return _list;

package/lib/components/booking/info/service/addService/index.js

@@ -60,7 +60,8 @@ var shopList = [
   6080,
   6978,
   7386,
-  6848
+  6848,
+  6305
 ];
 var Info = () => {
   var _a, _b, _c, _d;

package/lib/components/booking/info/utils.d.ts

@@ -1,5 +1,23 @@
 export declare const getIsBundleOrCombination: (productDetail: any) => boolean;
 export declare const uniqueByField: (arr: any[], field: string) => any[];
 export declare const moveItemToFront: (arr: any[], targetId: string | number) => any[];
+/**
+ * @title:  判断两个时间是否在同一个时间段内
+ * @description:
+ * @param {number} time1 开始时间
+ * @param {number} time2 结束时间
+ * @param {number} interval 时间间隔
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-13 19:37
+ */
 export declare const isInterval: (time1: number, time2: number, interval?: number) => boolean;
+/**
+ * @title: 根据时间间隔格式化服务列表
+ * @description: 防止短时间内添加多个相同服务, 如果两个服务的时间间隔小于1秒，则合并为一个服务
+ * @param {any} list 服务列表
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-13 19:36
+ */
 export declare const formatServiceListByTime: (list: any[]) => any[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.108",
+  "version": "3.0.109",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,9 +59,9 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/utils": "1.0.27",
+    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "1.0.91",
-    "@pisell/icon": "0.0.11"
+    "@pisell/utils": "1.0.27"
   },
   "peerDependencies": {
     "react": "^18.0.0",