@fonixtree/magic-design 0.0.71 → 0.0.72

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

@@ -13,8 +13,6 @@ require("./index.less");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _lodash = _interopRequireDefault(require("lodash.throttle"));
-
 var _mobx = require("../../../../../mobx");
 
 var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
@@ -27,8 +25,6 @@ var _commonUtil = require("../../../../../utils/commonUtil");
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
-var _Iconfont = _interopRequireDefault(require("../../../../../common/Iconfont"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -232,24 +228,16 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
 
 var LAYOUT_IMAGE_SIZE = {
   layout1: {
-    w: '100%',
+    w: 180,
     h: 180
   },
-  layout2_col6: {
+  layout2: {
     w: 160,
     h: 160
   },
-  layout2_col5: {
-    w: 200,
-    h: 200
-  },
-  layout3_col6: {
-    w: 160,
-    h: 160
-  },
-  layout3_col5: {
-    w: 200,
-    h: 200
+  layout3: {
+    w: 180,
+    h: 180
   }
 };
 
@@ -266,27 +254,14 @@ function (_super) {
     _this._cache = (0, _coreUtil.isDesignMode)() ? {} : (0, _commonUtil.ensure)(function () {
       return (0, _storeUtil.getMagicStore)("recommend_" + _this.props.panelProps.id);
     }, {});
-    _this.scrollRef = /*#__PURE__*/_react["default"].createRef();
     _this.state = __assign({
       tabIndex: 0,
       tabLeft: 0,
       tabWidth: 0,
       groupSource: [],
-      hideTabs: false,
-      scrollToLeftDisabled: true,
-      scrollToRightDisabled: true
+      hideTabs: false
     }, _this._cache);
 
-    _this.setScrollDisabled = function (scrollDom) {
-      var scrollToLeftDisabled = scrollDom.scrollLeft === 0;
-      var scrollToRightDisabled = scrollDom.clientWidth + scrollDom.scrollLeft >= scrollDom.scrollWidth;
-
-      _this.setState({
-        scrollToLeftDisabled: scrollToLeftDisabled,
-        scrollToRightDisabled: scrollToRightDisabled
-      });
-    };
-
     _this.initTab = function (index, hideTabs) {
       var selectedTabDom = document.querySelector(".tab-select-wrap .tabTitle:nth-child(" + (index + 1) + ")");
       var tabLeft = 0;
@@ -475,7 +450,8 @@ function (_super) {
 
     _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
@@ -486,34 +462,6 @@ function (_super) {
       });
 
       _this.getProductList(index);
-
-      setTimeout(function () {
-        var scrollDom = _this.scrollRef.current;
-
-        if (scrollDom) {
-          _this.setScrollDisabled(scrollDom);
-
-          scrollDom.onscroll = (0, _lodash["default"])(function () {
-            _this.setScrollDisabled(scrollDom);
-          }, 500);
-        }
-      }, 0);
-    };
-
-    _this.scrollToRight = function () {
-      var scrollDom = _this.scrollRef.current;
-
-      if (scrollDom.clientWidth + scrollDom.scrollLeft < scrollDom.scrollWidth) {
-        scrollDom.scrollTo(scrollDom.scrollLeft + scrollDom.clientWidth, 0);
-      }
-    };
-
-    _this.scrollToLeft = function () {
-      var scrollDom = _this.scrollRef.current;
-
-      if (scrollDom.scrollLeft > 0) {
-        scrollDom.scrollTo(scrollDom.scrollLeft - scrollDom.clientWidth, 0);
-      }
     };
 
     return _this;
@@ -535,17 +483,6 @@ function (_super) {
 
       _this.getProductList(0);
     });
-    setTimeout(function () {
-      var scrollDom = _this.scrollRef.current;
-
-      if (scrollDom) {
-        _this.setScrollDisabled(scrollDom);
-
-        scrollDom.onscroll = (0, _lodash["default"])(function () {
-          _this.setScrollDisabled(scrollDom);
-        }, 500);
-      }
-    }, 0);
   };
 
   RecommendMobile.prototype.componentWillReceiveProps = function () {
@@ -587,21 +524,10 @@ function (_super) {
         hideTabs: hideTabs
       });
     });
-    var curLayout = JSON.stringify(panelProps.customize);
+    var curLayout = panelProps.customize.layout.pcLayout;
 
     if (curLayout !== this.preLayout) {
       this.resetLayout();
-      setTimeout(function () {
-        var scrollDom = _this.scrollRef.current;
-
-        if (scrollDom) {
-          _this.setScrollDisabled(scrollDom);
-
-          scrollDom.onscroll = (0, _lodash["default"])(function () {
-            _this.setScrollDisabled(scrollDom);
-          }, 500);
-        }
-      }, 0);
     }
 
     this.preLayout = curLayout;
@@ -616,12 +542,10 @@ function (_super) {
         tabLeft = _a.tabLeft,
         tabWidth = _a.tabWidth,
         groupSource = _a.groupSource,
-        hideTabs = _a.hideTabs,
-        scrollToLeftDisabled = _a.scrollToLeftDisabled,
-        scrollToRightDisabled = _a.scrollToRightDisabled;
+        hideTabs = _a.hideTabs;
     var bgStyle = this.getBackgroundStyle();
     var products = this.state["products" + tabIndex] || [];
-    var isDivide = groupSource.length <= 10;
+    var isDivide = groupSource.length <= 3;
     var layout = panelProps.customize.layout.pcLayout;
 
     var _seeAll = (0, _commonUtil.ensure)(function () {
@@ -629,10 +553,10 @@ function (_super) {
     }, '');
 
     var imgHeight = (0, _commonUtil.ensure)(function () {
-      return layout === 'layout1' ? LAYOUT_IMAGE_SIZE[layout].h : LAYOUT_IMAGE_SIZE[layout + "_col" + panelProps.customize.pcRowNum].h;
+      return LAYOUT_IMAGE_SIZE[layout].h;
     }, 140);
     var imgWidth = (0, _commonUtil.ensure)(function () {
-      return layout === 'layout1' ? LAYOUT_IMAGE_SIZE[layout].w : LAYOUT_IMAGE_SIZE[layout + "_col" + panelProps.customize.pcRowNum].w;
+      return LAYOUT_IMAGE_SIZE[layout].w;
     }, 140);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-recommend-pc",
@@ -674,22 +598,8 @@ function (_super) {
         transform: "translateX(" + tabLeft + "px)",
         background: this.getTabBarActiveColor(panelProps)
       }
-    })), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "tab-content"
-    }, layout !== 'layout1' && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "arrow-icon left",
-      onClick: function onClick() {
-        return _this.scrollToLeft();
-      }
-    }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
-      color: scrollToLeftDisabled ? '#BDC1C8' : '#232F46',
-      size: 20,
-      type: "icon-outlined-left"
-    })), layout === 'layout1' ? /*#__PURE__*/_react["default"].createElement("div", {
-      className: "tab-list"
-    }, /*#__PURE__*/_react["default"].createElement("div", {
+    })), layout === 'layout1' ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
       key: "macyContainer",
