@pisell/materials 2.2.94 → 2.2.96

package/es/components/productCard/cartSkuCard/components/MultiDay/index.less

@@ -0,0 +1,31 @@
+.pisell-cart-sku-card {
+  &__multi-day-wrap {
+  }
+
+  &__multi-day {
+    color: var(--Gray-500, #667085);
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 20px;
+    display: flex;
+    flex-direction: column;
+  }
+
+  &__multi-day-total {
+    color: var(--Gray-900, #101828);
+    text-align: right;
+    font-size: 14px;
+    font-weight: 600;
+    line-height: 20px;
+    display: flex;
+    flex-direction: column;
+  }
+
+  &__multi-day-total-discount {
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 18px;
+    text-decoration-line: line-through;
+    color: var(--Gray-500, #667085);
+  }
+}

package/es/components/productCard/cartSkuCard/components/MultiDay/utils.d.ts

@@ -0,0 +1,14 @@
+interface InputItem {
+    start_date: string;
+    end_date: string;
+    total: number;
+    num: number;
+}
+interface OutputItem {
+    start_date: string;
+    end_date: string;
+    total: number;
+    num: number;
+}
+export declare function formatDateRanges(list: InputItem[]): OutputItem[];
+export {};

package/es/components/productCard/cartSkuCard/components/MultiDay/utils.js

@@ -0,0 +1,56 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import dayjs from 'dayjs';
+
+// 定义输入数据的接口
+
+// 定义输出数据的接口
+
+export function formatDateRanges(list) {
+  var result = [];
+  var currentGroup = null;
+  list.forEach(function (item, index) {
+    // Convert string dates using dayjs
+    var currentStartDate = dayjs(item.start_date);
+    var currentEndDate = dayjs(item.end_date);
+    var currentTotal = item.total;
+    var currentNum = item.num;
+    if (!currentGroup) {
+      // Start a new group
+      currentGroup = _objectSpread(_objectSpread({}, item), {}, {
+        start_date: currentStartDate.format('YYYY-MM-DD'),
+        end_date: currentEndDate.format('YYYY-MM-DD'),
+        total: currentTotal,
+        num: currentNum
+      });
+    } else {
+      var prevEndDate = dayjs(currentGroup.end_date);
+
+      // Check if current item can be merged with current group
+      if (currentTotal === currentGroup.total && prevEndDate.isSame(currentStartDate, 'day')) {
+        // Update end date and add up num
+        currentGroup.end_date = currentEndDate.format('YYYY-MM-DD');
+        currentGroup.num += currentNum;
+      } else {
+        // Push current group and start a new one
+        result.push(currentGroup);
+        currentGroup = _objectSpread(_objectSpread({}, item), {}, {
+          start_date: currentStartDate.format('YYYY-MM-DD'),
+          end_date: currentEndDate.format('YYYY-MM-DD'),
+          total: currentTotal,
+          num: currentNum
+        });
+      }
+    }
+
+    // Push the last group
+    if (index === list.length - 1 && currentGroup) {
+      result.push(currentGroup);
+    }
+  });
+  return result;
+}

package/es/components/productCard/cartSkuCard/components/Note/index.d.ts

@@ -0,0 +1,3 @@
+import './index.less';
+declare const Note: (props: any) => JSX.Element | null;
+export default Note;

package/es/components/productCard/cartSkuCard/components/Note/index.js

@@ -0,0 +1,29 @@
+import React from 'react';
+import classNames from 'classnames';
+import { locales } from '@pisell/utils';
+import { Divider } from 'antd';
+import { PREFIX } from "../../index";
+import "./index.less";
+var Note = function Note(props) {
+  var item = props.item,
+    type = props.type,
+    openNote = props.openNote,
+    disabledEdit = props.disabledEdit;
+  return item !== null && item !== void 0 && item.note || !disabledEdit ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, {
+    style: {
+      margin: 0
+    }
+  }), /*#__PURE__*/React.createElement("div", {
+    className: classNames("".concat(PREFIX, "__note-wrap"))
+  }, item !== null && item !== void 0 && item.note ? /*#__PURE__*/React.createElement("div", {
+    className: classNames("".concat(PREFIX, "__note-text"))
+  }, locales.getText('pisell2.product.card.discount.note'), ": ", item.note) : null, !disabledEdit ? /*#__PURE__*/React.createElement("span", {
+    className: "".concat(PREFIX, "__note-btn"),
+    onClick: function onClick(e) {
+      e.preventDefault();
+      e.stopPropagation();
+      openNote();
+    }
+  }, item !== null && item !== void 0 && item.note ? locales.getText('pisell2.product.card.discount.edit.note') : locales.getText('pisell2.product.card.discount.add.note')) : null)) : null;
+};
+export default Note;

package/es/components/productCard/cartSkuCard/components/Note/index.less

@@ -0,0 +1,27 @@
+.pisell-cart-sku-card {
+  &__note-wrap {
+    display: flex;
+    gap: 8px;
+    color: var(--Gray-900, #101828);
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 20px;
+  }
+
+  &__note-text {
+    color: #101828;
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 20px;
+    word-break: keep-all;
+    word-wrap: normal;
+  }
+
+  &__note-btn {
+    color: var(--Blue-600, #1570ef);
+    font-weight: 600;
+    cursor: pointer;
+    white-space: nowrap;
+  }
+}

package/es/components/productCard/cartSkuCard/components/basicInfo/index.d.ts

@@ -13,9 +13,15 @@ interface IProps {
         total?: number;
         origin_total?: number;
         num?: number;
+        holder_id?: any;
     };
     style?: React.CSSProperties;
+    /** 作为主商品卡片展示
+     * 1. 影响商品数量 tag 的位置
+     * 2. isMain 且 type 为 a5，展示holder
+     */
     isMainProduct?: boolean;
+    type?: 'a2' | 'a5';
 }
 declare const BasicInfo: (props: IProps) => JSX.Element;
 export default BasicInfo;

package/es/components/productCard/cartSkuCard/components/basicInfo/index.js

@@ -2,6 +2,7 @@ import React from 'react';
 import classNames from 'classnames';
 import { image as imageAli, formatAmount } from '@pisell/utils';
 import Specs from "../specs";
+import Holders from "../holders";
 import { PREFIX } from "../../index";
 import "./index.less";
 var BasicInfo = function BasicInfo(props) {
@@ -9,7 +10,8 @@ var BasicInfo = function BasicInfo(props) {
     _props$dataSource = props.dataSource,
     dataSource = _props$dataSource === void 0 ? {} : _props$dataSource,
     style = props.style,
-    isMainProduct = props.isMainProduct;
+    isMainProduct = props.isMainProduct,
+    type = props.type;
   var image = dataSource.image,
     bundle = dataSource.bundle,
     options = dataSource.options,
@@ -22,14 +24,14 @@ var BasicInfo = function BasicInfo(props) {
     _dataSource$origin_to = dataSource.origin_total,
     origin_total = _dataSource$origin_to === void 0 ? 0 : _dataSource$origin_to,
     _dataSource$num = dataSource.num,
-    num = _dataSource$num === void 0 ? 1 : _dataSource$num;
+    num = _dataSource$num === void 0 ? 1 : _dataSource$num,
+    holder_id = dataSource.holder_id;
   var renderNumTag = function renderNumTag() {
-    if (num > 1) return /*#__PURE__*/React.createElement("div", {
+    return /*#__PURE__*/React.createElement("div", {
       className: classNames("num-tag", {
         'is-main': isMainProduct
       })
     }, num < 100 ? num : '99+');
-    return null;
   };
   var hasSpecs = (bundle === null || bundle === void 0 ? void 0 : bundle.length) || (options === null || options === void 0 ? void 0 : options.length) || product_option_string;
   var renderImage = function renderImage() {
@@ -47,12 +49,30 @@ var BasicInfo = function BasicInfo(props) {
       className: "product-cover-text"
     }, displayText);
   };
+  if (type === 'a5') {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "".concat(PREFIX, "__basic-info"),
+      style: style || {}
+    }, renderNumTag(), renderImage(), !isShowImage || !image && !name ? /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: 20
+      }
+    }) : null, /*#__PURE__*/React.createElement("div", {
+      className: "product-info"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "product-name"
+    }, name), !holder_id || !(holder_id !== null && holder_id !== void 0 && holder_id.length) ? /*#__PURE__*/React.createElement("div", {
+      className: "product-price"
+    }, formatAmount(price, 2, symbol)) : /*#__PURE__*/React.createElement(Holders, {
+      dataSource: dataSource
+    })));
+  }
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(PREFIX, "__basic-info"),
     style: style || {}
