@fonixtree/magic-design 0.0.56 → 0.0.60

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

@@ -163,7 +163,7 @@ function (_super) {
       autoplaySpeed: data.setting.autoplay.interval * 1000,
       speed: 500,
       slidesToShow: colNum,
-      slidesToScroll: colNum,
+      slidesToScroll: 1,
       beforeChange: function beforeChange(oldIndex, newIndex) {
         _this.setState({
           sliderIndex: newIndex
@@ -220,7 +220,7 @@ function (_super) {
       }), item.secondButtonTag.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
         data: item.secondButtonTag
       }))));
-    })), data.setting.dots.open && /*#__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/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,10 +71,9 @@ var getDefaultJSON = function getDefaultJSON() {
           pcImgHoverUrl: '',
           h5ImgHoverUrl: ''
         }
-      },
-      button: __assign({}, getDefaultMetaButtonJson()),
-      secondaryButton: __assign({}, getDefaultMetaButtonJson())
+      }
     },
+    groupSource: [tagGroupSourceJSON()],
     spacing: {
       pc: {
         paddingTop: 10,

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

@@ -81,15 +81,13 @@ function (_super) {
       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.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

@@ -141,7 +141,7 @@ var getDefaultJSON = function getDefaultJSON() {
     customize: {
       layout: 'left',
       align: 'left',
-      rowNum: 3
+      pcRowNum: 3
     },
     background: {
       opacity: 100,

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

@@ -86,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"
@@ -96,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/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;
+    }
+  }
+}

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

@@ -7,7 +7,7 @@ exports["default"] = ButtonConfig;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _ButtonConfigContent = _interopRequireDefault(require("./ButtonConfigContent"));
+var _ButtonConfigGroup = _interopRequireDefault(require("./ButtonConfigGroup"));
 
 var _layout = _interopRequireDefault(require("./imgs/layout1.png"));
 
@@ -33,8 +33,8 @@ function ButtonConfig(props) {
     source: [{
       key: '1',
       name: (0, _locale.i18n)('CONTENT'),
-      value: /*#__PURE__*/_react["default"].createElement(_ButtonConfigContent["default"], {
-        panelProps: data.content
+      value: /*#__PURE__*/_react["default"].createElement(_ButtonConfigGroup["default"], {
+        source: data.groupSource
       })
     }, {
       key: '2',

package/es/composite-comp/bol/config-panels/CarouselConfig/CarouselConfigImageGroup/index.js

@@ -80,7 +80,7 @@ function (_super) {
     };
 
     _this.onAddClick = function () {
-      var json = (0, _defaultJSON.imagesGroupSourceJSON)('', 'Tab');
+      var json = (0, _defaultJSON.imagesGroupSourceJSON)(_this.props.id);
 
       _this.props.source.push(json);
 

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

@@ -34,6 +34,7 @@ function CarouselConfig(props) {
       key: '1',
       name: (0, _locale.i18n)('IMAGE'),
       value: /*#__PURE__*/_react["default"].createElement(_CarouselConfigImageGroup["default"], {
+        id: data.id,
         source: data.groupSource
       })
     }, {

package/es/composite-comp/bol/config-panels/TagCompConfig/TagConfigContent/index.js

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _ButtonConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ButtonConfig"));
+var _TagConfigGroup = _interopRequireDefault(require("../TagConfigGroup"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
@@ -65,7 +65,9 @@ function (_super) {
   }
 
   AComponent.prototype.render = function () {
-    var panelProps = this.props.panelProps;
+    var _a = this.props,
+        panelProps = _a.panelProps,
+        groupSource = _a.groupSource;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "recommend_content"
     }, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
@@ -78,22 +80,10 @@ function (_super) {
           data: panelProps.image
         }),
         metaOption: panelProps.image
-      }, {
-        key: '2',
-        name: (0, _locale.i18n)('BUTTON_TAG'),
-        value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
-          data: panelProps.button
-        }),
-        metaOption: panelProps.button
-      }, {
-        key: '3',
-        name: (0, _locale.i18n)('SECONDARY_BUTTON_TAG'),
-        value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
-          data: panelProps.secondaryButton
-        }),
-        metaOption: panelProps.secondaryButton
       }],
       type: "switch"
+    }), /*#__PURE__*/_react["default"].createElement(_TagConfigGroup["default"], {
+      source: groupSource
     }));
   };
 

package/es/composite-comp/bol/config-panels/TagCompConfig/TagConfigGroup/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/Tag/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.tagGroupSourceJSON)();
+
+      _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 Tag"));
+    };
+
+    return _this;
+  }
+
+  AComponent.prototype.render = function () {
+    var _this = this;
+
+    var source = this.props.source;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "tag_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_TAG'))));
+  };
+
+  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/TagCompConfig/TagConfigGroup/index.less

@@ -0,0 +1,16 @@
+.tag_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;
+    }
+  }
+}

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

@@ -32,6 +32,7 @@ function TagCompConfig(props) {
       key: '1',
       name: (0, _locale.i18n)('CONTENT'),
       value: /*#__PURE__*/_react["default"].createElement(_TagConfigContent["default"], {
+        groupSource: data.groupSource,
         panelProps: data.content
       })
     }, {

package/es/composite-comp/bol/config-panels/TextCompConfig/TextConfigGroup/index.js

@@ -17,6 +17,8 @@ var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _defaultJSON = require("../../../components/Text/defaultJSON");
 
+var _decorator = require("../../../../../decorator");
+
 require("./index.less");
 
 var _locale = require("../../../../../locale");
@@ -132,7 +134,7 @@ function (_super) {
   default_1.defaultProps = {
     source: []
   };
-  default_1 = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer], default_1);
+  default_1 = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], default_1);
   return default_1;
 }(_react["default"].Component);
 

package/es/composite-comp/bol/second-config-panels/BannerSecondConfig/index.js

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _coreUtil = require("../../../../utils/coreUtil");
-
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
 var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
@@ -102,10 +100,8 @@ function (_super) {
         metaOption: panelProps.secondButton
       }];
       return /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
-        headerSize: "middle",
-        onRefresh: function onRefresh() {
-          return (0, _coreUtil.renderPreview)();
-        },
+        headerSize: "middle" // onRefresh={() => renderPreview()}
+        ,
         showActiveColor: true,
         source: source,
         type: "switch"