@fonixtree/magic-design 2.0.86 → 2.0.88

package/es/core/Renderer/index.js

@@ -44,7 +44,8 @@ var __assign = void 0 && (void 0).__assign || function () {
 var setDesignConfig = function setDesignConfig(props) {
   var config = props.config,
       device = props.device,
-      isPreview = props.isPreview;
+      isPreview = props.isPreview,
+      projectCode = props.projectCode;
   window.magicDesign = __assign(__assign({
     pageBackground: '#f2f2f2',
     mode: 'renderer',
@@ -52,6 +53,7 @@ var setDesignConfig = function setDesignConfig(props) {
     designMode: isPreview,
     navigatePreUrl: ''
   }, config), {
+    projectCode: projectCode,
     compSpacing: Number(config.compSpacing),
     compWidth: Number(config.compWidth)
   });

package/es/utils/androidUtil.js

@@ -22,6 +22,7 @@ var browserVersion = function browserVersion() {
     weixin: u.indexOf('MicroMessenger') > -1,
     qq: u.match(/\sQQ/i) == ' qq',
     isApp: u.indexOf('app/CYLON-APP') > -1,
+    isNuriApp: u.indexOf('app/NURI-APP') > -1,
     isAshitaApp: u.indexOf('app/ASHITA-APP') > -1
   };
 };

package/es/utils/commonUtil.js

@@ -296,29 +296,20 @@ function commonFetch(url, data, method) {
   });
 }
 
