@fonixtree/magic-design 0.0.100 → 0.0.102

package/lib/composite-comp/bol/components/Banner/pc/index.js

@@ -23,6 +23,8 @@ var _AlignSelector = require("../../../../../common/AlignSelector");
 
 var _common = require("../../../../../common");
 
+var _businessUtil = require("../../../../../utils/businessUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -51,22 +53,6 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-var __assign = void 0 && (void 0).__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-
-      for (var p in s) {
-        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-      }
-    }
-
-    return t;
-  };
-
-  return __assign.apply(this, arguments);
-};
-
 // @inject('store')
 // @observer
 var BannerPc =
@@ -132,39 +118,23 @@ function (_super) {
       if ((_b = data.setting.navigation) === null || _b === void 0 ? void 0 : _b.size) {
         e.target.style.fontSize = data.setting.navigation.size;
       }
-    }; // padding用统一设置
-
-
-    _this.getBackgroundStyle = function (item) {
-      // const { data: { spacing }  } = this.props;
-      // const { spacing, background } = data;
-      // const { device } = window.magicDesign;
-      var wrapStyle = {}; // 边距
-      // if (spacing && spacing[device]) {
-      //   wrapStyle = { ...wrapStyle, ...spacing[device] };
-      // }
-      // 背景
-
-      if (item.background) {
-        if (item.background.bgType === 'color') {
-          wrapStyle.backgroundColor = item.background.color;
-          wrapStyle.opacity = item.background.opacity ? item.background.opacity : 1;
-        } else {
-          wrapStyle.backgroundImage = "url(" + item.background.image + ")";
-          wrapStyle.backgroundPosition = 'center';
-          wrapStyle.backgroundSize = 'cover';
-        }
-      }
-
-      return __assign({}, wrapStyle);
     };
 
