@fonixtree/magic-design 1.0.138 → 1.0.139

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

@@ -78,9 +78,7 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", _extends({
       className: (0, _classnames["default"])('slide-image-card-item-wrap'),
       onClick: function onClick() {
-        var _a;
-
-        return createModal(((_a = data.groupName.content.clickUrl) === null || _a === void 0 ? void 0 : _a.value) || []);
+        return createModal(data.groupName.content.clickUrl || {});
       }
     }, rest), /*#__PURE__*/_react["default"].createElement(_VideoItem["default"], {
       data: data

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

@@ -17,6 +17,10 @@ var _ProductCardModal = _interopRequireDefault(require("./components/ProductCard
 
 var _commonUtil = require("../../../../../utils/commonUtil");
 
+var _coreUtil = require("../../../../../utils/coreUtil");
+
+var _constants = require("../../../../../constants");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -180,7 +184,7 @@ function SlideImagePc(props) {
   var columnSpace = props.panelProps.spacing.pc.columnSpace;
   var lineSpace = props.panelProps.spacing.pc.lineSpace;
 
-  var createModal = function createModal(offerIds) {
+  var createModal = function createModal(url) {
     return __awaiter(_this, void 0, void 0, function () {
       var res, resList;
 
@@ -189,6 +193,13 @@ function SlideImagePc(props) {
       return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
+            console.log('url', url);
+            if (!url.type) return [2
+            /*return*/
+            ];
+            if (!(url.type === _constants.urlTypeMap.PRODUCT_LIST)) return [3
+            /*break*/
+            , 2];
             if (offerIds.length === 0) return [2
             /*return*/
             ];
@@ -209,6 +220,15 @@ function SlideImagePc(props) {
             document.body.classList.add('no-scroll');
             setVisible(true);
             setList(resList);
+            return [3
+            /*break*/
+            , 3];
+
+          case 2:
+            (0, _coreUtil.clickUrl)(url);
+            _b.label = 3;
+
+          case 3:
             return [2
             /*return*/
             ];

package/es/utils/commonUtil.js

@@ -249,7 +249,7 @@ function commonFetch(url, data, method) {
       'Content-Type': 'application/json; charset=UTF-8',
       credentials: credentials,
       accessToken: credentials,
-      'Device-Type': (0, _coreUtil.isPc)() ? 'pc' : 'mobile'
+      'Device-Type': (0, _coreUtil.isPc)() ? 'pc' : 'web'
     };
 
     if (_method === 'GET') {

package/es/utils/coreUtil.js

@@ -309,8 +309,7 @@ var clickUrl = function clickUrl(url, state) {
     url = '';
   }
 
-  console.log('clickUrl...', url, state);
-  console.log('media', window.magicDesign.device, isPc()); // 只读模式，设计模式，url为空，邮箱模版
+  console.log('clickUrl...', url, state); // 只读模式，设计模式，url为空，邮箱模版
 
   if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
     return;
@@ -320,8 +319,7 @@ var clickUrl = function clickUrl(url, state) {
       _link = _b.link,
       data = _b.data;
 
-  var link = window.magicDesign.device === 'pc' ? "/web" + _link : _link;
-  console.log('link', link);
+  var link = isPc() ? "web" + _link : _link;
   var _c = data.params,
       params = _c === void 0 ? {} : _c;
   /** 锚点跳转 */
@@ -384,7 +382,11 @@ var clickUrl = function clickUrl(url, state) {
           window.open(link);
         }
       } else {
-        (0, _commonUtil.navigateTo)(link, state);
+        if (isPc()) {
+          window.location.href += link;
+        } else {
+          (0, _commonUtil.navigateTo)(link, state);
+        }
       }
     } else {
       (0, _commonUtil.navigateTo)(link, state);

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

@@ -78,9 +78,7 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", _extends({
       className: (0, _classnames["default"])('slide-image-card-item-wrap'),
       onClick: function onClick() {
-        var _a;
-
-        return createModal(((_a = data.groupName.content.clickUrl) === null || _a === void 0 ? void 0 : _a.value) || []);
+        return createModal(data.groupName.content.clickUrl || {});
       }
     }, rest), /*#__PURE__*/_react["default"].createElement(_VideoItem["default"], {
       data: data

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

@@ -17,6 +17,10 @@ var _ProductCardModal = _interopRequireDefault(require("./components/ProductCard
 
 var _commonUtil = require("../../../../../utils/commonUtil");
 
+var _coreUtil = require("../../../../../utils/coreUtil");
+
+var _constants = require("../../../../../constants");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -180,7 +184,7 @@ function SlideImagePc(props) {
   var columnSpace = props.panelProps.spacing.pc.columnSpace;
   var lineSpace = props.panelProps.spacing.pc.lineSpace;
 
-  var createModal = function createModal(offerIds) {
+  var createModal = function createModal(url) {
     return __awaiter(_this, void 0, void 0, function () {
       var res, resList;
 
@@ -189,6 +193,13 @@ function SlideImagePc(props) {
       return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
+            console.log('url', url);
+            if (!url.type) return [2
+            /*return*/
+            ];
+            if (!(url.type === _constants.urlTypeMap.PRODUCT_LIST)) return [3
+            /*break*/
+            , 2];
             if (offerIds.length === 0) return [2
             /*return*/
             ];
@@ -209,6 +220,15 @@ function SlideImagePc(props) {
             document.body.classList.add('no-scroll');
             setVisible(true);
             setList(resList);
+            return [3
+            /*break*/
+            , 3];
+
+          case 2:
+            (0, _coreUtil.clickUrl)(url);
+            _b.label = 3;
+
+          case 3:
             return [2
             /*return*/
             ];

package/lib/utils/commonUtil.js

@@ -249,7 +249,7 @@ function commonFetch(url, data, method) {
       'Content-Type': 'application/json; charset=UTF-8',
       credentials: credentials,
       accessToken: credentials,
-      'Device-Type': (0, _coreUtil.isPc)() ? 'pc' : 'mobile'
+      'Device-Type': (0, _coreUtil.isPc)() ? 'pc' : 'web'
     };
 
     if (_method === 'GET') {

package/lib/utils/coreUtil.js

@@ -309,8 +309,7 @@ var clickUrl = function clickUrl(url, state) {
     url = '';
   }
 
-  console.log('clickUrl...', url, state);
-  console.log('media', window.magicDesign.device, isPc()); // 只读模式，设计模式，url为空，邮箱模版
+  console.log('clickUrl...', url, state); // 只读模式，设计模式，url为空，邮箱模版
 
   if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
     return;
@@ -320,8 +319,7 @@ var clickUrl = function clickUrl(url, state) {
       _link = _b.link,
       data = _b.data;
 
-  var link = window.magicDesign.device === 'pc' ? "/web" + _link : _link;
-  console.log('link', link);
+  var link = isPc() ? "web" + _link : _link;
   var _c = data.params,
       params = _c === void 0 ? {} : _c;
   /** 锚点跳转 */
@@ -384,7 +382,11 @@ var clickUrl = function clickUrl(url, state) {
           window.open(link);
         }
       } else {
-        (0, _commonUtil.navigateTo)(link, state);
+        if (isPc()) {
+          window.location.href += link;
+        } else {
+          (0, _commonUtil.navigateTo)(link, state);
+        }
       }
     } else {
       (0, _commonUtil.navigateTo)(link, state);

package/package.json

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