-      ref: this.scrollRef,
       className: "macyContainer"
     }, products.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement(_ProductItem["default"], {
@@ -699,24 +609,19 @@ function (_super) {
         imgHeight: imgHeight,
         imgWidth: imgWidth,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId);
+          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: (0, _classnames["default"])('btnSeeAll', {
-        line: layout === 'layout1'
-      }),
+      className: "btnSeeAll",
       data: _seeAll
     })) : /*#__PURE__*/_react["default"].createElement("div", {
       key: "scrollContainer",
-      ref: this.scrollRef,
       className: (0, _classnames["default"])('scrollContainer', {
         pl_100: layout === 'layout3'
       })
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: "productList"
     }, products.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "productCard"
@@ -727,24 +632,15 @@ function (_super) {
         imgHeight: imgHeight,
         imgWidth: imgWidth,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId);
+          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
-    })), layout !== 'layout1' && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "arrow-icon right",
-      onClick: function onClick() {
-        return _this.scrollToRight();
-      }
-    }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
-      color: scrollToRightDisabled ? '#BDC1C8' : '#232F46',
-      size: 20,
-      type: "icon-outlined-right"
-    }))));
+    })));
   };
 
   RecommendMobile.defaultProps = {

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

@@ -1,17 +1,17 @@
 .m-recommend-pc {
   display: flex;
   flex-direction: column;
-  position: relative;
 
   .ant-tabs-nav-operations {
     display: none !important;
   }
 
-  // ::-webkit-scrollbar {
-  //   width: 0;
-  //   height: 0;
-  //   display: none;
-  // }
+  ::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+    display: none;
+  }
+
 
   .tab-select-wrap {
     display: flex;
@@ -25,8 +25,7 @@
     .tabTitle {
       display: flex;
       align-items: center;
-      // padding: 0 24px;
-      min-width: 100px;
+      padding: 0 24px;
       height: 100%;
       justify-content: center;
       white-space: nowrap;
@@ -50,47 +49,16 @@
     }
   }
 
-  .tab-content {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-
-    .tab-list {
-      width: 100%;
-    }
-  }
-
-  .arrow-icon {
-    display: block;
-    width: 36px;
-    height: 36px;
-    line-height: 42px;
-    text-align: center;
-    background: #FFFFFF;
-    box-shadow: -1px -1px 4px rgba(45, 48, 64, 0.08), 1px 1px 4px rgba(45, 48, 64, 0.08);
-    border-radius: 100px;
-    cursor: pointer;
-
-    &.left {
-      margin-right: 40px;
-    }
-
-    &.right {
-      margin-left: 40px;
-    }
-  }
-
   .macyContainer {
     display: flex;
-    margin: 0;
+    margin: 0 16px;
   }
 
   .scrollContainer {
     display: flex;
     flex-direction: row;
     align-items: center;
-    flex: 1;
-    margin: 0;
+    margin: 0 16px;
     overflow-x: auto;
     padding-bottom: 15px;
 
@@ -98,14 +66,8 @@
       padding-left: 100px;
     }
 
-    .productList {
-      display: flex;
-      flex-direction: row;
-      align-items: flex-start;
-
-      .productCard {
-        margin-right: 20px;
-      }
+    .productCard {
+      margin-right: 12px;
     }
   }
 
@@ -113,9 +75,6 @@
     display: block;
     width: fit-content;
     min-width: 80px;
-
-    &.line {
-      margin: 0 auto 10px auto;
-    }
+    margin: 0 auto;
   }
 }

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

