@fonixtree/magic-design 0.0.48 → 0.0.50

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

@@ -12,8 +12,7 @@
     }
   }
 
-  &.position-1,
-  &.position-default {
+  &.position-1 {
     top: 0;
     left: 0;
   }
@@ -32,4 +31,9 @@
     bottom: 0;
     right: 0;
   }
+
+  &.position-null {
+    top: 0;
+    left: 0;
+  }
 }

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

@@ -4,14 +4,11 @@
   background: #FFFFFF;
   border: 1px solid #D2D9E5;
   width: 142px;
-  border-radius: 8px;
 
   .img-wrap {
     position: relative;
-    border-radius: 8px;
 
     .product-img {
-      border-radius: 8px;
       width: 140px;
       height: 140px;
       object-fit: cover;
@@ -36,7 +33,7 @@
     }
 
     .product-name {
-      margin-bottom: 5px;
+      margin-bottom: 3px;
       // font-family: 'Montserrat';
       // font-style: normal;
       // font-weight: 500;
@@ -60,7 +57,7 @@
 
     .old-price-wrap {
       display: flex;
-      margin-top: 3px;
+      margin-top: 0px;
       align-items: baseline;
       white-space: nowrap;
       overflow: hidden;
@@ -71,9 +68,11 @@
         font-family: 'Montserrat';
         font-style: normal;
         font-weight: 700;
-        font-size: 12px;
+        font-size: 8px;
         line-height: 15px;
-        color: #2F3043;
+        color: #fff;
+        padding: 0 4px;
+        background-color: #CE1126;
       }
 
       .old-price {

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

@@ -279,8 +279,14 @@ var getDefaultJSON = function getDefaultJSON() {
       }
     },
     customize: {
-      layout: 'left',
-      align: 'left'
+      layout: {
+        pcLayout: 'layout1',
+        h5Layout: 'layout1'
+      },
+      align: 'left',
+      pcRowNum: 6,
+      pcMaxRowNum: 6,
+      pcMinRowNum: 5
     },
     background: {
       opacity: 100,

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

@@ -227,10 +227,6 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
 };
 
 var LAYOUT_IMAGE_SIZE = {
-  left: {
-    w: '100%',
-    h: 165
-  },
   layout1: {
     w: '100%',
     h: 164
@@ -416,10 +412,8 @@ function (_super) {
     };
 
     _this.resetLayout = function () {
-      var layout = _this.props.panelProps.customize.layout.h5Layout || _this.props.panelProps.customize.layout; // 后面删除
-
+      var layout = _this.props.panelProps.customize.layout.h5Layout;
       var LAYOUT_COLUMN = {
-        left: 2,
         layout1: 2,
         layout2: 1,
         layout3: 3
@@ -543,7 +537,7 @@ function (_super) {
         hideTabs: hideTabs
       });
     });
-    var curLayout = panelProps.customize.layout.h5Layout || panelProps.customize.layout; // 后面删除
+    var curLayout = panelProps.customize.layout.h5Layout;
 
     if (curLayout !== this.preLayout) {
       this.resetLayout();
@@ -565,7 +559,7 @@ function (_super) {
     var bgStyle = this.getBackgroundStyle();
     var products = this.state["products" + tabIndex] || [];
     var isDivide = groupSource.length <= 3;
-    var layout = panelProps.customize.layout.h5Layout || panelProps.customize.layout; // 后面删除
+    var layout = panelProps.customize.layout.h5Layout;
 
     var _seeAll = (0, _commonUtil.ensure)(function () {
       return groupSource[tabIndex].seeAll;
@@ -617,47 +611,47 @@ function (_super) {
         transform: "translateX(" + tabLeft + "px)",
         background: this.getTabBarActiveColor(panelProps)
       }
-    })), ['layout4', 'layout5'].includes(layout) ? /*#__PURE__*/_react["default"].createElement("div", {
-      key: "scrollContainer",
-      className: (0, _classnames["default"])('scrollContainer', {
-        pl_100: layout === 'layout5'
-      })
+    })), ['layout1', 'layout2', 'layout3'].includes(layout) ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+      key: "macyContainer",
+      className: "macyContainer"
     }, products.map(function (item) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        className: "productCard"
-      }, /*#__PURE__*/_react["default"].createElement(_ProductItem["default"], {
-        key: "scroll_" + item.productId,
+      return /*#__PURE__*/_react["default"].createElement(_ProductItem["default"], {
+        key: item.productId,
         data: item,
-        fixHeight: true,
+        fixHeight: layout === 'layout3',
         imgHeight: imgHeight,
         imgWidth: imgWidth,
+        layout: layout === 'layout2' ? 'horizontal' : 'vertical',
         onItemClick: function onItemClick() {
           return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
         showProgress: false
-      }));
-    }), _seeAll.open && products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+      });
+    })), _seeAll.open && products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "btnSeeAll",
       data: _seeAll
