@fonixtree/magic-design 2.0.94 → 2.0.95

package/es/common/index.js

@@ -99,6 +99,12 @@ Object.defineProperty(exports, "MyModal", {
     return _MyModal["default"];
   }
 });
+Object.defineProperty(exports, "NewImg", {
+  enumerable: true,
+  get: function get() {
+    return _NewImg["default"];
+  }
+});
 Object.defineProperty(exports, "ProductSource", {
   enumerable: true,
   get: function get() {
@@ -196,4 +202,6 @@ var _MyModal = _interopRequireDefault(require("./MyModal"));
 
 var _CropperModal = _interopRequireDefault(require("./CropperModal"));
 
+var _NewImg = _interopRequireDefault(require("./NewImg"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

package/es/composite-comp/bol/components/Banner/mobile/index.js

@@ -13,6 +13,8 @@ var _antd = require("antd");
 
 require("./index.less");
 
+var _locale = require("../../../../../locale");
+
 var _mobx = require("../../../../../mobx");
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -212,8 +214,8 @@ function (_super) {
           /** PTO 定制GA */
           if (window.magicDesign.pushGA) {
             window.magicDesign.pushGA({}, 'select_promotion', {
-              event_label: (0, _ConfigPanel.getSecondConfigName)(data, item.id),
-              promotion_name: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
+              event_section: 'Banner',
+              promotion_name: item.image.content.h5ImgSrc ? item.image.content.h5Name : (0, _locale.i18n)('BANNER_GROUP_NAME')
             });
           }
         },

package/es/composite-comp/common/components/ProductItem/index.js

@@ -13,7 +13,7 @@ var _commonUtil = require("../../../../utils/commonUtil");
 
 var _currencyUtil = require("../../../../utils/currencyUtil");
 
-var _NewImg = _interopRequireDefault(require("../../../../common/NewImg"));
+var _common = require("../../../../common");
 
 var _ImageLabel = _interopRequireDefault(require("../ImageLabel"));
 
@@ -95,20 +95,21 @@ function (_super) {
   }
 
   ProductItem.prototype.render = function () {
-    var _a, _b, _c;
-
-    var _d = this.props,
-        data = _d.data,
-        panelProps = _d.panelProps,
-        onItemClick = _d.onItemClick,
-        showProName = _d.showProName,
-        showProgress = _d.showProgress,
-        fixHeight = _d.fixHeight,
-        layout = _d.layout,
-        imgHeight = _d.imgHeight,
-        imgWidth = _d.imgWidth,
-        unknownPrice = _d.unknownPrice,
-        rest = __rest(_d, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
+    var _a, _b, _c, _d, _e;
+
+    var _f = this.props,
+        data = _f.data,
+        type = _f.type,
+        panelProps = _f.panelProps,
+        onItemClick = _f.onItemClick,
+        showProName = _f.showProName,
+        showProgress = _f.showProgress,
+        fixHeight = _f.fixHeight,
+        layout = _f.layout,
+        imgHeight = _f.imgHeight,
+        imgWidth = _f.imgWidth,
+        unknownPrice = _f.unknownPrice,
+        rest = __rest(_f, ["data", "type", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
 
     var promotions = (0, _businessUtil.getPromotionList)(data);
     var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
@@ -139,6 +140,9 @@ function (_super) {
     var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
 
     var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
+
+    var _oldPrice = type === 'groupBuy' && data.sppMarketPrice ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.sppMarketPrice) : oldPrice;
+
     var discount = Number(data.discountPercent) || 0;
     var salePercent = Number(data.salePercent) / 100 || 0;
     var imgStyle = {};
@@ -153,6 +157,9 @@ function (_super) {
     var priceLabels = ((_c = data.labels) === null || _c === void 0 ? void 0 : _c.filter(function (f) {
       return f.position === '7';
     })) || [];
+    var shareByNum = (0, _commonUtil.ensure)(function () {
+      return data.campaigns.cmpShareBuys[0].shareByNum;
+    }, 0);
     return /*#__PURE__*/_react["default"].createElement("div", _extends({
       className: (0, _classnames["default"])('m-product-item-wrap', {
         fixHeight: fixHeight,
@@ -166,7 +173,7 @@ function (_super) {
       }
     }, rest), /*#__PURE__*/_react["default"].createElement("div", {
       className: "img-wrap"
-    }, /*#__PURE__*/_react["default"].createElement(_NewImg["default"], {
+    }, /*#__PURE__*/_react["default"].createElement(_common.NewImg, {
       className: "product-img",
       lazy: true,
       src: (0, _commonUtil.convertImageUrl)(data.productImg || data.imgUrlContent || data.productImageUrlContent),
@@ -176,7 +183,7 @@ function (_super) {
       small: true
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"
-    }, panelProps.label.open && /*#__PURE__*/_react["default"].createElement("div", {
+    }, type !== 'groupBuy' && panelProps.label.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "promotions-wrap"
     }, promotions.map(function (promot, index) {
       return /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
@@ -187,7 +194,13 @@ function (_super) {
         }),
         readonly: true
       });
-    })), /*#__PURE__*/_react["default"].createElement("div", {
+    })), type === 'groupBuy' && panelProps.label.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+      className: "group-num",
+      data: __assign(__assign({}, panelProps.label), {
+        text: shareByNum
+      }),
+      readonly: true
+    }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "product-name-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "box"
@@ -216,10 +229,10 @@ function (_super) {
       className: "old-price-wrap"
     }, !!discount && /*#__PURE__*/_react["default"].createElement("span", {
       className: "discount"
-    }, "-", discount, "%"), oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+    }, "-", discount, "%"), _oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "old-price",
       data: __assign(__assign({}, panelProps.salesPrice), {
-        text: oldPrice
+        text: _oldPrice
       }),
       readonly: true,
       style: {
@@ -227,7 +240,7 @@ function (_super) {
       }
     })), !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "sold-count"
-    }, (0, _commonUtil.convertCount)(data.salesCnt), " sold")), showProgress && panelProps.salesProgressVisible.open && /*#__PURE__*/_react["default"].createElement("div", {
+    }, (0, _commonUtil.convertCount)(data.salesCnt), " sold")), showProgress && ((_d = panelProps.salesProgress) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress-wrap"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "text"
@@ -236,7 +249,8 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress",
       style: {
-        width: salePercent + "%"
+        width: salePercent + "%",
+        backgroundColor: (_e = panelProps.salesProgress) === null || _e === void 0 ? void 0 : _e.color
       }
     })))));
   };

