@fonixtree/magic-design 0.1.71 → 0.1.73

package/es/common/ImagePicker/index.js

@@ -19,6 +19,8 @@ var _ = require("..");
 
 var _Iconfont = _interopRequireDefault(require("../Iconfont"));
 
+var _coreUtil = require("../../utils/coreUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -66,7 +68,6 @@ function (_super) {
 
     _this.state = {
       visible: false,
-      imageWay: 'upload',
       inputVal: ''
     };
 
@@ -198,6 +199,21 @@ function (_super) {
       }))));
     };
 
+    _this.changePickerWay = function (way) {
+      var tempObj = _this.props.imageSelectedWay;
+
+      if ((0, _coreUtil.isPc)()) {
+        tempObj.pc = way;
+        if (!tempObj.mobile) tempObj.mobile = way;
+      } else {
+        tempObj.mobile = way;
+        if (!tempObj.pc) tempObj.pc = way;
+      }
+
+      var onChange = _this.props.onChange;
+      onChange(null, tempObj);
+    };
+
     return _this;
   }
 
@@ -218,7 +234,8 @@ function (_super) {
   ImagePicker.prototype.render = function () {
     var _this = this;
 
-    var imageWay = this.state.imageWay;
+    var imageSelectedWay = this.props.imageSelectedWay;
+    var way = (0, _coreUtil.isPc)() ? imageSelectedWay.pc : imageSelectedWay.mobile;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "image-picker-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_.Field, {
@@ -228,31 +245,25 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
       className: "image-picker-select",
       onChange: function onChange(value) {
-        _this.setState({
-          imageWay: value
-        });
+        _this.changePickerWay(value);
       },
       size: "large",
-      value: imageWay
+      value: way || 'upload'
     }, selectList.map(function (v) {
       return /*#__PURE__*/_react["default"].createElement(Option, {
         key: v.key,
         value: v.key
       }, v.value);
-    })), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "ai-btn"
-    }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
-      color: "#2F54EB",
-      size: 20,
-      type: "icon-ai"
-    }), /*#__PURE__*/_react["default"].createElement("span", {
-      className: "btn-txt"
-    }, (0, _locale.i18n)('AI_IMAGE'))))), imageWay === 'upload' ? this.getImagePick() : this.getImageUrl());
+    })))), way === 'url' ? this.getImageUrl() : this.getImagePick());
   };
 
   ImagePicker.defaultProps = {
     value: '',
-    onChange: function onChange() {}
+    onChange: function onChange() {},
+    imageSelectedWay: {
+      pc: '',
+      mobile: ''
+    }
   };
   return ImagePicker;
 }(_react["default"].Component);

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

@@ -207,7 +207,7 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
     },
     background: {
       opacity: 100,
-      color: '#232F46',
+      color: 'rgba(255, 255, 255, 0)',
       image: '',
       bgType: 'color'
     }

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

