@fonixtree/magic-design 0.0.78 → 0.0.80

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

@@ -15,8 +15,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 () {
@@ -104,10 +102,9 @@ function (_super) {
   ImageTextMobile.prototype.render = function () {
     var _this = this;
 
-    var data = this.props.data; // const { ready } = this.state;
-    // console.log('----imagetext mobile', data);
+    var data = this.props.data; // console.log('----imagetext mobile', data);
 
-    var wrapStyle = (0, _businessUtil.computeStyle)(data, window.magicDesign.device);
+    var wrapStyle = {};
     wrapStyle.textAlign = data.customize.align; // if (data.background.bgType === 'color') {
     //   wrapStyle.backgroundColor = data.background.color;
     //   wrapStyle.opacity = data.background.opacity ? data.background.opacity : 1;

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

@@ -59,8 +59,8 @@
         }
         .card-btn-wrap {
           display: flex;
-          .card-first-btn {
-            margin-right: 12px;
+          .card-second-btn {
+            margin-left: 12px;
           }
         }
       }
@@ -94,8 +94,8 @@
         }
         .card-btn-wrap {
           display: flex;
-          .card-first-btn {
-            margin-right: 12px;
+          .card-second-btn {
+            margin-left: 12px;
           }
         }
       }
@@ -135,8 +135,8 @@
         flex-direction: column;
       }
 
-      .card-second-btn {
-        margin-top: 8px;
+      .card-first-btn, .card-second-btn {
+        margin-bottom: 8px;
       }
     }
     .card-margin-bottom {
@@ -170,8 +170,8 @@
         }
         .card-btn-wrap {
           display: flex;
-          .card-first-btn {
-            margin-right: 12px;
+          .card-second-btn {
+            margin-left: 12px;
           }
         }
       }

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

@@ -11,6 +11,8 @@ require("./index.less");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _lodash = require("lodash");
+
 var _AlignSelector = require("../../../../../common/AlignSelector");
 
 var _components = require("../../../../../meta-comp/components");
@@ -63,7 +65,7 @@ var __assign = void 0 && (void 0).__assign || function () {
 
 var maxWidthAndHeight = {
   normal: 410,
-  outside: 100,
+  outside: 86,
   center: 410
 };
 
@@ -76,17 +78,26 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      hoverIndex: -1
-    }; // componentDidMount() {
-    //   this.distroy = autorun(() => {
-    //     this.setState({
-    //       clickedGroup: store.clickedGroup,
-    //     });
-    //   });
-    // }
-    // componentWillUnmount() {
-    //   this.distroy();
-    // }
+      hoverIndex: -1,
+      currentMaxWidth: 410
+    };
+
+    _this.listenCardWidth = function () {
+      var _a;
+
+      var data = _this.props.data;
+
+      try {
+        var cardWidth = ((_a = document.querySelector('.group-wrap .one-card')) === null || _a === void 0 ? void 0 : _a.offsetWidth) - 48;
+        var maxLayoutWidth = maxWidthAndHeight[data.customize.layout.pcLayout];
+
+        _this.setState({
+          currentMaxWidth: Math.min(cardWidth, maxLayoutWidth)
+        });
+      } catch (error) {
+        console.log(error);
+      }
+    };
 
     _this.calcWidth = function (num) {
       return (100 - (num - 1) * 2) / num + "%";
@@ -114,15 +125,32 @@ function (_super) {
     return _this;
   }
 
+  ImageTextPc.prototype.componentDidMount = function () {
+    var data = this.props.data;
+    this.layout = data.customize.layout.pcLayout;
+    this.listenCardWidth();
+    window.addEventListener('resize', (0, _lodash.debounce)(this.listenCardWidth));
+  };
+
+  ImageTextPc.prototype.componentWillUnmount = function () {
+    window.removeEventListener('resize', this.listenCardWidth);
+  };
+
+  ImageTextPc.prototype.componentWillReceiveProps = function (nextProps) {
+    if (nextProps.data.customize.layout.pcLayout !== this.layout) {
+      this.layout = nextProps.data.customize.layout.pcLayout;
+      this.listenCardWidth();
+    }
+  };
+
   ImageTextPc.prototype.render = function () {
     var _this = this;
 
     var data = this.props.data;
-    var hoverIndex = this.state.hoverIndex; // console.log('====================================');
-    // console.log(data);
-    // console.log('====================================');
-
-    var wrapStyle = (0, _businessUtil.computeStyle)(data, window.magicDesign.device);
+    var _a = this.state,
+        hoverIndex = _a.hoverIndex,
+        currentMaxWidth = _a.currentMaxWidth;
+    var wrapStyle = {};
     wrapStyle.alignItems = _AlignSelector.alignItemMap[data.customize.align];
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('image-text-pc', data.customize.layout.pcLayout),
@@ -156,7 +184,7 @@ function (_super) {
         data: hoverIndex == i ? source.hover.image : source.image,
         limitWidthHeight: true,
         maxHeight: maxWidthAndHeight[data.customize.layout.pcLayout],
-        maxWidth: maxWidthAndHeight[data.customize.layout.pcLayout],
+        maxWidth: currentMaxWidth,
         scale: 0.5
       })), (source.title.open && data.customize.layout.pcLayout !== 'center' && hoverIndex != i || hoverIndex == i && source.hover.title.open && data.customize.layout.pcLayout !== 'center') && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         className: "card-title",

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