-    })) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
-      key: "macyContainer",
-      className: "macyContainer"
+    })) : /*#__PURE__*/_react["default"].createElement("div", {
+      key: "scrollContainer",
+      className: (0, _classnames["default"])('scrollContainer', {
+        pl_100: layout === 'layout5'
+      })
     }, products.map(function (item) {
-      return /*#__PURE__*/_react["default"].createElement(_ProductItem["default"], {
-        key: item.productId,
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: "productCard"
+      }, /*#__PURE__*/_react["default"].createElement(_ProductItem["default"], {
+        key: "scroll_" + item.productId,
         data: item,
-        fixHeight: layout === 'layout3',
+        fixHeight: true,
         imgHeight: imgHeight,
         imgWidth: imgWidth,
-        layout: layout === 'layout2' ? 'horizontal' : 'vertical',
         onItemClick: function onItemClick() {
           return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
         showProgress: false
-      });
-    })), _seeAll.open && products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+      }));
+    }), _seeAll.open && products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "btnSeeAll",
       data: _seeAll
     })));

package/es/composite-comp/dito/components/Recommend/pc/index.js

@@ -228,7 +228,7 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
 
 var LAYOUT_IMAGE_SIZE = {
   layout1: {
-    w: 180,
+    w: '100%',
     h: 180
   },
   layout2: {
@@ -524,7 +524,7 @@ function (_super) {
         hideTabs: hideTabs
       });
     });
-    var curLayout = panelProps.customize.layout.pcLayout;
+    var curLayout = JSON.stringify(panelProps.customize);
 
     if (curLayout !== this.preLayout) {
       this.resetLayout();
@@ -615,7 +615,9 @@ function (_super) {
         showProgress: false
       });
     })), _seeAll.open && products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
-      className: "btnSeeAll",
+      className: (0, _classnames["default"])('btnSeeAll', {
+        line: layout === 'layout1'
+      }),
       data: _seeAll
     })) : /*#__PURE__*/_react["default"].createElement("div", {
       key: "scrollContainer",

package/es/composite-comp/dito/components/Recommend/pc/index.less

@@ -75,6 +75,9 @@
     display: block;
     width: fit-content;
     min-width: 80px;
-    margin: 0 auto;
+
+    &.line {
+      margin: 0 auto 10px auto;
+    }
   }
 }

package/es/composite-comp/dito/second-config-panels/RecommendSecondConfig/index.js

@@ -25,6 +25,8 @@ var _BaseConfig = _interopRequireDefault(require("../../../../meta-comp/config-p
 
 var _coreUtil = require("../../../../utils/coreUtil");
 
+require("./index.less");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -74,8 +76,9 @@ function (_super) {
         };
       }
 
-      var productSource = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
-        split: "dashed",
+      var productSource = /*#__PURE__*/_react["default"].createElement("div", {
+        className: "sourceOfProduct"
+      }, /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('SOURCE_OF_PRODUCT')
       }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
         onChange: function onChange(v) {
@@ -88,7 +91,9 @@ function (_super) {
         value: "select"
       }, (0, _locale.i18n)('SELECT_PRODUCT')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: "recommend"
-      }, (0, _locale.i18n)('AI_RECOMMENDATION')))), panelProps.sourceType === 'select' && /*#__PURE__*/_react["default"].createElement(_common.ProductSource, {
+      }, (0, _locale.i18n)('AI_RECOMMENDATION')))), /*#__PURE__*/_react["default"].createElement("div", {
+        className: "greyBg"
+      }, panelProps.sourceType === 'select' && /*#__PURE__*/_react["default"].createElement(_common.ProductSource, {
         onChange: function onChange(v) {
           panelProps.prodIds = v;
 
@@ -107,7 +112,6 @@ function (_super) {
           intelligentValue: panelProps.intelligentValue
         }
       }), panelProps.sourceType === 'recommend' && /*#__PURE__*/_react["default"].createElement(_common.Field, {
-        split: "dashed",
         title: (0, _locale.i18n)('PRODUCT_QUANTITY')
       }, /*#__PURE__*/_react["default"].createElement(_antd.Radio.Group, {
         onChange: function onChange(e) {
@@ -124,7 +128,7 @@ function (_super) {
         value: 50
       }, "\u226450"), /*#__PURE__*/_react["default"].createElement(_antd.Radio, {
         value: 100
-      }, "\u2264100"))));
+      }, "\u2264100")))));
 
       var hoverSetting = /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
         divider: "dashed",
