@fonixtree/magic-design 1.0.53 → 1.0.55

package/lib/composite-comp/common/components/AffiliateProductItem/index.less

@@ -0,0 +1,129 @@
+.m-product-item-wrap {
+  display: flex;
+  flex-direction: column;
+  background: #FFFFFF;
+  border: 1px solid #D2D9E5;
+  width: 142px;
+  cursor: pointer;
+  position: relative;
+  border-radius: 4px;
+
+  .product-img {
+    flex-shrink: 0;
+  }
+
+  .productItemContent {
+    padding: 4px 4px 0;
+
+    .producItemName {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 2;
+      line-height: 18px;
+      max-height: 40px;
+    }
+
+  }
+
+  .cashBackBox {
+    width: 100%;
+    background: #F9F9F9;
+    padding: 4px;
+
+    .cashBackBox_cashBack {
+      display: flex;
+      align-items: center;
+
+      img {
+        width: 14px;
+        height: 14px;
+      }
+
+      .cashBackBox_text {
+        display: flex;
+        align-items: center;
+        padding-left: 4px;
+        color: #279e2c;
+        font-family: Trueno;
+        font-size: 10px;
+        font-style: normal;
+        font-weight: 700;
+        line-height: 12px;
+
+        span {
+          padding-left: 2px;
+        }
+      }
+
+      .custom_font {
+        font-size: 9px;
+        padding-left: 2px;
+      }
+    }
+
+    .cashBackBox_koin {
+      display: flex;
+      align-items: center;
+
+      img {
+        width: 14px;
+        height: 14px;
+      }
+
+      .cashBackBox_text {
+        color: #fa7539;
+        font-family: Trueno;
+        font-size: 10px;
+        font-style: normal;
+        font-weight: 700;
+        line-height: 12px;
+        display: flex;
+        align-items: center;
+        padding-left: 4px;
+
+        span {
+          padding: 0 2px;
+        }
+      }
+
+      .custom_font {
+        font-size: 9px;
+        padding-left: 2px;
+      }
+    }
+  }
+
+  .producItemPrice {
+    padding: 4px;
+  }
+
+  &.fixHeight {
+    .promotions-wrap {
+      height: 30px;
+      flex-wrap: nowrap;
+      overflow: hidden;
+    }
+
+    .producItemName {
+      height: 38px;
+    }
+  }
+
+  &.horizontal {
+    flex-direction: row;
+
+    .product-img {
+      width: 100px;
+      height: 100%;
+      min-height: 100px;
+    }
+
+    .content-wrap {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+    }
+  }
+}

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

@@ -19,6 +19,8 @@ var _ImageLabel = _interopRequireDefault(require("../ImageLabel"));
 
 var _components = require("../../../../meta-comp/components");
 
+var _businessUtil = require("../../../../utils/businessUtil");
+
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -93,26 +95,26 @@ function (_super) {
   }
 
   ProductItem.prototype.render = function () {
-    var _a, _b, _c, _d;
-
-    var _e = this.props,
-        data = _e.data,
-        panelProps = _e.panelProps,
-        onItemClick = _e.onItemClick,
-        showProName = _e.showProName,
-        showProgress = _e.showProgress,
-        fixHeight = _e.fixHeight,
-        layout = _e.layout,
-        imgHeight = _e.imgHeight,
-        imgWidth = _e.imgWidth,
-        unknownPrice = _e.unknownPrice,
-        rest = __rest(_e, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]); // const promotions = getPromotionList(data);
-
-
+    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 promotions = (0, _businessUtil.getPromotionList)(data);
     var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
     /** 当是拼团时 显示价格 */
 
-    if (data.sppType) {
+    if (data.sppType && promotions.length) {
       price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrency)(data.specialPrice) : (0, _currencyUtil.formatCurrency)(data.salesPrice);
     }
 
