@fonixtree/magic-design 0.1.68 → 0.1.70-nuri

package/es/utils/commonUtil.js

@@ -14,7 +14,7 @@ exports.copy2ClipBoard = copy2ClipBoard;
 exports.covertKey = covertKey;
 exports.dragSource = void 0;
 exports.ensure = ensure;
-exports.getColorRgba = void 0;
+exports.getGAData = exports.getColorRgba = void 0;
 exports.getPageDataMap = getPageDataMap;
 exports.nextTick = exports.navigateTo = exports.importAsync = exports.getUrlParams = void 0;
 exports.pushGA = pushGA;
@@ -33,8 +33,26 @@ var _uuid = require("uuid");
 
 var _qs = _interopRequireDefault(require("qs"));
 
+var _constants = require("../constants");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+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);
+};
+
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -781,9 +799,33 @@ exports.pxToRem = pxToRem;
 var compatibleNewPageData = function compatibleNewPageData(pageData) {
   if (pageData.childNodes && pageData.childNodes.length > 0) {
     pageData.childNodes.forEach(function (child) {
-      // 兼容新开发的功能： video新增播放按钮 的设置
+      // 兼容新功能：banner 轮播的 dots 点 区分pc 移动
+      if (child.type === 'BANNER') {
+        if (!child.setting.dots.color.pc || !child.setting.dots.hoverColor.pc || !child.setting.dots.size.pc) {
+          child.setting.dots = __assign(__assign({}, child.setting.dots), {
+            color: {
+              pc: '#fff',
+              mobile: '#fff'
+            },
+            hoverColor: {
+              pc: '#fff',
+              mobile: '#fff'
+            },
+            size: {
+              pc: 16,
+              mobile: 8
+            },
+            hoverSize: {
+              pc: 16,
+              mobile: 8
+            }
+          });
+        }
+      } // 兼容新开发的功能： video新增播放按钮 的设置
+
+
       if (child.type === 'VIDEO') {
-        console.log('--compatibleNewPageData -- video ');
+        // console.log('--compatibleNewPageData -- video ');
         child.groupSource.forEach(function (group) {
           if (!group.playIcon) {
             group.playIcon = {
@@ -797,11 +839,21 @@ var compatibleNewPageData = function compatibleNewPageData(pageData) {
               iconColor: 'Light'
             };
           }
-        });
-        console.log('--compatibleNewPageData -- video add group.playIcon ', child.groupSource);
+        }); // console.log('--compatibleNewPageData -- video add group.playIcon ', child.groupSource);
       }
     });
   }
 };
 
-exports.compatibleNewPageData = compatibleNewPageData;
+exports.compatibleNewPageData = compatibleNewPageData;
+
+var getGAData = function getGAData(data) {
+  var _a;
+
+  return {
+    moduleId: data.id,
+    moduleName: data.moduleIndex + '.' + ((_a = _constants.compInfoMap[data.type]) === null || _a === void 0 ? void 0 : _a.name)
+  };
+};
+
+exports.getGAData = getGAData;

package/es/utils/coreUtil.js

@@ -11,8 +11,6 @@ var _businessUtil = require("./businessUtil");
 
 var _commonUtil = require("./commonUtil");
 
-var _androidUtil = require("./androidUtil");
-
 var _constants = require("../constants");
 
 var _MessageModal = _interopRequireDefault(require("../common/MessageModal"));
@@ -302,35 +300,33 @@ var clickUrl = function clickUrl(url) {
       data = _a.data;
 
   var _b = data.params,
-      params = _b === void 0 ? {} : _b;
-
-  if ((0, _androidUtil.browserVersion)().isApp) {
-    (0, _androidUtil.sendToApp)(data);
-  } else {
-    // 视频
-    if (params.type === 'VIDEO') {
-      (0, _Video.createVideoModal)((0, _uuid.v4)(), __assign(__assign({}, params.data), {
-        source: params.data.sourceUrl
-      }));
-      return;
-    } // 领取优惠券
-
-
-    if (params.type === 'GET_COUPON') {
-      getCoupon(params.couponId);
-      return;
-    }
+      params = _b === void 0 ? {} : _b; // if (browserVersion().isApp) {
+  //   sendToApp(data);
+  // } else {
+  // 视频
+
+  if (params.type === 'VIDEO') {
+    (0, _Video.createVideoModal)((0, _uuid.v4)(), __assign(__assign({}, params.data), {
+      source: params.data.sourceUrl
+    }));
+    return;
+  } // 领取优惠券
 
-    if (params.type === 'SHARE_URL' || params.type === 'AFFILIATE_PRODUCT') {
-      if (window.magicDesign.handleAction) {
-        window.magicDesign.handleAction(params);
-      }
 
-      return;
+  if (params.type === 'GET_COUPON') {
+    getCoupon(params.couponId);
+    return;
+  }
+
+  if (params.type === 'SHARE_URL' || params.type === 'AFFILIATE_PRODUCT') {
+    if (window.magicDesign.handleAction) {
+      window.magicDesign.handleAction(params);
     }
 
-    (0, _commonUtil.navigateTo)(link);
+    return;
   }
+
+  (0, _commonUtil.navigateTo)(link); // }
 };
 
 exports.clickUrl = clickUrl;

package/lib/common/LinkModal/AffiliateProductTable/index.js

@@ -265,8 +265,9 @@ function AffiliateProductTable(props) {
   var rowSelection = {
     onChange: function onChange(selectedRowKeys, selectedRow) {
       _onChange({
-        value: selectedRow[0].affiliateProductId,
-        name: selectedRow[0].productName
+        value: selectedRow[0].productName,
+        name: selectedRow[0].productName,
+        productId: selectedRow[0].affiliateProductId
       });
     },
     type: 'radio'

package/lib/composite-comp/bol/components/Banner/index.js

@@ -49,22 +49,6 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-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);
-};
-
 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,
@@ -82,33 +66,21 @@ function (_super) {
 
   function Banner() {
     return _super !== null && _super.apply(this, arguments) || this;
-  }
+  } // componentWillMount() {
+  //   // 兼容新功能： 轮播的 dots 点 区分pc 移动
+  //   const { nodeData } = this.props;
+  //   if (!nodeData.setting.dots.color.pc || !nodeData.setting.dots.hoverColor.pc || !nodeData.setting.dots.size.pc) {
+  //     nodeData.setting.dots = { ...nodeData.setting.dots,
+  //       ...{
+  //         color: { pc: '#fff', mobile: '#fff' },
+  //         hoverColor: { pc: '#fff', mobile: '#fff' },
+  //         size: { pc: 16, mobile: 8 },
+  //         hoverSize: { pc: 16, mobile: 8 },
+  //       },
+  //     };
+  //   }
+  // }
 
-  Banner.prototype.componentWillMount = function () {
-    // 兼容新功能： 轮播的 dots 点 区分pc 移动
-    var nodeData = this.props.nodeData;
-
-    if (!nodeData.setting.dots.color.pc || !nodeData.setting.dots.hoverColor.pc || !nodeData.setting.dots.size.pc) {
-      nodeData.setting.dots = __assign(__assign({}, nodeData.setting.dots), {
-        color: {
-          pc: '#fff',
-          mobile: '#fff'
-        },
-        hoverColor: {
-          pc: '#fff',
-          mobile: '#fff'
-        },
-        size: {
-          pc: 16,
-          mobile: 8
-        },
-        hoverSize: {
-          pc: 16,
-          mobile: 8
-        }
-      });
-    }
-  };
 
   Banner.prototype.render = function () {
     var nodeData = this.props.nodeData; // console.log('---banner', nodeData);

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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) {