@@ -167,16 +171,8 @@ function (_super) {
           data: panelProps.seeAll
         }),
         metaOption: panelProps.seeAll
-      }, {
-        key: 'defaultSource_4',
-        name: (0, _locale.i18n)('SECOND_CATEGORY'),
-        value: productSource,
-        toggleType: 'arrow',
-        metaOption: {
-          id: 'productSource',
-          open: true
-        }
-      }, {
+      }];
+      var hoverSource = [{
         key: 'defaultSource_5',
         name: (0, _locale.i18n)('HOVER'),
         value: hoverSetting,
@@ -191,6 +187,14 @@ function (_super) {
         showActiveColor: true,
         source: defaultSource,
         type: "switch"
+      }), productSource, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
+        headerSize: "middle",
+        onRefresh: function onRefresh() {
+          return (0, _coreUtil.renderPreview)();
+        },
+        showActiveColor: true,
+        source: hoverSource,
+        type: "switch"
       }));
     };
 

package/es/composite-comp/dito/second-config-panels/RecommendSecondConfig/index.less

@@ -1,3 +1,16 @@
 .recommend_second_conf_wrap {
-  width: 354px;
+
+  .sourceOfProduct {
+    border-top: 1px solid #D2D9E5;
+    border-bottom: 1px solid #D2D9E5;
+    padding-top: 20px;
+    padding-bottom: 20px;
+
+    .greyBg {
+      background: #F5F6F7;
+      border-radius: 6px;
+      padding: 12px;
+      padding-bottom: 1px;
+    }
+  }
 }

package/es/core/Designer/PageCompList/index.less

@@ -121,19 +121,19 @@
       display: block;
     }
   }
-}
 
-.active {
-  background: #E9F0FF;
-  color: #2F54EB;
+  &.active {
+    background: #E9F0FF;
+    color: #2F54EB;
 
-  .left {
-    .card-title {
-      font-weight: 600;
+    .left {
+      .card-title {
+        font-weight: 600;
+      }
     }
-  }
 
-  .more-btn {
-    display: block;
+    .more-btn {
+      display: block;
+    }
   }
 }

package/es/locale/index.js

@@ -30,10 +30,12 @@ function i18n(key, args) {
   var tempString = localeMap[_mobx.store.locale || 'en'][key];
 
   if (tempString) {
+    var str_1 = tempString;
     Object.keys(args).map(function (key) {
       var reg = new RegExp("{" + key + "}", 'g');
-      tempString.replace(reg, args[key]);
+      str_1 = tempString.replace(reg, args[key]);
     });
+    return str_1;
   } else {
     console.log('未找到国际化KEY:' + key);
     return key;

package/es/meta-comp/components/Image/index.js

@@ -11,6 +11,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 require("./index.less");
 
+var _defaultImg = _interopRequireDefault(require("./image/default-img.png"));
+
 var _coreUtil = require("../../../utils/coreUtil");
 
 var _decorator = require("../../../decorator");
@@ -161,10 +163,11 @@ function (_super) {
 
     if (window.magicDesign.isShop && (srcImg === null || srcImg === void 0 ? void 0 : srcImg.includes('ecommerce/static'))) {
       srcImg = srcImg.replace('ecommerce/static', 'static');
-    } // if (!srcImg) {
-    //   srcImg = defaultImg;
-    // }
+    }
 
+    if (!srcImg) {
+      srcImg = _defaultImg["default"];
+    }
 
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('m-meta-image', {