@pisell/private-materials 3.0.107 → 3.0.109

package/es/components/booking/index.js

@@ -4,7 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import React, { useEffect, useContext } from "react";
+import React, { useEffect, useContext } from 'react';
 import { Provider, Context } from "./model";
 import Info from "./info";
 import Notes from "./notes";
@@ -17,7 +17,7 @@ var Booking = Provider(function () {
   useEffect(function () {}, []);
   var setState = function setState(payload) {
     dispatch({
-      type: "setState",
+      type: 'setState',
       payload: _objectSpread({}, payload)
     });
   };

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { FormState } from "../model";
+import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;

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

@@ -4,14 +4,15 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import { miniRedux } from "@pisell/utils";
+import { miniRedux } from '@pisell/utils';
+import { formatServiceListByTime } from "./utils";
 export var walkInData = {
   id: 1,
-  nickname: "Select a customer"
+  nickname: 'Select a customer'
 };
 var defaultState = {};
 var _miniRedux = miniRedux({
-    namespace: "state",
+    namespace: 'state',
     state: defaultState,
     reducers: {
       setStateFn: function setStateFn(state, payload) {
@@ -27,8 +28,14 @@ var _miniRedux = miniRedux({
         // return { ...state, client: { ...state.client, ...payload } };
       },
       setService: function setService(state, payload) {
+        var obj = {};
+
+        // 拦截,  如果服务列表里 有两个相近时间的服务, 删除最后一个
+        if (payload.value) {
+          obj.value = formatServiceListByTime(payload.value);
+        }
         state.setGlobalState({
-          service: _objectSpread(_objectSpread({}, state.service), payload)
+          service: _objectSpread(_objectSpread(_objectSpread({}, state.service), payload), obj)
         });
       },
       setDate: function setDate(state, payload) {
@@ -58,7 +65,7 @@ var _miniRedux = miniRedux({
         var _val = {
           appointment_status: payload
         };
-        if (payload === "cancelled") {
+        if (payload === 'cancelled') {
           _val.disabledEdit = true;
         } else {
           _val.disabledEdit = false;

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/service/editService/index.js

@@ -34,7 +34,6 @@ import { getErrorList, getServiceTimes, deleteCacheParams } from "../../../utils
 import Like from "../like";
 import { getNoResource } from "../../../mock";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj } from "../addService/utils";
-import { checkProductByTime } from "../../utils";
 var submitLock = false;
 var Info = function Info() {
   var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service$cacheI6, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _window$BaseMaterials, _state$service$cacheI7, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI8, _state$service$cacheI9, _state$service$cacheI10, _state$service$cacheI11, _state$bookingConfig5, _state$bookingConfig6, _state$bookingConfig7, _state$bookingConfig8;
@@ -378,10 +377,7 @@ var Info = function Info() {
     if (!_list.some(function (d) {
       return d._id === _id;
     })) {
-      // 检查列表最后的商品添加时间是否在指定间隔内  如果在 则不添加新商品
-      if (checkProductByTime(_list)) {
-        _list.push(_item);
-      }
+      _list.push(_item);
     } else {
       _list = _list.map(function (d) {
         return d._id === _id ? _objectSpread(_objectSpread({}, _item), {}, {

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

@@ -2,12 +2,22 @@ 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: 检查列表最后的商品添加时间是否在指定间隔内
+ * @title:  判断两个时间是否在同一个时间段内
  * @description:
- * @param {any} list
- * @param {number} interval
+ * @param {number} time1 开始时间
+ * @param {number} time2 结束时间
+ * @param {number} interval 时间间隔
  * @return {*}
  * @Author: zhiwei.Wang
- * @Date: 2024-08-13 18:35
+ * @Date: 2024-08-13 19:37
  */
-export declare const checkProductByTime: (list: any[], interval?: number) => boolean;
+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

@@ -1,3 +1,9 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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; }
 // 商品是套餐或单规格多规格
 export var getIsBundleOrCombination = function getIsBundleOrCombination(productDetail) {
   var _productDetail$bundle;
@@ -31,26 +37,50 @@ export var moveItemToFront = function moveItemToFront(arr, targetId) {
 };
 
 /**
- * @title: 检查列表最后的商品添加时间是否在指定间隔内
+ * @title:  判断两个时间是否在同一个时间段内
  * @description: 
- * @param {any} list
- * @param {number} interval
+ * @param {number} time1 开始时间
+ * @param {number} time2 结束时间
+ * @param {number} interval 时间间隔
  * @return {*}
  * @Author: zhiwei.Wang
- * @Date: 2024-08-13 18:35
+ * @Date: 2024-08-13 19:37
  */
-export var checkProductByTime = function checkProductByTime(list) {
-  var interval = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1000;
-  var bol = true;
+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 {
-    if (list.length) {
-      var _list;
-      var last = (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list._time;
-      var currentTime = new Date().getTime();
-      if (last && currentTime - last < interval) {
-        bol = false;
+    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;
+      } else {
+        return list;
       }
+    } else {
+      return list;
     }
-  } catch (err) {}
-  return bol;
+  } catch (err) {
+    return list;
+  }
 };

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { FormState } from "../model";
+import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;

package/lib/components/booking/info/model.js

@@ -25,6 +25,7 @@ __export(model_exports, {
 });
 module.exports = __toCommonJS(model_exports);
 var import_utils = require("@pisell/utils");
+var import_utils2 = require("./utils");
 var walkInData = {
   id: 1,
   nickname: "Select a customer"
@@ -44,7 +45,13 @@ var { Provider, Context } = (0, import_utils.miniRedux)({
       state.setGlobalState({ client: { ...state.client, ...payload } });
     },
     setService(state, payload) {
-      state.setGlobalState({ service: { ...state.service, ...payload } });
+      let obj = {};
+      if (payload.value) {
+        obj.value = (0, import_utils2.formatServiceListByTime)(payload.value);
+      }
+      state.setGlobalState({
+        service: { ...state.service, ...payload, ...obj }
+      });
     },
     setDate(state, payload) {
       state.setGlobalState({ date: { ...state.date, ...payload } });

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/service/editService/index.js

@@ -47,7 +47,6 @@ var import_utils3 = require("../../../utils");
 var import_like = __toESM(require("../like"));
 var import_mock = require("../../../mock");
 var import_utils4 = require("../addService/utils");
-var import_utils5 = require("../../utils");
 var submitLock = false;
 var Info = () => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w;
@@ -247,9 +246,7 @@ var Info = () => {
     _item._time = (/* @__PURE__ */ new Date()).getTime();
     let _id = _item == null ? void 0 : _item._id;
     if (!_list.some((d) => d._id === _id)) {
-      if ((0, import_utils5.checkProductByTime)(_list)) {
-        _list.push(_item);
-      }
+      _list.push(_item);
     } else {
       _list = _list.map((d) => d._id === _id ? { ..._item, new: 0 } : d);
     }

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

@@ -2,12 +2,22 @@ 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: 检查列表最后的商品添加时间是否在指定间隔内
+ * @title:  判断两个时间是否在同一个时间段内
  * @description:
- * @param {any} list
- * @param {number} interval
+ * @param {number} time1 开始时间
+ * @param {number} time2 结束时间
+ * @param {number} interval 时间间隔
  * @return {*}
  * @Author: zhiwei.Wang
- * @Date: 2024-08-13 18:35
+ * @Date: 2024-08-13 19:37
  */
-export declare const checkProductByTime: (list: any[], interval?: number) => boolean;
+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/lib/components/booking/info/utils.js

@@ -19,8 +19,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/booking/info/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
-  checkProductByTime: () => checkProductByTime,
+  formatServiceListByTime: () => formatServiceListByTime,
   getIsBundleOrCombination: () => getIsBundleOrCombination,
+  isInterval: () => isInterval,
   moveItemToFront: () => moveItemToFront,
   uniqueByField: () => uniqueByField
 });
@@ -53,25 +54,35 @@ var moveItemToFront = (arr, targetId) => {
   }
   return arr;
 };
-var checkProductByTime = (list, interval = 1e3) => {
-  var _a;
-  let bol = true;
+var isInterval = (time1, time2, interval = 1e3) => {
+  return time2 - time1 < interval;
+};
+var formatServiceListByTime = (list) => {
+  var _a, _b;
   try {
-    if (list.length) {
-      let last = (_a = list[list.length - 1]) == null ? void 0 : _a._time;
-      let currentTime = (/* @__PURE__ */ new Date()).getTime();
-      if (last && currentTime - last < interval) {
-        bol = false;
+    let _list = [...list];
+    const length = _list.length;
+    if (length > 1) {
+      let start = (_a = _list[length - 2]) == null ? void 0 : _a._time;
+      let end = (_b = _list[length - 1]) == null ? void 0 : _b._time;
+      if (start && end && isInterval(start, end)) {
+        _list.pop();
+        return _list;
+      } else {
+        return list;
       }
+    } else {
+      return list;
     }
   } catch (err) {
+    return list;
   }
-  return bol;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  checkProductByTime,
+  formatServiceListByTime,
   getIsBundleOrCombination,
+  isInterval,
   moveItemToFront,
   uniqueByField
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.107",
+  "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",