@@ -182,10 +182,7 @@ function (_super) {
         carouseIndex = _a.carouseIndex,
         hoverState = _a.hoverState;
     var autoplay = data.setting.autoplay.open;
-    var GAData = {
-      moduleId: data.id,
-      moduleName: data.moduleIndex + '.' + data.type
-    };
+    var GAData = (0, _commonUtil.getGAData)(data);
     /** 设计器模式下 如果选中特定group 自动播放关闭 */
 
     if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {

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

@@ -1,80 +1,54 @@
 .m-banner-mobile {
   position: relative;
-  // .turnPage {
-  //   position: absolute;
-  //   top: 50%;
-  //   transform: translateY(-50%);
-  //   z-index: 3;
-  //   cursor: pointer;
-  // }
-  // .leftBtn {
-  //   left: 20px;
-  // }
-  // .rightBtn {
-  //   right: 20px;
-  // }
-
-  .cylon-carousel {
-    .slick-track {
-      display: flex;
-      align-items: center;
-    }
-  }
-
-  .carouselItem {
-    // height: 386px;
-    position: relative;
-    display: flex;
-
-    .carouseContent {
-      padding: 0 28px;
-      position: absolute;
-      z-index: 2;
-      display: flex;
-      flex-direction: column;
-      margin-bottom: auto;
-    }
-
-    .title {
-      margin-bottom: 8px;
-    }
-
-    .sub-title {
-      margin-bottom: 20px;
-    }
-
-    .btn-wrap {
-      display: flex;
-      align-items: center;
-      justify-content: flex-start;
-
-      .btn {
-        margin-right: 12px;
-      }
-    }
-  }
-
-  .swiper-ban {
-    position: absolute;
-    width: 100%;
-    bottom: 10px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    .ban {
-      font-size: 16px;
-      width: 1.5em;
-      height: 0.3em;
-      background: #FFF;
-      cursor: inherit;
-      margin-right: 0.3em;
-      transition: all .5s;
-
-      &.active {
-        width: 1.5em;
-        opacity: 1;
-      }
-    }
-  }
-}
+}
+.m-banner-mobile .cylon-carousel .slick-track {
+  display: flex;
+  align-items: center;
+}
+.m-banner-mobile .carouselItem {
+  position: relative;
+  display: flex;
+}
+.m-banner-mobile .carouselItem .carouseContent {
+  padding: 0 0.56rem;
+  position: absolute;
+  z-index: 2;
+  display: flex;
+  flex-direction: column;
+  margin-bottom: auto;
+}
+.m-banner-mobile .carouselItem .title {
+  margin-bottom: 0.16rem;
+}
+.m-banner-mobile .carouselItem .sub-title {
+  margin-bottom: 0.4rem;
+}
+.m-banner-mobile .carouselItem .btn-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+}
+.m-banner-mobile .carouselItem .btn-wrap .btn {
+  margin-right: 0.24rem;
+}
+.m-banner-mobile .swiper-ban {
+  position: absolute;
+  width: 100%;
+  bottom: 0.2rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.m-banner-mobile .swiper-ban .ban {
+  font-size: 0.32rem;
+  width: 1.5em;
+  height: 0.3em;
+  background: #FFF;
+  cursor: inherit;
+  margin-right: 0.3em;
+  transition: all 0.5s;
+}
+.m-banner-mobile .swiper-ban .ban.active {
+  width: 1.5em;
+  opacity: 1;
+}

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

@@ -227,10 +227,7 @@ function (_super) {
       autoplay = false;
     }
 
-    var GAData = {
-      moduleId: data.id,
-      moduleName: data.moduleIndex + '.' + data.type
-    };
+    var GAData = (0, _commonUtil.getGAData)(data);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-banner-pc"
     }, data.setting.navigation.open && /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {

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

@@ -17,6 +17,8 @@ var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/
 
 var _ConfigPanel = require("../../../../core/Designer/ConfigPanel");
 
+var _commonUtil = require("../../../../utils/commonUtil");
+
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -92,10 +94,7 @@ function (_super) {
     var _a;
 
     var nodeData = this.props.nodeData;
-    var GAData = {
-      moduleId: nodeData.id,
-      moduleName: nodeData.moduleIndex + '.' + nodeData.type
-    };
+    var GAData = (0, _commonUtil.getGAData)(nodeData);
     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

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

@@ -199,10 +199,7 @@ function (_super) {
     }
 
     var floorColNum = Math.floor(colNum);
-    var GAData = {
-      moduleId: data.id,
-      moduleName: data.moduleIndex + '.' + data.type
-    };
+    var GAData = (0, _commonUtil.getGAData)(data);
     var autoplay = data.setting.autoplay.open;
     /** 设计器模式下 如果选中特定group 自动播放关闭 */
 

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

@@ -1,103 +1,84 @@
 .m-carousel-mobile {
   position: relative;
   width: 100%;
-
-  .content {
-    display: flex;
-    margin: 0 auto;
-  }
-
-  .slider-wrap {
-    width: 100%;
-    margin: 0 auto;
-    line-height: 1;
-
-    .slick-list {
-      // margin-left: -11px;
-      // margin-right: -11px;
-      padding: 0;
-
-      &:hover {
-        padding-top: 100px;
-        margin-top: -100px;
-        padding-bottom: 100px;
-        margin-bottom: -100px;
-      }
-
-      .slick-track {
-        display: flex;
-        align-items: center;
-        gap: 12px;
-      }
-    }
-
-    .img-wrap {
-      .img {
-        width: fit-content;
-        height: fit-content;
-        display: block;
-        margin: 0 auto;
-      }
-
-      .title {
-        display: flex;
-        justify-content: center;
-        margin-top: 12px;
-      }
-
-      .text {
-        display: flex;
-        justify-content: center;
-        margin-top: 6px;
-      }
-
-      .tags {
-        margin-top: 8px;
-        margin-bottom: 12px;
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: center;
-
-        >div {
-          margin-right: 8px;
-
-          &:last-child {
-            margin-right: 0;
-          }
-        }
-      }
-    }
-  }
-
-  .swiper-ban {
-    position: absolute;
-    width: 100%;
-    bottom: 6px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    .ban {
-      font-size: 8px;
-      width: 1em;
-      height: 1em;
-      border-radius: 50%;
-      background: #FFF;
-      cursor: inherit;
-      margin-right: 10px;
-      transition: all .5s;
-
-      &:last-child {
-        margin-right: 0;
-      }
-
-      &.active {
-        width: 2em;
-        height: 1em;
-        border-radius: 100px;
-        opacity: 1;
-      }
-    }
-  }
-}
+}
+.m-carousel-mobile .content {
+  display: flex;
+  margin: 0 auto;
+}
+.m-carousel-mobile .slider-wrap {
+  width: 100%;
+  margin: 0 auto;
+  line-height: 1;
+}
+.m-carousel-mobile .slider-wrap .slick-list {
+  padding: 0;
+}
+.m-carousel-mobile .slider-wrap .slick-list:hover {
+  padding-top: 2rem;
+  margin-top: -2rem;
+  padding-bottom: 2rem;
+  margin-bottom: -2rem;
+}
+.m-carousel-mobile .slider-wrap .slick-list .slick-track {
+  display: flex;
+  align-items: center;
+  gap: 0.24rem;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .img {
+  width: fit-content;
+  height: fit-content;
+  display: block;
+  margin: 0 auto;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .title {
+  display: flex;
+  justify-content: center;
+  margin-top: 0.24rem;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .text {
+  display: flex;
+  justify-content: center;
+  margin-top: 0.12rem;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .tags {
+  margin-top: 0.16rem;
+  margin-bottom: 0.24rem;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .tags > div {
+  margin-right: 0.16rem;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .tags > div:last-child {
+  margin-right: 0;
+}
+.m-carousel-mobile .swiper-ban {
+  position: absolute;
+  width: 100%;
+  bottom: 0.12rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.m-carousel-mobile .swiper-ban .ban {
+  font-size: 0.16rem;
+  width: 1em;
+  height: 1em;
+  border-radius: 50%;
+  background: #FFF;
+  cursor: inherit;
+  margin-right: 0.2rem;
+  transition: all 0.5s;
+}
+.m-carousel-mobile .swiper-ban .ban:last-child {
+  margin-right: 0;
+}
+.m-carousel-mobile .swiper-ban .ban.active {
+  width: 2em;
+  height: 1em;
+  border-radius: 2rem;
+  opacity: 1;
+}

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

@@ -209,10 +209,7 @@ function (_super) {
     }
 
     var floorColNum = Math.floor(colNum);
-    var GAData = {
-      moduleId: data.id,
-      moduleName: data.moduleIndex + '.' + data.type
-    };
+    var GAData = (0, _commonUtil.getGAData)(data);
     var autoplay = data.setting.autoplay.open;
     /** 设计器模式下 如果选中特定group 自动播放关闭 */
 

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

@@ -112,10 +112,7 @@ function (_super) {
 
   ImageGalleryMobile.prototype.render = function () {
     var data = this.props.data;
-    var GAData = {
-      moduleId: data.id,
-      moduleName: data.moduleIndex + '.' + data.type
-    };
+    var GAData = (0, _commonUtil.getGAData)(data);
     var isHorizontal = data.customize.layout.h5Layout === 'layout2';
     var colNum = isHorizontal ? data.customize.rowNum : 1;
     var newData = data.groupSource.reduce(function (prev, curr, index) {

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

@@ -1,22 +1,15 @@
-.m-image-gallery-mobile {
-  .content {
-    .line {
-      margin-bottom: 12px;
-
-      &.isHorizontal {
-        display: flex;
-        justify-content: flex-start;
-      }
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-
-      .img-wrap {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-    }
-  }
-}
+.m-image-gallery-mobile .content .line {
+  margin-bottom: 0.24rem;
+}
+.m-image-gallery-mobile .content .line.isHorizontal {
+  display: flex;
+  justify-content: flex-start;
+}
+.m-image-gallery-mobile .content .line:last-child {
+  margin-bottom: 0;
+}
+.m-image-gallery-mobile .content .line .img-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}

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

@@ -13,6 +13,8 @@ var _components = require("../../../../../meta-comp/components");
 
 var _ConfigPanel = require("../../../../../core/Designer/ConfigPanel");
 
+var _commonUtil = require("../../../../../utils/commonUtil");
+
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -128,10 +130,7 @@ function (_super) {
 
   ImageGalleryPc.prototype.render = function () {
     var data = this.props.data;
-    var GAData = {
-      moduleId: data.id,
-      moduleName: data.moduleIndex + '.' + data.type
-    };
+    var GAData = (0, _commonUtil.getGAData)(data);
     var isHorizontal = data.customize.layout.pcLayout === 'layout2';
     var colNum = isHorizontal ? data.customize.pcRowNum : 1;
     var newData = data.groupSource.reduce(function (prev, curr, index) {

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

@@ -26,14 +26,23 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         pcName: 'name2',
         h5ImgSrc: '',
         pcImgSrc: '',
-        clickUrl: ''
+        clickUrl: '',
+        // scale: 0.5,
+        imageSelectedWay: {
+          pc: '',
+          mobile: ''
+        }
       },
       hover: {
         open: false,
         backgroundType: 'enlarge',
         magnification: 1.5,
         pcImgHoverUrl: '',
-        h5ImgHoverUrl: ''
+        h5ImgHoverUrl: '',
+        imageSelectedWay: {
+          pc: '',
+          mobile: ''
+        }
       }
     },
     title: {

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

@@ -124,10 +124,7 @@ function (_super) {
 
     var data = this.props.data; // console.log('----imagetext mobile', data);
 
-    var GAData = {
-      moduleId: data.id,
-      moduleName: data.moduleIndex + '.' + data.type
-    };
+    var GAData = (0, _commonUtil.getGAData)(data);
     var wrapStyle = {};
     wrapStyle.textAlign = data.customize.align; // if (data.background.bgType === 'color') {
     //   wrapStyle.backgroundColor = data.background.color;