@fonixtree/magic-design 1.0.140 → 1.0.142

package/es/{composite-comp/dito/components/SlideImage/pc/components → common}/ProductCardModal/index.js

@@ -13,11 +13,13 @@ var _framerMotion = require("framer-motion");
 
 var _dotIcon = _interopRequireDefault(require("./imgs/dot-icon.png"));
 
-var _common = require("../../../../../../../common");
+var _Iconfont = _interopRequireDefault(require("../Iconfont"));
 
 require("./index.less");
 
-var _coreUtil = require("../../../../../../../utils/coreUtil");
+var _coreUtil = require("../../utils/coreUtil");
+
+var _commonUtil = require("../../utils/commonUtil");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -137,9 +139,9 @@ function ProductCardModal(_a) {
       }
     }, /*#__PURE__*/_react["default"].createElement("div", {
       dangerouslySetInnerHTML: {
-        __html: item.goodsIntroduce
+        __html: (0, _commonUtil.xssDecode)(item.goodsIntroduce)
       }
-    })), index === active && /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+    })), index === active && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       className: "closIcon",
       color: "#929292",
       onClick: onClose,
@@ -150,7 +152,7 @@ function ProductCardModal(_a) {
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + item.productId);
       }
-    }, "Apply Now", /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+    }, "Apply Now", /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       color: "#FCD116",
       size: 20,
       type: "icon-arrow-right"
@@ -159,7 +161,7 @@ function ProductCardModal(_a) {
       className: "dotIcon",
       src: _dotIcon["default"]
     })));
-  }))), /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+  }))), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
     className: "iconLeft",
     color: "#929292",
     onClick: function onClick(e) {
@@ -167,7 +169,7 @@ function ProductCardModal(_a) {
     },
     size: 36,
     type: "icon-circle-down"
-  }), /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+  }), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
     className: "iconRight",
     color: "#929292",
     onClick: function onClick(e) {

package/es/common/index.js

@@ -111,6 +111,12 @@ Object.defineProperty(exports, "NewImg", {
     return _NewImg["default"];
   }
 });
