npm - @fonixtree/magic-design - Versions diffs - 2.0.109 → 2.0.111 - Mend

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.isActiveFloor = exports.getVideoCover = exports.copyNode = exports.clickUrl = void 0;
+exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.isAutoAudit = exports.isActiveFloor = exports.getVideoCover = exports.copyNode = exports.clickUrl = void 0;
 var _uuid = require("uuid");
@@ -310,10 +310,9 @@ var clickUrl = function clickUrl(url) {
   }
   console.log('clickUrl...', url); // 只读模式，设计模式，url为空，邮箱模版
-  if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
-    return;
-  }
+  // if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
+  //   return;
+  // }
   var _b = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
       link = _b.link,
@@ -337,23 +336,21 @@ var clickUrl = function clickUrl(url) {
   if ((0, _androidUtil.browserVersion)().isAshitaApp) {
     (0, _androidUtil.sendToApp)(data);
-  } else if ((0, _androidUtil.browserVersion)().isNuriApp && params.link && params.link.startsWith('http')) {
-    // 兼容Nuri app的 绝对路径跳转
-    var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "userToken=" + (localStorage.getItem('h5Token') || '');
-    (0, _androidUtil.sendToApp)({
-      type: 'jumpBrowser',
-      params: {
-        url: urlTemp
-      }
-    });
   } else if ((0, _androidUtil.browserVersion)().isApp && params.link && params.link.startsWith('http')) {
-    // 别的app打开外链
-    (0, _androidUtil.sendToAndroid)({
-      type: 'jumpBrowser',
-      params: {
-        url: params.link
-      }
-    });
+    // 跳转链接是个绝对路径
+    if (params.type === 'Gamezop') {
+      // Nuri 对接 Gamezop 特殊情况
+      (0, _androidUtil.sendToApp)(data);
+    } else {
+      // Nuri 抽奖系统对接
+      var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "userToken=" + (localStorage.getItem('h5Token') || '');
+      (0, _androidUtil.sendToApp)({
+        type: 'jumpBrowser',
+        params: {
+          url: urlTemp
+        }
+      });
+    }
   } else {
     // 视频
     if (params.type === 'VIDEO') {
@@ -381,7 +378,10 @@ var clickUrl = function clickUrl(url) {
     if (((_a = window === null || window === void 0 ? void 0 : window.magicDesign) === null || _a === void 0 ? void 0 : _a.projectCode) === 'nuri') {
       // 输入的是完整的跳转地址
       if (isUrl(link)) {
-        if (!link.includes(window.location.host)) {
+        if (params.type === 'Gamezop') {
+          // Nuri 对接游戏页面
+          window.open(link);
+        } else if (!link.includes(window.location.host)) {
           // 跳转外链 需要把userToken带上
           if (link.includes('?')) {
             var a = link + "&userToken=" + (localStorage.getItem('h5Token') || '');
@@ -396,9 +396,9 @@ var clickUrl = function clickUrl(url) {
       } else {
         (0, _commonUtil.navigateTo)(link);
       }
+    } else {
+      (0, _commonUtil.navigateTo)(link);
     }
-    (0, _commonUtil.navigateTo)(link);
   }
 };
@@ -444,5 +444,15 @@ var copyNode = function copyNode(value, parentId) {
   });
   return newNode;
 };
+/**
+ * 是否开启自动审核
+ */
+exports.copyNode = copyNode;
+var isAutoAudit = function isAutoAudit() {
+  return window.magicDesign.autoAudit || window.partyType === _constants.partyTypeMap.PLATFORM;
+};
-exports.copyNode = copyNode;
+exports.isAutoAudit = isAutoAudit;

@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 require("./index.less");
-var _antd = require("antd");
+var _antd = require("antd4");
 var _coreUtil = require("../../../../utils/coreUtil");

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _antd = require("antd");
+var _antd = require("antd4");
 require("./index.less");

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _antd = require("antd");
+var _antd = require("antd4");
 var _classnames = _interopRequireDefault(require("classnames"));

@@ -11,7 +11,7 @@ var _reactQuill = _interopRequireDefault(require("react-quill"));
 require("react-quill/dist/quill.snow.css");
-var _antd = require("antd");
+var _antd = require("antd4");
 require("./index.less");

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
-var _antd = require("antd");
+var _antd = require("antd4");
 var _react = _interopRequireDefault(require("react"));

@@ -23,6 +23,9 @@ var browserVersion = function browserVersion() {
     qq: u.match(/\sQQ/i) == ' qq',
     isApp: u.indexOf('app/CYLON-APP') > -1,
     isNuriApp: u.indexOf('app/NURI-APP') > -1,
+    isDitoApp: u.indexOf('mydito') > -1,
+    ditoAndroidApp: u.indexOf('mydito') > -1 && (u.indexOf('Android') > -1 || u.indexOf('Adr') > -1),
+    ditoIosApp: u.indexOf('mydito') > -1 && !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
     isAshitaApp: u.indexOf('app/ASHITA-APP') > -1
   };
 };
@@ -136,9 +139,9 @@ var sendToApp = function sendToApp(params) {
 exports.sendToApp = sendToApp;
 var goToLoginApp = function goToLoginApp() {
-  if (browserVersion().androidApp) {
+  if (browserVersion().ditoAndroidApp) {
     window.dito.goToLogin();
-  } else if (browserVersion().iosApp) {
+  } else if (browserVersion().ditoIosApp) {
     window.dito.goToLogin();
   }
 };

@@ -28,7 +28,8 @@ var newParseUrl = function newParseUrl(urlObj) {
   var type = urlObj.type,
       value = urlObj.value,
       offerId = urlObj.offerId,
-      productId = urlObj.productId;
+      productId = urlObj.productId,
+      name = urlObj.name;
   switch (type) {
     // 锚点跳转
@@ -206,6 +207,18 @@ var newParseUrl = function newParseUrl(urlObj) {
       };
       break;
+    case _constants.urlTypeMap.AFFILIATE_PLATFORM:
+      // affiliate platform
+      link = "/platformDetail/" + value;
+      params = {
+        action: 'jump',
+        params: {
+          type: 'AFFILIATE_PLATFORM',
+          url: value
+        }
+      };
+      break;
     default:
       var map = {
         '/main/cart': 'CART',
@@ -228,8 +241,9 @@ var newParseUrl = function newParseUrl(urlObj) {
       params = {
         action: 'jump',
         params: {
-          type: map[link],
-          link: link
+          type: map[link] || name,
+          link: link,
+          url: link
         }
       };
   }
@@ -433,6 +447,7 @@ var getPromotionList = function getPromotionList(offer) {
   var PROMOTION_TYPE_MAP = {
     2: 'FLASH',
     4: 'Group',
+    12: 'Bargain',
     C: 'Discount',
     D: 'Discount',
     G: 'Gift'

@@ -372,8 +372,8 @@ var checkLogin = function checkLogin(isLead, redirectUrl, replaceFlag) {
   if (!isLogin()) {
     if (isLead) {
-      if ((0, _androidUtil.browserVersion)().isApp) {
-        goToLoginApp();
+      if ((0, _androidUtil.browserVersion)().isDitoApp) {
+        (0, _androidUtil.goToLoginApp)();
       } else {
         var _a = window.location,
             pathname = _a.pathname,

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

@fonixtree/magic-design 2.0.109 → 2.0.111