@pisell/private-materials 6.2.30 → 6.3.1

package/lib/components/productSelect/components/productGroup/index.js

@@ -71,12 +71,6 @@ var ProductGroup = ({
     }
     return `${import_utils.locales.getText("pisell2.product-select.stock")}：${item.stock_quantity}`;
   };
-  const getTextCover = (title) => {
-    if (!title) return "";
-    const cleanTitle = title.trim();
-    if (cleanTitle.length === 0) return "";
-    return cleanTitle.substring(0, 2).toUpperCase();
-  };
   const renderPrice = (item) => {
     const {
       price: _price,
@@ -99,11 +93,11 @@ var ProductGroup = ({
       className: (0, import_classnames.default)("product-card", {
         selected: currentProductId && item.id === currentProductId
       }),
-      onPointerUp: () => {
+      onClick: () => {
         onSelectProduct == null ? void 0 : onSelectProduct(item);
       }
     },
-    isProductCover ? /* @__PURE__ */ import_react.default.createElement(
+    isProductCover && item.cover ? /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: "card-left",
@@ -112,20 +106,13 @@ var ProductGroup = ({
           height: imgHeight || "auto"
         }
       },
-      item.cover ? /* @__PURE__ */ import_react.default.createElement(
+      /* @__PURE__ */ import_react.default.createElement(
         "img",
         {
           loading: "lazy",
           src: item.cover,
           style: { borderRadius: radius }
         }
-      ) : /* @__PURE__ */ import_react.default.createElement(
-        "div",
-        {
-          className: "text-cover",
-          style: { borderRadius: radius }
-        },
-        getTextCover(item.title)
       )
     ) : null,
     /* @__PURE__ */ import_react.default.createElement("div", { className: "card-right" }, !!isTitle ? /* @__PURE__ */ import_react.default.createElement("div", { className: "title" }, item.title) : null, !!isSubtitle && item.subtitle ? /* @__PURE__ */ import_react.default.createElement("div", { className: "subtitle" }, item.subtitle) : null, !!isStock && !!item.is_track ? /* @__PURE__ */ import_react.default.createElement("div", { className: "stock" }, getStockText(item)) : null, renderPrice(item))

package/lib/components/productSelect/components/productGroup/index.less

@@ -106,23 +106,6 @@
         height: 100%;
         object-fit: cover;
       }
-
-      .text-cover {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        background: #dedede;
-        color: #6c6c6c;
-        font-size: 60px;
-        font-weight: 600;
-        text-align: center;
-        line-height: 1;
-        letter-spacing: 1px;
-        border-radius: 8px;
-        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-      }
     }
 
     .card-right {

package/lib/components/schedules/utils.d.ts

@@ -17,6 +17,6 @@ declare let modal: Omit<ModalStaticFunctions, "warn">;
 export declare const setModal: (m: Omit<ModalStaticFunctions, "warn">) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
 }>;
 export { modal };

package/lib/components/schedules/utils.js

@@ -27,8 +27,8 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
 var Request = class {
-  request = {};
   constructor() {
+    this.request = {};
   }
   setRequest(val) {
     this.request = val;

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

@@ -37,8 +37,6 @@ var import_materials = require("@pisell/materials");
 var import_useClearCart = __toESM(require("../../hooks/useClearCart"));
 var import_useContext = require("../../hooks/useContext");
 var import_useAddService = __toESM(require("../../hooks/useAddService"));
-var import_utils = require("../../../booking/info/service2/utils");
-var import_pisellNumberSelector = __toESM(require("../../../../pro/pisellNumberSelector"));
 var import_ahooks = require("ahooks");
 var Product = (props) => {
   const { id, lists, isAdd = true } = props;
@@ -54,8 +52,7 @@ var Product = (props) => {
     isShowChangeHolder,
     isShowHolder,
     isShowAddHolderButton,
-    isShowEditProduct,
-    productCardStyleConfig = {}
+    isShowEditProduct
   } = state;
   const clearCart = (0, import_useClearCart.default)(id);
   const handleChange = (0, import_ahooks.useMemoizedFn)((item, type, other) => {
@@ -85,49 +82,18 @@ var Product = (props) => {
     isShowChangeHolder,
     isShowEditProduct
   ]);
-  const getProductCardStyleProps = (0, import_ahooks.useMemoizedFn)((type) => {
-    const conf = productCardStyleConfig[`${type}_product_card_style`];
-    return {
-      isShowImage: conf == null ? void 0 : conf.show_product_image,
-      isShowDelete: conf == null ? void 0 : conf.show_remove_button
-    };
-  });
+  (0, import_ahooks.useTrackedEffect)(
+    (changes) => {
+      console.log("Index of changed dependencies: ", changes);
+    },
+    [clearCart, lists, productParams, hideAddBtn, isAdd, platform]
+  );
   return (0, import_react.useMemo)(() => {
     console.log("render cart");
     return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__shopping-cart-content" }, clearCart, lists == null ? void 0 : lists.map((item) => {
-      let Comp = import_materials.ProductCard;
-      let isRetail;
-      if (state.scenario === "booking2") {
-        isRetail = (0, import_utils.isNormalProductByDurationSchedule)(item == null ? void 0 : item._origin);
-        Comp = isRetail ? import_materials.ProductCard.V2 : import_materials.ProductCard;
-      }
       return /* @__PURE__ */ import_react.default.createElement(
-        Comp,
+        import_materials.ProductCard,
         {
-          type: isRetail ? "a2" : void 0,
-          rightActions: [
-            {
-              key: "update_number",
-              text: /* @__PURE__ */ import_react.default.createElement(
-                import_pisellNumberSelector.default,
-                {
-                  enablePriceAdjust: true,
-                  min: 1,
-                  className: "pisell-sku-card__pisell-number-setter",
-                  value: item == null ? void 0 : item.num,
-                  onChange: (value) => {
-                    if (value < 1) {
-                      handleChange(item, "num", { num: 1 });
-                    } else {
-                      handleChange(item, "num", { num: value });
-                    }
-                  }
-                }
-              ),
-              color: "#667085"
-            }
-          ],
-          escapeDom: ".pisell-number-selector-popover",
           key: item._id,
           dataSource: item,
           onAction: (e) => onAction == null ? void 0 : onAction(e),
@@ -139,9 +105,7 @@ var Product = (props) => {
           onChangeResource: (e) => handleChange(item, "change_resource", e),
           onChangeHolder: (e) => handleChange(item, "change_holder", e),
           onAddHolder: (e) => handleChange(item, "add_holder", e),
-          ...productParams,
-          ...getProductCardStyleProps(isRetail ? "retail" : "appointment"),
-          scenario: state.scenario
+          ...productParams
         }
       );
     }), !hideAddBtn && platform !== "h5" && isAdd ? (0, import_useAddService.default)(id, "more") : null);

package/lib/components/shoppingCart/components/Cart/index.less

@@ -18,7 +18,7 @@
   .pisell-lowcode__shopping-cart-content {
     display: flex;
     flex-direction: column;
-    gap: 8px;
+    gap: 16px;
 
     .pisell-lowcode-product-card {
       margin-bottom: 0;
@@ -66,17 +66,3 @@
   //  align-items: start;
   //}
 }
-
-.pisell-sku-card__pisell-number-setter {
-  width: 110px;
-
-  .pisell-number-selector-btn {
-    flex-shrink: 0;
-  }
-
-  .pisell-number-selector-number {
-    min-width: unset !important;
-    padding: 0 !important;
-    flex: 1;
-  }
-}

package/lib/components/shoppingCart/type.d.ts

@@ -33,7 +33,6 @@ export interface shoppingCartProps {
     productParams?: productProps;
     isHideClearCart?: boolean;
     isParallelResource?: boolean;
-    scenario?: 'booking2';
 }
 /**
  * @title: 商品卡片

package/lib/components/subTotal/index.less

@@ -14,7 +14,7 @@
 
   .pisell-lowcode__subtotal-item-label {
     color: var(--Base-Black, #000);
-    font-size: 14px;
+    font-size: 16px;
     font-style: normal;
     font-weight: 500;
     line-height: 24px;

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

@@ -40,17 +40,17 @@ var import_utils2 = require("../../../booking/utils");
 var import_utils3 = require("../../../booking/info2/service/addService/utils");
 var import_utils4 = require("../../../booking/info/service2/utils");
 var import_utils5 = require("../../../booking/info/utils");
+var import_serve = require("../../../booking/info/service/serve");
 var import_serviceManager = require("../../../booking/info/service/serviceManager");
 var import_productSelect = __toESM(require("../../../productSelect"));
 var import_index = require("./index.less");
 var import_utils6 = require("../../utils");
 var import_notAvailable = __toESM(require("../notAvailable"));
 var import_dayjs = __toESM(require("dayjs"));
-var import_pisellos = require("../../hooks/pisellos");
-var import_utils7 = require("./utils");
 var AddSerivce = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const { onEdit, state, dispatch, renderMode = "current" } = props;
+  const [loading, setLoading] = (0, import_react.useState)(true);
   const context = (0, import_useEngineContext.default)();
   const notAvailableRef = (0, import_react.useRef)(null);
   const isLoadedServiceRef = (0, import_react.useRef)(false);
@@ -70,7 +70,17 @@ var AddSerivce = (props) => {
   const [currentProduct, setCurrentProduct] = (0, import_react.useState)(null);
   const stateRef = (0, import_react.useRef)(state);
   stateRef.current = state;
-  const { getProducts, products, loading } = (0, import_pisellos.useProducts)();
+  (0, import_react.useEffect)(() => {
+    return () => {
+      Object.values(debounceTimersRef.current).forEach((timer) => {
+        if (timer) clearTimeout(timer);
+      });
+      debounceTimersRef.current = {};
+    };
+  }, []);
+  const pendingCacheValuesRef = (0, import_react.useRef)({});
+  const clickCountRef = (0, import_react.useRef)({});
+  const debounceTimersRef = (0, import_react.useRef)({});
   const menuList = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.menu_list_tab) == null ? void 0 : _c2.menu_list) || [];
@@ -79,48 +89,152 @@ var AddSerivce = (props) => {
     var _a2, _b2;
     return ((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id) || void 0;
   }, [(_k = (_j = state.client) == null ? void 0 : _j.value) == null ? void 0 : _k.id]);
-  const scanAddService = (0, import_ahooks.useMemoizedFn)((list, code) => {
-    let newService = [...state.service.value];
-    list.forEach((item) => {
-      if ((0, import_utils7.isBundle)(item) || (0, import_utils7.isOption)(item)) {
-        handleSelectProduct(item);
-        return;
-      }
-      const values = (0, import_utils7.genValues)(item, code);
-      let cacheItem = (0, import_utils7.createCacheItem)(item, values, state);
-      cacheItem._serviceKey = (0, import_utils6.genServiceKey)(cacheItem);
-      cacheItem.autoClose = false;
-      let { list: _list, quantity } = (0, import_utils6.addService)(
-        [...newService],
-        cacheItem,
-        state
-      );
-      handleAddToast(cacheItem.title, quantity);
-      newService = _list;
+  const setDefaultService = async (list) => {
+    if (state.renderType !== "eventBooking") {
+      return;
+    }
+    if (state.bookingId) {
+      return;
+    }
+    if (list.length !== 1) {
+      return;
+    }
+    let _list = [...state.service.value];
+    if (_list.length !== 0) {
+      return;
+    }
+    setLoading(true);
+    let product = list[0];
+    const detail = await (0, import_serve.getProductDetail)(product.id, {
+      schedule_date: state.date.value.format("YYYY-MM-DD")
     });
+    const isBundleOrCombination = (0, import_utils5.getIsBundleOrCombination)(detail.data);
+    setLoading(false);
+    if (isBundleOrCombination) return;
+    let _item = {
+      ...product,
+      product_id: product.id,
+      _id: (0, import_utils.getUniqueId)(),
+      _extend: {
+        start_date: state.date.value,
+        startDate: state.date.value,
+        endDate: state.date.value,
+        start_time: "00:00:00",
+        duration: 10,
+        quantity: 1,
+        price: product.price,
+        total: product.price,
+        origin_total: product.price,
+        product_name: product.title
+      }
+    };
+    _list.push(_item);
     dispatch({
       type: "setService",
       payload: {
-        value: newService,
+        value: _list,
         edit: true
       }
     });
-  });
-  (0, import_react.useMemo)(() => {
-    (0, import_utils7.setHandleSetService)(scanAddService);
-  }, []);
-  const handleAddToast = (title, quantity) => {
-    var _a2;
-    (_a2 = Toast == null ? void 0 : Toast.success) == null ? void 0 : _a2.call(
-      Toast,
-      /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-title" }, title), /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-quantity" }, import_utils.locales.getText("pisell2.ticket-booking.in-cart")(
-        quantity || 1
-      )))
+  };
+  const removeNotAvailableService = (list) => {
+    var _a2, _b2, _c2, _d2, _e2;
+    if (!((_c2 = (_b2 = (_a2 = stateRef.current) == null ? void 0 : _a2.service) == null ? void 0 : _b2.value) == null ? void 0 : _c2.length)) return;
+    const listMap = list.reduce((acc, cur) => {
+      acc[cur.id] = cur;
+      return acc;
+    }, {});
+    const newValue = (((_e2 = (_d2 = stateRef.current) == null ? void 0 : _d2.service) == null ? void 0 : _e2.value) || []).filter(
+      (item) => listMap[item.product_id]
     );
+    dispatch({
+      type: "setService",
+      payload: {
+        value: newValue,
+        edit: true
+      }
+    });
+  };
+  const getServices = async (params) => {
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
+    setLoading(true);
+    if (state.renderType === "eventBooking" && !((_b2 = (_a2 = state.eventOtherParams) == null ? void 0 : _a2.productIds) == null ? void 0 : _b2.length)) {
+      dispatch({
+        type: "setService",
+        payload: {
+          services: []
+        }
+      });
+      setLoading(false);
+      return;
+    }
+    let data = await state.apis.getServices({
+      skip: 1,
+      num: 500,
+      // extension_type: state.productExtensionType,
+      exclude_extension_type: [
+        "product_party",
+        "product_event",
+        "product_series_event",
+        "product_package_ticket",
+        "ticket",
+        "event_item"
+      ],
+      with: ["category"],
+      open_quotation: 1,
+      with_schedule: 1,
+      with_count: ["bundleGroup", "optionGroup"],
+      order_by_string: "sort:desc",
+      status: "published",
+      schedule_date: params == null ? void 0 : params.schedule_date,
+      schedule_datetime: params == null ? void 0 : params.schedule_datetime,
+      customer_id: params == null ? void 0 : params.customer_id,
+      menu_list_ids: params == null ? void 0 : params.menu_list_ids,
+      _config: {
+        fullResult: true,
+        customResponse: true
+      }
+    });
+    setLoading(false);
+    if ((data == null ? void 0 : data.code) === 607100) {
+      if (!isLoadedServiceRef.current || ((_d2 = (_c2 = state.service) == null ? void 0 : _c2.services) == null ? void 0 : _d2.length)) {
+        (_e2 = notAvailableRef.current) == null ? void 0 : _e2.open();
+      }
+    }
+    if (!state.service.addModal) {
+      setDefaultService((_f2 = data == null ? void 0 : data.data) == null ? void 0 : _f2.list);
+    }
+    removeNotAvailableService((_g2 = data == null ? void 0 : data.data) == null ? void 0 : _g2.list);
+    isLoadedServiceRef.current = true;
+    dispatch({
+      type: "setService",
+      payload: {
+        services: ((_h2 = data == null ? void 0 : data.data) == null ? void 0 : _h2.list) || []
+      }
+    });
   };
+  const executeCacheValues = (0, import_ahooks.useMemoizedFn)((productId, originalCacheValues, item, originalCallback) => {
+    const clickCount = clickCountRef.current[productId] || 1;
+    const finalCacheValues = {
+      ...originalCacheValues,
+      quantity: clickCount
+    };
+    delete pendingCacheValuesRef.current[productId];
+    delete clickCountRef.current[productId];
+    delete debounceTimersRef.current[productId];
+    originalCallback(finalCacheValues, "", item, true);
+  });
+  const debouncedExecuteCacheValues = (0, import_ahooks.useMemoizedFn)((productId, cacheValues, item, callback) => {
+    if (debounceTimersRef.current[productId]) {
+      clearTimeout(debounceTimersRef.current[productId]);
+    }
+    debounceTimersRef.current[productId] = setTimeout(() => {
+      executeCacheValues(productId, cacheValues, item, callback);
+    }, 0);
+  });
   const handleSelectProduct = (0, import_ahooks.useMemoizedFn)(
     (item, type = "select") => {
-      var _a2;
+      var _a2, _b2, _c2, _d2;
       if (!(0, import_utils4.isNormalProductByDurationSchedule)(item)) {
         if (!Array.isArray((_a2 = state.service) == null ? void 0 : _a2.resourcesOrigin) || !state.service.resourcesOrigin.length) {
           dispatch({
@@ -142,7 +256,7 @@ var AddSerivce = (props) => {
         setCurrentProduct(item);
       } else {
         setCurrentProduct(null);
-        if (!isSession) {
+        if (!isSession && (0, import_utils4.isNormalProductByDurationSchedule)(item)) {
           cacheValues = {
             bundle: [],
             key: item.id,
@@ -152,12 +266,14 @@ var AddSerivce = (props) => {
             quantity: 1,
             rowKey: item.id,
             session: null,
-            unique: "08974625397"
+            unique: "08974625397",
+            _originalItem: item
+            // 保存原始商品信息
           };
         }
       }
-      const callback = async (e, extension_type, detail) => {
-        var _a3, _b2, _c2, _d2, _e2, _f2;
+      const callback = async (e, extension_type, detail, notShowToast) => {
+        var _a3, _b3, _c3, _d3, _e2, _f2, _g2;
         setCurrentProduct(null);
         if (lock) {
           return;
@@ -217,10 +333,17 @@ var AddSerivce = (props) => {
             cacheItem,
             state
           );
-          handleAddToast(cacheItem.title, quantity || 1);
+          if (!notShowToast) {
+            (_b3 = Toast == null ? void 0 : Toast.success) == null ? void 0 : _b3.call(
+              Toast,
+              /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-title" }, cacheItem.title), /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-quantity" }, import_utils.locales.getText("pisell2.ticket-booking.in-cart")(
+                quantity || 1
+              )))
+            );
+          }
           (0, import_utils6.addServiceScroll)(e.rowKey, cacheItem);
           try {
-            if (((_f2 = (_e2 = (_d2 = (_c2 = (_b2 = context.appHelper.utils.store) == null ? void 0 : _b2.getState) == null ? void 0 : _c2.call(_b2)) == null ? void 0 : _d2.global) == null ? void 0 : _e2.globalConfig) == null ? void 0 : _f2.id) === 2155) {
+            if (((_g2 = (_f2 = (_e2 = (_d3 = (_c3 = context.appHelper.utils.store) == null ? void 0 : _c3.getState) == null ? void 0 : _d3.call(_c3)) == null ? void 0 : _e2.global) == null ? void 0 : _f2.globalConfig) == null ? void 0 : _g2.id) === 2155) {
               const val = _list == null ? void 0 : _list.map((s) => {
                 return {
                   product_id: s == null ? void 0 : s.product_id,
@@ -277,7 +400,23 @@ var AddSerivce = (props) => {
         }
       };
       if (cacheValues) {
-        callback(cacheValues, "", item);
+        const productId = item.id.toString();
+        if (pendingCacheValuesRef.current[productId]) {
+          clickCountRef.current[productId] = (clickCountRef.current[productId] || 1) + 1;
+        } else {
+          pendingCacheValuesRef.current[productId] = cacheValues;
+          clickCountRef.current[productId] = 1;
+        }
+        const cacheItem = (0, import_utils6.createSimpleCacheItem)(item, cacheValues, state);
+        const detail = (_b2 = state.service.value) == null ? void 0 : _b2.find((val) => (0, import_utils6.isSameProduct)(val, cacheItem));
+        const originalQuantity = ((_c2 = detail == null ? void 0 : detail._extend) == null ? void 0 : _c2.quantity) || 0;
+        (_d2 = Toast == null ? void 0 : Toast.success) == null ? void 0 : _d2.call(
+          Toast,
+          /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-title" }, item.title), /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-quantity" }, import_utils.locales.getText("pisell2.ticket-booking.in-cart")(
+            (clickCountRef.current[productId] || 1) + originalQuantity
+          )))
+        );
+        debouncedExecuteCacheValues(productId, cacheValues, item, callback);
         return;
       }
       state.action({
@@ -305,7 +444,8 @@ var AddSerivce = (props) => {
     }
   );
   const renderList = (0, import_react.useMemo)(() => {
-    let _list = products || [];
+    var _a2;
+    let _list = ((_a2 = state.service) == null ? void 0 : _a2.services) || [];
     if ((0, import_utils4.isDaysBooking)(state)) {
       if (!(0, import_utils4.holderId)(state)) {
         _list = _list.filter(
@@ -314,7 +454,7 @@ var AddSerivce = (props) => {
       }
     }
     return _list;
-  }, [products, state == null ? void 0 : state.activeCartId]);
+  }, [(_l = state.service) == null ? void 0 : _l.services, state == null ? void 0 : state.activeCartId]);
   const currentDate = (0, import_react.useMemo)(() => {
     return state.date.value.format("YYYY-MM-DD");
   }, [state.date.value]);
@@ -323,7 +463,7 @@ var AddSerivce = (props) => {
   }, [state.date.value]);
   (0, import_react.useEffect)(() => {
     if (renderMode === "current" && state.bookingConfig) {
-      getProducts({
+      getServices({
         schedule_date: currentDate,
         customer_id: customerId,
         menu_list_ids: menuList,