+Object.defineProperty(exports, "ProductCardModal", {
+  enumerable: true,
+  get: function get() {
+    return _ProductCardModal["default"];
+  }
+});
 Object.defineProperty(exports, "ProductSource", {
   enumerable: true,
   get: function get() {
@@ -212,4 +218,6 @@ var _NewImg = _interopRequireDefault(require("./NewImg"));
 
 var _ErrorBoundary = _interopRequireDefault(require("./ErrorBoundary"));
 
+var _ProductCardModal = _interopRequireDefault(require("./ProductCardModal"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

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

@@ -31,6 +31,8 @@ var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _mobx = require("../../../../../mobx");
 
+var _constants = require("../../../../../constants");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -202,6 +204,19 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
+var JsonToUrl = function JsonToUrl(data) {
+  var tempArr = []; // eslint-disable-next-line no-unused-vars, no-restricted-syntax, guard-for-in
+
+  for (var i in data) {
+    var keyData = encodeURIComponent(i);
+    var value = encodeURIComponent(data[i]) === 'null' ? '' : encodeURIComponent(data[i]);
+    tempArr.push(keyData + "=" + value);
+  }
+
+  var urlParamsStr = tempArr.join('&');
+  return urlParamsStr;
+};
+
 var SearchDitoPc =
 /** @class */
 function (_super) {
@@ -379,6 +394,13 @@ function (_super) {
             return;
           }
 
+        case [_constants.urlTypeMap.CARD_PRODUCT_LIST]:
+          jumpUrl = {
+            type: _constants.urlTypeMap.CARD_PRODUCT_LIST,
+            value: objValue.objId
+          };
+          break;
+
         default:
           break;
       }
@@ -567,7 +589,7 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: (_h = (_g = data.content.icon) === null || _g === void 0 ? void 0 : _g.color) === null || _h === void 0 ? void 0 : _h.pc,
       onClick: function onClick() {
-        return (0, _coreUtil.clickUrl)('/product/list');
+        return (0, _coreUtil.clickUrl)('/search-page');
       },
       size: 24,
       type: "icon-search-short"
@@ -597,8 +619,15 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement("img", {
       alt: "",
       className: "avatar-img",
+      onClick: function onClick() {
+        return (0, _coreUtil.clickUrl)('/main/account/order/list/0');
+      },
       src: userInfo.photo || _avatar["default"]
-    }), /*#__PURE__*/_react["default"].createElement("div", null, "Hi, ", userInfo.firstName || 'user'), logVisible && /*#__PURE__*/_react["default"].createElement("div", {
+    }), /*#__PURE__*/_react["default"].createElement("div", {
+      onClick: function onClick() {
+        return (0, _coreUtil.clickUrl)('/main/account/order/list/0');
+      }
+    }, "Hi, ", userInfo.firstName || 'user'), logVisible && /*#__PURE__*/_react["default"].createElement("div", {
       className: "log-out-wrap",
       onClick: function onClick(e) {
         _this.onLogOut(e);

package/es/composite-comp/dito/components/SearchDITO/pc/index.less

@@ -157,10 +157,10 @@
           padding: 8px 16px;
           background-color: #fff;
           border-radius: 8px;
-          width: 120px;
           height: 36px;
           display: flex;
           align-items: center;
+          justify-content: center;
           gap: 10px;
           cursor: pointer;
 

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

@@ -72,14 +72,10 @@ function (_super) {
   CardItem.prototype.render = function () {
     var _a = this.props,
         data = _a.data,
-        createModal = _a.createModal,
-        rest = __rest(_a, ["data", "createModal"]);
+        rest = __rest(_a, ["data"]);
 
     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() {
-        return createModal(data.groupName.content.clickUrl || {});
-      }
+      className: (0, _classnames["default"])('slide-image-card-item-wrap')
     }, rest), /*#__PURE__*/_react["default"].createElement(_VideoItem["default"], {
       data: data
     }), data.groupName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {

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

@@ -26,8 +26,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function ParallaxScroll(_a) {
   var source = _a.source,
       xGap = _a.xGap,
-      yGap = _a.yGap,
-      createModal = _a.createModal;
+      yGap = _a.yGap;
 
   var _b = (0, _react.useState)(0),
       colOneScrollY = _b[0],
@@ -105,7 +104,6 @@ function ParallaxScroll(_a) {
         y: translateFirst
       }
     }, /*#__PURE__*/_react["default"].createElement(_CardItem["default"], {
-      createModal: createModal,
       data: el
     }));
   })), /*#__PURE__*/_react["default"].createElement("div", {
@@ -121,7 +119,6 @@ function ParallaxScroll(_a) {
         y: translateSecond
       }
     }, /*#__PURE__*/_react["default"].createElement(_CardItem["default"], {
-      createModal: createModal,
       data: el
     }));
   })), /*#__PURE__*/_react["default"].createElement("div", {
@@ -137,7 +134,6 @@ function ParallaxScroll(_a) {
         y: translateThird
       }
     }, /*#__PURE__*/_react["default"].createElement(_CardItem["default"], {
-      createModal: createModal,
       data: el
     }));
   }))));

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

@@ -1,257 +1,26 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = SlideImagePc;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 require("./index.less");
 
 var _ParallaxScroll = _interopRequireDefault(require("./components/ParallaxScroll"));
 
