@fonixtree/magic-design 2.0.32 → 2.0.35

package/lib/constants/component-types.js

@@ -39,6 +39,8 @@ var _SignBoard = _interopRequireDefault(require("../composite-comp/dito/componen
 
 var _Recommend = _interopRequireDefault(require("../composite-comp/dito/components/Recommend"));
 
+var _AffiliateRecommend = _interopRequireDefault(require("../composite-comp/dito/components/AffiliateRecommend"));
+
 var _MobileNavigation = _interopRequireDefault(require("../composite-comp/dito/components/MobileNavigation"));
 
 var _PcNavigation = _interopRequireDefault(require("../composite-comp/dito/components/PcNavigation"));
@@ -77,6 +79,8 @@ var _SignBoardConfig = _interopRequireDefault(require("../composite-comp/dito/co
 
 var _RecommendConfig = _interopRequireDefault(require("../composite-comp/dito/config-panels/RecommendConfig"));
 
+var _AffiliateRecommendConfig = _interopRequireDefault(require("../composite-comp/dito/config-panels/AffiliateRecommendConfig"));
+
 var _MobileNavigationConfig = _interopRequireDefault(require("../composite-comp/dito/config-panels/MobileNavigationConfig"));
 
 var _PcNavigationConfig = _interopRequireDefault(require("../composite-comp/dito/config-panels/PcNavigationConfig"));
@@ -101,6 +105,8 @@ var _WalletSecondConfig = _interopRequireDefault(require("../composite-comp/bol/
 
 var _RecommendSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/RecommendSecondConfig"));
 
+var _AffiliateRecommendSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/AffiliateRecommendSecondConfig"));
+
 var _MobileNavigationSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/MobileNavigationSecondConfig"));
 
 var _PcNavigationSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/PcNavigationSecondConfig"));
@@ -113,17 +119,17 @@ var _a, _b, _c; // 组件
 /**
  * 渲染组件索引
  */
-var componentMap = (_a = {}, _a[_Banner["default"].type] = _Banner["default"], _a[_Video["default"].type] = _Video["default"], _a[_Text["default"].type] = _Text["default"], _a[_FlashDeal["default"].type] = _FlashDeal["default"], _a[_SearchBar["default"].type] = _SearchBar["default"], _a[_SignBoard["default"].type] = _SignBoard["default"], _a[_ImageText["default"].type] = _ImageText["default"], _a[_Recommend["default"].type] = _Recommend["default"], _a[_MobileNavigation["default"].type] = _MobileNavigation["default"], _a[_PcNavigation["default"].type] = _PcNavigation["default"], _a[_Divider["default"].type] = _Divider["default"], _a[_ImageGallery["default"].type] = _ImageGallery["default"], _a[_Newsletter["default"].type] = _Newsletter["default"], _a[_Carousel["default"].type] = _Carousel["default"], _a[_Button["default"].type] = _Button["default"], _a[_Tag["default"].type] = _Tag["default"], _a[_Wallet["default"].type] = _Wallet["default"], _a[_CustomCode["default"].type] = _CustomCode["default"], _a[_Location["default"].type] = _Location["default"], _a);
+var componentMap = (_a = {}, _a[_Banner["default"].type] = _Banner["default"], _a[_Video["default"].type] = _Video["default"], _a[_Text["default"].type] = _Text["default"], _a[_FlashDeal["default"].type] = _FlashDeal["default"], _a[_SearchBar["default"].type] = _SearchBar["default"], _a[_SignBoard["default"].type] = _SignBoard["default"], _a[_ImageText["default"].type] = _ImageText["default"], _a[_Recommend["default"].type] = _Recommend["default"], _a[_AffiliateRecommend["default"].type] = _AffiliateRecommend["default"], _a[_MobileNavigation["default"].type] = _MobileNavigation["default"], _a[_PcNavigation["default"].type] = _PcNavigation["default"], _a[_Divider["default"].type] = _Divider["default"], _a[_ImageGallery["default"].type] = _ImageGallery["default"], _a[_Newsletter["default"].type] = _Newsletter["default"], _a[_Carousel["default"].type] = _Carousel["default"], _a[_Button["default"].type] = _Button["default"], _a[_Tag["default"].type] = _Tag["default"], _a[_Wallet["default"].type] = _Wallet["default"], _a[_CustomCode["default"].type] = _CustomCode["default"], _a[_Location["default"].type] = _Location["default"], _a);
 /**
  * 一级配置面板索引
  */
 
 exports.componentMap = componentMap;
-var configPanelMap = (_b = {}, _b[_Banner["default"].type] = _BannerConfig["default"], _b[_Video["default"].type] = _VideoConfig["default"], _b[_Text["default"].type] = _TextCompConfig["default"], _b[_FlashDeal["default"].type] = _FlashDealConfig["default"], _b[_SearchBar["default"].type] = _SearchBarConfig["default"], _b[_SignBoard["default"].type] = _SignBoardConfig["default"], _b[_ImageText["default"].type] = _ImageTextConfig["default"], _b[_Recommend["default"].type] = _RecommendConfig["default"], _b[_MobileNavigation["default"].type] = _MobileNavigationConfig["default"], _b[_PcNavigation["default"].type] = _PcNavigationConfig["default"], _b[_Divider["default"].type] = _DividerConfig["default"], _b[_ImageGallery["default"].type] = _ImageGalleryConfig["default"], _b[_Newsletter["default"].type] = _NewsletterConfig["default"], _b[_Carousel["default"].type] = _CarouselConfig["default"], _b[_Button["default"].type] = _ButtonCompConfig["default"], _b[_Tag["default"].type] = _TagCompConfig["default"], _b[_Wallet["default"].type] = _WalletConfig["default"], _b[_CustomCode["default"].type] = _CustomCodeConfig["default"], _b[_Location["default"].type] = _LocationConfig["default"], _b);
+var configPanelMap = (_b = {}, _b[_Banner["default"].type] = _BannerConfig["default"], _b[_Video["default"].type] = _VideoConfig["default"], _b[_Text["default"].type] = _TextCompConfig["default"], _b[_FlashDeal["default"].type] = _FlashDealConfig["default"], _b[_SearchBar["default"].type] = _SearchBarConfig["default"], _b[_SignBoard["default"].type] = _SignBoardConfig["default"], _b[_ImageText["default"].type] = _ImageTextConfig["default"], _b[_Recommend["default"].type] = _RecommendConfig["default"], _b[_AffiliateRecommend["default"].type] = _AffiliateRecommendConfig["default"], _b[_MobileNavigation["default"].type] = _MobileNavigationConfig["default"], _b[_PcNavigation["default"].type] = _PcNavigationConfig["default"], _b[_Divider["default"].type] = _DividerConfig["default"], _b[_ImageGallery["default"].type] = _ImageGalleryConfig["default"], _b[_Newsletter["default"].type] = _NewsletterConfig["default"], _b[_Carousel["default"].type] = _CarouselConfig["default"], _b[_Button["default"].type] = _ButtonCompConfig["default"], _b[_Tag["default"].type] = _TagCompConfig["default"], _b[_Wallet["default"].type] = _WalletConfig["default"], _b[_CustomCode["default"].type] = _CustomCodeConfig["default"], _b[_Location["default"].type] = _LocationConfig["default"], _b);
 /**
  * 二级配置面板索引
  */
 
 exports.configPanelMap = configPanelMap;
-var secondConfigPanelMap = (_c = {}, _c[_Banner["default"].type] = _BannerSecondConfig["default"], _c[_Video["default"].type] = _VideoSecondConfig["default"], _c[_Text["default"].type] = _TextSecondConfig["default"], _c[_ImageText["default"].type] = _ImageTextSecondConfig["default"], _c[_Recommend["default"].type] = _RecommendSecondConfig["default"], _c[_MobileNavigation["default"].type] = _MobileNavigationSecondConfig["default"], _c[_PcNavigation["default"].type] = _PcNavigationSecondConfig["default"], _c[_Carousel["default"].type] = _CarouselSecondConfig["default"], _c[_ImageGallery["default"].type] = _ImageGallerySecondConfig["default"], _c[_Tag["default"].type] = _TagSecondConfig["default"], _c[_Button["default"].type] = _ButtonSecondConfig["default"], _c[_Wallet["default"].type] = _WalletSecondConfig["default"], _c);
+var secondConfigPanelMap = (_c = {}, _c[_Banner["default"].type] = _BannerSecondConfig["default"], _c[_Video["default"].type] = _VideoSecondConfig["default"], _c[_Text["default"].type] = _TextSecondConfig["default"], _c[_ImageText["default"].type] = _ImageTextSecondConfig["default"], _c[_Recommend["default"].type] = _RecommendSecondConfig["default"], _c[_AffiliateRecommend["default"].type] = _AffiliateRecommendSecondConfig["default"], _c[_MobileNavigation["default"].type] = _MobileNavigationSecondConfig["default"], _c[_PcNavigation["default"].type] = _PcNavigationSecondConfig["default"], _c[_Carousel["default"].type] = _CarouselSecondConfig["default"], _c[_ImageGallery["default"].type] = _ImageGallerySecondConfig["default"], _c[_Tag["default"].type] = _TagSecondConfig["default"], _c[_Button["default"].type] = _ButtonSecondConfig["default"], _c[_Wallet["default"].type] = _WalletSecondConfig["default"], _c);
 exports.secondConfigPanelMap = secondConfigPanelMap;

package/lib/constants/index.js

@@ -141,6 +141,10 @@ var compInfoMap = {
     name: 'Recommend',
     icon: 'icon-forms'
   },
+  AFFILIATE_RECOMMEND: {
+    name: 'Affiliate Recommend',
+    icon: 'icon-forms'
+  },
   DIVIDER: {
     name: 'Divider',
     icon: 'icon-divider-1'

package/lib/core/Designer/ConfigPanel/index.js

@@ -113,6 +113,8 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
       break;
 
     case 'RECOMMEND':
+    case 'AFFILIATE_RECOMMEND':
+      // console.log('RECOMMEND ---panelProps.groupName.text', panelProps.groupName.text);
       groupName = panelProps.groupName.text;
       break;
 
@@ -374,8 +376,11 @@ function (_super) {
       onClick: this.onSecConfigBack,
       type: "icon"
     })), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "title"
-    }, getSecondConfigName(selectedNode, clickedGroup))), this.getSecondConfigInstance()));
+      className: "title",
+      dangerouslySetInnerHTML: {
+        __html: getSecondConfigName(selectedNode, clickedGroup)
+      }
+    })), this.getSecondConfigInstance()));
   };
 
   return ConfigPanel;

