@fonixtree/magic-design 0.0.110 → 0.0.111

package/es/common/index.js

@@ -63,6 +63,18 @@ Object.defineProperty(exports, "ImagePicker", {
     return _ImagePicker["default"];
   }
 });
+Object.defineProperty(exports, "ImgArea", {
+  enumerable: true,
+  get: function get() {
+    return _ImgArea["default"];
+  }
+});
+Object.defineProperty(exports, "InputNumber", {
+  enumerable: true,
+  get: function get() {
+    return _InputNumber["default"];
+  }
+});
 Object.defineProperty(exports, "LayoutSelector", {
   enumerable: true,
   get: function get() {
@@ -81,18 +93,42 @@ Object.defineProperty(exports, "Slider", {
     return _Slider["default"];
   }
 });
+Object.defineProperty(exports, "SwiperBan", {
+  enumerable: true,
+  get: function get() {
+    return _SwiperBan["default"];
+  }
+});
 Object.defineProperty(exports, "SwitchCollapse", {
   enumerable: true,
   get: function get() {
     return _SwitchCollapse["default"];
   }
 });
+Object.defineProperty(exports, "SystemNotification", {
+  enumerable: true,
+  get: function get() {
+    return _SystemNotification["default"];
+  }
+});
 Object.defineProperty(exports, "UrlPicker", {
   enumerable: true,
   get: function get() {
     return _UrlPicker["default"];
   }
 });
+Object.defineProperty(exports, "Video", {
+  enumerable: true,
+  get: function get() {
+    return _Video["default"];
+  }
+});
+Object.defineProperty(exports, "VideoUpload", {
+  enumerable: true,
+  get: function get() {
+    return _VideoUpload["default"];
+  }
+});
 
 var _LayoutSelector = _interopRequireDefault(require("./LayoutSelector"));
 
@@ -124,4 +160,16 @@ var _ButtonIconLayout = _interopRequireDefault(require("./ButtonIconLayout"));
 
 var _ProductSource = _interopRequireDefault(require("./ProductSource"));
 
+var _ImgArea = _interopRequireDefault(require("./ImgArea"));
+
+var _SystemNotification = _interopRequireDefault(require("./SystemNotification"));
+
+var _Video = _interopRequireDefault(require("./Video"));
+
+var _SwiperBan = _interopRequireDefault(require("./SwiperBan"));
+
+var _InputNumber = _interopRequireDefault(require("./InputNumber"));
+
+var _VideoUpload = _interopRequireDefault(require("./VideoUpload"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

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

@@ -43,12 +43,12 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
       text: 'Title use, click modify text.',
       specialContent: [],
       content: {
-        // sizeType: 'Headline 1',
+        sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
         fontWeight: 700,
         fontSize: 28,
         color: '#FFFFFF',
-        width: 400
+        width: 319
       },
       underline: {
         open: false,
@@ -65,12 +65,12 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
       specialContent: [],
       text: 'For the text area, you can enter a subtitle or description, the default width is the same as title.',
       content: {
-        // sizeType: 'Headline 1',
+        sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
         fontWeight: 400,
         fontSize: 18,
         color: '#FFFFFF',
-        width: 500
+        width: 319
       },
       underline: {},
       vertical: {}
@@ -86,7 +86,7 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
         backgroundColor: '#2F54EB'
       },
       buttonText: {
-        // sizeType: 'Headline 1',
+        sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
         fontWeight: 600,
         fontSize: 14,
@@ -122,7 +122,7 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
           backgroundColor: '#0d39ed'
         },
         buttonText: {
-          // sizeType: 'Headline 1',
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -151,7 +151,7 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
         backgroundColor: '#fff'
       },
       buttonText: {
-        // sizeType: 'Headline 1',
+        sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
         fontWeight: 600,
         fontSize: 14,
@@ -187,7 +187,7 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
           backgroundColor: '#E9F0FF'
         },
         buttonText: {
-          // sizeType: 'Headline 1',
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -254,12 +254,12 @@ var getDefaultJSON = function getDefaultJSON() {
       pc: {
         paddingTop: 0,
         paddingBottom: 0,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing * 1.5
       },
       mobile: {
         paddingTop: 0,
         paddingBottom: 0,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing
       }
     }
   };

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

@@ -21,8 +21,6 @@ var _AlignSelector = require("../../../../../common/AlignSelector");
 
 var _components = require("../../../../../meta-comp/components");
 
-var _businessUtil = require("../../../../../utils/businessUtil");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -51,6 +49,22 @@ 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);
+};
+
 var BannerMobile =
 /** @class */
 function (_super) {
@@ -61,8 +75,7 @@ function (_super) {
 
     _this.state = {
       carouseIndex: 0,
-      hoverState: false,
-      clickedGroup: ''
+      hoverState: false
     };
     _this.carouselRef = /*#__PURE__*/_react["default"].createRef();
     _this.destroy = null;
@@ -75,6 +88,31 @@ function (_super) {
       if (nextIndex != -1 && nextIndex != _this.state.carouseIndex) {
         _this.carouselRef.current.goTo(nextIndex);
       }
+    }; // 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) {
@@ -122,19 +160,16 @@ function (_super) {
     var data = this.props.data;
     var _a = this.state,
         carouseIndex = _a.carouseIndex,
-        hoverState = _a.hoverState,
-        clickedGroup = _a.clickedGroup;
+        hoverState = _a.hoverState;
     var autoplay = data.setting.autoplay.open;
     /** 设计器模式下 如果选中特定group 自动播放关闭 */
 
-    if ((0, _coreUtil.isDesignMode)() && clickedGroup) {
+    if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
       autoplay = false;
     }
 
-    var wrapStyle = (0, _businessUtil.computeStyle)(data, window.magicDesign.device);
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-banner-mobile",
-      style: wrapStyle
+      className: "m-banner-mobile"
     }, /*#__PURE__*/_react["default"].createElement(_antd.Carousel, {
       ref: this.carouselRef,
       afterChange: function afterChange(n) {
@@ -148,6 +183,8 @@ 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,
@@ -182,7 +219,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/es/composite-comp/bol/components/Banner/pc/index.js

@@ -23,8 +23,6 @@ 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 () {
@@ -53,6 +51,22 @@ 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 =
@@ -118,23 +132,39 @@ 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.getBgStyle = function (item) {
+    _this.getItemStyle = function (item) {
       var data = _this.props.data;
-      var bgStyle = {
-        justifyContent: _AlignSelector.alignItemMap[item.customize.layout]
+      return {
+        justifyContent: _AlignSelector.alignItemMap[item.customize.layout],
+        height: data.setting.pcHeight
       };
-
-      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;
@@ -174,10 +204,8 @@ function (_super) {
       autoplay = false;
     }
 
-    var wrapStyle = (0, _businessUtil.computeStyle)(data, window.magicDesign.device);
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-banner-pc",
-      style: wrapStyle
+      className: "m-banner-pc"
     }, data.setting.navigation.open && /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       className: "turnPage leftBtn",
       onClick: function onClick() {
@@ -200,11 +228,13 @@ 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.getBgStyle(item)
+        style: _this.getItemStyle(item)
       }, item.image.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
         data: item.image,
         hoverState: hoverState && carouseIndex === index,
@@ -234,7 +264,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/es/composite-comp/bol/components/Button/defaultJSON.js

@@ -3,99 +3,69 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getDefaultJSON = void 0;
+exports.getDefaultJSON = exports.buttonGroupSourceJSON = 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 getDefaultMetaButtonJson = function getDefaultMetaButtonJson() {
+var buttonGroupSourceJSON = function buttonGroupSourceJSON() {
+  var groupId = (0, _uuid.v4)();
   return {
-    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: {
+    id: groupId,
+    button: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
       open: true,
-      borderColor: '',
-      borderRadius: 6
-    },
-    buttonIcon: {
-      iconUrl: '',
-      layout: 'right'
-    },
-    spacing: {
-      pc: {},
-      mobile: {}
-    },
-    text: 'Button',
-    hover: null
+      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
+    }
   };
 };
 
+exports.buttonGroupSourceJSON = buttonGroupSourceJSON;
+
 var getDefaultJSON = function getDefaultJSON() {
   return {
     id: (0, _uuid.v4)(),
     type: 'BUTTON',
-    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
-        }
-      })
-    },
+    groupSource: [buttonGroupSourceJSON()],
     spacing: {
       pc: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing * 1.5
       },
       mobile: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing
       }
     },
     customize: {

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

@@ -15,8 +15,6 @@ 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 }; }
@@ -76,20 +74,16 @@ 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,
-      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
-    })));
+      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
+      }));
+    }));
   };
 
   Button.defaultProps = {};

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

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