-var _ProductCardModal = _interopRequireDefault(require("./components/ProductCardModal"));
-
-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); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
-  }
-
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-
-var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
-  var _ = {
-    label: 0,
-    sent: function sent() {
-      if (t[0] & 1) throw t[1];
-      return t[1];
-    },
-    trys: [],
-    ops: []
-  },
-      f,
-      y,
-      t,
-      g;
-  return g = {
-    next: verb(0),
-    "throw": verb(1),
-    "return": verb(2)
-  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-    return this;
-  }), g;
-
-  function verb(n) {
-    return function (v) {
-      return step([n, v]);
-    };
-  }
-
-  function step(op) {
-    if (f) throw new TypeError("Generator is already executing.");
-
-    while (_) {
-      try {
-        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-        if (y = 0, t) op = [op[0] & 2, t.value];
-
-        switch (op[0]) {
-          case 0:
-          case 1:
-            t = op;
-            break;
-
-          case 4:
-            _.label++;
-            return {
-              value: op[1],
-              done: false
-            };
-
-          case 5:
-            _.label++;
-            y = op[1];
-            op = [0];
-            continue;
-
-          case 7:
-            op = _.ops.pop();
-
-            _.trys.pop();
-
-            continue;
-
-          default:
-            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-              _ = 0;
-              continue;
-            }
-
-            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-              _.label = op[1];
-              break;
-            }
-
-            if (op[0] === 6 && _.label < t[1]) {
-              _.label = t[1];
-              t = op;
-              break;
-            }
-
-            if (t && _.label < t[2]) {
-              _.label = t[2];
-
-              _.ops.push(op);
-
-              break;
-            }
-
-            if (t[2]) _.ops.pop();
-
-            _.trys.pop();
-
-            continue;
-        }
-
-        op = body.call(thisArg, _);
-      } catch (e) {
-        op = [6, e];
-        y = 0;
-      } finally {
-        f = t = 0;
-      }
-    }
-
-    if (op[0] & 5) throw op[1];
-    return {
-      value: op[0] ? op[1] : void 0,
-      done: true
-    };
-  }
-};
-
 function SlideImagePc(props) {
-  var _this = this;
-
-  var _a = (0, _react.useState)(false),
-      visible = _a[0],
-      setVisible = _a[1];
-
-  var _b = (0, _react.useState)([]),
-      list = _b[0],
-      setList = _b[1];
-
   var columnSpace = props.panelProps.spacing.pc.columnSpace;
   var lineSpace = props.panelProps.spacing.pc.lineSpace;
-
-  var createModal = function createModal(url) {
-    return __awaiter(_this, void 0, void 0, function () {
-      var res, resList;
-
-      var _a;
-
-      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 (url.value.length === 0) return [2
-            /*return*/
-            ];
-            return [4
-            /*yield*/
-            , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', {
-              pageIndex: 1,
-              pageSize: 20,
-              offerIdList: url.value || []
-            }, 'POST')];
-
-          case 1:
-            res = _b.sent();
-            resList = ((_a = res.pageInfo) === null || _a === void 0 ? void 0 : _a.list) || [];
-            if (resList.length === 0) return [2
-            /*return*/
-            ];
-            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*/
-            ];
-        }
-      });
-    });
-  };
-
-  var closeModal = function closeModal() {
-    document.body.classList.remove('no-scroll');
-    setVisible(false);
-    setList([]);
-  };
-
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "m-slide-image-pc"
   }, /*#__PURE__*/_react["default"].createElement(_ParallaxScroll["default"], {
-    createModal: createModal,
     source: props.panelProps.groupSource,
     xGap: columnSpace,
     yGap: lineSpace
-  }), visible && /*#__PURE__*/_react["default"].createElement(_ProductCardModal["default"], {
-    data: list,
-    onClose: closeModal
   }));
 }

package/es/constants/index.js