-    _this.getItemStyle = function (item) {
+    _this.getBgStyle = function (item) {
       var data = _this.props.data;
-      return {
-        justifyContent: _AlignSelector.alignItemMap[item.customize.layout],
-        height: data.setting.pcHeight
+      var bgStyle = {
+        justifyContent: _AlignSelector.alignItemMap[item.customize.layout]
       };
+
+      if (item.background.bgType === 'color') {
+        bgStyle.opacity = item.background.opacity ? item.background.opacity / 100 : 1;
+        bgStyle.backgroundColor = item.background.color;
+      } else {
+        bgStyle.backgroundImage = "url(" + item.background.image + ")";
+      }
+
+      if (data.setting.pcHeight) bgStyle.height = data.setting.pcHeight;
+      return bgStyle;
     };
 
     return _this;
@@ -204,8 +174,10 @@ function (_super) {
       autoplay = false;
     }
 
+    var wrapStyle = (0, _businessUtil.computeStyle)(data, window.magicDesign.device);
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-banner-pc"
+      className: "m-banner-pc",
+      style: wrapStyle
     }, data.setting.navigation.open && /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       className: "turnPage leftBtn",
       onClick: function onClick() {
@@ -228,13 +200,11 @@ function (_super) {
     }, data.groupSource.map(function (item, index) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: item.id
-      }, /*#__PURE__*/_react["default"].createElement("div", {
-        style: _this.getBackgroundStyle(item)
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "carouselItem",
         onMouseEnter: _this.mouseEnterWrap,
         onMouseLeave: _this.mouseLeaveWrap,
-        style: _this.getItemStyle(item)
+        style: _this.getBgStyle(item)
       }, item.image.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
         data: item.image,
         hoverState: hoverState && carouseIndex === index,
@@ -264,7 +234,7 @@ function (_super) {
       }), item.secondButton.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
         className: "btn",
         data: item.secondButton
-      }))))));
+      })))));
     })), data.setting.dots.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "swiper-ban"
     }, data.groupSource.length > 1 && data.groupSource.map(function (item, i) {

package/lib/composite-comp/bol/components/Button/defaultJSON.js

@@ -3,69 +3,99 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getDefaultJSON = exports.buttonGroupSourceJSON = void 0;
+exports.getDefaultJSON = void 0;
 
 var _uuid = require("uuid");
 
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
 /**
  * 获取 text 元组件json
  */
-var buttonGroupSourceJSON = function buttonGroupSourceJSON() {
-  var groupId = (0, _uuid.v4)();
+var getDefaultMetaButtonJson = function getDefaultMetaButtonJson() {
   return {
-    id: groupId,
-    button: {
-      parentId: groupId,
-      id: (0, _uuid.v4)(),
+    id: (0, _uuid.v4)(),
+    open: true,
+    content: {
+      backgroundColor: '#2F54EB'
+    },
+    buttonText: {
+      sizeType: 'Customize font styles',
+      fontFamily: 'Open Sans',
+      fontWeight: 400,
+      fontSize: 14,
+      fontStyle: 'normal',
+      color: '#fff',
+      padding: '10px 26px'
+    },
+    buttonBorder: {
       open: true,
-      content: {
-        backgroundColor: '#2F54EB'
-      },
-      buttonText: {
-        sizeType: 'Customize font styles',
-        fontFamily: 'Open Sans',
-        fontWeight: 400,
-        fontSize: 14,
-        fontStyle: 'normal',
-        color: '#fff',
-        padding: '10px 26px'
-      },
-      buttonBorder: {
-        open: true,
-        borderColor: '',
-        borderRadius: 6
-      },
-      buttonIcon: {
-        iconUrl: '',
-        layout: 'right'
-      },
-      spacing: {
-        pc: {},
-        mobile: {}
-      },
-      text: 'Button',
-      hover: null
-    }
+      borderColor: '',
+      borderRadius: 6
+    },
+    buttonIcon: {
+      iconUrl: '',
+      layout: 'right'
+    },
+    spacing: {
+      pc: {},
+      mobile: {}
+    },
+    text: 'Button',
+    hover: null
   };
 };
 
-exports.buttonGroupSourceJSON = buttonGroupSourceJSON;
-
 var getDefaultJSON = function getDefaultJSON() {
   return {
     id: (0, _uuid.v4)(),
     type: 'BUTTON',
-    groupSource: [buttonGroupSourceJSON()],
+    content: {
+      button: __assign({}, getDefaultMetaButtonJson()),
+      secondaryButton: __assign(__assign({}, getDefaultMetaButtonJson()), {
+        content: {
+          backgroundColor: '#fff'
+        },
+        buttonText: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 400,
+          fontSize: 14,
+          fontStyle: 'normal',
+          color: '#2F54EB',
+          padding: '10px 26px'
+        },
+        buttonBorder: {
+          open: true,
+          borderColor: '#2F54EB',
+          borderRadius: 6
+        }
+      })
+    },
     spacing: {
       pc: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: window.magicDesign.compSpacing * 1.5
+        marginBottom: 0
       },
       mobile: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: window.magicDesign.compSpacing
+        marginBottom: 0
       }
     },
     customize: {

package/lib/composite-comp/bol/components/Button/index.js

@@ -15,6 +15,8 @@ var _components = require("../../../../meta-comp/components");
 
 var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
 
+var _businessUtil = require("../../../../utils/businessUtil");
+
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -74,16 +76,20 @@ function (_super) {
     var _a;
 
     var nodeData = this.props.nodeData;
+    var wrapStyle = (0, _businessUtil.computeStyle)(nodeData, window.magicDesign.device);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('button-comp-wrap', (_a = {}, _a[nodeData.customize.layout] = true, _a[nodeData.customize.align] = true, _a)),
-      onClick: this.onComponentClick
-    }, nodeData.groupSource && nodeData.groupSource.map(function (m) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        className: "secondary-button"
-      }, /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
-        data: m.button
-      }));
-    }));
+      onClick: this.onComponentClick,
+      style: wrapStyle
+    }, nodeData.content.button.open && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "first-button"
+    }, /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+      data: nodeData.content.button
+    })), nodeData.content.secondaryButton.open && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "secondary-button"
+    }, /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+      data: nodeData.content.secondaryButton
+    })));
   };
 
   Button.defaultProps = {};

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

@@ -2,7 +2,6 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  flex-wrap: wrap;
 
   .first-button {
     margin: 5px;
@@ -13,35 +12,36 @@
   }
 
   &.layout1 {
-    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;
     }
   }
 
   &.layout2 {
-    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;
     }
   }
 
+
 }

package/lib/composite-comp/bol/components/Carousel/defaultJSON.js

@@ -7,6 +7,10 @@ exports.imagesGroupSourceJSON = exports.getDefaultJSON = void 0;
 
 var _uuid = require("uuid");
 