-var navigateTo = function navigateTo(url, state) {
-  console.log(url);
-
+var navigateTo = function navigateTo(url) {
   if (!url) {
     return;
   }
 
   var _a = url.split(';'),
       h5Url = _a[0],
-      appUrl = _a[1];
-
-  if (appUrl && (0, _androidUtil.browserVersion)().isApp) {
-    window.location.href = appUrl;
-  } // 未配置App路径并且h5绝对路径时直接跳转，其他情况让业务层处理
+      appUrl = _a[1]; // 未配置App路径并且h5绝对路径时直接跳转，其他情况让业务层处理
 
 
   if (!appUrl && !h5Url.startsWith('/')) {
     window.location.href = h5Url;
   } else if (window.magicDesign.history) {
-    window.magicDesign.history.push({
-      pathname: h5Url,
-      state: state
-    });
+    window.magicDesign.history.push(url);
   } else if (window.magicDesign.navigatePreUrl) {
     // 预览模式跳转
     if (h5Url.startsWith('/')) {

package/es/utils/coreUtil.js

@@ -303,6 +303,8 @@ function isUrl(string) {
 }
 
 var clickUrl = function clickUrl(url) {
+  var _a;
+
   if (url === void 0) {
     url = '';
   }
@@ -313,12 +315,12 @@ var clickUrl = function clickUrl(url) {
     return;
   }
 
-  var _a = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
-      link = _a.link,
-      data = _a.data;
+  var _b = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
+      link = _b.link,
+      data = _b.data;
 
-  var _b = data.params,
-      params = _b === void 0 ? {} : _b;
+  var _c = data.params,
+      params = _c === void 0 ? {} : _c;
   console.log('clicked data:', data);
   console.log({
     type: 'jumpBrowser',
@@ -340,13 +342,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')) {
-    var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "userToken=" + (localStorage.getItem('h5Token') || ''); // 兼容Nuri的 绝对路径跳转
-
+    // 别的app打开外链
     (0, _androidUtil.sendToAndroid)({
       type: 'jumpBrowser',
       params: {
-        url: urlTemp
+        url: params.link
       }
     });
   } else {
@@ -370,25 +380,30 @@ var clickUrl = function clickUrl(url) {
       }
 
       return;
-    } // 输入的是完整的跳转地址
-
-
-    if (isUrl(link)) {
-      if (!link.includes(window.location.host)) {
-        // 跳转外链 需要把userToken带上
-        if (link.includes('?')) {
-          var a = link + "&userToken=" + (localStorage.getItem('h5Token') || '');
-          window.open(a);
+    } // 判断是否是nuri， nuri跳外链需要带token
+
+
+    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)) {
+          // 跳转外链 需要把userToken带上
+          if (link.includes('?')) {
+            var a = link + "&userToken=" + (localStorage.getItem('h5Token') || '');
+            window.open(a);
+          } else {
+            var a = link + "?userToken=" + (localStorage.getItem('h5Token') || '');
+            window.open(a);
+          }
         } else {
-          var a = link + "?userToken=" + (localStorage.getItem('h5Token') || '');
-          window.open(a);
+          window.open(link);
         }
       } else {
-        window.open(link);
+        (0, _commonUtil.navigateTo)(link);
       }
-    } else {
-      (0, _commonUtil.navigateTo)(link);
     }
+
+    (0, _commonUtil.navigateTo)(link);
   }
 };
 

package/lib/core/Renderer/index.js

@@ -44,7 +44,8 @@ var __assign = void 0 && (void 0).__assign || function () {
 var setDesignConfig = function setDesignConfig(props) {
   var config = props.config,
       device = props.device,
-      isPreview = props.isPreview;
+      isPreview = props.isPreview,
+      projectCode = props.projectCode;
   window.magicDesign = __assign(__assign({
     pageBackground: '#f2f2f2',
     mode: 'renderer',
@@ -52,6 +53,7 @@ var setDesignConfig = function setDesignConfig(props) {
     designMode: isPreview,
     navigatePreUrl: ''
   }, config), {
+    projectCode: projectCode,
     compSpacing: Number(config.compSpacing),
     compWidth: Number(config.compWidth)
   });

package/lib/utils/androidUtil.js

@@ -22,6 +22,7 @@ var browserVersion = function browserVersion() {
     weixin: u.indexOf('MicroMessenger') > -1,
     qq: u.match(/\sQQ/i) == ' qq',
     isApp: u.indexOf('app/CYLON-APP') > -1,
+    isNuriApp: u.indexOf('app/NURI-APP') > -1,
     isAshitaApp: u.indexOf('app/ASHITA-APP') > -1
   };
 };

package/lib/utils/commonUtil.js

@@ -296,29 +296,20 @@ function commonFetch(url, data, method) {
   });
 }
 
-var navigateTo = function navigateTo(url, state) {
-  console.log(url);
-
+var navigateTo = function navigateTo(url) {
   if (!url) {
     return;
   }
 
   var _a = url.split(';'),
       h5Url = _a[0],
-      appUrl = _a[1];
-
-  if (appUrl && (0, _androidUtil.browserVersion)().isApp) {
-    window.location.href = appUrl;
-  } // 未配置App路径并且h5绝对路径时直接跳转，其他情况让业务层处理
+      appUrl = _a[1]; // 未配置App路径并且h5绝对路径时直接跳转，其他情况让业务层处理
 
 
   if (!appUrl && !h5Url.startsWith('/')) {
     window.location.href = h5Url;
   } else if (window.magicDesign.history) {
-    window.magicDesign.history.push({
-      pathname: h5Url,
-      state: state
-    });
+    window.magicDesign.history.push(url);
   } else if (window.magicDesign.navigatePreUrl) {
     // 预览模式跳转
     if (h5Url.startsWith('/')) {

package/lib/utils/coreUtil.js

@@ -303,6 +303,8 @@ function isUrl(string) {
 }
 
 var clickUrl = function clickUrl(url) {
+  var _a;
+
   if (url === void 0) {
     url = '';
   }
@@ -313,12 +315,12 @@ var clickUrl = function clickUrl(url) {
     return;
   }
 
-  var _a = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
-      link = _a.link,
-      data = _a.data;
+  var _b = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
+      link = _b.link,
+      data = _b.data;
 
-  var _b = data.params,
-      params = _b === void 0 ? {} : _b;
+  var _c = data.params,
+      params = _c === void 0 ? {} : _c;
   console.log('clicked data:', data);
   console.log({
     type: 'jumpBrowser',
@@ -340,13 +342,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')) {
-    var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "userToken=" + (localStorage.getItem('h5Token') || ''); // 兼容Nuri的 绝对路径跳转
-
+    // 别的app打开外链
     (0, _androidUtil.sendToAndroid)({
       type: 'jumpBrowser',
       params: {
-        url: urlTemp
+        url: params.link
       }
     });
   } else {
@@ -370,25 +380,30 @@ var clickUrl = function clickUrl(url) {
       }
 
       return;
-    } // 输入的是完整的跳转地址
-
-
-    if (isUrl(link)) {
-      if (!link.includes(window.location.host)) {
-        // 跳转外链 需要把userToken带上
-        if (link.includes('?')) {
-          var a = link + "&userToken=" + (localStorage.getItem('h5Token') || '');
-          window.open(a);
+    } // 判断是否是nuri， nuri跳外链需要带token
+
+
+    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)) {
+          // 跳转外链 需要把userToken带上
+          if (link.includes('?')) {
+            var a = link + "&userToken=" + (localStorage.getItem('h5Token') || '');
+            window.open(a);
+          } else {
+            var a = link + "?userToken=" + (localStorage.getItem('h5Token') || '');
+            window.open(a);
+          }
         } else {
-          var a = link + "?userToken=" + (localStorage.getItem('h5Token') || '');
-          window.open(a);
+          window.open(link);
         }
       } else {
-        window.open(link);
+        (0, _commonUtil.navigateTo)(link);
       }
-    } else {
-      (0, _commonUtil.navigateTo)(link);
     }
+
+    (0, _commonUtil.navigateTo)(link);
   }
 };
 

package/package.json

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