@@ -85,7 +85,7 @@ var urlTypeMap = {
   STORE: 'Store',
   AFFILIATE_PRODUCT: 'AffiliateProduct',
   ANCHOR: 'Anchor',
-  PRODUCT_LIST: 'ProductList'
+  CARD_PRODUCT_LIST: 'ProductList'
 };
 exports.urlTypeMap = urlTypeMap;
 var respCodeMap = {

package/es/core/Renderer/index.js

@@ -78,6 +78,10 @@ var Renderer = function Renderer(props) {
       modalState = _b[0],
       setModalState = _b[1];
 
+  var _c = (0, _react.useState)(_mobx.frameStore.pcProdCardModalState),
+      pcProdCardModalState = _c[0],
+      setPcProdCardModalState = _c[1];
+
   if (!noSetWindow) {
     setDesignConfig(props);
   }
@@ -133,6 +137,7 @@ var Renderer = function Renderer(props) {
   (0, _react.useEffect)(function () {
     var disposer = (0, _mobx.autorun)(function () {
       setModalState(_mobx.frameStore.modalState);
+      setPcProdCardModalState(_mobx.frameStore.pcProdCardModalState);
     });
     return function () {
       disposer();
@@ -149,6 +154,17 @@ var Renderer = function Renderer(props) {
     });
   };
 
+  var onCloseProdCardModal = function onCloseProdCardModal() {
+    document.body.classList.remove('no-scroll');
+
+    _mobx.frameStore.setState({
+      pcProdCardModalState: {
+        visible: false,
+        data: []
+      }
+    });
+  };
+
   var getRestStyle = function getRestStyle() {
     if (modalState.visible) {
       return {
@@ -194,6 +210,8 @@ var Renderer = function Renderer(props) {
     isPreview: isPreview
   }, modalState, {
     onClose: onCloseModal
+  })), pcProdCardModalState.visible && /*#__PURE__*/_react["default"].createElement(_common.ProductCardModal, _extends({}, pcProdCardModalState, {
+    onClose: onCloseProdCardModal
   })));
 };
 

package/es/decorator/compositeDecorator.js

@@ -144,7 +144,7 @@ function compositeDecorator(WrappedComponent) {
         var zIndex = '0';
         var position = 'relative';
 
-        if (nodeData.type === 'CAROUSEL' || nodeData.type === 'IMAGE_GALLERY' || nodeData.type === 'SLIDE_IMAGE') {
+        if (nodeData.type === 'CAROUSEL' || nodeData.type === 'IMAGE_GALLERY') {
           zIndex = '1';
         } // 解决pc导航hover上去，类目被下面组件遮罩的问题
 

package/es/mobx/Frame.js

@@ -60,10 +60,15 @@ function () {
       onOk: function onOk() {},
       close: function close() {}
     };
+    this.pcProdCardModalState = {
+      visible: false,
+      data: []
+    };
     (0, _mobx.makeObservable)(this, {
       confirmState: _mobx.observable,
       textModalState: _mobx.observable,
-      modalState: _mobx.observable
+      modalState: _mobx.observable,
+      pcProdCardModalState: _mobx.observable
     });
   }
   /** 修改状态 */

package/es/utils/businessUtil.js

@@ -111,7 +111,7 @@ var newParseUrl = function newParseUrl(urlObj) {
       break;
     // 商品卡片列表
 
-    case _constants.urlTypeMap.PRODUCT_LIST:
+    case _constants.urlTypeMap.CARD_PRODUCT_LIST:
       params = {
         action: 'operation',
         params: {

package/es/utils/commonUtil.js

@@ -28,7 +28,7 @@ exports.shareFacebook = shareFacebook;
 exports.shareLinkedin = shareLinkedin;
 exports.shareTwitter = shareTwitter;
 exports.sleep = sleep;
-exports.styleStringify = void 0;
+exports.xssDecode = exports.styleStringify = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
@@ -376,6 +376,10 @@ function goLogin(state, replaceFlag) {
     navigateTo(signUrl, state);
   }
 }
+
+var xssDecode = function xssDecode(html) {
+  return html.replace(/&lt;/g, '<').replace(/&gt;/g, '>');
+};
 /**
  * 检查是否登录 未登录返回登录页
  * @param {boolean?} isLead 是否引导登录
@@ -383,6 +387,8 @@ function goLogin(state, replaceFlag) {
  */
 
 
+exports.xssDecode = xssDecode;
+
 var checkLogin = function checkLogin(isLead, redirectUrl, replaceFlag) {
   if (isLead === void 0) {
     isLead = true;

package/es/utils/coreUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.isActiveFloor = exports.getVideoCover = exports.copyNode = exports.clickUrl = void 0;
+exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.isActiveFloor = exports.getVideoCover = exports.createProdCardModal = exports.copyNode = exports.clickUrl = void 0;
 
 var _uuid = require("uuid");
 
@@ -21,6 +21,8 @@ var _locale = require("../locale");
 
 var _Video = require("../common/Video");
 
+var _mobx = require("../mobx");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
@@ -302,6 +304,51 @@ function isUrl(string) {
   }
 }
 
+var createProdCardModal = function createProdCardModal(ids) {
+  return __awaiter(void 0, void 0, void 0, function () {
+    var res, resList;
+
+    var _a;
+
+    return __generator(this, function (_b) {
+      switch (_b.label) {
+        case 0:
+          if (ids.length === 0) return [2
+          /*return*/
+          ];
+          return [4
+          /*yield*/
+          , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', {
+            pageIndex: 1,
+            pageSize: 20,
+            offerIdList: ids || []
+          }, 'POST')];
+
+        case 1:
+          res = _b.sent();
+          resList = ((_a = res.pageInfo) === null || _a === void 0 ? void 0 : _a.list) || [];
+          if (resList.length === 0) return [2
+          /*return*/
+          ];
+          document.body.classList.add('no-scroll');
+
+          _mobx.frameStore.setState({
+            pcProdCardModalState: {
+              visible: true,
+              data: resList
+            }
+          });
+
+          return [2
+          /*return*/
+          ];
+      }
+    });
+  });
+};
+
+exports.createProdCardModal = createProdCardModal;
+
 var clickUrl = function clickUrl(url, state) {
   var _a;
 
@@ -322,6 +369,14 @@ var clickUrl = function clickUrl(url, state) {
   var link = isPc() ? "web" + _link : _link;
   var _c = data.params,
       params = _c === void 0 ? {} : _c;
+  console.log('params...', params); // PC商品卡片弹窗
+
+  if (params.type === _constants.urlTypeMap.CARD_PRODUCT_LIST) {
+    createProdCardModal(params.offerIds);
+    return;
+  }
+
+  return;
   /** 锚点跳转 */
 
   if (params.type === 'ANCHOR') {