@fonixtree/magic-design 1.0.98 → 1.0.100

package/es/composite-comp/dito/components/GroupBuy/mobile/index.less

@@ -79,8 +79,8 @@
   border-radius: 0;
 }
 .m-group-buy-mobile .group-buy-list .m-product-item-wrap .product-img {
-  height: 2.8rem;
-  width: 2.8rem;
+  height: 3.4rem;
+  width: 3.4rem;
 }
 .m-group-buy-mobile .group-buy-list .m-product-item-wrap .content-wrap {
   padding: 0.24rem;

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/coreUtil.js

@@ -286,35 +286,61 @@ var getCoupon = function getCoupon(couponId) {
   });
 };
 
-var clickUrl = function clickUrl(url) {
+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);
+  try {
+    new URL(string);
+    return true;
+  } catch (_) {
+    return false;
+  }
+}
+
+var clickUrl = function clickUrl(url, state) {
+  var _a;
+
   if (url === void 0) {
     url = '';
   }
 
-  console.log('clickUrl...', url); // 只读模式，设计模式，url为空，邮箱模版
+  console.log('clickUrl...', url, state); // 只读模式，设计模式，url为空，邮箱模版
 
   if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
     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; // console.log('clicked data:', 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') {
+    ensure(function () {
+      var nodeId = isPc() ? params.data.pcNodeId : params.data.mobileNodeId;
+      document.querySelector("#node-" + nodeId).scrollIntoView({
+        behavior: 'smooth'
+      });
+    });
+    return;
+  }
+
   if ((0, _androidUtil.browserVersion)().isAshitaApp) {
     (0, _androidUtil.sendToApp)(data);
-  } else if ((0, _androidUtil.browserVersion)().isApp && params.link && params.link.startsWith('http')) {
-    // 兼容Nuri的 绝对路径跳转
-    (0, _androidUtil.sendToAndroid)({
-      type: 'jumpBrowser',
-      params: {
-        url: params.link
-      }
-    });
+  } else if ((0, _androidUtil.browserVersion)().isDitoApp && params.link && params.link.startsWith('http')) {
+    // pto 抽奖系统对接
+    var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "token=" + (localStorage.getItem('h5Token') || '');
+    window.location.href = urlTemp;
   } else {
     // 视频
     if (params.type === 'VIDEO') {
@@ -336,9 +362,32 @@ var clickUrl = function clickUrl(url) {
       }
 
       return;
+    } // 判断是否是pto， pto跳外链需要带token
+
+
+    if (((_a = window === null || window === void 0 ? void 0 : window.magicDesign) === null || _a === void 0 ? void 0 : _a.projectCode) === 'pto') {
+      // 输入的是完整的跳转地址
+      if (isUrl(link)) {
+        if (!link.includes(window.location.host)) {
+          // 跳转外链 需要把token带上
+          if (link.includes('?')) {
+            var a = link + "&token=" + (localStorage.getItem('h5Token') || '');
+            console.log('wai lian: ', a);
+            window.location.href = a;
+          } else {
+            var a = link + "?token=" + (localStorage.getItem('h5Token') || '');
+            console.log('wai lian: ', a);
+            window.location.href = a;
+          }
+        } else {
+          window.open(link);
+        }
+      } else {
+        (0, _commonUtil.navigateTo)(link, state);
+      }
+    } else {
+      (0, _commonUtil.navigateTo)(link, state);
     }
-
-    (0, _commonUtil.navigateTo)(link);
   }
 };
 

package/lib/composite-comp/dito/components/GroupBuy/mobile/index.less

@@ -79,8 +79,8 @@
   border-radius: 0;
 }
 .m-group-buy-mobile .group-buy-list .m-product-item-wrap .product-img {
-  height: 2.8rem;
-  width: 2.8rem;
+  height: 3.4rem;
+  width: 3.4rem;
 }
 .m-group-buy-mobile .group-buy-list .m-product-item-wrap .content-wrap {
   padding: 0.24rem;

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/coreUtil.js

@@ -286,35 +286,61 @@ var getCoupon = function getCoupon(couponId) {
   });
 };
 
-var clickUrl = function clickUrl(url) {
+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);
+  try {
+    new URL(string);
+    return true;
+  } catch (_) {
+    return false;
+  }
+}
+
+var clickUrl = function clickUrl(url, state) {
+  var _a;
+
   if (url === void 0) {
     url = '';
   }
 
-  console.log('clickUrl...', url); // 只读模式，设计模式，url为空，邮箱模版
+  console.log('clickUrl...', url, state); // 只读模式，设计模式，url为空，邮箱模版
 
   if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
     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; // console.log('clicked data:', 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') {
+    ensure(function () {
+      var nodeId = isPc() ? params.data.pcNodeId : params.data.mobileNodeId;
+      document.querySelector("#node-" + nodeId).scrollIntoView({
+        behavior: 'smooth'
+      });
+    });
+    return;
+  }
+
   if ((0, _androidUtil.browserVersion)().isAshitaApp) {
     (0, _androidUtil.sendToApp)(data);
-  } else if ((0, _androidUtil.browserVersion)().isApp && params.link && params.link.startsWith('http')) {
-    // 兼容Nuri的 绝对路径跳转
-    (0, _androidUtil.sendToAndroid)({
-      type: 'jumpBrowser',
-      params: {
-        url: params.link
-      }
-    });
+  } else if ((0, _androidUtil.browserVersion)().isDitoApp && params.link && params.link.startsWith('http')) {
+    // pto 抽奖系统对接
+    var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "token=" + (localStorage.getItem('h5Token') || '');
+    window.location.href = urlTemp;
   } else {
     // 视频
     if (params.type === 'VIDEO') {
@@ -336,9 +362,32 @@ var clickUrl = function clickUrl(url) {
       }
 
       return;
+    } // 判断是否是pto， pto跳外链需要带token
+
+
+    if (((_a = window === null || window === void 0 ? void 0 : window.magicDesign) === null || _a === void 0 ? void 0 : _a.projectCode) === 'pto') {
+      // 输入的是完整的跳转地址
+      if (isUrl(link)) {
+        if (!link.includes(window.location.host)) {
+          // 跳转外链 需要把token带上
+          if (link.includes('?')) {
+            var a = link + "&token=" + (localStorage.getItem('h5Token') || '');
+            console.log('wai lian: ', a);
+            window.location.href = a;
+          } else {
+            var a = link + "?token=" + (localStorage.getItem('h5Token') || '');
+            console.log('wai lian: ', a);
+            window.location.href = a;
+          }
+        } else {
+          window.open(link);
+        }
+      } else {
+        (0, _commonUtil.navigateTo)(link, state);
+      }
+    } else {
+      (0, _commonUtil.navigateTo)(link, state);
     }
-
-    (0, _commonUtil.navigateTo)(link);
   }
 };
 

package/package.json

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