@fonixtree/magic-design 0.1.35 → 0.1.38

package/es/composite-comp/dito/components/SignBoard/mobile/index.js

@@ -15,6 +15,8 @@ var _common = require("../../../../../common");
 
 var _defaultImg = _interopRequireDefault(require("../../../../../common/GroupList/defaultImg.png"));
 
+var _coreUtil = require("../../../../../utils/coreUtil");
+
 var _commonUtil = require("../../../../../utils/commonUtil");
 
 var _locale = require("../../../../../locale");
@@ -240,7 +242,7 @@ function (_super) {
 
     _this.searchProduct = function () {
       var storeId = window.magicDesign.storeId;
-      clickUrl("/product/list?q=" + _this.state.inputVal + "&storeId=" + storeId);
+      (0, _coreUtil.clickUrl)("/product/list?q=" + _this.state.inputVal + "&storeId=" + storeId);
     };
 
     _this.clickCollect = function () {
@@ -263,7 +265,7 @@ function (_super) {
               /*yield*/
               , (0, _commonUtil.commonFetch)('/h5/collection/store', {
                 storeId: storeId,
-                operationType: !isFollow ? 'D' : 'A'
+                operationType: isFollow ? 'D' : 'A'
               }, 'post')];
 
             case 2:

package/es/composite-comp/dito/components/SignBoard/pc/index.js

@@ -262,7 +262,7 @@ function (_super) {
               /*yield*/
               , (0, _commonUtil.commonFetch)('/h5/collection/store', {
                 storeId: storeId,
-                operationType: !isFollow ? 'D' : 'A'
+                operationType: isFollow ? 'D' : 'A'
               }, 'post')];
 
             case 2:

package/es/core/Renderer/index.js

@@ -34,19 +34,15 @@ var __assign = void 0 && (void 0).__assign || function () {
 
   return __assign.apply(this, arguments);
 };
-/* eslint-disable consistent-return */
 
-
-// import { deviceTypeMap } from '../../constants';
 var setDesignConfig = function setDesignConfig(props) {
   var config = props.config,
-      device = props.device,
-      isShop = props.isShop;
+      device = props.device;
   window.magicDesign = __assign(__assign({
     pageBackground: '#f2f2f2',
     mode: 'renderer',
     device: device,
-    isShop: isShop
+    navigatePreUrl: ''
   }, config), {
     compSpacing: Number(config.compSpacing),
     compWidth: Number(config.compWidth)
@@ -60,7 +56,7 @@ var setDesignConfig = function setDesignConfig(props) {
 var Renderer = function Renderer(props) {
   var pageData = props.pageData,
       outputType = props.outputType,
-      noSetWindow = props.noSetWindow; // console.log('pageData: ', pageData);
+      noSetWindow = props.noSetWindow;
 
   if (!noSetWindow) {
     setDesignConfig(props);

package/es/meta-comp/components/Image/index.js

@@ -173,11 +173,10 @@ function (_super) {
 
     if (data.hover.open && data.hover.backgroundType === 'new' && (hoverState || hoverImgSrc)) {
       srcImg = (0, _coreUtil.isPc)() ? data.hover.pcImgHoverUrl : data.hover.h5ImgHoverUrl;
-    }
+    } // if (window.magicDesign.isShop && srcImg?.includes('ecommerce/static')) {
+    //   srcImg = srcImg.replace('ecommerce/static', 'static');
+    // }
 
-    if (window.magicDesign.isShop && (srcImg === null || srcImg === void 0 ? void 0 : srcImg.includes('ecommerce/static'))) {
-      srcImg = srcImg.replace('ecommerce/static', 'static');
-    }
 
     if (!srcImg) {
       srcImg = (0, _coreUtil.isPc)() ? _pcDefImg["default"] : _h5DefImg["default"];

package/es/utils/commonUtil.js

@@ -270,15 +270,12 @@ var navigateTo = function navigateTo(url) {
     return;
   }
 
-  if (!window.magicDesign || !window.magicDesign.history) {
-    window.location.href = url;
-    return;
-  }
-
   if (url.startsWith('/')) {
-    /** 相同路由跳转不生效 例如：/poster/71 跳转 /poster/72 */
-    // window.magicDesign.history.push(url);
-    window.location.href = url;
+    if (window.magicDesign.history && !window.magicDesign.navigatePreUrl) {
+      window.magicDesign.history.push(url);
+    } else {
+      window.location.href = "" + window.magicDesign.navigatePreUrl + url;
+    }
   } else {
     window.location.href = url;
   }

package/es/utils/coreUtil.js

@@ -291,9 +291,9 @@ var clickUrl = function clickUrl(url) {
     url = '';
   }
 
-  console.log('clickUrl...', url);
+  console.log('clickUrl...', url); // 只读模式，设计模式，url为空，邮箱模版
 
-  if (window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
+  if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
     return;
   }
 
@@ -302,11 +302,7 @@ var clickUrl = function clickUrl(url) {
       data = _a.data;
 
   var _b = data.params,
-      params = _b === void 0 ? {} : _b; // 如果是video 放开return
-
-  if (params.type !== 'VIDEO' && window.magicDesign.readOnly) {
-    return;
-  }
+      params = _b === void 0 ? {} : _b;
 
   if ((0, _androidUtil.browserVersion)().isApp) {
     (0, _androidUtil.sendToApp)(data);

package/lib/composite-comp/dito/components/SignBoard/mobile/index.js

@@ -15,6 +15,8 @@ var _common = require("../../../../../common");
 
 var _defaultImg = _interopRequireDefault(require("../../../../../common/GroupList/defaultImg.png"));
 
+var _coreUtil = require("../../../../../utils/coreUtil");
+
 var _commonUtil = require("../../../../../utils/commonUtil");
 
 var _locale = require("../../../../../locale");
@@ -240,7 +242,7 @@ function (_super) {
 
     _this.searchProduct = function () {
       var storeId = window.magicDesign.storeId;
-      clickUrl("/product/list?q=" + _this.state.inputVal + "&storeId=" + storeId);
+      (0, _coreUtil.clickUrl)("/product/list?q=" + _this.state.inputVal + "&storeId=" + storeId);
     };
 
     _this.clickCollect = function () {
@@ -263,7 +265,7 @@ function (_super) {
               /*yield*/
               , (0, _commonUtil.commonFetch)('/h5/collection/store', {
                 storeId: storeId,
-                operationType: !isFollow ? 'D' : 'A'
+                operationType: isFollow ? 'D' : 'A'
               }, 'post')];
 
             case 2:

package/lib/composite-comp/dito/components/SignBoard/pc/index.js

@@ -262,7 +262,7 @@ function (_super) {
               /*yield*/
               , (0, _commonUtil.commonFetch)('/h5/collection/store', {
                 storeId: storeId,
-                operationType: !isFollow ? 'D' : 'A'
+                operationType: isFollow ? 'D' : 'A'
               }, 'post')];
 
             case 2:

package/lib/core/Renderer/index.js

@@ -34,19 +34,15 @@ var __assign = void 0 && (void 0).__assign || function () {
 
   return __assign.apply(this, arguments);
 };
-/* eslint-disable consistent-return */
 
-
-// import { deviceTypeMap } from '../../constants';
 var setDesignConfig = function setDesignConfig(props) {
   var config = props.config,
-      device = props.device,
-      isShop = props.isShop;
+      device = props.device;
   window.magicDesign = __assign(__assign({
     pageBackground: '#f2f2f2',
     mode: 'renderer',
     device: device,
-    isShop: isShop
+    navigatePreUrl: ''
   }, config), {
     compSpacing: Number(config.compSpacing),
     compWidth: Number(config.compWidth)
@@ -60,7 +56,7 @@ var setDesignConfig = function setDesignConfig(props) {
 var Renderer = function Renderer(props) {
   var pageData = props.pageData,
       outputType = props.outputType,
-      noSetWindow = props.noSetWindow; // console.log('pageData: ', pageData);
+      noSetWindow = props.noSetWindow;
 
   if (!noSetWindow) {
     setDesignConfig(props);

package/lib/meta-comp/components/Image/index.js

@@ -173,11 +173,10 @@ function (_super) {
 
     if (data.hover.open && data.hover.backgroundType === 'new' && (hoverState || hoverImgSrc)) {
       srcImg = (0, _coreUtil.isPc)() ? data.hover.pcImgHoverUrl : data.hover.h5ImgHoverUrl;
-    }
+    } // if (window.magicDesign.isShop && srcImg?.includes('ecommerce/static')) {
+    //   srcImg = srcImg.replace('ecommerce/static', 'static');
+    // }
 
-    if (window.magicDesign.isShop && (srcImg === null || srcImg === void 0 ? void 0 : srcImg.includes('ecommerce/static'))) {
-      srcImg = srcImg.replace('ecommerce/static', 'static');
-    }
 
     if (!srcImg) {
       srcImg = (0, _coreUtil.isPc)() ? _pcDefImg["default"] : _h5DefImg["default"];

package/lib/utils/commonUtil.js

@@ -270,15 +270,12 @@ var navigateTo = function navigateTo(url) {
     return;
   }
 
-  if (!window.magicDesign || !window.magicDesign.history) {
-    window.location.href = url;
-    return;
-  }
-
   if (url.startsWith('/')) {
-    /** 相同路由跳转不生效 例如：/poster/71 跳转 /poster/72 */
-    // window.magicDesign.history.push(url);
-    window.location.href = url;
+    if (window.magicDesign.history && !window.magicDesign.navigatePreUrl) {
+      window.magicDesign.history.push(url);
+    } else {
+      window.location.href = "" + window.magicDesign.navigatePreUrl + url;
+    }
   } else {
     window.location.href = url;
   }

package/lib/utils/coreUtil.js

@@ -291,9 +291,9 @@ var clickUrl = function clickUrl(url) {
     url = '';
   }
 
-  console.log('clickUrl...', url);
+  console.log('clickUrl...', url); // 只读模式，设计模式，url为空，邮箱模版
 
-  if (window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
+  if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
     return;
   }
 
@@ -302,11 +302,7 @@ var clickUrl = function clickUrl(url) {
       data = _a.data;
 
   var _b = data.params,
-      params = _b === void 0 ? {} : _b; // 如果是video 放开return
-
-  if (params.type !== 'VIDEO' && window.magicDesign.readOnly) {
-    return;
-  }
+      params = _b === void 0 ? {} : _b;
 
   if ((0, _androidUtil.browserVersion)().isApp) {
     (0, _androidUtil.sendToApp)(data);

package/package.json

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