@@ -136,7 +138,7 @@ function (_super) {
 
     var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
 
-    var oldPrice = data.marketPrice ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
+    var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
     var discount = Number(data.discountPercent) || 0;
     var salePercent = Number(data.salePercent) / 100 || 0;
     var imgStyle = {};
@@ -174,9 +176,9 @@ function (_super) {
       small: true
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"
-    }, panelProps.label.open && ((_d = data === null || data === void 0 ? void 0 : data.cmpBuygetnLabels) === null || _d === void 0 ? void 0 : _d.length) > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+    }, panelProps.label.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "promotions-wrap"
-    }, data.cmpBuygetnLabels.map(function (promot, index) {
+    }, promotions.map(function (promot, index) {
       return /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
         key: index,
         className: "promotion-item",

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

@@ -7,8 +7,6 @@
   cursor: pointer;
   position: relative;
 
-
-
   .img-wrap {
     position: relative;
 
@@ -21,22 +19,14 @@
 
   .content-wrap {
     padding: 8px;
-    width: 100%;
-    overflow: hidden;
 
     .promotions-wrap {
-      // display: flex;
-      // flex-wrap: wrap;
-      display: block;
-      width: 100%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
+      display: flex;
+      flex-wrap: wrap;
 
       .promotion-item {
         margin-right: 5px;
         margin-bottom: 5px;
-        display: inline-flex;
 
         &:last-child {
           margin-right: 0;

package/lib/composite-comp/common/config-panels/CustomizeConfig/index.js

@@ -135,6 +135,19 @@ function (_super) {
             showRowNum: false
           });
         }
+      } // wallet 第一种布局可选列数
+
+
+      if (component === 'wallet') {
+        if (v === 'layout2') {
+          _this.setState({
+            showRowNum: false
+          });
+        } else {
+          _this.setState({
+            showRowNum: true
+          });
+        }
       } // 移动端导航特殊处理
       // 更改需求，两个布局都需 可选行数
       // if (component == 'mobileNavigation') {

package/lib/composite-comp/common/config-panels/CustomizeConfig/index.less

@@ -4,15 +4,16 @@
     justify-content: space-between;
     align-items: center;
   }
+
   .selectWrap {
     position: relative;
     display: flex;
-    
+
     .iconNum {
       position: absolute;
       z-index: 9;
       left: 15px;
-      top: 10px;
+      top: 8px;
     }
 
     .cylon-select {

package/lib/composite-comp/common/config-panels/SpacingConfig/index.js

@@ -92,6 +92,7 @@ function (_super) {
         _this.selfRender();
       }
     })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      split: "dashed",
       title: (0, _locale.i18n)('PADDING')
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "padding-wrap"

package/lib/composite-comp/dito/components/AffiliateRecommend/defaultJSON.js

@@ -0,0 +1,243 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.recommendGroupSourceJSON = exports.getDefaultJSON = void 0;
+
+var _uuid = require("uuid");
+
+var recommendGroupSourceJSON = function recommendGroupSourceJSON(parentId, logo, text) {
+  var groupId = (0, _uuid.v4)();
+  var imageId = (0, _uuid.v4)();
+  var groupNameId = (0, _uuid.v4)();
+  return {
+    id: groupId,
+    parentId: parentId,
+    image: {
+      parentId: groupId,
+      id: imageId,
+      open: true,
+      type: 'IMAGE',
+      content: {
+        h5Name: '',
+        pcName: '',
+        h5ImgSrc: logo,
+        pcImgSrc: logo,
+        clickUrl: ''
+      },
+      hover: {
+        open: false,
+        backgroundType: 'enlarge',
+        magnification: 1.5,
+        pcImgHoverUrl: '',
+        h5ImgHoverUrl: ''
+      }
+    },
+    groupName: {
+      parentId: groupId,
+      id: groupNameId,
+      open: true,
+      type: 'TEXT',
+      specialContent: [],
+      text: text,
+      content: {
+        sizeType: 'Customize font styles',
+        fontFamily: 'Open Sans',
+        fontWeight: 400,
+        fontSize: 14,
+        color: '#8493AF'
+      },
+      underline: {
+        open: false,
+        textDecorationColor: '',
+        textDecorationStyle: 'solid'
+      },
+      vertical: {}
+    },
+    seeAll: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'BUTTON',
+      text: 'See All',
+      content: {
+        url: '',
+        backgroundColor: '#fff'
+      },
+      buttonText: {
+        sizeType: 'Customize font styles',
+        fontFamily: 'Open Sans',
+        fontWeight: 400,
+        fontSize: 12,
+        fontStyle: 'normal',
+        color: '#232F46'
+      },
+      buttonBorder: {
+        open: true,
+        borderColor: '',
+        borderRadius: 0
+      },
+      spacing: {
+        pc: {
+          paddingTop: 0,
+          paddingBottom: 0,
+          paddingLeft: 0,
+          paddingRight: 0
+        },
+        mobile: {
+          paddingTop: 0,
+          paddingBottom: 0,
+          paddingLeft: 0,
+          paddingRight: 0
+        }
+      },
+      buttonIcon: {
+        iconUrl: '/get/resource/platform/conf/20220923/picture/Frame24271573200432656932864.png',
+        layout: 'left'
+      },
+      hover: null
+    },
+    prodIds: '',
+    intelligentType: 'Hot',
+    intelligentValue: [],
+    maxProdNum: 10,
+    hover: {
+      open: false,
+      image: {
+        parentId: groupId,
+        id: imageId,
+        open: false,
+        type: 'IMAGE',
+        content: {
+          h5Name: '',
+          pcName: '',
+          h5ImgSrc: logo,
+          pcImgSrc: logo,
+          clickUrl: ''
+        },
+        hover: {
+          open: false,
+          backgroundType: 'enlarge',
+          magnification: 1.5,
+          pcImgHoverUrl: '',
+          h5ImgHoverUrl: ''
+        }
+      },
+      groupName: {
+        parentId: groupId,
+        id: groupNameId,
+        open: false,
+        type: 'TEXT',
+        specialContent: [],
+        text: text,
+        content: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 600,
+          fontSize: 14,
+          color: '#CE1126'
+        },
+        underline: {
+          open: false,
+          textDecorationColor: '',
+          textDecorationStyle: 'solid'
+        },
+        vertical: {}
+      }
+    }
+  };
+};
+
+exports.recommendGroupSourceJSON = recommendGroupSourceJSON;
+
+var getDefaultJSON = function getDefaultJSON() {
+  var groupId = (0, _uuid.v4)();
+  return {
+    id: groupId,
+    type: 'AFFILIATE_RECOMMEND',
+    groupSource: [recommendGroupSourceJSON(groupId, '', 'Tab1'), recommendGroupSourceJSON(groupId, '', 'Tab2')],
+    content: {
+      productName: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'TEXT',
+        specialContent: [],
+        text: 'Flash Deal',
+        content: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 400,
+          fontSize: 10,
+          color: '#282828'
+        },
+        underline: {
+          open: false,
+          textDecorationColor: '',
+          textDecorationStyle: 'solid'
+        },
+        vertical: {
+          open: false,
+          lineHeight: 18
+        }
+      },
+      salesPrice: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'TEXT',
+        specialContent: [],
+        text: 'Flash Deal',
+        content: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 800,
+          fontSize: 18,
+          color: '#333'
+        },
+        underline: {
+          open: false,
+          textDecorationColor: '',
+          textDecorationStyle: 'solid'
+        },
+        vertical: {
+          open: false,
+          lineHeight: 18
+        }
+      }
+    },
+    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: {
+        pcLayout: 'layout1',
+        h5Layout: 'layout1'
+      },
+      align: 'left',
+      pcRowNum: 6,
+      pcMaxRowNum: 6,
+      pcMinRowNum: 5
+    },
+    background: {
+      opacity: 100,
+      color: '#fff',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;

package/lib/composite-comp/dito/components/AffiliateRecommend/index.js

@@ -0,0 +1,90 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _mobile = _interopRequireDefault(require("./mobile"));
+
+var _pc = _interopRequireDefault(require("./pc"));
+
+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 AffiliateRecommend =
+/** @class */
+function (_super) {
+  __extends(AffiliateRecommend, _super);
+
+  function AffiliateRecommend() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  AffiliateRecommend.prototype.render = function () {
+    var nodeData = this.props.nodeData;
+    return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
+      panelProps: nodeData
+    }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
+      panelProps: nodeData
+    }));
+  };
+
+  AffiliateRecommend.defaultProps = {};
+  AffiliateRecommend.type = 'AFFILIATE_RECOMMEND';
+  AffiliateRecommend.getDefaultJSON = _defaultJSON.getDefaultJSON;
+  AffiliateRecommend = __decorate([_compositeDecorator["default"]], AffiliateRecommend);
+  return AffiliateRecommend;
+}(_react.Component);
+
+var _default = AffiliateRecommend;
+exports["default"] = _default;