@fonixtree/magic-design 2.0.67 → 2.0.69

package/es/utils/coreUtil.js

@@ -287,14 +287,19 @@ var getCoupon = function getCoupon(couponId) {
 };
 
 function isUrl(string) {
-  var pattern = new RegExp('^(https?:\\/\\/)?' + // 协议
-  '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // 域名
-  '((\\d{1,3}\\.){3}\\d{1,3}))' + // 或者 IP (v4) 地址
-  '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // 端口和路径
-  '(\\?[;&a-z\\d%_.~+=-]*)?' + // 查询字符串
-  '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
-
-  return !!pattern.test(string);
+  // var pattern = new RegExp('^(https?:\\/\\/)?' + // 协议
+  //   '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // 域名
+  //   '((\\d{1,3}\\.){3}\\d{1,3}))' + // 或者 IP (v4) 地址
+  //   '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // 端口和路径
+  //   '(\\?[;&a-z\\d%_.~+=-]*)?' + // 查询字符串
+  //   '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
+  // return !!pattern.test(string);
+  try {
+    new URL(string);
+    return true;
+  } catch (_) {
+    return false;
+  }
 }
 
 var clickUrl = function clickUrl(url) {
@@ -358,18 +363,13 @@ var clickUrl = function clickUrl(url) {
 
     if (isUrl(link)) {
       if (!link.includes(window.location.host)) {
-        // 跳转外链
-        if (localStorage.getItem('isLogin') === 'Y') {
-          // 登录情况下 需要把token带上
-          if (link.includes('?')) {
-            var a = link + "&token=" + localStorage.getItem('h5Token');
-            window.open(a);
-          } else {
-            var a = link + "?token=" + localStorage.getItem('h5Token');
-            window.open(a);
-          }
+        // 跳转外链 需要把token带上
+        if (link.includes('?')) {
+          var a = link + "&token=" + (localStorage.getItem('h5Token') || '');
+          window.open(a);
         } else {
-          window.open(link);
+          var a = link + "?token=" + (localStorage.getItem('h5Token') || '');
+          window.open(a);
         }
       }
     } else {

package/lib/utils/coreUtil.js

@@ -287,14 +287,19 @@ var getCoupon = function getCoupon(couponId) {
 };
 
 function isUrl(string) {
-  var pattern = new RegExp('^(https?:\\/\\/)?' + // 协议
-  '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // 域名
-  '((\\d{1,3}\\.){3}\\d{1,3}))' + // 或者 IP (v4) 地址
-  '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // 端口和路径
-  '(\\?[;&a-z\\d%_.~+=-]*)?' + // 查询字符串
-  '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
-
-  return !!pattern.test(string);
+  // var pattern = new RegExp('^(https?:\\/\\/)?' + // 协议
+  //   '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // 域名
+  //   '((\\d{1,3}\\.){3}\\d{1,3}))' + // 或者 IP (v4) 地址
+  //   '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // 端口和路径
+  //   '(\\?[;&a-z\\d%_.~+=-]*)?' + // 查询字符串
+  //   '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
+  // return !!pattern.test(string);
+  try {
+    new URL(string);
+    return true;
+  } catch (_) {
+    return false;
+  }
 }
 
 var clickUrl = function clickUrl(url) {
@@ -358,18 +363,13 @@ var clickUrl = function clickUrl(url) {
 
     if (isUrl(link)) {
       if (!link.includes(window.location.host)) {
-        // 跳转外链
-        if (localStorage.getItem('isLogin') === 'Y') {
-          // 登录情况下 需要把token带上
-          if (link.includes('?')) {
-            var a = link + "&token=" + localStorage.getItem('h5Token');
-            window.open(a);
-          } else {
-            var a = link + "?token=" + localStorage.getItem('h5Token');
-            window.open(a);
-          }
+        // 跳转外链 需要把token带上
+        if (link.includes('?')) {
+          var a = link + "&token=" + (localStorage.getItem('h5Token') || '');
+          window.open(a);
         } else {
-          window.open(link);
+          var a = link + "?token=" + (localStorage.getItem('h5Token') || '');
+          window.open(a);
         }
       }
     } else {

package/package.json

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