@fonixtree/magic-design 1.0.99 → 1.0.104

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)
   });
@@ -155,7 +157,7 @@ var Renderer = function Renderer(props) {
     }
 
     return {
-      overflow: 'auto'
+      overflow: 'hidden'
     };
   };
 
@@ -163,7 +165,6 @@ var Renderer = function Renderer(props) {
     className: "render_wrap",
     magic_design: "",
     style: __assign({
-      height: '100%',
       background: pageBackground
     }, getRestStyle())
   }, floors.length > 0 && floors.map(function (nodeData, moduleIndex) {

package/es/utils/coreUtil.js

@@ -286,6 +286,22 @@ 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);
+  try {
+    new URL(string);
+    return true;
+  } catch (_) {
+    return false;
+  }
+}
+
 var clickUrl = function clickUrl(url, state) {
   var _a;
 
@@ -356,9 +372,11 @@ var clickUrl = function clickUrl(url, state) {
           // 跳转外链 需要把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 {

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)
   });
@@ -155,7 +157,7 @@ var Renderer = function Renderer(props) {
     }
 
     return {
-      overflow: 'auto'
+      overflow: 'hidden'
     };
   };
 
@@ -163,7 +165,6 @@ var Renderer = function Renderer(props) {
     className: "render_wrap",
     magic_design: "",
     style: __assign({
-      height: '100%',
       background: pageBackground
     }, getRestStyle())
   }, floors.length > 0 && floors.map(function (nodeData, moduleIndex) {

package/lib/utils/coreUtil.js

@@ -286,6 +286,22 @@ 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);
+  try {
+    new URL(string);
+    return true;
+  } catch (_) {
+    return false;
+  }
+}
+
 var clickUrl = function clickUrl(url, state) {
   var _a;
 
@@ -356,9 +372,11 @@ var clickUrl = function clickUrl(url, state) {
           // 跳转外链 需要把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 {

package/package.json

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