-  }, renderNumTag(), renderImage(), (!isShowImage || !image && !name) && num > 1 ? /*#__PURE__*/React.createElement("div", {
+  }, renderNumTag(), renderImage(), !isShowImage || !image && !name ? /*#__PURE__*/React.createElement("div", {
     style: {
-      width: 26
+      width: 20
     }
   }) : null, /*#__PURE__*/React.createElement("div", {
     className: "product-info"

package/es/components/productCard/cartSkuCard/components/basicInfo/index.less

@@ -3,6 +3,7 @@
     display: flex;
     gap: 4px;
     position: relative;
+    min-height: 48px;
 
     .num-tag {
       background-color: #7f56da;
@@ -46,16 +47,18 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      font-size: 22px;
+      font-size: 20px;
       font-weight: 500;
       line-height: 1;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
 
     .product-info {
       flex: 1;
       display: flex;
       align-items: center;
-      gap: 4px;
       flex: 1 0 0;
       flex-wrap: wrap;
       overflow: hidden;
@@ -70,6 +73,7 @@
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
+        padding-right: 20px;
       }
 
       .product-price {

package/es/components/productCard/cartSkuCard/components/discountReason/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const DiscountReason: (props: any) => JSX.Element;
 export default DiscountReason;

package/es/components/productCard/cartSkuCard/components/packages/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface IProps {
     isShowImage?: boolean;

package/es/components/productCard/cartSkuCard/components/packages/index.js

@@ -21,7 +21,7 @@ var Packages = function Packages(_ref) {
     symbol = _dataSource$symbol === void 0 ? '$' : _dataSource$symbol;
   return (bundle === null || bundle === void 0 ? void 0 : bundle.length) > 0 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, {
     style: {
-      margin: '4px 0'
+      margin: 0
     }
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(PREFIX, "__packages-wrap")

package/es/components/productCard/cartSkuCard/components/resources/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import './index.less';
-declare const Resources: (props: any) => JSX.Element;
+declare const Resources: (props: any) => JSX.Element | null;
 export default Resources;

package/es/components/productCard/cartSkuCard/components/resources/index.js

@@ -16,10 +16,7 @@ var Resources = function Resources(props) {
     var ids = item.id,
       lists = item.lists,
       _id = item._id;
-    return /*#__PURE__*/React.createElement("div", {
-      className: "resource-item",
-      key: _id
-    }, Array.isArray(ids) ? ids.map(function (id) {
+    return Array.isArray(ids) ? ids.map(function (id) {
       var targetRes = lists.find(function (l) {
         return l.id === id;
       });
@@ -30,15 +27,13 @@ var Resources = function Resources(props) {
         }, targetRes.label);
       }
       return null;
-    }) : null);
-  };
-  var renderContent = function renderContent() {
-    if (isMultipleResource && (multiResources === null || multiResources === void 0 ? void 0 : multiResources.length) > 0) {
-      return multiResources.map(renderResourceItem);
-    }
+    }) : null;
   };
-  return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(PREFIX, "__resources")
-  }, renderContent());
+  if (isMultipleResource && (multiResources === null || multiResources === void 0 ? void 0 : multiResources.length) > 0) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "".concat(PREFIX, "__resources")
+    }, multiResources.map(renderResourceItem));
+  }
+  return null;
 };
 export default Resources;