@@ -111,12 +111,12 @@ var getDefaultJSON = function getDefaultJSON() {
       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/Newsletter/index.js

@@ -19,8 +19,6 @@ var _Text = require("../../../../meta-comp/components/Text");
 
 require("./index.less");
 
-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); }
@@ -90,15 +88,12 @@ function (_super) {
     //   wrapStyle.backgroundPosition = 'center';
     // }
 
-    var wrapStyle = (0, _businessUtil.computeStyle)(nodeData, window.magicDesign.device);
-
     var style = __assign({}, (0, _Text.contentStyle)(nodeData.content.inputField.content));
 
     Reflect.deleteProperty(style, 'width');
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('newsletter-wrap', (_a = {}, _a[nodeData.customize.layout] = true, _a[nodeData.customize.align] = true, _a[window.magicDesign.device] = true, _a)),
-      onClick: this.onComponentClick,
-      style: wrapStyle
+      onClick: this.onComponentClick
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "top-wrap"
     }, nodeData.content.inputField.open && /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -3,60 +3,51 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getDefaultJSON = void 0;
+exports.tagGroupSourceJSON = 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 getDefaultMetaButtonJson = function getDefaultMetaButtonJson() {
+var tagGroupSourceJSON = function tagGroupSourceJSON() {
+  var groupId = (0, _uuid.v4)();
   return {
-    id: (0, _uuid.v4)(),
-    open: true,
-    content: {
-      url: '',
-      backgroundColor: '#e6eaf0'
-    },
-    buttonText: {
-      sizeType: 'Customize font styles',
-      fontFamily: 'Open Sans',
-      fontWeight: 600,
-      fontSize: 12,
-      fontStyle: 'normal',
-      color: '#8493AF',
-      padding: '2px 8px'
-    },
-    buttonBorder: {
+    id: groupId,
+    button: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
       open: true,
-      borderColor: '',
-      borderRadius: 4
-    },
-    buttonIcon: {
-      iconUrl: '',
-      layout: 'right'
-    },
-    text: 'Button Tag',
-    hover: null
+      content: {
+        url: '',
+        backgroundColor: '#e6eaf0'
+      },
+      buttonText: {
+        sizeType: 'Customize font styles',
+        fontFamily: 'Open Sans',
+        fontWeight: 600,
+        fontSize: 12,
+        fontStyle: 'normal',
+        color: '#8493AF',
+        padding: '2px 8px'
+      },
+      buttonBorder: {
+        open: true,
+        borderColor: '',
+        borderRadius: 4
+      },
+      buttonIcon: {
+        iconUrl: '',
+        layout: 'right'
+      },
+      text: 'Button Tag',
+      hover: null
+    }
   };
 };
 