@@ -25,7 +25,7 @@ var getDefaultJSON = function getDefaultJSON() {
         h5Name: 'name2',
         pcName: 'name2',
         h5ImgSrc: _ditoLogo["default"],
-        pcImgSrc: _ditoLogo["default"],
+        pcImgSrc: 'https://online.iwhalecloud.com/static/banner3.d4d11f4b.webp',
         clickUrl: ''
       },
       hover: {
@@ -36,33 +36,9 @@ var getDefaultJSON = function getDefaultJSON() {
         h5ImgHoverUrl: ''
       }
     },
-    box: {
-      id: (0, _uuid.v4)(),
-      open: true,
-      color: {
-        pc: '#D92929',
-        mobile: '#D92929'
-      }
-    },
     icon: {
-      id: (0, _uuid.v4)(),
       open: true,
-      color: {
-        pc: '#D92929',
-        mobile: '#D92929'
-      }
-    },
-    spacing: {
-      pc: {
-        paddingTop: 20,
-        paddingBottom: 30,
-        marginBottom: 0
-      },
-      mobile: {
-        paddingTop: 8,
-        paddingBottom: 8,
-        marginBottom: 0
-      }
+      color: '#2F54EB'
     },
     customize: {
       layout: 'left',

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

@@ -11,8 +11,6 @@ var _defaultJSON = require("./defaultJSON");
 
 var _index = _interopRequireDefault(require("./mobile/index"));
 
-var _index2 = _interopRequireDefault(require("./pc/index"));
-
 var _coreUtil = require("../../../../utils/coreUtil");
 
 var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
@@ -71,11 +69,8 @@ function (_super) {
   }
 
   SearchBar.prototype.render = function () {
-    var nodeData = this.props.nodeData; // console.log('search nodeData', nodeData);
-
-    return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? /*#__PURE__*/_react["default"].createElement(_index2["default"], {
-      data: nodeData
-    }) : /*#__PURE__*/_react["default"].createElement(_index["default"], {
+    var nodeData = this.props.nodeData;
+    return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? null : /*#__PURE__*/_react["default"].createElement(_index["default"], {
       data: nodeData
     }));
   };

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

@@ -233,47 +233,44 @@ function (_super) {
 
   SearchMobile.prototype.render = function () {
     var data = this.props.data;
-    console.log('----search ', data);
-    var messageNum = this.state.messageNum; // let styleWrap = {};
-    // if (data.background.bgType === 'color') {
-    //   styleWrap = {
-    //     backgroundColor: data.background.color,
-    //     opacity: data.background.opacity,
-    //   };
-    // } else {
-    //   styleWrap = {
-    //     backgroundImage: `url(${data.background.image})`,
-    //     backgroundPosition: 'center',
-    //     backgroundRepeat: 'no-repeat',
-    //     backgroundSize: '100%',
-    //   };
-    // }
+    var messageNum = this.state.messageNum;
+    var styleWrap = {};
+
+    if (data.background.bgType === 'color') {
+      styleWrap = {
+        backgroundColor: data.background.color,
+        opacity: data.background.opacity
+      };
+    } else {
+      styleWrap = {
+        backgroundImage: "url(" + data.background.image + ")",
+        backgroundPosition: 'center',
+        backgroundRepeat: 'no-repeat',
+        backgroundSize: '100%'
+      };
+    }
 
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-search-bar"
+      className: "m-search-bar",
+      style: styleWrap
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "right"
-    }, data.box.open && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "search-input-wrap",
+    }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+      color: "#2C2C2C",
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/search-page');
       },
-      style: {
-        borderColor: data.box.color.mobile
-      }
-    }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: data.box.color.mobile,
       size: 24,
       type: "icon-search2"
