@fonixtree/magic-design 0.0.110 → 0.0.111

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

@@ -7,13 +7,16 @@ exports.recommendGroupSourceJSON = exports.getDefaultJSON = void 0;
 
 var _uuid = require("uuid");
 
-var recommendGroupSourceJSON = function recommendGroupSourceJSON(logo, text) {
+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: (0, _uuid.v4)(),
+      id: imageId,
       open: true,
       type: 'IMAGE',
       content: {
@@ -33,12 +36,13 @@ var recommendGroupSourceJSON = function recommendGroupSourceJSON(logo, text) {
     },
     groupName: {
       parentId: groupId,
-      id: (0, _uuid.v4)(),
+      id: groupNameId,
       open: true,
       type: 'TEXT',
       specialContent: [],
       text: text,
       content: {
+        sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
         fontWeight: 400,
         fontSize: 14,
@@ -52,6 +56,7 @@ var recommendGroupSourceJSON = function recommendGroupSourceJSON(logo, text) {
       vertical: {}
     },
     seeAll: {
+      parentId: groupId,
       id: (0, _uuid.v4)(),
       open: true,
       type: 'BUTTON',
@@ -61,6 +66,7 @@ var recommendGroupSourceJSON = function recommendGroupSourceJSON(logo, text) {
         backgroundColor: '#fff'
       },
       buttonText: {
+        sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
         fontWeight: 400,
         fontSize: 12,
@@ -98,10 +104,10 @@ var recommendGroupSourceJSON = function recommendGroupSourceJSON(logo, text) {
     intelligentValue: [],
     maxProdNum: 10,
     hover: {
-      open: true,
+      open: false,
       image: {
         parentId: groupId,
-        id: (0, _uuid.v4)(),
+        id: imageId,
         open: false,
         type: 'IMAGE',
         content: {
@@ -121,12 +127,13 @@ var recommendGroupSourceJSON = function recommendGroupSourceJSON(logo, text) {
       },
       groupName: {
         parentId: groupId,
-        id: (0, _uuid.v4)(),
+        id: groupNameId,
         open: false,
         type: 'TEXT',
         specialContent: [],
         text: text,
         content: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -146,10 +153,11 @@ var recommendGroupSourceJSON = function recommendGroupSourceJSON(logo, text) {
 exports.recommendGroupSourceJSON = recommendGroupSourceJSON;
 
 var getDefaultJSON = function getDefaultJSON() {
+  var groupId = (0, _uuid.v4)();
   return {
-    id: (0, _uuid.v4)(),
+    id: groupId,
     type: 'RECOMMEND',
-    groupSource: [recommendGroupSourceJSON('', 'Tab1'), recommendGroupSourceJSON('', 'Tab2')],
+    groupSource: [recommendGroupSourceJSON(groupId, '', 'Tab1'), recommendGroupSourceJSON(groupId, '', 'Tab2')],
     content: {
       label: {
         id: (0, _uuid.v4)(),
@@ -161,6 +169,7 @@ var getDefaultJSON = function getDefaultJSON() {
           backgroundColor: '#CE1126'
         },
         buttonText: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 8,
@@ -195,10 +204,11 @@ var getDefaultJSON = function getDefaultJSON() {
       productName: {
         id: (0, _uuid.v4)(),
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 700,
           fontSize: 14,
@@ -217,10 +227,11 @@ var getDefaultJSON = function getDefaultJSON() {
       activityPrice: {
         id: (0, _uuid.v4)(),
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 700,
           fontSize: 14,
@@ -239,10 +250,11 @@ var getDefaultJSON = function getDefaultJSON() {
       salesPrice: {
         id: (0, _uuid.v4)(),
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 500,
           fontSize: 10,
@@ -268,19 +280,25 @@ var getDefaultJSON = function getDefaultJSON() {
         paddingBottom: 0,
         paddingLeft: 0,
         paddingRight: 0,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing * 1.5
       },
       mobile: {
         paddingTop: 0,
         paddingBottom: 0,
         paddingLeft: 0,
         paddingRight: 0,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing
       }
     },
     customize: {
-      layout: 'left',
-      align: 'left'
+      layout: {
+        pcLayout: 'layout1',
+        h5Layout: 'layout1'
+      },
+      align: 'left',
+      pcRowNum: 6,
+      pcMaxRowNum: 6,
+      pcMinRowNum: 5
     },
     background: {
       opacity: 100,

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

@@ -9,14 +9,14 @@ 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"));
 
-var _businessUtil = require("../../../../utils/businessUtil");
-
 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); }
@@ -72,10 +72,9 @@ function (_super) {
 
   Recommend.prototype.render = function () {
     var nodeData = this.props.nodeData;
-    var wrapStyle = (0, _businessUtil.computeStyle)(nodeData, window.magicDesign.device);
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      style: wrapStyle
-    }, (0, _coreUtil.isPc)() ? null : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
+    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
     }));
   };

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

@@ -227,13 +227,9 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
 };
 
 var LAYOUT_IMAGE_SIZE = {
-  left: {
-    w: '100%',
-    h: 165
-  },
   layout1: {
     w: '100%',
-    h: 164
+    h: ''
   },
   layout2: {
     w: 100,
@@ -241,7 +237,7 @@ var LAYOUT_IMAGE_SIZE = {
   },
   layout3: {
     w: '100%',
-    h: 104
+    h: ''
   },
   layout4: {
     w: 96,
@@ -263,10 +259,13 @@ function (_super) {
 
     _this.preData = {};
     _this.preLayout = '';
+    _this.preContent = '';
+    _this.preSpacing = '';
     _this._cache = (0, _coreUtil.isDesignMode)() ? {} : (0, _commonUtil.ensure)(function () {
       return (0, _storeUtil.getMagicStore)("recommend_" + _this.props.panelProps.id);
     }, {});
     _this.state = __assign({
+      contentWidth: 0,
       tabIndex: 0,
       tabLeft: 0,
       tabWidth: 0,
@@ -274,6 +273,15 @@ function (_super) {
       hideTabs: false
     }, _this._cache);
 
+    _this.listenWidth = function () {
+      setTimeout(function () {
+        var renderContainer = document.querySelector(".macyContainer_" + _this.props.panelProps.id);
+        if (renderContainer) _this.setState({
+          contentWidth: renderContainer.offsetWidth
+        });
+      });
+    };
+
     _this.initTab = function (index, hideTabs) {
       var selectedTabDom = document.querySelector(".tab-select-wrap .tabTitle:nth-child(" + (index + 1) + ")");
       var tabLeft = 0;
@@ -292,9 +300,10 @@ function (_super) {
 
     _this.getTabBarActiveColor = function (_panelProps) {
       var tabIndex = _this.state.tabIndex;
-      return (0, _commonUtil.ensure)(function () {
-        return _panelProps.groupSource[tabIndex].hover.groupName.content.color;
-      }, '#1890ff');
+      var activeHoverGroupName = _panelProps.groupSource[tabIndex].hover;
+      return activeHoverGroupName.open ? (0, _commonUtil.ensure)(function () {
+        return activeHoverGroupName.groupName.content.color;
+      }, '#CE1126') : '#CE1126';
     };
 
     _this.getProductList = function (index) {
@@ -334,8 +343,11 @@ function (_super) {
               _k.label = 1;
 
             case 1:
-              _k.trys.push([1, 7,, 8]);
+              _k.trys.push([1, 9,, 10]);
 
+              if (!(groupSource.length > 0)) return [3
+              /*break*/
+              , 7];
               if (!(sourceType === 'select')) return [3
               /*break*/
               , 3];
@@ -392,13 +404,22 @@ function (_super) {
               , 8];
 
             case 7:
+              newData = [];
+              _k.label = 8;
+
+            case 8:
+              return [3
+              /*break*/
+              , 10];
+
+            case 9:
               e_1 = _k.sent();
               newData = [];
               return [3
               /*break*/
-              , 8];
+              , 10];
 
-            case 8:
+            case 10:
               if (!(0, _coreUtil.isDesignMode)()) {
                 _cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
                 (0, _storeUtil.setMagicStore)("recommend_" + recommendId, __assign(__assign({}, _cache), (_h = {}, _h["products" + index] = newData, _h.endTime = Date.now() + 3 * 60 * 1000, _h)));
@@ -416,18 +437,16 @@ 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
       };
       if (!LAYOUT_COLUMN[layout]) return;
       setTimeout(function () {
-        if (document.querySelector('.macyContainer')) {
-          _this.getMacy('.macyContainer', LAYOUT_COLUMN[layout]);
+        if (document.querySelector(".macyContainer_" + _this.props.panelProps.id)) {
+          _this.getMacy(".macyContainer_" + _this.props.panelProps.id, LAYOUT_COLUMN[layout]);
         }
       });
     };
@@ -449,28 +468,9 @@ function (_super) {
       }, true);
     };
 
-    _this.getBackgroundStyle = function () {
-      var panelProps = _this.props.panelProps;
-      var bgStyle = {};
-
-      if (panelProps.background.bgType === 'color') {
-        bgStyle = {
-          backgroundColor: (0, _commonUtil.getColorRgba)(panelProps.background.color || '#fff', panelProps.background.opacity / 100 || 1)
-        };
-      } else {
-        bgStyle = {
-          background: "url(" + panelProps.background.image + ") no-repeat center",
-          backgroundSize: '100%'
-        };
-      }
-
-      return bgStyle;
-    };
-
     _this.onTabClick = function (e, index) {
       var tabIndex = _this.state.tabIndex;
-      if (tabIndex === index) return;
-      e.currentTarget.scrollIntoView(false);
+      if (tabIndex === index) return; // e.currentTarget.scrollIntoView(false);
 
       _this.setState({
         tabIndex: index
@@ -502,13 +502,14 @@ function (_super) {
 
       _this.getProductList(0);
     });
+    this.listenWidth();
   };
 
-  RecommendMobile.prototype.componentWillReceiveProps = function () {
+  RecommendMobile.prototype.componentWillReceiveProps = function (nextProps) {
     var _this = this;
 
     var tabIndex = this.state.tabIndex;
-    var panelProps = this.props.panelProps;
+    var panelProps = nextProps.panelProps;
     var source = [];
     var hideTabs = false;
     panelProps.groupSource.map(function (m) {
@@ -516,8 +517,8 @@ function (_super) {
       if (show) source.push(m);
     });
 
-    if (source.length === 0 && panelProps.groupSource.length > 0) {
-      source.push(panelProps.groupSource[0]);
+    if (source.length === 0) {
+      if (panelProps.groupSource.length > 0) source.push(panelProps.groupSource[0]);
       hideTabs = true;
     }
 
@@ -543,13 +544,21 @@ function (_super) {
         hideTabs: hideTabs
       });
     });
-    var curLayout = panelProps.customize.layout.h5Layout || panelProps.customize.layout; // 后面删除
+    var curLayout = panelProps.customize.layout.h5Layout;
+    var curContent = JSON.stringify(panelProps.content);
+    var curSpacing = JSON.stringify(panelProps.spacing);
+
+    if (curSpacing !== this.preSpacing) {
+      this.listenWidth();
+    }
 
-    if (curLayout !== this.preLayout) {
+    if (curLayout !== this.preLayout || curContent !== this.preContent || curSpacing !== this.preSpacing) {
       this.resetLayout();
     }
 
     this.preLayout = curLayout;
+    this.preContent = curContent;
+    this.preSpacing = curSpacing;
   };
 
   RecommendMobile.prototype.render = function () {
@@ -561,22 +570,26 @@ function (_super) {
         tabLeft = _a.tabLeft,
         tabWidth = _a.tabWidth,
         groupSource = _a.groupSource,
-        hideTabs = _a.hideTabs;
-    var bgStyle = this.getBackgroundStyle();
+        hideTabs = _a.hideTabs,
+        contentWidth = _a.contentWidth;
     var products = this.state["products" + tabIndex] || [];
     var isDivide = groupSource.length <= 3;
-    var layout = panelProps.customize.layout.h5Layout || panelProps.customize.layout; // 后面删除
-    // const _seeAll = ensure(() => groupSource[tabIndex].seeAll, '');
+    var layout = panelProps.customize.layout.h5Layout;
+
+    var _seeAll = (0, _commonUtil.ensure)(function () {
+      return groupSource[tabIndex].seeAll;
+    }, '');
 
-    var imgHeight = (0, _commonUtil.ensure)(function () {
-      return LAYOUT_IMAGE_SIZE[layout].h;
-    }, 140);
     var imgWidth = (0, _commonUtil.ensure)(function () {
       return LAYOUT_IMAGE_SIZE[layout].w;
     }, 140);
+    var imgHeight = (0, _commonUtil.ensure)(function () {
+      return LAYOUT_IMAGE_SIZE[layout].h;
+    }, 140);
+    if (layout === 'layout1' && contentWidth) imgHeight = (contentWidth - 12) / 2;
+    if (layout === 'layout3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-recommend-mobile",
-      style: bgStyle
+      className: "m-recommend-mobile"
     }, !hideTabs && /*#__PURE__*/_react["default"].createElement("div", {
       className: "tab-select-wrap"
     }, groupSource.map(function (tab, index) {
@@ -607,18 +620,40 @@ function (_super) {
           tab.groupName.text = text;
         }
       }));
-    }), /*#__PURE__*/_react["default"].createElement("div", {
+    }), groupSource.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "active-line",
       style: {
         width: tabWidth,
         transform: "translateX(" + tabLeft + "px)",
         background: this.getTabBarActiveColor(panelProps)
       }
-    })), ['layout4', 'layout5'].includes(layout) ? /*#__PURE__*/_react["default"].createElement("div", {
+    })), ['layout1', 'layout2', 'layout3'].includes(layout) ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+      key: "macyContainer",
+      className: "macyContainer macyContainer_" + panelProps.id
+    }, products.map(function (item) {
+      return /*#__PURE__*/_react["default"].createElement(_ProductItem["default"], {
+        key: item.productId,
+        data: item,
+        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, {
+      className: "btnSeeAll",
+      data: _seeAll
+    })) : /*#__PURE__*/_react["default"].createElement("div", {
       key: "scrollContainer",
       className: (0, _classnames["default"])('scrollContainer', {
         pl_100: layout === 'layout5'
       })
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "scrollProductList"
     }, products.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "productCard"
@@ -634,24 +669,10 @@ function (_super) {
         panelProps: panelProps.content,
         showProgress: false
       }));
-    })) : /*#__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(_ProductItem["default"], {
-        key: item.productId,
-        data: item,
-        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, {
+      className: "btnSeeAll",
+      data: _seeAll
+    })));
   };
 
   RecommendMobile.defaultProps = {

package/lib/composite-comp/dito/components/Recommend/mobile/index.less

@@ -25,7 +25,9 @@
     .tabTitle {
       display: flex;
       align-items: center;
+      text-align: center;
       padding: 0 24px;
+      width: fit-content;
       height: 100%;
       justify-content: center;
       white-space: nowrap;
@@ -66,8 +68,14 @@
       padding-left: 100px;
     }
 
-    .productCard {
-      margin-right: 12px;
+    .scrollProductList {
+      display: flex;
+      flex-direction: row;
+      align-items: flex-start;
+
+      .productCard {
+        margin-right: 12px;
+      }
     }
   }
 
@@ -76,5 +84,6 @@
     width: fit-content;
     min-width: 80px;
     margin: 0 auto;
+    flex: none;
   }
 }