package/es/composite-comp/common/components/ProductItem/index.less

@@ -34,6 +34,14 @@
       }
     }
 
+    .group-num {
+      display: inline-block;
+
+      .m-meta-button .btnContent img {
+        height: 14px;
+      }
+    }
+
     .product-name-wrap {
       overflow: hidden;
       text-overflow: ellipsis;
@@ -42,6 +50,7 @@
       -webkit-line-clamp: 2;
       line-height: 18px;
       max-height: 40px;
+      white-space: wrap;
     }
 
     .price-wrap {

package/es/composite-comp/dito/components/FlashDeal/defaultJSON.js

@@ -205,7 +205,7 @@ var getDefaultJSON = function getDefaultJSON() {
           lineHeight: 18
         }
       },
-      salesProgressVisible: {
+      salesProgress: {
         open: true
       }
     },

package/es/composite-comp/dito/components/FlashDeal/mobile/index.js

@@ -423,7 +423,14 @@ function (_super) {
         }) // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId ?? ''}`)}
         ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
+          if (window.magicDesign.pushGA) {
+            window.magicDesign.pushGA({}, 'select_promotion', {
+              event_section: 'Flash Deal',
+              promotion_name: item === null || item === void 0 ? void 0 : item.offerName
+            });
+          }
+
+          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
         },
         panelProps: panelProps.content,
         unknownPrice: isWill

package/es/composite-comp/dito/components/FlashDeal/mobile/index.less

@@ -81,6 +81,3 @@
   height: 2.8rem;
   width: 2.8rem;
 }
-.m-flash-deal-mobile .flash-deal-list .m-product-item-wrap .product-name {
-  height: 0.72rem;
-}

package/es/composite-comp/dito/components/GroupBuy/defaultJSON.js

