@fonixtree/magic-design 0.1.68 → 0.1.70-nuri

package/lib/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/lib/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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.1.68",
+  "version": "0.1.70-nuri",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",