@pisell/private-materials 6.11.56 → 6.11.57

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

@@ -50,13 +50,7 @@ import_utils.locales.init(import_locales.default, localStorage.getItem("umi_loca
 var prefixCls = "pisell-lowcode__shopping-cart";
 var Cart = () => {
   const { state, updateState, onActiveKey, onChange, externalState } = (0, import_useContext.useContext)();
-  const {
-    platform,
-    carts,
-    isProductList,
-    collapseParams,
-    cartInfo
-  } = state;
+  const { platform, carts, isProductList, collapseParams, cartInfo } = state;
   const translationOriginal = (0, import_useTranslationOriginal.default)();
   const { openModal, MarketingModal } = (0, import_usePromotionModal.usePromotionModal)({
     onConfirm: async (selectedProduct) => {
@@ -71,6 +65,15 @@ var Cart = () => {
       onChange(params, key);
     }
   });
+  const _isShowPromotionAlert = (0, import_react.useMemo)(() => {
+    const { promotions, isShowPromotionAlert = true } = cartInfo || {};
+    if (!isShowPromotionAlert || !(promotions == null ? void 0 : promotions.length)) return false;
+    const _promotions = (promotions || []).filter(
+      (item) => (item == null ? void 0 : item.actionType) === "X_ITEMS_FOR_Y_PRICE"
+    );
+    if (!(_promotions == null ? void 0 : _promotions.length)) return false;
+    return true;
+  }, [JSON.stringify(cartInfo)]);
   const cartsMap = (0, import_react.useMemo)(() => {
     return carts == null ? void 0 : carts.map((item) => {
       var _a, _b, _c;
@@ -86,13 +89,14 @@ var Cart = () => {
             id: item == null ? void 0 : item.key,
             lists: item == null ? void 0 : item.products,
             isAdd: state.maxLength > _length,
-            openPromotionModal: openModal
+            openPromotionModal: openModal,
+            isShowPromotionAlert: _isShowPromotionAlert
           }
         ) : /* @__PURE__ */ import_react.default.createElement(import_Empty.default, { id: item == null ? void 0 : item.key }),
         showArrow: platform === "shop"
       };
     });
-  }, [carts, platform, openModal, state.maxLength]);
+  }, [carts, platform, openModal, state.maxLength, _isShowPromotionAlert]);
   const handleOpenPromotionModal = (0, import_ahooks.useMemoizedFn)(
     (item, type = "gift") => {
       var _a, _b, _c, _d, _e, _f, _g, _h, _i;
@@ -118,7 +122,9 @@ var Cart = () => {
         const services = ((_f = externalState == null ? void 0 : externalState.service) == null ? void 0 : _f.value) || [];
         selectedProducts = services == null ? void 0 : services.filter((option) => {
           var _a2, _b2;
-          const _id = (0, import_utils2.getPureSourceProductId)((_a2 = option == null ? void 0 : option._giftInfo) == null ? void 0 : _a2.sourceProductId);
+          const _id = (0, import_utils2.getPureSourceProductId)(
+            (_a2 = option == null ? void 0 : option._giftInfo) == null ? void 0 : _a2.sourceProductId
+          );
           return _id && ((_b2 = currentItem == null ? void 0 : currentItem.sourceProductId) == null ? void 0 : _b2.includes(_id));
         });
         if (isMultiple) {
@@ -150,34 +156,28 @@ var Cart = () => {
     }
   );
   const promotionAlert = (0, import_react.useMemo)(() => {
-    var _a;
-    const { promotions, isShowPromotionAlert = true } = cartInfo || {};
-    if (!isShowPromotionAlert) return null;
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-promotion-alert` }, /* @__PURE__ */ import_react.default.createElement("div", null, (_a = promotions || []) == null ? void 0 : _a.map(
-      (item) => (item == null ? void 0 : item.actionType) === "X_ITEMS_FOR_Y_PRICE" ? /* @__PURE__ */ import_react.default.createElement(
-        import_materials.PisellAlert,
-        {
-          description: import_utils.locales.getText(
-            "pisell2.text.shopping-cart.marketing.alert"
-          )(
-            item == null ? void 0 : item.needQuantity,
-            translationOriginal == null ? void 0 : translationOriginal(item == null ? void 0 : item.strategyName)
-          ),
-          type: "error",
-          action: /* @__PURE__ */ import_react.default.createElement(
-            import_materials.Button,
-            {
-              onClick: () => handleOpenPromotionModal(item, "promotion")
-            },
-            /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText(
-              "pisell2.text.shopping-cart.marketing.browse.items"
-            )),
-            /* @__PURE__ */ import_react.default.createElement(import_iconfont.default, { type: "pisell2-arrow-right" })
-          )
-        }
-      ) : null
-    )));
-  }, [JSON.stringify(cartInfo)]);
+    const { promotions } = cartInfo || {};
+    if (!_isShowPromotionAlert) return null;
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-promotion-alert` }, /* @__PURE__ */ import_react.default.createElement("div", null, promotions == null ? void 0 : promotions.map((item) => /* @__PURE__ */ import_react.default.createElement(
+      import_materials.PisellAlert,
+      {
+        description: import_utils.locales.getText(
+          "pisell2.text.shopping-cart.marketing.alert"
+        )(item == null ? void 0 : item.needQuantity, translationOriginal == null ? void 0 : translationOriginal(item == null ? void 0 : item.strategyName)),
+        type: "error",
+        action: /* @__PURE__ */ import_react.default.createElement(
+          import_materials.Button,
+          {
+            onClick: () => handleOpenPromotionModal(item, "promotion")
+          },
+          /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText(
+            "pisell2.text.shopping-cart.marketing.browse.items"
+          )),
+          /* @__PURE__ */ import_react.default.createElement(import_iconfont.default, { type: "pisell2-arrow-right" })
+        )
+      }
+    ))));
+  }, [JSON.stringify(cartInfo), _isShowPromotionAlert]);
   return (0, import_react.useMemo)(() => {
     console.log("render cart 22222", state.prodcuts);
     return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-lowcode__shopping-cart") }, isProductList ? /* @__PURE__ */ import_react.default.createElement(
@@ -185,7 +185,8 @@ var Cart = () => {
       {
         id: void 0,
         lists: state == null ? void 0 : state.products,
-        openPromotionModal: handleOpenPromotionModal
+        openPromotionModal: handleOpenPromotionModal,
+        isShowPromotionAlert: _isShowPromotionAlert
       }
     ) : /* @__PURE__ */ import_react.default.createElement(
       import_materials.Collapse,
@@ -210,7 +211,8 @@ var Cart = () => {
     state == null ? void 0 : state.products,
     promotionAlert,
     MarketingModal,
-    handleOpenPromotionModal
+    handleOpenPromotionModal,
+    _isShowPromotionAlert
   ]);
 };
 var Cart_default = Cart;

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

@@ -110,9 +110,10 @@
   //}
 
   &-promotion-alert {
-    margin-top: 16px;
+    flex-shrink: 0;
+    margin-top: 0 !important;
     z-index: 10;
-    position: sticky;
+    position: absolute !important;
     bottom: 0;
     background: transparent;
 

package/lib/components/shoppingCart/hooks/usePromotionModal.js

@@ -374,7 +374,7 @@ var usePromotionModal = (options) => {
     try {
       const selectedIds = Array.isArray(selected) ? selected.map((item) => (item == null ? void 0 : item.value) || item) : [selected];
       const _selectedProduct = (0, import_utils4.findSelectedProductsFromList)(
-        products,
+        productsRef.current,
         selectedIds
       );
       if (!(_selectedProduct == null ? void 0 : _selectedProduct.length)) return;

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

@@ -54,5 +54,6 @@ export interface ProductProps {
     isAdd?: boolean;
     openPromotionModal?: (products: any[]) => void;
     promotionProducts?: any[];
+    isShowPromotionAlert?: boolean;
 }
 export {};

package/lib/components/shoppingCart/utils.js

@@ -338,7 +338,9 @@ var updateProductInList = (props) => {
     let _products = (products || []).map((item) => {
       if (item.id === productId) {
         return {
-          ...cacheItem
+          ...cacheItem,
+          // 增加初始价格，用于赠品处理
+          _initPrice: item == null ? void 0 : item._initPrice
         };
       }
       return item;

package/lib/components/ticketBooking/components/ticketBooking/index.less

@@ -20,6 +20,7 @@
       padding-top: 10px;
       display: flex;
       flex-direction: column;
+      position: relative;
 
       .pisell-lowcode__booking-service-wrap {
         flex: 1;

package/lib/components/ticketBooking/hooks/pisellos/useProducts.js

@@ -39,7 +39,6 @@ var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContex
 var import_dayjs = __toESM(require("dayjs"));
 var import_useLogger = __toESM(require("../../../../hooks/useLogger"));
 var import_usePromotion = __toESM(require("../../../booking/hooks/usePromotion"));
-var import_utils = require("@pisell/utils");
 var useProducts = (notAvailableRef) => {
   var _a;
   const bookingTicket = (0, import_bookingTicket.useBookingTicket)();
@@ -52,7 +51,6 @@ var useProducts = (notAvailableRef) => {
   const { getApp } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const logger = (0, import_useLogger.default)();
   const { formatProductList } = (0, import_usePromotion.default)();
-  const useCurrentId = (0, import_react.useRef)((0, import_utils.getUniqueId)());
   const app = getApp();
   const [scheduleTimePoints, setScheduleTimePoints] = (0, import_react.useState)([]);
   const scheduledTaskQueueIdRef = (0, import_react.useRef)("booking-schedule-products");
@@ -68,16 +66,7 @@ var useProducts = (notAvailableRef) => {
           params
         }
       });
-      const products2 = await bookingTicket.loadProducts(params, {
-        callback: (res) => {
-          var _a3, _b;
-          console.log(res, "1234321");
-          if ((_a3 = res == null ? void 0 : res.data) == null ? void 0 : _a3.list) {
-            setProducts(formatProductList((_b = res == null ? void 0 : res.data) == null ? void 0 : _b.list));
-          }
-        },
-        subscriberId: useCurrentId
-      });
+      const products2 = await bookingTicket.loadProducts(params);
       logger.addLog({
         title: "useProducts: getProducts 返回",
         metadata: {
@@ -101,11 +90,6 @@ var useProducts = (notAvailableRef) => {
       isFirstLoadRef.current = false;
     }
   });
-  (0, import_react.useEffect)(() => {
-    return () => {
-      bookingTicket.unsubscribeProductQuery(useCurrentId);
-    };
-  }, []);
   (0, import_react.useEffect)(() => {
     var _a2, _b, _c;
     if (platform === "shop") {

package/lib/components/ticketBooking/index.d.ts

@@ -0,0 +1,23 @@
+import React from 'react';
+import { ProductDisplayConfig, ProductDisplayPresetKey } from './components/ProductDisplayAdapter/types';
+import './index.less';
+export declare const ticketBookingInitialState: any;
+interface TicketBookingProps {
+    productExtensionType: string[];
+    bookingConfigParams: Record<string, any>;
+    isShowMenuBar?: boolean;
+    onPrerenderComplete?: () => void;
+    isShowTimeBar?: boolean;
+    isShowFloatButtons?: boolean;
+    productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
+    isActive?: boolean;
+    rulesHooks?: any;
+    businessCode?: string;
+    storeRef?: React.MutableRefObject<any>;
+    /** 是否是弹窗编辑模式（由 TicketBookingDialog 传入） */
+    isEditTicketMode?: boolean;
+    /** 编辑模式下的初始 store 状态，会在 store 创建时合并进去 */
+    editModeInitialState?: Record<string, any>;
+}
+declare const _default: (props: TicketBookingProps) => React.JSX.Element;
+export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.56",
+  "version": "6.11.57",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -67,10 +67,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
-    "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.11.17",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.8"
+    "@pisell/date-picker": "3.0.8",
+    "@pisell/utils": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",