@@ -0,0 +1,232 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultJSON = void 0;
+
+var _uuid = require("uuid");
+
+var getDefaultJSON = function getDefaultJSON() {
+  var contentId = (0, _uuid.v4)();
+  return {
+    id: (0, _uuid.v4)(),
+    type: 'GROUP_BUY',
+    title: {
+      headline: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'TEXT',
+        specialContent: [],
+        text: 'Group Buy',
+        content: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 600,
+          fontSize: 16,
+          color: '#000'
+        },
+        underline: {
+          open: false,
+          textDecorationColor: '',
+          textDecorationStyle: 'solid'
+        },
+        vertical: {
+          open: false,
+          lineHeight: 18
+        }
+      },
+      button: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'BUTTON',
+        text: 'Shop More',
+        content: {
+          url: '/product/GroupBuy',
+          backgroundColor: ''
+        },
+        buttonText: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 400,
+          fontSize: 13,
+          fontStyle: 'normal',
+          color: '#2F54EB',
+          padding: '0'
+        },
+        buttonBorder: {
+          open: false,
+          borderColor: '',
+          borderRadius: 6
+        },
+        spacing: {
+          pc: {
+            paddingTop: 2,
+            paddingBottom: 2,
+            paddingLeft: 5,
+            paddingRight: 5
+          },
+          mobile: {
+            paddingTop: 2,
+            paddingBottom: 2,
+            paddingLeft: 5,
+            paddingRight: 5
+          }
+        },
+        buttonIcon: {
+          iconUrl: '',
+          layout: 'right'
+        },
+        hover: null
+      }
+    },
+    content: {
+      id: contentId,
+      sortType: '3',
+      label: {
+        id: (0, _uuid.v4)(),
+        contentId: contentId,
+        open: true,
+        type: 'BUTTON',
+        text: 'Button',
+        content: {
+          url: '',
+          backgroundColor: '#CE1126'
+        },
+        buttonText: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 700,
+          fontSize: 8,
+          fontStyle: 'normal',
+          color: '#fff'
+        },
+        buttonBorder: {
+          open: true,
+          borderColor: '',
+          borderRadius: 0
+        },
+        spacing: {
+          mobile: {
+            paddingTop: 0,
+            paddingBottom: 0,
+            paddingLeft: 5,
+            paddingRight: 5
+          }
+        },
+        buttonIcon: {
+          iconUrl: '/get/resource/platform/20240417/picture/Users1780405511404216320.svg',
+          layout: 'left'
+        },
+        hover: null
+      },
+      productName: {
+        id: (0, _uuid.v4)(),
+        contentId: contentId,
+        open: true,
+        type: 'TEXT',
+        specialContent: [],
+        text: 'Group Buy',
+        content: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 700,
+          fontSize: 13,
+          color: '#232F46'
+        },
+        underline: {
+          open: false,
+          textDecorationColor: '',
+          textDecorationStyle: 'solid'
+        },
+        vertical: {
+          open: false,
+          lineHeight: 18
+        }
+      },
+      activityPrice: {
+        id: (0, _uuid.v4)(),
+        contentId: contentId,
+        open: true,
+        type: 'TEXT',
+        specialContent: [],
+        text: 'Group Buy',
+        content: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 700,
+          fontSize: 13,
+          color: '#CE1126'
+        },
+        underline: {
+          open: false,
+          textDecorationColor: '',
+          textDecorationStyle: 'solid'
+        },
+        vertical: {
+          open: false,
+          lineHeight: 18
+        }
+      },
+      salesPrice: {
+        id: (0, _uuid.v4)(),
+        contentId: contentId,
+        open: true,
+        type: 'TEXT',
+        specialContent: [],
+        text: 'Group Buy',
+        content: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 500,
+          fontSize: 10,
+          color: '#8493AF'
+        },
+        underline: {
+          open: false,
+          textDecorationColor: '',
+          textDecorationStyle: 'solid'
+        },
+        vertical: {
+          open: false,
+          lineHeight: 18
+        }
+      },
+      salesProgress: {
+        open: true,
+        color: '#CE1126'
+      }
+    },
+    spacing: {
+      pc: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        paddingLeft: 0,
+        paddingRight: 0,
+        marginBottom: window.magicDesign.compSpacing * 1.5
+      },
+      mobile: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        paddingLeft: 0,
+        paddingRight: 0,
+        marginBottom: window.magicDesign.compSpacing
+      }
+    },
+    customize: {
+      layout: 'layout1',
+      align: 'left',
+      pcRowNum: 6,
+      pcMaxRowNum: 6,
+      pcMinRowNum: 5
+    },
+    background: {
+      opacity: 100,
+      color: '#fff',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;

package/es/composite-comp/dito/components/GroupBuy/index.js

@@ -0,0 +1,86 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _mobile = _interopRequireDefault(require("./mobile"));
+
+var _defaultJSON = require("./defaultJSON");
+
+var _coreUtil = require("../../../../utils/coreUtil");
+
+var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var __decorate = void 0 && (void 0).__decorate || function (decorators, target, key, desc) {
+  var c = arguments.length,
+      r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
+      d;
+  if ((typeof Reflect === "undefined" ? "undefined" : _typeof(Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) {
+    if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  }
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+
+var GroupBuy =
+/** @class */
+function (_super) {
+  __extends(GroupBuy, _super);
+
+  function GroupBuy() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  GroupBuy.prototype.render = function () {
+    var nodeData = this.props.nodeData;
+    return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? null : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
+      panelProps: nodeData
+    }));
+  };
+
+  GroupBuy.defaultProps = {};
+  GroupBuy.type = 'GROUP_BUY';
+  GroupBuy.getDefaultJSON = _defaultJSON.getDefaultJSON;
+  GroupBuy = __decorate([_compositeDecorator["default"]], GroupBuy);
+  return GroupBuy;
+}(_react.Component);
+
+var _default = GroupBuy;
+exports["default"] = _default;