@fonixtree/magic-design 2.0.204 → 2.0.206

package/es/common/Collapse/index.js

@@ -267,7 +267,8 @@ function (_super) {
     _this.getHeader = function (panel) {
       var activeKey = _this.state.activeKey;
       var name = panel.name,
-          key = panel.key;
+          key = panel.key,
+          onClick = panel.onClick;
       var _a = _this.props,
           headerStyle = _a.headerStyle,
           showActiveColor = _a.showActiveColor;
@@ -277,6 +278,7 @@ function (_super) {
       } : {};
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "header_wrap",
+        onClick: onClick,
         onMouseEnter: function onMouseEnter() {
           return _this.headerMouseEnter(panel);
         },

package/es/common/Field/index.js

@@ -72,13 +72,14 @@ function (_super) {
         topSplit = _a.topSplit,
         rest = __rest(_a, ["title", "children", "layout", "split", "topSplit"]);
 
-    return /*#__PURE__*/_react["default"].createElement("div", _extends({
-      className: (0, _classnames["default"])('m-field', {
+    return /*#__PURE__*/_react["default"].createElement("div", _extends({}, rest, {
+      className: (0, _classnames["default"])('m-field', "" + rest.className, {
         split: split,
         topSplit: topSplit,
-        bold: split === 'bold'
+        bold: split === 'bold',
+        solid: split === 'solid'
       })
-    }, rest), /*#__PURE__*/_react["default"].createElement("div", {
+    }), /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('field-item', {
         horizontal: layout === 'horizontal'
       })

package/es/common/Field/index.less

@@ -14,6 +14,10 @@
       border-bottom: 8px solid #EDF0F4;
       border-radius: 2px;
     }
+
+    &.solid {
+      border-bottom: 1px solid #D2D9E5;
+    }
   }
 
   .field-item {

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

@@ -114,6 +114,7 @@ function (_super) {
     var data = this.props.data;
     var GAData = (0, _commonUtil.getGAData)(data);
     var isHorizontal = data.customize.layout.h5Layout === 'layout2';
+    var isFluidLayout = data.customize.layout.h5Layout === 'layout3' || data.customize.layout.h5Layout === 'layout4';
     var colNum = isHorizontal ? data.customize.rowNum : 1;
     var newData = data.groupSource.reduce(function (prev, curr, index) {
       var i = Math.floor(index / colNum);
@@ -122,7 +123,7 @@ function (_super) {
     }, []);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-image-gallery-mobile"
-    }, /*#__PURE__*/_react["default"].createElement("div", {
+    }, !isFluidLayout && /*#__PURE__*/_react["default"].createElement("div", {
       className: "content"
     }, newData.map(function (arr, index) {
       return /*#__PURE__*/_react["default"].createElement("div", {
@@ -150,7 +151,37 @@ function (_super) {
           maxWidth: "100%"
         }));
       }));
-    })));
+    })), data.customize.layout.h5Layout === 'layout3' && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "fluid-content"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "left-img"
+    }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      data: data.groupSource[0].image,
+      maxWidth: "100%"
+    })), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "right-img"
+    }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      data: data.groupSource[1].image,
+      maxWidth: "100%"
+    }), /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      data: data.groupSource[2].image,
+      maxWidth: "100%"
+    }))), data.customize.layout.h5Layout === 'layout4' && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "fluid-content"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "left-img"
+    }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      data: data.groupSource[0].image,
+      maxWidth: "100%"
+    }), /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      data: data.groupSource[1].image,
+      maxWidth: "100%"
+    })), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "right-img"
+    }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      data: data.groupSource[2].image,
+      maxWidth: "100%"
+    }))));
   };
 
   ImageGalleryMobile.defaultProps = {

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

@@ -16,3 +16,18 @@
   align-items: center;
   justify-content: center;
 }
+.m-image-gallery-mobile .fluid-content {
+  display: flex;
+}
+.m-image-gallery-mobile .fluid-content > div {
+  width: calc((100% - 0.4rem) / 2);
+}
+.m-image-gallery-mobile .fluid-content .left-img > div:nth-child(2) {
+  margin-top: 0.2rem;
+}
+.m-image-gallery-mobile .fluid-content .right-img {
+  margin-left: 0.4rem;
+}
+.m-image-gallery-mobile .fluid-content .right-img > div:nth-child(2) {
+  margin-top: 0.2rem;
+}

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

