@fonixtree/magic-design 0.0.82 → 0.0.84

package/es/composite-comp/bol/components/Banner/mobile/index.js

@@ -19,6 +19,8 @@ var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _AlignSelector = require("../../../../../common/AlignSelector");
 
+var _commonUtil = require("../../../../../utils/commonUtil");
+
 var _components = require("../../../../../meta-comp/components");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -171,7 +173,9 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-banner-mobile",
       style: {
-        marginBottom: data.spacing.mobile.marginBottom || 0
+        marginBottom: (0, _commonUtil.ensure)(function () {
+          return data.spacing.mobile.marginBottom;
+        }, 0)
       }
     }, /*#__PURE__*/_react["default"].createElement(_antd.Carousel, {
       ref: this.carouselRef,

package/es/composite-comp/bol/components/Button/index.less

@@ -13,36 +13,35 @@
   }
 
   &.layout1 {
-    flex-direction: column;
+    flex-direction: row;
 
     &.left {
-      align-items: flex-start;
+      justify-content: flex-start;
     }
 
     &.center {
-      align-items: center;
+      justify-content: center;
     }
 
     &.right {
-      align-items: flex-end;
+      justify-content: flex-end;
     }
   }
 
   &.layout2 {
-    flex-direction: row;
+    flex-direction: column;
 
     &.left {
-      justify-content: flex-start;
+      align-items: flex-start;
     }
 
     &.center {
-      justify-content: center;
+      align-items: center;
     }
 
     &.right {
-      justify-content: flex-end;
+      align-items: flex-end;
     }
   }
 
-
 }

package/es/composite-comp/bol/components/Carousel/mobile/index.js