+exports.tagGroupSourceJSON = tagGroupSourceJSON;
+
 var getDefaultJSON = function getDefaultJSON() {
   return {
     id: (0, _uuid.v4)(),
@@ -80,20 +71,19 @@ var getDefaultJSON = function getDefaultJSON() {
           pcImgHoverUrl: '',
           h5ImgHoverUrl: ''
         }
-      },
-      button: __assign({}, getDefaultMetaButtonJson()),
-      secondaryButton: __assign({}, getDefaultMetaButtonJson())
+      }
     },
+    groupSource: [tagGroupSourceJSON()],
     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/Tag/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,24 +74,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"])('tag-comp-wrap', (_a = {}, _a[nodeData.customize.layout] = true, _a[nodeData.customize.align] = true, _a)),
-      onClick: this.onComponentClick,
-      style: wrapStyle
+      onClick: this.onComponentClick
     }, nodeData.content.image.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "tag-image"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       data: nodeData.content.image
-    })), 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
-    })));
+    })), nodeData.groupSource && nodeData.groupSource.map(function (m) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: "first-button"
+      }, /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+        data: m.button
+      }));
+    }));
   };
 
   Tag.defaultProps = {};

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

@@ -1,6 +1,7 @@
 .tag-comp-wrap {
   display: flex;
   align-items: center;
+  flex-wrap: wrap;
 
   .tag-image {
     width: 26px;

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

@@ -69,7 +69,6 @@ var textGroupSourceJSON = function textGroupSourceJSON(parentId) {
           fontWeight: 600,
           fontSize: 22,
           pcFontSize: 22,
-          width: '100%',
           color: '#232F46'
         }
       }),
@@ -84,7 +83,6 @@ var textGroupSourceJSON = function textGroupSourceJSON(parentId) {
           fontWeight: 400,
           fontSize: 18,
           pcFontSize: 18,
-          width: '100%',
           color: '#232F46'
         }
       })
@@ -103,7 +101,7 @@ var getDefaultJSON = function getDefaultJSON() {
       headline: __assign(__assign({}, getDefaultMetaTextJson()), {
         text: 'Title use, click modify text.',
         content: {
-          sizeType: 'Headline 1',
+          sizeType: 'Customize font styles',
           fontFamily: 'Montserrat',
           fontWeight: 600,
           fontSize: 28,
@@ -130,18 +128,18 @@ var getDefaultJSON = function getDefaultJSON() {
       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: {
       layout: 'left',
       align: 'left',
-      rowNum: 3
+      pcRowNum: 3
     },
     background: {
       opacity: 100,

package/es/composite-comp/bol/components/Text/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,11 +74,9 @@ 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: "m-text",
-      onClick: this.onComponentClick,
-      style: wrapStyle
+      onClick: this.onComponentClick
     }, nodeData.title.headline.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "title-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
@@ -90,7 +86,7 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       data: nodeData.title.subtitle
     })), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])('group-content-wrap', 'col-' + nodeData.customize.rowNum, (_a = {}, _a[window.magicDesign.device] = true, _a))