@@ -207,6 +207,7 @@ var getDefaultJSON = function getDefaultJSON() {
     groupSource: [videoGroupSourceJSON(id)],
     pcHeight: 600,
     mobileHeight: 212,
+    arc: 0,
     share: {
       open: false,
       image: '',

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

@@ -124,7 +124,8 @@ function (_super) {
         key: group.id,
         className: "video-item-wrap",
         style: (0, _commonUtil.pxToRem)({
-          height: data.mobileHeight
+          height: data.mobileHeight,
+          borderRadius: data.arc
         })
       }, /*#__PURE__*/_react["default"].createElement(_common.Video, {
         ref: function ref(el) {

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

@@ -6,6 +6,7 @@
   height: 4.24rem;
   position: relative;
   margin-bottom: 0.2rem;
+  overflow: hidden;
 }
 .video-layout1-wrap .video-item-wrap:last-child {
   margin-bottom: 0;

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

@@ -156,7 +156,8 @@ function (_super) {
         key: group.id,
         className: "video-item-wrap",
         style: (0, _commonUtil.pxToRem)({
-          height: data.mobileHeight
+          height: data.mobileHeight,
+          borderRadius: data.arc
         })
       }, /*#__PURE__*/_react["default"].createElement(_common.Video, {
         ref: function ref(el) {

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

@@ -22,6 +22,7 @@
   position: relative;
   width: 100%;
   flex-shrink: 0;
+  overflow: hidden;
 }
 .video-layout2-wrap .slider-wrap .video-item-wrap:last-child {
   margin-bottom: 0;

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

@@ -126,7 +126,8 @@ function (_super) {
         key: group.id,
         className: "video-item-wrap",
         style: (0, _commonUtil.pxToRem)({
-          height: data.mobileHeight
+          height: data.mobileHeight,
+          borderRadius: data.arc
         })
       }, /*#__PURE__*/_react["default"].createElement(_common.Video, {
         ref: function ref(el) {

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

@@ -17,6 +17,7 @@
 .video-layout3-wrap .video-item-wrap {
   height: 4.24rem;
   position: relative;
+  overflow: hidden;
 }
 .video-layout3-wrap .video-item-wrap:last-child {
   margin-bottom: 0;

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

@@ -123,7 +123,8 @@ function (_super) {
         key: group.id,
         className: "video-item-wrap",
         style: {
-          height: data.pcHeight
+          height: data.pcHeight,
+          borderRadius: data.arc
         }
       }, /*#__PURE__*/_react["default"].createElement(_common.Video, {
         ref: function ref(el) {

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

@@ -16,6 +16,7 @@
     height: 792px;
     position: relative;
     margin-bottom: 10px;
+    overflow: hidden;
 
     &:last-child {
       margin-bottom: 0;

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

@@ -128,7 +128,10 @@ function (_super) {
       }
     }, firstGroup && /*#__PURE__*/_react["default"].createElement("div", {
       key: firstGroup.id,
-      className: "video-left-wrap"
+      className: "video-left-wrap",
+      style: {
+        borderRadius: data.arc
+      }
     }, /*#__PURE__*/_react["default"].createElement(_common.Video, {
       ref: function ref(el) {
         if (!_this.videoRefMap[firstGroup.id]) {
@@ -181,7 +184,10 @@ function (_super) {
       var isPlaying = !!((_a = _this.videoRefMap[group.id]) === null || _a === void 0 ? void 0 : _a.playing);
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: group.id,
-        className: "video-item-wrap"
+        className: "video-item-wrap",
+        style: {
+          borderRadius: data.arc
+        }
       }, /*#__PURE__*/_react["default"].createElement(_common.Video, {
         ref: function ref(el) {
           if (!_this.videoRefMap[group.id]) {

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

@@ -24,6 +24,7 @@
     height: 100%;
     position: relative;
     width: 50%;
+    overflow: hidden;
 
     .play-btn {
       position: absolute;
@@ -48,6 +49,7 @@
     flex-direction: column;
     flex: 1;
     width: 100%;
+    overflow: hidden;
 
     .play-btn {
       position: absolute;

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

@@ -133,7 +133,10 @@ function (_super) {
       var isPlaying = !!((_a = _this.videoRefMap[group.id]) === null || _a === void 0 ? void 0 : _a.playing);
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: group.id,
-        className: "video-item-wrap"
+        className: "video-item-wrap",
+        style: {
+          borderRadius: data.arc
+        }
       }, /*#__PURE__*/_react["default"].createElement(_common.Video, {
         ref: function ref(el) {
           if (!_this.videoRefMap[group.id]) {

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

@@ -17,6 +17,7 @@
     position: relative;
     flex: 1;
     margin-right: 20px;
+    overflow: hidden;
 
     &:last-child {
       margin-right: 0;

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

@@ -126,7 +126,8 @@ function (_super) {
         key: group.id,
         className: "video-item-wrap",
         style: {
-          height: data.pcHeight
+          height: data.pcHeight,
+          borderRadius: data.arc
         }
       }, /*#__PURE__*/_react["default"].createElement(_common.Video, {
         ref: function ref(el) {

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

@@ -17,6 +17,7 @@
     height: 212px;
     position: relative;
     width: 440px;
+    overflow: hidden;
 
     &:last-child {
       margin-bottom: 0;

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

@@ -126,7 +126,8 @@ function (_super) {
         key: group.id,
         className: "video-item-wrap",
         style: {
-          height: data.pcHeight
+          height: data.pcHeight,
+          borderRadius: data.arc
         }
       }, /*#__PURE__*/_react["default"].createElement(_common.Video, {
         ref: function ref(el) {

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

@@ -19,6 +19,7 @@
     position: relative;
     // margin-bottom: 10px;
     width: 440px;
+    overflow: hidden;
 
     .play-btn {
       position: absolute;

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

@@ -131,6 +131,7 @@ function (_super) {
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "btn_wrap"
     }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      disabled: source.length >= 3,
       icon: "icon-add",
       onClick: this.onAddClick,
       type: "primary"

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

@@ -58,7 +58,7 @@ function ImageGalleryConfig(props) {
         component: "imageGallery",
         data: data.customize,
         isHideAlign: true,
-        layoutSource: _layout.imageGalleryLayout,
+        layoutSource: (0, _coreUtil.isPc)() ? _layout.imageGalleryPcLayout : _layout.imageGalleryLayout,
         selectedLayoutFun: function selectedLayoutFun(v) {
           return getLayout(v);
         }

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

@@ -128,6 +128,18 @@ function (_super) {
           },
           unit: "px",
           value: data[(0, _coreUtil.isPc)() ? 'pcHeight' : 'mobileHeight']
+        })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+          title: "Arc"
+        }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
+          onChange: function onChange(_a) {
+            var count = _a.count;
+            data.arc = count;
+
+            _this.selfRender();
+          },
+          value: {
+            count: data.arc
+          }
         })))
       }, {
         key: 'Spacing',

package/es/composite-comp/common/components/ProductItem/index.js

@@ -163,7 +163,7 @@ function (_super) {
       }, data.url && /*#__PURE__*/_react["default"].createElement("img", {
         alt: "welcome advertise",
         onClick: function onClick() {
-          (0, _commonUtil.jumpUrlConfig)(data.adObj);
+          if (window.magicDesign.h5JumpUrlConfig) window.magicDesign.h5JumpUrlConfig(data.adObj, 'voucherRedeemed');
         },
         src: data.url
       }));

package/es/composite-comp/dito/components/Campaign/defaultJSON.js

@@ -0,0 +1,112 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.groupSourceJSON = exports.getDefaultJSON = void 0;
+
+var _uuid = require("uuid");
+
+var groupSourceJSON = function groupSourceJSON(parentId, type) {
+  var groupId = (0, _uuid.v4)();
+  return {
+    id: groupId,
+    parentId: parentId,
+    type: type,
+    open: true,
+    groupName: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'TEXT',
+      specialContent: [],
+      text: 'PAYDAY SALE!',
+      content: {
+        sizeType: 'Customize font styles',
+        fontWeight: 700,
+        fontSize: 10,
+        color: '#0038A7'
+      },
+      underline: {
+        open: false,
+        textDecorationColor: '',
+        textDecorationStyle: 'solid'
+      },
+      vertical: {}
+    }
+  };
+};
+
+exports.groupSourceJSON = groupSourceJSON;
+
+var getDefaultJSON = function getDefaultJSON() {
+  var groupId = (0, _uuid.v4)();
+  return {
+    id: (0, _uuid.v4)(),
+    type: 'CAMPAIGN',
+    title: {
+      headline: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'TEXT',
+        specialContent: [],
+        text: 'Lorem Ipsum',
+        content: {
+          sizeType: 'Customize font styles',
+          fontWeight: 600,
+          fontSize: 14,
+          color: '#000000'
+        },
+        underline: {
+          open: false,
+          textDecorationColor: '',
+          textDecorationStyle: 'solid'
+        },
+        vertical: {
+          open: false,
+          lineHeight: 18
+        }
+      }
+    },
+    content: {
+      image: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'IMAGE',
+        content: {
+          h5Name: 'name2',
+          pcName: 'name2',
+          h5ImgSrc: '',
+          pcImgSrc: '',
+          clickUrl: ''
+        },
+        hover: {
+          open: false,
+          backgroundType: 'enlarge',
+          magnification: 1.5,
+          pcImgHoverUrl: '',
+          h5ImgHoverUrl: ''
+        }
+      }
+    },
+    groupSource: [groupSourceJSON(groupId, 'Flash Sale'), groupSourceJSON(groupId, 'Group Buy'), groupSourceJSON(groupId, 'Bargain')],
+    spacing: {
+      mobile: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        marginBottom: 0
+      }
+    },
+    customize: {
+      layout: 'layout1'
+    },
+    background: {
+      opacity: 100,
+      color: '#fff',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;

package/es/composite-comp/dito/components/Campaign/index.js

@@ -0,0 +1,88 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _mobile = _interopRequireDefault(require("./mobile"));
+
+var _defaultJSON = require("./defaultJSON");
+
+var _coreUtil = require("../../../../utils/coreUtil");
+
+var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
+
+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); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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 Campaign =
+/** @class */
+function (_super) {
+  __extends(Campaign, _super);
+
+  function Campaign() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  Campaign.prototype.render = function () {
+    var nodeData = this.props.nodeData;
+    return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? null : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
+      panelProps: nodeData
+    }));
+  };
+
+  Campaign.defaultProps = {
+    nodeData: (0, _defaultJSON.getDefaultJSON)()
+  };
+  Campaign.type = 'CAMPAIGN';
+  Campaign.getDefaultJSON = _defaultJSON.getDefaultJSON;
+  Campaign = __decorate([_compositeDecorator["default"]], Campaign);
+  return Campaign;
+}(_react.Component);
+
+var _default = Campaign;
+exports["default"] = _default;