@fonixtree/magic-design 1.0.167 → 1.0.169

package/lib/common/Collapse/index.js

@@ -265,7 +265,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;
@@ -275,6 +276,7 @@ function (_super) {
       } : {};
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "header_wrap",
+        onClick: onClick,
         onMouseEnter: function onMouseEnter() {
           return _this.headerMouseEnter(panel);
         },

package/lib/common/CountDown/index.js

@@ -9,10 +9,18 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _commonUtil = require("../../utils/commonUtil");
 
 require("./index.less");
 
+var _Iconfont = _interopRequireDefault(require("../Iconfont"));
+
+var _coreUtil = require("../../utils/coreUtil");
+
+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; }
@@ -138,13 +146,32 @@ function (_super) {
   };
 
   CountDown.prototype.render = function () {
+    var type = this.props.type;
     var _a = this.state,
         hour = _a.hour,
         min = _a.min,
         second = _a.second;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "count-down-wrap"
-    }, /*#__PURE__*/_react["default"].createElement("span", null, hour), /*#__PURE__*/_react["default"].createElement("span", null, min), /*#__PURE__*/_react["default"].createElement("span", null, second));
+      className: (0, _classnames["default"])('count-down-wrap', {
+        pc: type === 'pc'
+      })
+    }, (0, _coreUtil.isPc)() && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+      bold: true,
+      className: "icon_time",
+      color: "#000",
+      size: 24,
+      type: "icon-time1"
+    }), /*#__PURE__*/_react["default"].createElement("span", {
+      className: "num"
+    }, hour), (0, _coreUtil.isPc)() && /*#__PURE__*/_react["default"].createElement("span", {
+      className: "pots"
+    }, ":"), /*#__PURE__*/_react["default"].createElement("span", {
+      className: "num"
+    }, min), (0, _coreUtil.isPc)() && /*#__PURE__*/_react["default"].createElement("span", {
+      className: "pots"
+    }, ":"), /*#__PURE__*/_react["default"].createElement("span", {
+      className: "num"
+    }, second));
   };
 
   CountDown.defaultProps = {

package/lib/common/CountDown/index.less

@@ -1,11 +1,13 @@
 .count-down-wrap {
   display: flex;
   align-items: center;
+  justify-content: center;
+  font-family: 'Montserrat';
+  gap: 4px;
 
-  span {
+  .num {
     background: #CC1D20;
     border-radius: 4px;
-    font-family: 'Montserrat';
     font-style: normal;
     font-weight: 500;
     font-size: 12px;
@@ -14,10 +16,41 @@
     line-height: 17px;
     width: 24px;
     text-align: center;
-    margin-right: 4px;
+  }
+
+  .pots {
+    display: none;
+  }
+
+  &.pc {
+    background-color: #F9CA1C;
+    border-radius: 20px;
+    padding: 0 12px;
+    gap: 2px;
+
+    .icon_time {
+      margin-right: 2px;
+    }
+
+    .num {
+      background: none;
+      font-style: normal;
+      font-weight: 700;
+      font-size: 20px;
+      color: #000;
+      height: 36px;
+      line-height: 38px;
+    }
 
-    &:last-child {
-      margin-right: 0;
+    .pots {
+      display: inline-block;
+      font-style: normal;
+      font-weight: 700;
+      font-size: 20px;
+      color: #000;
+      height: 36px;
+      line-height: 35px;
+      margin-left: 3px;
     }
   }
 }

package/lib/common/Field/index.js

@@ -71,12 +71,13 @@ function (_super) {
         split = _a.split,
         rest = __rest(_a, ["title", "children", "layout", "split"]);
 
-    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,
-        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/lib/common/Field/index.less

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

package/lib/common/Iconfont/index.js

@@ -105,7 +105,8 @@ function (_super) {
         color = _a.color,
         svg = _a.svg,
         className = _a.className,
-        rest = __rest(_a, ["type", "size", "color", "svg", "className"]);
+        bold = _a.bold,
+        rest = __rest(_a, ["type", "size", "color", "svg", "className", "bold"]);
 
     var _size = size;
 
@@ -124,7 +125,8 @@ function (_super) {
       className: (0, _classnames["default"])('icon_container', className),
       style: {
         fontSize: _size,
-        color: color
+        color: color,
+        fontWeight: bold ? 'bold' : 'normal'
       }
     }, rest), svg ? /*#__PURE__*/_react["default"].createElement("svg", {
       "aria-hidden": "true",

package/lib/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/lib/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/lib/composite-comp/bol/components/Video/defaultJSON.js

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

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/composite-comp/common/config-panels/BackgroundConfig/index.js

@@ -49,47 +49,34 @@ function (_super) {
   __extends(BackgroundConfig, _super);
 
   function BackgroundConfig() {
-    var _this = _super !== null && _super.apply(this, arguments) || this;
-
-    _this.state = {};
-    return _this;
+    return _super !== null && _super.apply(this, arguments) || this;
   }
 
   BackgroundConfig.prototype.render = function () {
     var _this = this;
 
-    var _a, _b, _c, _d, _e;
-
-    var _f = this.props,
-        data = _f.data,
-        component = _f.component;
-
-    if (!data.tabBackground) {
-      data.tabBackground = {
-        opacity: 100,
-        color: '#232F46',
-        image: '',
-        tabBgType: 'color'
-      };
-    }
-
+    var _a = this.props,
+        data = _a.data,
+        name = _a.name,
+        type = _a.type;
     return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
-      title: component === 'recommend' ? (0, _locale.i18n)('PRODUCT_BACKGROUND') : (0, _locale.i18n)('BACKGROUND')
-    }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
+      title: name
+    }, type === 'all' && /*#__PURE__*/_react["default"].createElement(_antd.Select, {
       onChange: function onChange(bgType) {
         data.bgType = bgType;
+        data.tabBgType = bgType;
 
         _this.selfRender();
       },
       style: {
         marginBottom: '15px'
       },
-      value: data.bgType
+      value: data.bgType || data.tabBgType
     }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
       value: "color"
     }, (0, _locale.i18n)('COLOR')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
       value: "image"
-    }, (0, _locale.i18n)('IMAGE'))), data.bgType === 'color' ? /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
+    }, (0, _locale.i18n)('IMAGE'))), (type === 'color' || data.bgType === 'color' || data.tabBgType === 'color') && /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
       colorType: "rgba",
       onChange: function onChange(v) {
         data.opacity = 1;
@@ -98,7 +85,7 @@ function (_super) {
         _this.selfRender();
       },
       value: data.color
-    }) : /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
+    }), (type === 'image' || data.bgType === 'image' || data.tabBgType === 'image') && /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
       imageSelectedWay: data.imageSelectedWay || {
         pc: '',
         mobile: ''
@@ -115,48 +102,6 @@ function (_super) {
         _this.selfRender();
       },
       value: data.image
-    })), component === 'recommend' && /*#__PURE__*/_react["default"].createElement(_common.Field, {
-      title: (0, _locale.i18n)('TAB_BACKGROUND')
-    }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
-      onChange: function onChange(tabBgType) {
-        data.tabBackground.tabBgType = tabBgType;
-
-        _this.selfRender();
-      },
-      style: {
-        marginBottom: '15px'
-      },
-      value: (_a = data.tabBackground) === null || _a === void 0 ? void 0 : _a.tabBgType
-    }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-      value: "color"
-    }, (0, _locale.i18n)('COLOR')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-      value: "image"
-    }, (0, _locale.i18n)('IMAGE'))), ((_b = data.tabBackground) === null || _b === void 0 ? void 0 : _b.tabBgType) === 'color' ? /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
-      colorType: "rgba",
-      onChange: function onChange(v) {
-        data.tabBackground.opacity = 1;
-        data.tabBackground.color = v;
-
-        _this.selfRender();
-      },
-      value: (_c = data.tabBackground) === null || _c === void 0 ? void 0 : _c.color
-    }) : /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
-      imageSelectedWay: ((_d = data.tabBackground) === null || _d === void 0 ? void 0 : _d.imageSelectedWay) || {
-        pc: '',
-        mobile: ''
-      },
-      onChange: function onChange(v, way) {
-        if (v) {
-          data.tabBackground.image = v.url;
-        }
-
-        if (way) {
-          data.tabBackground.imageSelectedWay = way;
-        }
-
-        _this.selfRender();
-      },
-      value: (_e = data.tabBackground) === null || _e === void 0 ? void 0 : _e.image
     })));
   };
 
@@ -166,13 +111,10 @@ function (_super) {
       color: '#232F46',
       image: '',
       bgType: 'color',
-      tabBackground: {
-        opacity: 100,
-        color: '#232F46',
-        image: '',
-        tabBgType: 'color'
-      }
-    }
+      tabBgType: 'color'
+    },
+    name: (0, _locale.i18n)('BACKGROUND'),
+    type: 'all'
   };
   return BackgroundConfig;
 }(_BaseConfig["default"]);