@@ -13,6 +13,10 @@ var _reactSlick = _interopRequireDefault(require("react-slick"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _lodash = require("lodash");
+
+var _coreUtil = require("../../../../../utils/coreUtil");
+
 var _components = require("../../../../../meta-comp/components");
 
 var _commonUtil = require("../../../../../utils/commonUtil");
@@ -70,20 +74,20 @@ var __assign = void 0 && (void 0).__assign || function () {
 };
 
 var MOBILE_IMG_SIZE = [{
-  w: 282,
-  h: 212
+  maxW: 375,
+  maxH: 160
 }, {
-  w: 135,
-  h: 102
+  maxW: 169,
+  maxH: 126
 }, {
-  w: 86,
-  h: 65
+  maxW: 109,
+  maxH: 82
 }, {
-  w: 60,
-  h: 45
+  maxW: 78,
+  maxH: 58
 }, {
-  w: 50,
-  h: 50
+  maxW: 50,
+  maxH: 50
 }];
 
 var CarouselMobile =
@@ -95,9 +99,28 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      sliderIndex: 0
+      sliderIndex: 0,
+      contentWidth: 0
     };
     _this.sliderRef = /*#__PURE__*/_react["default"].createRef();
+    _this.destroy = null;
+
+    _this.listenWidth = function () {
+      var renderContainer = document.querySelector('.composite_wrap');
+      if (renderContainer) _this.setState({
+        contentWidth: renderContainer.offsetWidth
+      });
+    };
+
+    _this.sliderGoTo = function (groupSource) {
+      var nextIndex = groupSource.findIndex(function (item) {
+        return item.id === _mobx.store.clickedGroup;
+      });
+
+      if (nextIndex != -1 && nextIndex != _this.state.sliderIndex) {
+        _this.sliderRef.slickGoTo(nextIndex);
+      }
+    };
 
     _this.mouseEnterBtn = function (e) {
       var _a, _b;
@@ -133,14 +156,24 @@ function (_super) {
   CarouselMobile.prototype.componentDidMount = function () {
     var _a;
 
+    var _this = this;
+
     var data = this.props.data;
 
     _mobx.store.setState({
       CarouselStore: __assign(__assign({}, _mobx.store.CarouselStore), (_a = {}, _a[data.id] = data.customize.layout, _a))
     });
+
+    this.destroy = (0, _mobx.autorun)(function () {
+      _this.sliderGoTo(_this.props.data.groupSource);
+    });
+    this.listenWidth();
+    window.addEventListener('resize', (0, _lodash.debounce)(this.listenWidth));
   };
 
   CarouselMobile.prototype.componentWillReceiveProps = function (nextProps) {
+    this.sliderGoTo(nextProps.data.groupSource);
+
     if (nextProps.data.setting.autoplay.open) {
       this.sliderRef.slickPlay();
     } else {
@@ -148,11 +181,17 @@ function (_super) {
     }
   };
 
+  CarouselMobile.prototype.componentWillUnmount = function () {
+    this.destroy();
+  };
+
   CarouselMobile.prototype.render = function () {
     var _this = this;
 
     var data = this.props.data;
-    var sliderIndex = this.state.sliderIndex;
+    var _a = this.state,
+        sliderIndex = _a.sliderIndex,
+        contentWidth = _a.contentWidth;
     var showText = data.customize.layout === 'layout2';
     var colNum = showText ? 1 : Math.min(data.customize.rowNum, data.groupSource.length);
     var bgStyle = {};
@@ -168,13 +207,18 @@ function (_super) {
       };
     }
 
-    var spacing = data.spacing[window.magicDesign.device];
-    if (spacing.contentWidth) bgStyle.width = spacing.contentWidth;
+    var autoplay = data.setting.autoplay.open;
+    /** 设计器模式下 如果选中特定group 自动播放关闭 */
+
+    if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
+      autoplay = false;
+    }
+
     var settings = {
       className: 'slider-wrap',
       arrows: false,
       dots: false,
-      autoplay: data.setting.autoplay.open,
+      autoplay: autoplay,
       autoplaySpeed: data.setting.autoplay.interval * 1000,
       speed: 500,
       draggable: window.magicDesign.mode === 'renderer',
@@ -186,9 +230,16 @@ function (_super) {
         });
       }
     };
+    var spacing = data.spacing[window.magicDesign.device];
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-carousel-mobile",
       style: bgStyle
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "content",
+      style: {
+        width: contentWidth - spacing.paddingLeft - spacing.paddingRight,
+        paddingBottom: data.setting.dots.open && data.groupSource.length / colNum > 1 ? '20px' : '0'
+      }
     }, /*#__PURE__*/_react["default"].createElement(_reactSlick["default"], _extends({
       ref: function ref(slider) {
         return _this.sliderRef = slider;
@@ -201,8 +252,8 @@ function (_super) {
         className: "img"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
         data: item.image,
-        maxHeight: MOBILE_IMG_SIZE[colNum - 1].h,
-        maxWidth: MOBILE_IMG_SIZE[colNum - 1].w
+        maxHeight: MOBILE_IMG_SIZE[colNum - 1].maxH,
+        maxWidth: MOBILE_IMG_SIZE[colNum - 1].maxW
       })), showText && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.title.open && /*#__PURE__*/_react["default"].createElement("div", {
         className: "title"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
@@ -237,7 +288,7 @@ function (_super) {
           fontSize: i == sliderIndex ? data.setting.dots.hoverSize : data.setting.dots.size
         }
       });
-    })));
+    }))));
   };
 
   CarouselMobile.defaultProps = {

package/es/composite-comp/bol/components/Carousel/mobile/index.less

@@ -1,12 +1,16 @@
 .m-carousel-mobile {
-  display: flex;
   position: relative;
-  margin: 0 auto;
+  width: 100%;
+
+  .content {
+    display: flex;
+    margin: 0 auto;
+  }
 
   .slider-wrap {
     width: 100%;
-    padding: 30px 0;
     margin: 0 auto;
+    line-height: 1;
 
     .img-wrap {
       .img {
@@ -30,6 +34,7 @@
 
       .tags {
         margin-top: 8px;
+        margin-bottom: 12px;
         display: flex;
         flex-direction: row;
         align-items: center;
@@ -54,7 +59,7 @@
   .swiper-ban {
     position: absolute;
     width: 100%;
-    bottom: 0;
+    bottom: 6px;
     display: flex;
     align-items: center;
     justify-content: center;

package/es/composite-comp/bol/components/Carousel/pc/index.js

@@ -13,8 +13,12 @@ var _reactSlick = _interopRequireDefault(require("react-slick"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _lodash = require("lodash");
+
 var _coreUtil = require("../../../../../utils/coreUtil");
 
+var _mobx = require("../../../../../mobx");
+
 var _components = require("../../../../../meta-comp/components");
 
 var _commonUtil = require("../../../../../utils/commonUtil");
@@ -25,10 +29,14 @@ require("slick-carousel/slick/slick.css");
 
 require("slick-carousel/slick/slick-theme.css");
 
+var _ref, _ref2, _ref3, _ref4;
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 var __extends = void 0 && (void 0).__extends || function () {
   var _extendStatics = function extendStatics(d, b) {
     _extendStatics = Object.setPrototypeOf || {
@@ -56,30 +64,28 @@ var __extends = void 0 && (void 0).__extends || function () {
 }();
 
 var PC_IMG_SIZE = [{
-  minW: 806,
+  minW: 150,
   maxW: 1072,
-  maxH: 662
+  minH: 150,
+  maxH: 400
 }, {
-  minW: 390,
+  minW: 150,
   maxW: 524,
-  maxH: 393
-}, {
-  minW: 258,
-  maxW: 341,
-  maxH: 256
-}, {
-  minW: 184,
-  maxW: 251,
-  maxH: 188
-}, {
-  minW: 142,
-  maxW: 195,
-  maxH: 147
-}, {
-  minW: 124,
-  maxW: 168,
-  maxH: 126
-}];
+  minH: 150,
+  maxH: 524
+}, (_ref = {
+  minW: 100,
+  maxW: 341
+}, _defineProperty(_ref, "minW", 100), _defineProperty(_ref, "maxW", 341), _ref), (_ref2 = {
+  minW: 100,
+  maxW: 251
+}, _defineProperty(_ref2, "minW", 100), _defineProperty(_ref2, "maxW", 251), _ref2), (_ref3 = {
+  minW: 100,
+  maxW: 195
+}, _defineProperty(_ref3, "minW", 100), _defineProperty(_ref3, "maxW", 195), _ref3), (_ref4 = {
+  minW: 100,
+  maxW: 168
+}, _defineProperty(_ref4, "minW", 100), _defineProperty(_ref4, "maxW", 168), _ref4)];
 
 var CarouselPc =
 /** @class */
@@ -90,9 +96,28 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      sliderIndex: 0
+      sliderIndex: 0,
+      contentWidth: 0
     };
     _this.sliderRef = /*#__PURE__*/_react["default"].createRef();
+    _this.destroy = null;
+
+    _this.listenWidth = function () {
+      var renderContainer = document.querySelector('.composite_wrap');
+      if (renderContainer) _this.setState({
+        contentWidth: renderContainer.offsetWidth
+      });
+    };
+
+    _this.sliderGoTo = function (groupSource) {
+      var nextIndex = groupSource.findIndex(function (item) {
+        return item.id === _mobx.store.clickedGroup;
+      });
+
+      if (nextIndex != -1 && nextIndex != _this.state.sliderIndex) {
+        _this.sliderRef.slickGoTo(nextIndex);
+      }
+    };
 
     _this.mouseEnterBtn = function (e) {
       var _a, _b;
@@ -125,7 +150,19 @@ function (_super) {
     return _this;
   }
 
+  CarouselPc.prototype.componentDidMount = function () {
+    var _this = this;
+
+    this.destroy = (0, _mobx.autorun)(function () {
+      _this.sliderGoTo(_this.props.data.groupSource);
+    });
+    this.listenWidth();
+    window.addEventListener('resize', (0, _lodash.debounce)(this.listenWidth));
+  };
+
   CarouselPc.prototype.componentWillReceiveProps = function (nextProps) {
+    this.sliderGoTo(nextProps.data.groupSource);
+
     if (nextProps.data.setting.autoplay.open) {
       this.sliderRef.slickPlay();
     } else {
@@ -133,11 +170,17 @@ function (_super) {
     }
   };
 
+  CarouselPc.prototype.componentWillUnmount = function () {
+    this.destroy();
+  };
+
   CarouselPc.prototype.render = function () {
     var _this = this;
 
     var data = this.props.data;
-    var sliderIndex = this.state.sliderIndex;
+    var _a = this.state,
+        sliderIndex = _a.sliderIndex,
+        contentWidth = _a.contentWidth;
     var showText = data.customize.layout === 'layout2';
     var colNum = showText ? 1 : Math.min(data.customize.pcRowNum, data.groupSource.length);
     var bgStyle = {};
@@ -153,11 +196,18 @@ function (_super) {
       };
     }
 
+    var autoplay = data.setting.autoplay.open;
+    /** 设计器模式下 如果选中特定group 自动播放关闭 */
+
+    if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
+      autoplay = false;
+    }
+
     var settings = {
       className: 'slider-wrap',
       arrows: false,
       dots: false,
-      autoplay: data.setting.autoplay.open,
+      autoplay: autoplay,
       autoplaySpeed: data.setting.autoplay.interval * 1000,
       speed: 500,
       draggable: window.magicDesign.mode === 'renderer',
@@ -180,7 +230,8 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "content",
       style: {
-        width: spacing.contentWidth ? 'fit-content' : '100%'
+        width: contentWidth - spacing.paddingLeft - spacing.paddingRight,
+        paddingBottom: data.setting.dots.open && data.groupSource.length / colNum > 1 ? '30px' : '0'
       }
     }, data.setting.navigation.open && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       className: "carousel-icon-left",
@@ -191,11 +242,7 @@ function (_super) {
       onMouseLeave: this.mouseLeaveBtn,
       style: navStyle,
       type: "icon-left"
-    }), /*#__PURE__*/_react["default"].createElement("div", {
-      style: {
-        width: spacing.contentWidth || 'calc(100% - 52px)'
-      }
-    }, /*#__PURE__*/_react["default"].createElement(_reactSlick["default"], _extends({
+    }), /*#__PURE__*/_react["default"].createElement(_reactSlick["default"], _extends({
       ref: function ref(slider) {
         return _this.sliderRef = slider;
       }
@@ -209,6 +256,7 @@ function (_super) {
         data: item.image,
         maxHeight: PC_IMG_SIZE[colNum - 1].maxH,
         maxWidth: PC_IMG_SIZE[colNum - 1].maxW,
+        minHeight: PC_IMG_SIZE[colNum - 1].minH,
         minWidth: PC_IMG_SIZE[colNum - 1].minW
       })), showText && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.title.open && !((0, _coreUtil.isPc)() && item.title.pcText === '') && /*#__PURE__*/_react["default"].createElement("div", {
         className: "title"
@@ -228,7 +276,7 @@ function (_super) {
       }), item.secondButtonTag.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
         data: item.secondButtonTag
       }))));
-    }))), data.setting.dots.open && Math.ceil(data.groupSource.length / colNum) > 1 && /*#__PURE__*/_react["default"].createElement("div", {
+    })), data.setting.dots.open && Math.ceil(data.groupSource.length / colNum) > 1 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "swiper-ban"
     }, data.groupSource.length > 1 && data.groupSource.map(function (item, i) {
       return /*#__PURE__*/_react["default"].createElement("div", {

package/es/composite-comp/bol/components/Carousel/pc/index.less

@@ -1,30 +1,30 @@
 .m-carousel-pc {
   position: relative;
-  overflow-x: auto;
   width: 100%;
 
   .content {
     display: flex;
-    width: fit-content;
     margin: 0 auto;
   }
 
   .carousel-icon-left {
-    float: left;
-    margin-left: 10px;
+    margin-right: 20px;
+    cursor: pointer;
   }
 
   .carousel-icon-right {
-    float: right;
-    margin-right: 10px;
+    margin-left: 20px;
+    cursor: pointer;
   }
 
   .slider-wrap {
-    width: 100%;
-    padding: 30px 0;
+    width: calc(100% - 72px);
     margin: 0 auto;
+    line-height: 1;
 
     .img-wrap {
+      overflow-x: auto;
+
       .img {
         width: fit-content;
         height: fit-content;
@@ -46,6 +46,7 @@
 
       .tags {
         margin-top: 8px;
+        margin-bottom: 12px;
         display: flex;
         flex-direction: row;
         align-items: center;
@@ -70,7 +71,7 @@
   .swiper-ban {
     position: absolute;
     width: 100%;
-    bottom: 0;
+    bottom: 10px;
     left: 0;
     right: 0;
     display: flex;

package/es/composite-comp/bol/components/ImageGallery/defaultJSON.js

@@ -22,8 +22,8 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON() {
       open: true,
       type: 'IMAGE',
       content: {
-        h5Name: 'name2',
-        pcName: 'name2',
+        h5Name: 'Image Name',
+        pcName: 'Image Name',
         h5ImgSrc: '',
         pcImgSrc: '',
         clickUrl: ''
@@ -60,7 +60,13 @@ var getDefaultJSON = function getDefaultJSON() {
     },
     customize: {
       layout: 'layout1',
-      align: 'left'
+      align: 'left',
+      pcRowNum: 2,
+      rowNum: 2,
+      mobileMinRowNum: 2,
+      mobileMaxRowNum: 5,
+      pcMinRowNum: 2,
+      pcMaxRowNum: 6
     },
     background: {
       opacity: 100,

package/es/composite-comp/bol/components/ImageGallery/mobile/index.js

@@ -7,9 +7,11 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 require("./index.less");
 
-var _mobx = require("../../../../../mobx");
+var _components = require("../../../../../meta-comp/components");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -39,6 +41,34 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
+var MOBILE_IMG_SIZE = {
+  1: {
+    maxW: 343,
+    maxH: 258,
+    gap: 12
+  },
+  2: {
+    maxW: 165,
+    maxH: 124,
+    gap: 12
+  },
+  3: {
+    maxW: 106,
+    maxH: 80,
+    gap: 12
+  },
+  4: {
+    maxW: 77,
+    maxH: 56,
+    gap: 12
+  },
+  5: {
+    maxW: 62,
+    maxH: 45,
+    gap: 8
+  }
+};
+
 var ImageGalleryMobile =
 /** @class */
 function (_super) {
@@ -48,27 +78,35 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
-    _this.carouselRef = /*#__PURE__*/_react["default"].createRef();
-    _this.destroy = null;
     return _this;
   }
 
-  ImageGalleryMobile.prototype.componentDidMount = function () {
-    this.destroy = (0, _mobx.autorun)(function () {// this.init(this.props.data.groupSource);
-    });
-  };
-
-  ImageGalleryMobile.prototype.componentWillReceiveProps = function (nextProps) {// this.init(nextProps.data.groupSource);
-  };
-
-  ImageGalleryMobile.prototype.componentWillUnmount = function () {// this.destroy();
-  };
-
   ImageGalleryMobile.prototype.render = function () {
     var data = this.props.data;
+    var isHorizontal = data.customize.layout === 'layout2';
+    var colNum = isHorizontal ? data.customize.rowNum : 1;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-image-gallery-mobile"
-    }, "image gallery");
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])('content', {
+        horizontal: isHorizontal
+      }),
+      style: {
+        gap: MOBILE_IMG_SIZE[colNum].gap
+      }
+    }, data.groupSource.map(function (m) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        key: m.id,
+        className: "img-wrap",
+        style: {
+          width: MOBILE_IMG_SIZE[colNum].maxW
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+        data: m.image,
+        maxHeight: MOBILE_IMG_SIZE[colNum].maxH,
+        maxWidth: MOBILE_IMG_SIZE[colNum].maxW
+      }));
+    })));
   };
 
   ImageGalleryMobile.defaultProps = {