@fonixtree/magic-design 0.0.94 → 0.0.97

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

@@ -13,7 +13,9 @@ require("./index.less");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _lodash = _interopRequireDefault(require("lodash.throttle"));
+var _lodash = require("lodash");
+
+var _lodash2 = _interopRequireDefault(require("lodash.throttle"));
 
 var _mobx = require("../../../../../mobx");
 
@@ -359,8 +361,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];
@@ -417,13 +422,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)));
@@ -467,24 +481,6 @@ 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);
@@ -505,7 +501,7 @@ function (_super) {
         if (scrollDom) {
           _this.setScrollDisabled(scrollDom);
 
-          scrollDom.onscroll = (0, _lodash["default"])(function () {
+          scrollDom.onscroll = (0, _lodash2["default"])(function () {
             _this.setScrollDisabled(scrollDom);
           }, 500);
         }
@@ -553,19 +549,24 @@ function (_super) {
       if (scrollDom) {
         _this.setScrollDisabled(scrollDom);
 
-        scrollDom.onscroll = (0, _lodash["default"])(function () {
+        scrollDom.onscroll = (0, _lodash2["default"])(function () {
           _this.setScrollDisabled(scrollDom);
         }, 500);
       }
     }, 0);
     this.listenWidth();
+    window.addEventListener('resize', (0, _lodash.debounce)(this.listenWidth));
+  };
+
+  RecommendMobile.prototype.componentWillUnmount = function () {
+    window.removeEventListener('resize', 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) {
@@ -573,8 +574,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;
     }
 
@@ -610,7 +611,7 @@ function (_super) {
         if (scrollDom) {
           _this.setScrollDisabled(scrollDom);
 
-          scrollDom.onscroll = (0, _lodash["default"])(function () {
+          scrollDom.onscroll = (0, _lodash2["default"])(function () {
             _this.setScrollDisabled(scrollDom);
           }, 500);
         }
@@ -646,7 +647,6 @@ function (_super) {
         scrollToLeftDisabled = _a.scrollToLeftDisabled,
         scrollToRightDisabled = _a.scrollToRightDisabled,
         contentWidth = _a.contentWidth;
-    var bgStyle = this.getBackgroundStyle();
     var products = this.state["products" + tabIndex] || [];
     var isDivide = groupSource.length <= 10;
     var layout = panelProps.customize.layout.pcLayout;
@@ -663,8 +663,7 @@ function (_super) {
     }, 140);
     if (layout === 'layout1' && contentWidth) imgHeight = (contentWidth - 12 * (panelProps.customize.pcRowNum - 1)) / panelProps.customize.pcRowNum;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-recommend-pc",
-      style: bgStyle
+      className: "m-recommend-pc"
     }, !hideTabs && /*#__PURE__*/_react["default"].createElement("div", {
       className: "tab-select-wrap"
     }, groupSource.map(function (tab, index) {

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

@@ -25,6 +25,7 @@
     .tabTitle {
       display: flex;
       align-items: center;
+      text-align: center;
       // padding: 0 24px;
       min-width: 100px;
       height: 100%;

package/lib/decorator/compositeDecorator.js

@@ -123,8 +123,9 @@ function compositeDecorator(WrappedComponent) {
               wrapStyle.opacity = background.opacity ? background.opacity : 1;
             } else {
               wrapStyle.backgroundImage = "url(" + background.image + ")";
-              wrapStyle.backgroundPosition = 'center';
-              wrapStyle.backgroundSize = 'cover';
+              wrapStyle.backgroundPosition = '0px 0px';
+              wrapStyle.backgroundSize = 'auto 100%';
+              wrapStyle.backgroundRepeat = 'no-repeat';
             }
           }
         }

package/lib/decorator/metaDecorator.js

@@ -211,8 +211,8 @@ function metaDecorator(WrappedComponent) {
           className = _a.className,
           rest = __rest(_a, ["className"]);
 
-      var hoverStyle = this.getInteractStyle();
-      console.log(rest);
+      var hoverStyle = this.getInteractStyle(); // console.log(rest);
+
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: className,
         style: this.getStyle()

package/lib/meta-comp/components/Image/index.less

@@ -4,7 +4,7 @@
   height: 100%;
   display: flex;
   justify-content: center;
-  overflow: hidden;
+  // overflow: hidden;
   &>img {
     width: 100%;
     height: 100%;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.0.94",
+  "version": "0.0.97",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",