@pisell/private-materials 3.0.74 → 3.0.75

package/es/components/booking/components/drawer/index.d.ts

@@ -4,6 +4,7 @@ import "./index.less";
 export interface PisellDrawerProps extends DrawerProps {
     header?: React.ReactNode;
     titleNoWrap?: boolean;
+    hideScrollBar?: boolean;
 }
 /**
  * @title: 自定义抽屉

package/es/components/booking/components/drawer/index.js

@@ -13,11 +13,16 @@ import classNames from "classnames";
  * @Date: 2024-01-30 16:51
  */
 var Drawer = function Drawer(props) {
+  var _props$hideScrollBar = props.hideScrollBar,
+    hideScrollBar = _props$hideScrollBar === void 0 ? true : _props$hideScrollBar;
   return /*#__PURE__*/React.createElement(OriginDrawer, _extends({
     width: "600px",
     closable: false,
     zIndex: 999
   }, props, {
+    className: classNames("pisell-lowcode__booking-drawer", props.className, {
+      "pisell-lowcode__booking-drawer-hide-scrollbar": hideScrollBar
+    }),
     title: false,
     bodyStyle: {
       padding: 0

package/es/components/booking/components/drawer/index.less

@@ -28,12 +28,19 @@
   }
 }
 
-.pisell-lowcode-drawer-body {
-  &::-webkit-scrollbar {
-    display: block;
+
+.pisell-lowcode__booking-drawer-hide-scrollbar {
+  &.pisell-lowcode-drawer-body {
+
+    &::-webkit-scrollbar {
+      display: none;
+    }
+
   }
 }
 
+
+
 .pisell-lowcode__booking-drawer-title-no-wrap {
   display: inline;
 }

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

@@ -28,7 +28,7 @@ var Actions = function Actions(_ref) {
   };
   var addTimeProducts = useMemo(function () {
     return (state.addTimeProducts || []).some(function (item) {
-      return isUsableProduct(item.add_time.relation_product, currentService);
+      return isUsableProduct(item.add_time, currentService);
     });
   }, [state.addTimeProducts, currentService]);
   var showAddTimeButton = useMemo(function () {

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

@@ -16,14 +16,15 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useMemo, useState, useRef } from "react";
 import Drawer from "../../../components/drawer";
 import { Context } from "../../model";
-import { Select, Button, Skeleton, message, Alert } from "antd";
+import { Button, Skeleton, message, Alert } from "antd";
 import "./index.less";
 import { locales, formatAmount, createArray, formatDate } from "@pisell/utils";
 import { useUpdateEffect, useDebounceFn } from "ahooks";
 import Footer from "../../../components/footer";
 import { saveAddTimeProduct, getAddTimeProducts } from "./serve";
-import { getAddTimeSplits, isUsableProduct } from "./utils";
+import { getAddTimeSplits, isUsableProduct, addTimeRowKey } from "./utils";
 import classNames from "classnames";
+import dayjs from "dayjs";
 import BrowserSelect from "../../../components/browserSelect";
 import { isNowTime, getNowTime, getDiscountTime, getResourceTimeIsUsable, flexibleObj, isWalkIn } from "../../../utils";
 import useEngineContext from "../../../../../hooks/useEngineContext";
@@ -49,28 +50,23 @@ var AddTimeModal = function AddTimeModal() {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  var _useState5 = useState(null),
+  // id_time
+  var _useState5 = useState(""),
     _useState6 = _slicedToArray(_useState5, 2),
-    currentProductId = _useState6[0],
-    setCurrentProductId = _useState6[1];
-  var _useState7 = useState(null),
+    recordKey = _useState6[0],
+    setRecordKey = _useState6[1];
+  var _useState7 = useState(1),
     _useState8 = _slicedToArray(_useState7, 2),
-    currentTime = _useState8[0],
-    setCurrentTime = _useState8[1];
-  var _useState9 = useState(1),
-    _useState10 = _slicedToArray(_useState9, 2),
-    number = _useState10[0],
-    setNumber = _useState10[1];
+    number = _useState8[0],
+    setNumber = _useState8[1];
   var originServices = useRef([]);
-  var _useState11 = useState([]),
-    _useState12 = _slicedToArray(_useState11, 2),
-    renderList = _useState12[0],
-    setRenderList = _useState12[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    renderList = _useState10[0],
+    setRenderList = _useState10[1];
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
-    isTerminal = _context$appHelper$ut.isTerminal,
-    interaction = _context$appHelper$ut.interaction,
-    store = _context$appHelper$ut.store;
+    interaction = _context$appHelper$ut.interaction;
   var statusMap = {
     available: {
       label: locales.getText("page.booking.text.available"),
@@ -85,11 +81,15 @@ var AddTimeModal = function AddTimeModal() {
       color: "#98A2B3"
     }
   };
+
+  // 防抖计算新的服务
   var updateServices = useDebounceFn(function () {
     createNewServices();
   }, {
     wait: 200
   });
+
+  // board配置
   var transaction_habit_selection = useMemo(function () {
     var _state$bookingConfig, _state$bookingConfig$, _state$bookingConfig$2;
     return (state === null || state === void 0 ? void 0 : (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 ? void 0 : (_state$bookingConfig$ = _state$bookingConfig.config) === null || _state$bookingConfig$ === void 0 ? void 0 : (_state$bookingConfig$2 = _state$bookingConfig$.information_tab) === null || _state$bookingConfig$2 === void 0 ? void 0 : _state$bookingConfig$2.transaction_habit_selection) || {
@@ -97,28 +97,34 @@ var AddTimeModal = function AddTimeModal() {
       button_rows: 1
     };
   }, [state === null || state === void 0 ? void 0 : (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 ? void 0 : (_state$bookingConfig3 = _state$bookingConfig2.config) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.information_tab]);
-  var addTimeProducts = useMemo(function () {
-    return (renderList || []).map(function (d) {
-      return {
-        label: d.title,
-        value: d.id
-      };
-    });
-  }, [renderList, state.service.cacheItem]);
+
+  // 当前商品id
+  var currentProductId = useMemo(function () {
+    return addTimeRowKey.getValue(recordKey).product_id;
+  }, [recordKey]);
+
+  // 当前time
+  var currentTime = useMemo(function () {
+    var _time = addTimeRowKey.getValue(recordKey).time || "";
+    return _time;
+  }, [recordKey]);
+
+  // 当前商品
   var currentProduct = useMemo(function () {
     return (renderList || []).find(function (d) {
-      return d.id === currentProductId;
+      return d.id == currentProductId;
     });
   }, [renderList, currentProductId]);
+  var currentTimeItem = useMemo(function () {
+    var _currentProduct$times;
+    return (currentProduct === null || currentProduct === void 0 ? void 0 : (_currentProduct$times = currentProduct.times) === null || _currentProduct$times === void 0 ? void 0 : _currentProduct$times.find(function (d) {
+      return d.value == currentTime;
+    })) || {
+      price: 0
+    };
+  }, [currentTime, currentProduct]);
 
-  /**
-   * @title: 当前的资源
-   * @description:
-   * @param {*} useMemo
-   * @return {*}
-   * @Author: zhiwei.Wang
-   * @Date: 2024-01-09 14:06
-   */
+  // 当前的资源
   var currentResource = useMemo(function () {
     var _state$service;
     var list = ((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.resourcesOrigin) || [];
@@ -128,9 +134,25 @@ var AddTimeModal = function AddTimeModal() {
     });
     return item;
   }, [state.service.cacheItem, state.service.resourcesOrigin]);
+  var currentResourceTimeEndDate = useMemo(function () {
+    try {
+      var _state$service$cacheI3;
+      if (!currentResource || !((_state$service$cacheI3 = state.service.cacheItem) !== null && _state$service$cacheI3 !== void 0 && _state$service$cacheI3._extend)) {
+        return "";
+      }
+      var timeItem = currentResource === null || currentResource === void 0 ? void 0 : currentResource.times.find(function (_time) {
+        return _time.item_id === state.service.cacheItem._extend.relation_id;
+      });
+      var timeEndDate = dayjs(timeItem.end_date + " " + timeItem.end_time).add(1, "second");
+      return timeEndDate;
+    } catch (err) {
+      console.log("err", err);
+    }
+    return "";
+  }, [state.service.cacheItem, currentResource]);
   var getTimeUsableStatus = function getTimeUsableStatus(time) {
-    var _state$service$cacheI3;
-    if (!((_state$service$cacheI3 = state.service.cacheItem) !== null && _state$service$cacheI3 !== void 0 && _state$service$cacheI3._extend) || !currentResource) {
+    var _state$service$cacheI4;
+    if (!((_state$service$cacheI4 = state.service.cacheItem) !== null && _state$service$cacheI4 !== void 0 && _state$service$cacheI4._extend) || !currentResource) {
       return {
         status: statusMap.unavailable
       };
@@ -168,8 +190,9 @@ var AddTimeModal = function AddTimeModal() {
       }));
       if (!((_res$_extend = res._extend) !== null && _res$_extend !== void 0 && _res$_extend.isUsable)) {
         return {
+          // maxEndTime:
           status: statusMap.unavailable,
-          message: locales.getText("pisell1.text.resource-error-message-2")(currentResource.room_name || currentResource.name, startText, endText)
+          message: "".concat(currentResource.room_name || currentResource.name, " ").concat(locales.getText("pisell2.text.status.service-error-2"))
         };
       }
     } catch (err) {}
@@ -177,37 +200,46 @@ var AddTimeModal = function AddTimeModal() {
       status: statusMap.available
     };
   };
-  var times = useMemo(function () {
-    var config = (currentProduct === null || currentProduct === void 0 ? void 0 : currentProduct.add_time) || {
-      calculate_type: "select_quantity",
-      // 最大时长
-      max_add_time: 30,
-      // 最小时长
-      min_add_time: 30,
-      // 关联产品
-      relation_product: {
-        type: "product_all",
-        products: []
-      },
-      // 单位切片
-      unit_duration: 30
-    };
-    return getAddTimeSplits(config, (currentProduct === null || currentProduct === void 0 ? void 0 : currentProduct.price) || 0).map(function (d) {
-      return _objectSpread(_objectSpread({}, d), {}, {
-        status: getTimeUsableStatus(d.value)
-      });
-    });
-  }, [currentProduct]);
-  useEffect(function () {
-    if (state.service.addTimeModal && state.service.cacheItem && currentProduct && times.length) {
-      if (!currentTime) {
-        setCurrentTime(times[0].value);
-        setNumber(1);
-        setIsEdit(true);
-        updateServices.run();
-      }
-    }
-  }, [times, currentTime, state.service.addTimeModal, state.service.cacheItem, currentProduct]);
+
+  // 	let config = currentProduct?.add_time || {
+  // 		calculate_type: "select_quantity",
+  // 		// 最大时长
+  // 		max_add_time: 30,
+  // 		// 最小时长
+  // 		min_add_time: 30,
+  // 		// 关联产品
+  // 		relation_product: { type: "product_all", products: [] },
+  // 		// 单位切片
+  // 		unit_duration: 30,
+  // 	};
+  // 	return getAddTimeSplits(config, currentProduct?.price || 0).map((d) => {
+  // 		return {
+  // 			...d,
+  // 			status: getTimeUsableStatus(d.value),
+  // 		};
+  // 	});
+  // }, [currentProduct]);
+  // useEffect(() => {
+  // 	if (
+  // 		state.service.addTimeModal &&
+  // 		state.service.cacheItem &&
+  // 		currentProduct
+  // 	) {
+  // 		if (!currentTime) {
+  // 			setCurrentTime(currentProduct?.times?.[0]?.value);
+  // 			setNumber(1);
+  // 			setIsEdit(true);
+  // 			updateServices.run();
+  // 		}
+  // 	}
+  // }, [
+  // 	currentTime,
+  // 	state.service.addTimeModal,
+  // 	state.service.cacheItem,
+  // 	currentProduct,
+  // ]);
+
+  // 获取加时商品api
   var _getAddTimeProducts = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _state$client, _state$client$value, _state$client2, _state$client2$value;
@@ -239,6 +271,8 @@ var AddTimeModal = function AddTimeModal() {
       return _ref.apply(this, arguments);
     };
   }();
+
+  // 格式化加时商品
   var getTimeProducts = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var newList, list;
@@ -251,12 +285,19 @@ var AddTimeModal = function AddTimeModal() {
           case 3:
             newList = _context2.sent;
             list = newList.map(function (d) {
-              var isUsable = isUsableProduct(d.add_time.relation_product, state.service.cacheItem);
+              // 是否可用
+              var isUsable = isUsableProduct(d.add_time, state.service.cacheItem);
               return _objectSpread(_objectSpread({}, d), {}, {
-                usable: isUsable
+                usable: isUsable,
+                // 可用的商品生成加时列表
+                times: isUsable ? getAddTimeSplits(d, state.service.cacheItem, currentResourceTimeEndDate).map(function (time) {
+                  return _objectSpread(_objectSpread({}, time), {}, {
+                    status: getTimeUsableStatus(time.value)
+                  });
+                }) : undefined
               });
             }).filter(function (d) {
-              return d.usable;
+              return d.usable && d.times.length;
             }).sort(function (a, b) {
               return b.sort - a.sort;
             });
@@ -265,7 +306,8 @@ var AddTimeModal = function AddTimeModal() {
               setDefaultProduct(list);
             }
             setLoading("");
-          case 8:
+            setIsEdit(true);
+          case 9:
           case "end":
             return _context2.stop();
         }
@@ -275,9 +317,17 @@ var AddTimeModal = function AddTimeModal() {
       return _ref2.apply(this, arguments);
     };
   }();
+
+  // 设置默认商品
   var setDefaultProduct = function setDefaultProduct(list) {
-    setCurrentProductId(list[0].id);
+    try {
+      var productId = list[0].id;
+      var time = list[0].times[0].value;
+      setRecordKey(addTimeRowKey.create(productId, time));
+    } catch (err) {}
   };
+
+  // 打开弹窗时获取数据
   useUpdateEffect(function () {
     if (state.service.addTimeModal) {
       getTimeProducts();
@@ -286,20 +336,17 @@ var AddTimeModal = function AddTimeModal() {
       updateServices.run();
     }
   }, [state.service.addTimeModal]);
-  var onSelectItem = function onSelectItem(item) {
-    setCurrentTime(item === null || item === void 0 ? void 0 : item.value);
+
+  // 选择
+  var onSelectItem = function onSelectItem(pItem, item) {
+    setRecordKey(addTimeRowKey.create(pItem.id, item.value));
     setIsEdit(true);
     updateServices.run();
   };
-  var currentTimeItem = useMemo(function () {
-    return times.find(function (d) {
-      return d.value === currentTime;
-    }) || {
-      price: 0
-    };
-  }, [currentTime, times]);
+
+  // 临时模拟出的新服务
   var newService = useMemo(function () {
-    if (!currentProduct || !currentProduct || !state.service.cacheItem) {
+    if (!currentProduct || !state.service.cacheItem) {
       return null;
     }
 
@@ -509,10 +556,6 @@ var AddTimeModal = function AddTimeModal() {
       return _ref5.apply(this, arguments);
     };
   }();
-  var productChange = function productChange(e) {
-    setCurrentProductId(e);
-    setCurrentTime(null);
-  };
   useEffect(function () {
     if (!state.modalOpen) {
       onCancel();
@@ -520,8 +563,7 @@ var AddTimeModal = function AddTimeModal() {
   }, [state.modalOpen]);
   var onCancel = function onCancel() {
     setIsEdit(false);
-    setCurrentProductId(null);
-    setCurrentTime(null);
+    setRecordKey("");
     resetService();
     setTimeout(function () {
       dispatch({
@@ -532,7 +574,6 @@ var AddTimeModal = function AddTimeModal() {
       });
     }, 50);
   };
-  console.log("newService.duration", currentTimeItem);
   var updateTime = useMemo(function () {
     if (!newService) {
       return "";
@@ -553,21 +594,13 @@ var AddTimeModal = function AddTimeModal() {
     title: locales.getText("page.booking.text.add-time"),
     rootClassName: "booking-server-wrap",
     onClose: onCancel,
-    header: addTimeProducts.length > 1 && /*#__PURE__*/React.createElement("div", {
-      className: "pisell-lowcode__booking-add-time-header"
-    }, /*#__PURE__*/React.createElement(Select, {
-      options: addTimeProducts,
-      style: {
-        width: "100%"
-      },
-      size: "large",
-      loading: loading === "list",
-      value: currentProductId,
-      onChange: productChange
-    })),
     footerStyle: {
       padding: "10px 32px 20px"
     },
+    hideScrollBar: false,
+    bodyStyle: {
+      position: "relative"
+    },
     footer: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__booking-add-time-total-wrap"
     }, currentTimeItem && currentTimeItem !== null && currentTimeItem !== void 0 && (_currentTimeItem$stat = currentTimeItem.status) !== null && _currentTimeItem$stat !== void 0 && _currentTimeItem$stat.message ? /*#__PURE__*/React.createElement(Alert, {
@@ -624,33 +657,39 @@ var AddTimeModal = function AddTimeModal() {
     active: true,
     round: true
   }, /*#__PURE__*/React.createElement("div", {
-    className: "pisell-lowcode__booking-add-time-child-card-list"
-  }, times.map(function (child, index) {
-    var _child$status, _child$status$status, _child$status2, _child$status2$status;
-    if (child.readonly) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: "pisell-lowcode__booking-add-time-hours"
-      }, child.label);
-    }
+    className: ""
+  }, renderList.map(function (d) {
     return /*#__PURE__*/React.createElement("div", {
-      className: classNames("pisell-lowcode__booking-add-time-child-card", {
-        "pisell-lowcode__booking-add-time-child-card-active": currentTime === child.value
-      }),
-      onClick: function onClick() {
-        onSelectItem(child);
-      }
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "pisell-lowcode__booking-add-time-child-card-left"
+      className: ""
     }, /*#__PURE__*/React.createElement("div", {
-      className: "pisell-lowcode__booking-add-time-child-card-left-time"
-    }, child.label), /*#__PURE__*/React.createElement("div", {
-      className: "pisell-lowcode__booking-add-time-child-card-left-price"
-    }, formatAmount(child.price, 2, state.amountSymbol))), /*#__PURE__*/React.createElement("div", {
-      className: "pisell-lowcode__booking-add-time-child-card-right",
-      style: {
-        color: (_child$status = child.status) === null || _child$status === void 0 ? void 0 : (_child$status$status = _child$status.status) === null || _child$status$status === void 0 ? void 0 : _child$status$status.color
-      }
-    }, (_child$status2 = child.status) === null || _child$status2 === void 0 ? void 0 : (_child$status2$status = _child$status2.status) === null || _child$status2$status === void 0 ? void 0 : _child$status2$status.label));
+      className: "pisell-lowcode__booking-add-time-hours"
+    }, d.title), d.times ? /*#__PURE__*/React.createElement("div", {
+      className: "pisell-lowcode__booking-add-time-child-card-list"
+    }, d.times.map(function (child) {
+      var _child$status, _child$status$status, _child$status2, _child$status2$status;
+      return /*#__PURE__*/React.createElement("div", {
+        className: classNames("pisell-lowcode__booking-add-time-child-card", {
+          "pisell-lowcode__booking-add-time-child-card-active": recordKey === addTimeRowKey.create(d.id, child.value)
+        }),
+        onClick: function onClick() {
+          if (!child.value) {
+            return;
+          }
+          onSelectItem(d, child);
+        }
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "pisell-lowcode__booking-add-time-child-card-left"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "pisell-lowcode__booking-add-time-child-card-left-time"
+      }, child.label), /*#__PURE__*/React.createElement("div", {
+        className: "pisell-lowcode__booking-add-time-child-card-left-price"
+      }, formatAmount(child.price, 2, state.amountSymbol))), /*#__PURE__*/React.createElement("div", {
+        className: "pisell-lowcode__booking-add-time-child-card-right",
+        style: {
+          color: (_child$status = child.status) === null || _child$status === void 0 ? void 0 : (_child$status$status = _child$status.status) === null || _child$status$status === void 0 ? void 0 : _child$status$status.color
+        }
+      }, (_child$status2 = child.status) === null || _child$status2 === void 0 ? void 0 : (_child$status2$status = _child$status2.status) === null || _child$status2$status === void 0 ? void 0 : _child$status2$status.label));
+    })) : null);
   }))), /*#__PURE__*/React.createElement("div", {
     className: ""
   })));

package/es/components/booking/info/service/addTimeModal/index.less

@@ -10,22 +10,27 @@
   width: 100%;
   height: 100%;
 
+  .pisell-lowcode__booking-add-time-hours {
+    padding: 6px;
+    color: var(--Gray-900, #101828);
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 500;
+    background: var(--Gray-50, #F9FAFB);
+    margin: 10px 0;
+    flex: 0 0 100%;
+    position: sticky;
+    top: 95px;
+    z-index: 1;
+  }
+
   .pisell-lowcode__booking-add-time-child-card-list {
     width: 100%;
     display: flex;
     flex-wrap: wrap;
     gap: 10px;
 
-    .pisell-lowcode__booking-add-time-hours {
-      padding: 6px;
-      color: var(--Gray-900, #101828);
-      font-size: 14px;
-      font-style: normal;
-      font-weight: 500;
-      background: var(--Gray-50, #F9FAFB);
-      margin: 10px 0;
-      flex: 0 0 100%;
-    }
+
 
     .pisell-lowcode__booking-add-time-child-card {
       flex: 0 0 calc(50% - 5px);

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

@@ -1,12 +1,31 @@
-export declare const getAddTimeSplits: (config: any, price: number) => ({
-    label: string;
-    value: number;
-    readonly: boolean;
-    price?: undefined;
-} | {
-    label: string;
-    value: number;
-    price: number;
-    readonly?: undefined;
-})[];
-export declare const isUsableProduct: (relationProduct: any, currentItem: any) => any;
+/**
+ * @title: 根据商品生成加时列表
+ * @description:
+ * @param {any} config
+ * @param {number} price
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-07-01 09:34
+ */
+export declare const getAddTimeSplits: (product: any, cacheItem: any, currentResourceTimeEndDate: any) => {
+    label: any;
+    value: any;
+    price: any;
+}[];
+/**
+ * @title: 判断当前商品是否可用
+ * @description:
+ * @param {any} relationProduct
+ * @param {any} currentItem
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-07-01 09:33
+ */
+export declare const isUsableProduct: (addTime: any, currentItem: any) => any;
+export declare const addTimeRowKey: {
+    create: (product_id: number, time: number) => string;
+    getValue: (str: string) => {
+        product_id: number;
+        time: number | string;
+    };
+};