package/lib/core/Designer/LeftTitle/index.js

@@ -57,7 +57,7 @@ function (_super) {
   };
 
   LeftTitle.defaultProps = {
-    title: '邮件模板'
+    title: 'Email Template'
   };
   return LeftTitle;
 }(_react["default"].Component);

package/lib/core/Renderer/index.js

@@ -58,38 +58,36 @@ var Renderer = function Renderer(props) {
       outputType = props.outputType,
       noSetWindow = props.noSetWindow;
 
+  var _a = (0, _react.useState)([]),
+      floors = _a[0],
+      setFloors = _a[1];
+
   if (!noSetWindow) {
     setDesignConfig(props);
   }
 
   window.magicDesignPageData = pageData;
-  var pageBackground = window.magicDesign.pageBackground; // 根据楼层展示设备进行过滤
-
-  var filterCompFloor = function filterCompFloor() {
-    var source = [];
+  var pageBackground = window.magicDesign.pageBackground;
+  (0, _react.useEffect)(function () {
+    console.log('----pageData change', pageData);
+    var filterData = [];
 
     if (pageData && pageData.childNodes && pageData.childNodes.length) {
-      source = pageData.childNodes.filter(function (node) {
+      filterData = pageData.childNodes.filter(function (node) {
         return (0, _coreUtil.isActiveFloor)(node.activeTerminal);
       });
-    }
+    } // 首页组建分批渲染按5个一组
 
-    return source;
-  };
 
+    setFloors(filterData.slice(0, 5));
+    setTimeout(function () {
+      setFloors(filterData.slice(0, 10));
+      setTimeout(function () {
+        setFloors(filterData);
+      }, 200);
+    }, 200);
+  }, [pageData]);
   (0, _react.useEffect)(function () {
-    // const data = await fishFetch('/h5/ga/mediaid', {}, 'GET');
-    (0, _commonUtil.importAsync)('https://www.googletagmanager.com/gtag/js?id=G-7B9GSSLVX3', 'js').then(function () {
-      window.dataLayer = window.dataLayer || [];
-
-      function gtag() {
-        dataLayer.push(arguments);
-      }
-
-      gtag('js', new Date());
-      gtag('config', 'G-7B9GSSLVX3');
-      window.gtag = gtag;
-    });
     setTimeout(function () {
       var _a;
 
@@ -103,10 +101,11 @@ var Renderer = function Renderer(props) {
     className: "render_wrap",
     magic_design: "",
     style: {
+      height: '100%',
       background: pageBackground,
       overflow: 'auto'
     }
-  }, filterCompFloor().map(function (nodeData, moduleIndex) {
+  }, floors.length > 0 && floors.map(function (nodeData, moduleIndex) {
     var Clazz = _componentTypes.componentMap[nodeData.type];
 
     if (!Clazz) {

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

@@ -102,6 +102,8 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
 
   return r;
 };
+/* eslint-disable @typescript-eslint/no-unused-expressions */
+
 /* eslint-disable react/no-danger */
 
 
@@ -148,6 +150,16 @@ function (_super) {
           placeholder: '请输入内容...'
         });
 
+        var onInputChange = function onInputChange() {
+          _this.props.onTextInput(_this.quillRef.root.innerHTML);
+        };
+
+        _this.quillRef.on('text-change', onInputChange);
+
+        _this.destroy = function () {
+          _this.quillRef.off('text-change', onInputChange);
+        };
+
         _mobx.frameStore.setState({
           textModalState: {
             quillRef: null
@@ -209,6 +221,10 @@ function (_super) {
     return true;
   };
 
+  Text.prototype.componentWillUnmount = function () {
+    this.destroy && this.destroy();
+  };
+
   Text.prototype.render = function () {
     var _a = this.props,
         data = _a.data,

package/lib/utils/businessUtil.js

@@ -33,7 +33,12 @@ var newParseUrl = function newParseUrl(urlObj) {
   switch (type) {
     // 商品详情
     case _constants.urlTypeMap.PRODUCT_DETAIL_PAGE:
-      link = "/product/detail/" + offerId + "?productId=" + (productId !== null && productId !== void 0 ? productId : '');
+      if (offerId) {
+        link = "/product/detail/" + offerId + "?productId=" + (productId !== null && productId !== void 0 ? productId : '');
+      } else {
+        link = "/product/detail/" + productId;
+      }
+
       params = {
         action: 'jump',
         params: {

package/package.json

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