-    })), data.icon.open && /*#__PURE__*/_react["default"].createElement("div", {
+    }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "message-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: data.icon.color.mobile,
+      color: "#2C2C2C",
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/message-center');
       },
       size: 24,
-      type: "icon-ChatDots"
+      type: "icon-message"
     }), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"
     }, messageNum))), data.logo.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {

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

@@ -1,6 +1,6 @@
 .m-search-bar {
-  height: 48px;
-  padding: 8px 16px;
+  height: 44px;
+  padding: 10px 16px;
   display: flex;
   flex-direction: row-reverse;
   align-items: center;
@@ -8,23 +8,13 @@
   width: 100%;
 
   .right {
+    width: 60px;
     display: flex;
     align-items: center;
     justify-content: space-between;
 
-    .search-input-wrap {
-      width: 195px;
-      background: #fff;
-      border-radius: 4px;
-      border: 1px solid #D2D9E5;
-      padding: 4px 12px;
-      height: 32px;
-      text-align: right;
-    }
-
     .message-wrap {
       position: relative;
-      margin-left: 16px;
 
       .num {
         position: absolute;

package/lib/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigContent/index.js

@@ -19,8 +19,6 @@ var _common = require("../../../../../common");
 
 var _locale = require("../../../../../locale");
 
-require("./index.less");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -118,22 +116,14 @@ function (_super) {
           data: panelProps.salesPrice
         }),
         metaOption: panelProps.salesPrice
+      }, {
+        key: '5',
+        name: (0, _locale.i18n)('SALES_PROGRESS'),
+        value: null,
+        metaOption: panelProps.salesProgressVisible
       }],
       type: "switch"
-    }), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "sales_progress_wrap"
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: "label"
-    }, (0, _locale.i18n)('SALES_PROGRESS')), /*#__PURE__*/_react["default"].createElement(_antd.Switch, {
-      checked: panelProps.salesProgressVisible.open,
-      onChange: function onChange(v) {
-        panelProps.salesProgressVisible = {
-          open: v
-        };
-
-        _this.reRender();
-      }
-    })));
+    }));
   };
 
   AComponent.defaultProps = {

package/lib/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigContent/index.less

@@ -1,20 +0,0 @@
-.flash_sale_content {
-
-  .sales_progress_wrap {
-    border-top: 1px solid #EDF0F4;
-    padding-top: 20px;
-    padding-bottom: 10px;
-    display: flex;
-    justify-content: space-between;
-
-    .label {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      height: 24px !important;
-      font-weight: 600 !important;
-      color: #232F46;
-      font-family: 'Open Sans';
-      font-style: normal;
-    }
-  }
-}

package/lib/composite-comp/dito/config-panels/FlashDealConfig/index.js

@@ -13,27 +13,18 @@ var _FlashDealConfigContent = _interopRequireDefault(require("./FlashDealConfigC
 
 var _layout = _interopRequireDefault(require("./imgs/layout1.png"));
 
-var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
-
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
 
 var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
-var _mobx = require("../../../../mobx");
-
 var _locale = require("../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function FlashDealConfig(props) {
   var data = props.data;
-
-  var getIsContentActive = function getIsContentActive(content) {
-    return JSON.stringify(content).includes(_mobx.store.clickedMetaParent);
-  };
-
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
     divider: "bold",
     headerSize: "large",
@@ -48,30 +39,21 @@ function FlashDealConfig(props) {
       name: (0, _locale.i18n)('CONTENT'),
       value: /*#__PURE__*/_react["default"].createElement(_FlashDealConfigContent["default"], {
         panelProps: data.content
-      }),
-      active: getIsContentActive(data.content)
-    }, {
-      key: '3',
-      name: (0, _locale.i18n)('SPACING'),
-      value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
-        configCompSpace: true,
-        configPaddingLR: true,
-        data: data.spacing
       })
     }, {
-      key: '4',
+      key: '3',
       name: (0, _locale.i18n)('CUSTOMIZE'),
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
         isHideAlign: true,
         layoutSource: [{
           id: 'layout1',
-          name: 'layout1',
+          name: 'left',
           image: _layout["default"]
         }]
       })
     }, {
-      key: '5',
+      key: '4',
       name: (0, _locale.i18n)('BACKGROUND'),
       value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
         data: data.background