package/es/components/productCard/cartSkuCard/components/resources/index.less

@@ -1,5 +1,4 @@
 .pisell-cart-sku-card__resources {
-  margin-top: 4px;
   display: flex;
   flex-wrap: wrap;
   gap: 4px;
@@ -9,12 +8,12 @@
     display: flex;
     flex-wrap: wrap;
     gap: 4px;
+  }
 
-    .resource-tag {
-      max-width: 120px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      margin: 0;
-    }
+  .resource-tag {
+    max-width: 120px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    margin: 0;
   }
 }

package/es/components/productCard/cartSkuCard/components/sales/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface IProps {
     hideDivider?: boolean;
@@ -7,6 +6,7 @@ interface IProps {
         relation_products?: any[];
         bundle?: any[];
     };
+    isShowImage?: boolean;
 }
-declare const Sales: ({ hideDivider, dataSource }: IProps) => JSX.Element | null;
+declare const Sales: ({ hideDivider, dataSource, isShowImage }: IProps) => JSX.Element | null;
 export default Sales;

package/es/components/productCard/cartSkuCard/components/sales/index.js

@@ -13,7 +13,8 @@ import { PREFIX } from "../../index";
 import "./index.less";
 var Sales = function Sales(_ref) {
   var hideDivider = _ref.hideDivider,
-    dataSource = _ref.dataSource;
+    dataSource = _ref.dataSource,
+    isShowImage = _ref.isShowImage;
   var _ref2 = dataSource || {},
     _ref2$relation_produc = _ref2.relation_products,
     relation_products = _ref2$relation_produc === void 0 ? [] : _ref2$relation_produc,
@@ -32,7 +33,7 @@ var Sales = function Sales(_ref) {
   });
   return (other_products === null || other_products === void 0 ? void 0 : other_products.length) > 0 ? /*#__PURE__*/React.createElement(React.Fragment, null, hideDivider ? null : /*#__PURE__*/React.createElement(Divider, {
     style: {
-      margin: '4px 0'
+      margin: 0
     }
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(PREFIX, "_sales-wrap")
@@ -42,6 +43,7 @@ var Sales = function Sales(_ref) {
     list: other_products || [],
     renderItem: function renderItem(item) {
       return /*#__PURE__*/React.createElement(BasicInfo, {
+        isShowImage: isShowImage,
         style: {
           border: '1px solid #D0D5DD',
           borderRadius: 4,

package/es/components/productCard/cartSkuCard/components/specs/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Specs: (props: any) => JSX.Element | null;
 export default Specs;

package/es/components/productCard/cartSkuCard/components/specs/index.js

@@ -12,7 +12,8 @@ var Specs = function Specs(props) {
   var more = /*#__PURE__*/React.createElement("div", {
     style: {
       color: '#667085',
-      fontSize: 10
+      fontSize: 10,
+      lineHeight: '10px'
     }
   }, locales.getText('pisell2.cart.sku-card.more'));
   if (Array.isArray(bundle) && (bundle === null || bundle === void 0 ? void 0 : bundle.length) > 0) {
@@ -36,7 +37,7 @@ var Specs = function Specs(props) {
       className: "spec-name"
     }, _first.name), /*#__PURE__*/React.createElement("span", {
       className: "spec-num"
-    }, symbol, _first.price, "x", _first.num)), options.length > 1 ? more : null);
+    }, /*#__PURE__*/React.createElement("span", null, symbol, _first.price), /*#__PURE__*/React.createElement("span", null), "x", /*#__PURE__*/React.createElement("span", null, _first.num))), options.length > 1 ? more : null);
   }
   return null;
 };

package/es/components/productCard/cartSkuCard/components/specs/index.less

@@ -24,5 +24,11 @@
       white-space: nowrap;
       margin-right: 8px;
     }
