@fonixtree/magic-design 0.1.86 → 0.1.87

package/lib/utils/commonUtil.js

@@ -28,6 +28,7 @@ exports.shareLinkedin = shareLinkedin;
 exports.shareTwitter = shareTwitter;
 exports.sleep = sleep;
 exports.styleStringify = void 0;
+exports.triggerBuryingPointEvent = triggerBuryingPointEvent;
 
 var _axios = _interopRequireDefault(require("axios"));
 
@@ -296,8 +297,8 @@ function commonFetch(url, data, method) {
   });
 }
 
-var navigateTo = function navigateTo(url) {
-  console.log(url);
+var navigateTo = function navigateTo(url, state) {
+  console.log('navigateTo', url);
 
   if (!url) {
     return;
@@ -311,7 +312,7 @@ var navigateTo = function navigateTo(url) {
   if (!appUrl && !h5Url.startsWith('/')) {
     window.location.href = h5Url;
   } else if (window.magicDesign.history) {
-    window.magicDesign.history.push(url);
+    window.magicDesign.history.push(url, state);
   } else if (window.magicDesign.navigatePreUrl) {
     // 预览模式跳转
     if (h5Url.startsWith('/')) {
@@ -349,7 +350,7 @@ function goLogin(state, replaceFlag) {
   var signUrl = isFromSf === 'Y' ? '/sign-in-opt' : '/sign-in';
 
   if (replaceFlag) {
-    Fishx.history.replace({
+    window.magicDesign.history.replace({
       pathname: signUrl,
       state: state
     });
@@ -750,14 +751,29 @@ function pushGA(data, eventName) {
         groupName: data.groupName,
         elementId: data.elementId,
         elementName: data.elementName
-      };
-      console.log('GA push', eventName, eventData);
+      }; // console.log('GA push', eventName, eventData);
+
       if (window.gtag) window.gtag('event', eventName, eventData);
     }
   } catch (error) {
     console.error(error);
   }
 }
+/** 触发埋点事件
+ *
+  window.document.addEventListener('magic-design-burying-point', e => {
+    console.log(e.data);
+  });
+ */
+
+
+function triggerBuryingPointEvent(data) {
+  var evt = new Event('magic-design-burying-point', {
+    bubbles: false
+  });
+  evt.data = data;
+  window.document.dispatchEvent(evt);
+}
 /** react key 计算 */
 
 

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,19 +315,14 @@ 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 = data.params,
-      params = _b === void 0 ? {} : _b;
-  console.log('clicked data:', data);
-  console.log({
-    type: 'jumpBrowser',
-    params: {
-      url: params.link
-    }
-  });
+  var _b = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
+      link = _b.link,
+      data = _b.data;
+
+  var _c = data.params,
+      params = _c === void 0 ? {} : _c; // console.log('clicked data:', data);
+  // console.log({ type: 'jumpBrowser', params: { url: params.link } });
+
   /** 锚点跳转 */
 
   if (params.type === 'ANCHOR') {
@@ -340,13 +337,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 +375,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": "0.1.86",
+  "version": "0.1.87",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",
@@ -36,6 +36,7 @@
     "ramda": "^0.28.0",
     "react-ace": "^10.1.0",
     "react-color": "2.17.0",
+    "react-cropper": "^2.3.3",
     "react-router-dom": "5.3.0",
     "react-slick": "^0.29.0",
     "replace": "^1.2.1",

package/es/composite-comp/dito/second-config-panels/CommonFunctionsSecondConfig/index.less

@@ -1 +0,0 @@
-.common_functions_second_conf_wrap {}

package/lib/composite-comp/dito/second-config-panels/CommonFunctionsSecondConfig/index.less

@@ -1 +0,0 @@
-.common_functions_second_conf_wrap {}