+var _defaultImg = _interopRequireDefault(require("./imgs/defaultImg.png"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 var imagesGroupSourceJSON = function imagesGroupSourceJSON(compId) {
   var groupId = (0, _uuid.v4)();
   return {
@@ -20,8 +24,8 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(compId) {
       content: {
         h5Name: 'h5Name',
         pcName: 'pcName',
-        h5ImgSrc: '',
-        pcImgSrc: '',
+        h5ImgSrc: _defaultImg["default"],
+        pcImgSrc: _defaultImg["default"],
         clickUrl: ''
       },
       hover: {
@@ -40,7 +44,7 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(compId) {
       specialContent: [],
       text: 'Title of this group',
       content: {
-        sizeType: 'Customize font styles',
+        sizeType: 'Headline 1',
         fontFamily: 'Open Sans',
         fontWeight: 600,
         fontSize: 16,
@@ -63,7 +67,7 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(compId) {
       specialContent: [],
       text: 'Please enter a description',
       content: {
-        sizeType: 'Customize font styles',
+        sizeType: 'Headline 1',
         fontFamily: 'Open Sans',
         fontWeight: 400,
         fontSize: 14,
@@ -82,8 +86,8 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(compId) {
       content: {
         h5Name: '',
         pcName: '',
-        h5ImgSrc: '',
-        pcImgSrc: '',
+        h5ImgSrc: _defaultImg["default"],
+        pcImgSrc: _defaultImg["default"],
         clickUrl: ''
       },
       hover: {
@@ -105,7 +109,7 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(compId) {
         backgroundColor: '#E6EAF0'
       },
       buttonText: {
-        sizeType: 'Customize font styles',
+        // sizeType: 'Headline 1',
         fontFamily: 'Open Sans',
         fontWeight: 600,
         fontSize: 14,
@@ -141,7 +145,7 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(compId) {
           backgroundColor: '#E6EAF0'
         },
         buttonText: {
-          sizeType: 'Customize font styles',
+          // sizeType: 'Headline 1',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -170,7 +174,7 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(compId) {
         backgroundColor: '#E6EAF0'
       },
       buttonText: {
-        sizeType: 'Customize font styles',
+        // sizeType: 'Headline 1',
         fontFamily: 'Open Sans',
         fontWeight: 600,
         fontSize: 14,
@@ -206,7 +210,7 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(compId) {
           backgroundColor: '#E6EAF0'
         },
         buttonText: {
-          sizeType: 'Customize font styles',
+          // sizeType: 'Headline 1',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -260,14 +264,14 @@ var getDefaultJSON = function getDefaultJSON() {
     },
     spacing: {
       pc: {
-        paddingTop: 0,
-        paddingBottom: 0,
-        marginBottom: window.magicDesign.compSpacing * 1.5
+        paddingTop: 10,
+        paddingBottom: 10,
+        marginBottom: 0
       },
       mobile: {
-        paddingTop: 0,
-        paddingBottom: 0,
-        marginBottom: window.magicDesign.compSpacing
+        paddingTop: 10,
+        paddingBottom: 10,
+        marginBottom: 0
       }
     },
     customize: {

package/lib/composite-comp/bol/components/Carousel/index.js

@@ -15,6 +15,8 @@ var _defaultJSON = require("./defaultJSON");
 
 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); }
@@ -70,7 +72,10 @@ function (_super) {
 
   Carousel.prototype.render = function () {
     var nodeData = this.props.nodeData;
-    return /*#__PURE__*/_react["default"].createElement("div", null, window.magicDesign.device === 'pc' ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
+    var wrapStyle = (0, _businessUtil.computeStyle)(nodeData, window.magicDesign.device);
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      style: wrapStyle
+    }, window.magicDesign.device === 'pc' ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
       data: nodeData
     }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
       data: nodeData

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

@@ -13,10 +13,10 @@ var _reactSlick = _interopRequireDefault(require("react-slick"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _coreUtil = require("../../../../../utils/coreUtil");
-
 var _components = require("../../../../../meta-comp/components");
 
+var _commonUtil = require("../../../../../utils/commonUtil");
+
 require("slick-carousel/slick/slick.css");
 
 require("slick-carousel/slick/slick-theme.css");
@@ -70,20 +70,20 @@ var __assign = void 0 && (void 0).__assign || function () {
 };
 
 var MOBILE_IMG_SIZE = [{
-  maxW: 375,
-  maxH: 160
+  w: 282,
+  h: 212
 }, {
-  maxW: 169,
-  maxH: 126
+  w: 135,
+  h: 102
 }, {
-  maxW: 109,
-  maxH: 82
+  w: 86,
+  h: 65
 }, {
-  maxW: 78,
-  maxH: 58
+  w: 60,
+  h: 45
 }, {
-  maxW: 50,
-  maxH: 50
+  w: 50,
+  h: 50
 }];
 
 var CarouselMobile =
@@ -98,17 +98,6 @@ function (_super) {
       sliderIndex: 0
     };
     _this.sliderRef = /*#__PURE__*/_react["default"].createRef();
-    _this.destroy = null;
-
-    _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;
@@ -144,28 +133,14 @@ 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);
-      /** 设计器模式下 如果选中特定group 自动播放关闭 */
-
-
-      if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
-        _this.sliderRef.slickPause();
-      }
-    });
   };
 
   CarouselMobile.prototype.componentWillReceiveProps = function (nextProps) {
-    this.sliderGoTo(nextProps.data.groupSource);
-
     if (nextProps.data.setting.autoplay.open) {
       this.sliderRef.slickPlay();
     } else {
@@ -173,10 +148,6 @@ function (_super) {
     }
   };
 
-  CarouselMobile.prototype.componentWillUnmount = function () {
-    this.destroy();
-  };
-
   CarouselMobile.prototype.render = function () {
     var _this = this;
 
@@ -184,36 +155,43 @@ function (_super) {
     var sliderIndex = this.state.sliderIndex;
     var showText = data.customize.layout === 'layout2';
     var colNum = showText ? 1 : Math.min(data.customize.rowNum, data.groupSource.length);
-    var autoplay = data.setting.autoplay.open;
-    /** 设计器模式下 如果选中特定group 自动播放关闭 */
+    var bgStyle = {};
 
-    if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
-      autoplay = false;
+    if (data.background.bgType === 'color') {
+      bgStyle = {
+        backgroundColor: (0, _commonUtil.getColorRgba)(data.background.color || '#fff', data.background.opacity / 100 || 1)
+      };
+    } else {
+      bgStyle = {
+        background: "url(" + data.background.image + ") no-repeat center",
+        backgroundSize: '100%'
+      };
     }
 
+    var spacing = data.spacing[window.magicDesign.device];
+    if (spacing.contentWidth) bgStyle.width = spacing.contentWidth;
     var settings = {
       className: 'slider-wrap',
       arrows: false,
       dots: false,
-      autoplay: autoplay,
+      autoplay: data.setting.autoplay.open,
       autoplaySpeed: data.setting.autoplay.interval * 1000,
       speed: 500,
-      draggable: window.magicDesign.mode === 'renderer',
       slidesToShow: colNum,
-      slidesToScroll: 1,
+      slidesToScroll: colNum,
       beforeChange: function beforeChange(oldIndex, newIndex) {
         _this.setState({
           sliderIndex: newIndex
         });
       }
-    };
+    }; // const navStyle = {
+    //   fontSize: data.setting.navigation.size,
+    //   color: data.setting.navigation.color,
+    // };
+
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-carousel-mobile"
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: "content",
-      style: {
-        paddingBottom: data.setting.dots.open && data.groupSource.length / colNum > 1 ? '20px' : '0'
-      }
+      className: "m-carousel-mobile",
+      style: bgStyle
     }, /*#__PURE__*/_react["default"].createElement(_reactSlick["default"], _extends({
       ref: function ref(slider) {
         return _this.sliderRef = slider;
@@ -226,7 +204,9 @@ function (_super) {
         className: "img"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
         data: item.image,
-        maxHeight: MOBILE_IMG_SIZE[colNum - 1].maxH
+        isBackground: true,
+        maxHeight: MOBILE_IMG_SIZE[colNum - 1].h,
+        maxWidth: MOBILE_IMG_SIZE[colNum - 1].w
       })), 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, {
@@ -245,7 +225,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 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "swiper-ban"
     }, data.groupSource.length > 1 && data.groupSource.map(function (item, i) {
       return /*#__PURE__*/_react["default"].createElement("div", {
@@ -261,7 +241,7 @@ function (_super) {
           fontSize: i == sliderIndex ? data.setting.dots.hoverSize : data.setting.dots.size
         }
       });
-    }))));
+    })));
   };
 
   CarouselMobile.defaultProps = {