+
+    .spec-num {
+      display: flex;
+      gap: 4px;
+      align-items: center;
+    }
   }
 }

package/es/components/productCard/cartSkuCard/components/swipeAction/index.d.ts

@@ -28,6 +28,7 @@ export declare type SwipeActionProps = {
     stopPropagation?: PropagationEvent[];
     onActionsReveal?: (side: SideType) => void;
     onClose?: () => void;
+    escapeDom?: string;
 } & NativeProps<'--background'>;
 export declare const SwipeAction: React.ForwardRefExoticComponent<{
     rightActions?: Action[] | undefined;
@@ -39,5 +40,6 @@ export declare const SwipeAction: React.ForwardRefExoticComponent<{
     stopPropagation?: "click"[] | undefined;
     onActionsReveal?: ((side: SideType) => void) | undefined;
     onClose?: (() => void) | undefined;
+    escapeDom?: string | undefined;
 } & NativeProps<"--background"> & React.RefAttributes<SwipeActionRef>>;
 export {};

package/es/components/productCard/cartSkuCard/components/swipeAction/index.js

@@ -201,6 +201,11 @@ export var SwipeAction = /*#__PURE__*/forwardRef(function (p, ref) {
   useEffect(function () {
     if (!props.closeOnTouchOutside) return;
     function handle(e) {
+      // 检查点击的元素或其祖先元素是否有特定 class
+      if (e.target && props.escapeDom) {
+        var container = document.querySelector(props.escapeDom);
+        if (container !== null && container !== void 0 && container.contains(e.target)) return;
+      }
       if (x.get() === 0) {
         return;
       }
@@ -209,11 +214,16 @@ export var SwipeAction = /*#__PURE__*/forwardRef(function (p, ref) {
         close();
       }
     }
-    document.addEventListener('touchstart', handle);
+    if ('ontouchstart' in window) {
+      document.addEventListener('touchstart', handle);
+    } else {
+      document.addEventListener('mousedown', handle);
+    }
     return function () {
       document.removeEventListener('touchstart', handle);
+      document.removeEventListener('mousedown', handle);
     };
-  }, [props.closeOnTouchOutside]);
+  }, [props.closeOnTouchOutside, props.escapeDom]);
   function renderAction(action) {
     var _action$color, _colorRecord$color;
     var color = (_action$color = action.color) !== null && _action$color !== void 0 ? _action$color : 'light';

package/es/components/productCard/cartSkuCard/components/timeRange/index.js

@@ -1,6 +1,7 @@
 import Iconfont from "../../../../iconfont";
 import React, { useEffect, useMemo } from 'react';
 import { Divider } from 'antd';
+import { getServiceTime } from "../../../utils";
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
 import 'dayjs/locale/en';
@@ -41,13 +42,13 @@ var TimeRange = function TimeRange(props) {
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, {
     style: {
-      margin: '4px 0'
+      margin: '0'
     }
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(PREFIX, "__time-range")
-  }, renderTimeItem(start_date), /*#__PURE__*/React.createElement(Iconfont, {
-    className: "joint-icon",
-    type: "pisell2-arrow-right"
-  }), renderTimeItem(end_date)));
+  }, /*#__PURE__*/React.createElement(Iconfont, {
+    className: "time-icon",
+    type: "pisell2-clock"
+  }), getServiceTime(dataSource, start_date)));
 };
 export default TimeRange;

package/es/components/productCard/cartSkuCard/components/timeRange/index.less

@@ -1,9 +1,10 @@
 .pisell-cart-sku-card__time-range {
   user-select: none;
+  color: #667085;
 
   display: flex;
   align-items: center;
-  gap: 8px;
+  gap: 4px;
   overflow: hidden;
 
   .joint-icon {
@@ -11,6 +12,11 @@
     color: #7f56da;
   }
 
+  .time-icon {
+    font-size: 16px;
+    color: #7f56da;
+  }
+
   .time-range-item {
     white-space: nowrap;
     display: flex;
@@ -18,11 +24,6 @@
     align-items: center;
     overflow: hidden;
 
-    .time-icon {
-      font-size: 16px;
-      color: #7f56da;
-    }
-
     .time-str {
       color: #667085;
       font-size: 14px;

package/es/components/productCard/cartSkuCard/index.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="react" />
 import './index.less';
 import { ProductCardTypes } from '../types';
 interface ISKUCardProps extends ProductCardTypes {
     type: 'a2' | 'a5';
     rightActions: any[];
+    escapeDom?: string;
 }
 export declare const PREFIX = "pisell-cart-sku-card";
 declare const CartSkuCard: (props: ISKUCardProps) => JSX.Element;