@fonixtree/magic-design 0.1.89 → 0.1.91

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/es/common/LinkModal/AffiliatePlatform/index.js +1 -1
  2. package/es/utils/coreUtil.js +8 -15
  3. package/lib/common/LinkModal/AffiliatePlatform/index.js +1 -1
  4. package/lib/utils/coreUtil.js +8 -15
  5. package/package.json +1 -1
package/es/common/LinkModal/AffiliatePlatform/index.js CHANGED
@@ -9,7 +9,7 @@ exports["default"] = AffiliatePlatform;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
- var _antd = require("antd4");
12
+ var _antd = require("antd");
13
13
 
14
14
  var _locale = require("../../../locale");
15
15
 
package/es/utils/coreUtil.js CHANGED
@@ -310,9 +310,10 @@ var clickUrl = function clickUrl(url) {
310
310
  }
311
311
 
312
312
  console.log('clickUrl...', url); // 只读模式，设计模式，url为空，邮箱模版
313
- // if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
314
- // return;
315
- // }
313
+
314
+ if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
315
+ return;
316
+ }
316
317
 
317
318
  var _b = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
318
319
  link = _b.link,
@@ -336,12 +337,12 @@ var clickUrl = function clickUrl(url) {
336
337
 
337
338
  if ((0, _androidUtil.browserVersion)().isAshitaApp) {
338
339
  (0, _androidUtil.sendToApp)(data);
339
- } else if (params.link && params.link.startsWith('http')) {
340
+ } else if ((0, _androidUtil.browserVersion)().isApp && params.link && params.link.startsWith('http')) {
340
341
  // 跳转链接是个绝对路径
341
342
  if (params.type === 'Gamezop') {
342
343
  // Nuri 对接 Gamezop 特殊情况
343
344
  (0, _androidUtil.sendToApp)(data);
344
- } else if ((0, _androidUtil.browserVersion)().isApp || (0, _androidUtil.browserVersion)().isNuriApp) {
345
+ } else {
345
346
  // Nuri 抽奖系统对接
346
347
  var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "userToken=" + (localStorage.getItem('h5Token') || '');
347
348
  (0, _androidUtil.sendToApp)({
@@ -350,14 +351,6 @@ var clickUrl = function clickUrl(url) {
350
351
  url: urlTemp
351
352
  }
352
353
  });
353
- } else {
354
- // 新开浏览器打开
355
- (0, _androidUtil.sendToApp)({
356
- type: 'jumpBrowser',
357
- params: {
358
- url: params.link
359
- }
360
- });
361
354
  }
362
355
  } else {
363
356
  // 视频
@@ -404,9 +397,9 @@ var clickUrl = function clickUrl(url) {
404
397
  } else {
405
398
  (0, _commonUtil.navigateTo)(link);
406
399
  }
400
+ } else {
401
+ (0, _commonUtil.navigateTo)(link);
407
402
  }
408
-
409
- (0, _commonUtil.navigateTo)(link);
410
403
  }
411
404
  };
412
405
 
package/lib/common/LinkModal/AffiliatePlatform/index.js CHANGED
@@ -9,7 +9,7 @@ exports["default"] = AffiliatePlatform;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
- var _antd = require("antd4");
12
+ var _antd = require("antd");
13
13
 
14
14
  var _locale = require("../../../locale");
15
15
 
package/lib/utils/coreUtil.js CHANGED
@@ -310,9 +310,10 @@ var clickUrl = function clickUrl(url) {
310
310
  }
311
311
 
312
312
  console.log('clickUrl...', url); // 只读模式，设计模式，url为空，邮箱模版
313
- // if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
314
- // return;
315
- // }
313
+
314
+ if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
315
+ return;
316
+ }
316
317
 
317
318
  var _b = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
318
319
  link = _b.link,
@@ -336,12 +337,12 @@ var clickUrl = function clickUrl(url) {
336
337
 
337
338
  if ((0, _androidUtil.browserVersion)().isAshitaApp) {
338
339
  (0, _androidUtil.sendToApp)(data);
339
- } else if (params.link && params.link.startsWith('http')) {
340
+ } else if ((0, _androidUtil.browserVersion)().isApp && params.link && params.link.startsWith('http')) {
340
341
  // 跳转链接是个绝对路径
341
342
  if (params.type === 'Gamezop') {
342
343
  // Nuri 对接 Gamezop 特殊情况
343
344
  (0, _androidUtil.sendToApp)(data);
344
- } else if ((0, _androidUtil.browserVersion)().isApp || (0, _androidUtil.browserVersion)().isNuriApp) {
345
+ } else {
345
346
  // Nuri 抽奖系统对接
346
347
  var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "userToken=" + (localStorage.getItem('h5Token') || '');
347
348
  (0, _androidUtil.sendToApp)({
@@ -350,14 +351,6 @@ var clickUrl = function clickUrl(url) {
350
351
  url: urlTemp
351
352
  }
352
353
  });
353
- } else {
354
- // 新开浏览器打开
355
- (0, _androidUtil.sendToApp)({
356
- type: 'jumpBrowser',
357
- params: {
358
- url: params.link
359
- }
360
- });
361
354
  }
362
355
  } else {
363
356
  // 视频
@@ -404,9 +397,9 @@ var clickUrl = function clickUrl(url) {
404
397
  } else {
405
398
  (0, _commonUtil.navigateTo)(link);
406
399
  }
400
+ } else {
401
+ (0, _commonUtil.navigateTo)(link);
407
402
  }
408
-
409
- (0, _commonUtil.navigateTo)(link);
410
403
  }
411
404
  };
412
405
 
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fonixtree/magic-design",
3
3
  "author": "Cylon Team",
4
- "version": "0.1.89",
4
+ "version": "0.1.91",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",