+      className: (0, _classnames["default"])('group-content-wrap', 'col-' + nodeData.customize.pcRowNum, (_a = {}, _a[window.magicDesign.device] = true, _a))
     }, nodeData.groupSource.map(function (group) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "group-wrap-container"
@@ -100,11 +96,11 @@ function (_super) {
         style: {
           textAlign: nodeData.customize.align
         }
-      }, /*#__PURE__*/_react["default"].createElement("div", {
+      }, group.content.title.open && /*#__PURE__*/_react["default"].createElement("div", {
         className: "group-title"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         data: group.content.title
-      })), /*#__PURE__*/_react["default"].createElement("div", {
+      })), group.content.text.open && /*#__PURE__*/_react["default"].createElement("div", {
         className: "group-content"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         data: group.content.text

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

@@ -1,7 +1,7 @@
 .m-text {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
+  // display: flex;
+  // flex-direction: column;
+  // align-items: center;
 
   .title-wrap {
     font-weight: 500;

package/es/composite-comp/bol/config-panels/BannerConfig/BannerConfigGroup/index.js

@@ -21,6 +21,8 @@ require("./index.less");
 
 var _locale = require("../../../../../locale");
 
+var _decorator = require("../../../../../decorator");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
@@ -120,7 +122,7 @@ function (_super) {
   AComponent.defaultProps = {
     source: []
   };
-  AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer], AComponent);
+  AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], AComponent);
   return AComponent;
 }(_react["default"].Component);
 

package/es/composite-comp/bol/config-panels/ButtonCompConfig/ButtonConfigGroup/index.js

@@ -0,0 +1,141 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _mobxReact = require("mobx-react");
+
+var _GroupList = _interopRequireDefault(require("../../../../../common/GroupList"));
+
+var _defaultJSON = require("../../../components/Button/defaultJSON");
+
+var _coreUtil = require("../../../../../utils/coreUtil");
+
+var _Button = _interopRequireDefault(require("../../../../../common/Button"));
+
+require("./index.less");
+
+var _locale = require("../../../../../locale");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var __decorate = void 0 && (void 0).__decorate || function (decorators, target, key, desc) {
+  var c = arguments.length,
+      r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
+      d;
+  if ((typeof Reflect === "undefined" ? "undefined" : _typeof(Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) {
+    if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  }
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+
+var notice = '';
+
+var AComponent =
+/** @class */
+function (_super) {
+  __extends(AComponent, _super);
+
+  function AComponent() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {};
+
+    _this.onClickItem = function (node) {
+      _this.props.store.setState({
+        clickedGroup: node.id
+      });
+    };
+
+    _this.onAddClick = function () {
+      var json = (0, _defaultJSON.buttonGroupSourceJSON)();
+
+      _this.props.source.push(json);
+
+      _this.setState({});
+
+      (0, _coreUtil.renderPreview)();
+    };
+
+    _this.reRender = function () {
+      _this.setState({});
+    };
+
+    _this.renderCard = function (src) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: "card_wrap"
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "name"
+      }, "Button Name"));
+    };
+
+    return _this;
+  }
+
+  AComponent.prototype.render = function () {
+    var _this = this;
+
+    var source = this.props.source;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "button_group"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "node_list"
+    }, source.length === 0 ? /*#__PURE__*/_react["default"].createElement("span", {
+      className: "notice"
+    }, notice) : /*#__PURE__*/_react["default"].createElement(_GroupList["default"], {
+      onClickItem: this.onClickItem,
+      renderCard: function renderCard(v) {
+        return _this.renderCard(v);
+      },
+      reRender: this.reRender,
+      source: source
+    })), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "btn_wrap"
+    }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      icon: "icon-add",
+      onClick: this.onAddClick,
+      type: "primary"
+    }, (0, _locale.i18n)('ADD_BUTTON'))));
+  };
+
+  AComponent.defaultProps = {
+    source: []
+  };
+  AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer], AComponent);
+  return AComponent;
+}(_react["default"].Component);
+
+var _default = AComponent;
+exports["default"] = _default;

package/es/composite-comp/bol/config-panels/ButtonCompConfig/ButtonConfigGroup/index.less

@@ -0,0 +1,16 @@
+.button_group {
+  margin-bottom: 20px;
+
+  .node_list {
+    margin-bottom: 12px;
+
+    .notice {
+      font-family: 'Open Sans';
+      font-style: normal;
+      font-weight: 400;
+      font-size: 16px;
+      line-height: 24px;
+      color: #232F46;
+    }
+  }
+}