@fonixtree/magic-design 0.0.150 → 0.0.151

package/lib/composite-comp/common/components/ImageLabel/index.less

@@ -36,9 +36,10 @@
 
 
   &.position-6 {
-    position: relative;
-    float: left;
+    position: unset;
     height: 18px;
     margin-right: 5px;
+    vertical-align: middle;
+    float: left;
   }
 }

package/lib/composite-comp/common/components/ProductItem/index.js

@@ -186,16 +186,17 @@ function (_super) {
       });
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "product-name-wrap"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "box"
     }, prodLabels.length > 0 && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
       labels: prodLabels,
       small: true
     }), showProName && panelProps.productName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-      className: "product-name",
       data: __assign(__assign({}, panelProps.productName), {
         text: data.offerName
       }),
       readonly: true
-    })), panelProps.activityPrice.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+    }))), panelProps.activityPrice.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "price",
       data: __assign(__assign({}, panelProps.activityPrice), {
         text: _price

package/lib/composite-comp/common/components/ProductItem/index.less

@@ -34,18 +34,13 @@
     }
 
     .product-name-wrap {
-      margin-bottom: 3px;
+      overflow: hidden;
+      text-overflow: ellipsis;
       display: -webkit-box;
-      -webkit-line-clamp: 2;
       -webkit-box-orient: vertical;
-      overflow: hidden;
-      clear: both;
-    }
-
-    .product-name {
+      -webkit-line-clamp: 2;
       line-height: 18px;
-      word-break: break-all;
-      white-space: normal;
+      max-height: 40px;
     }
 
     .price {

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

@@ -256,7 +256,7 @@ var jumpUrlConfig = function jumpUrlConfig(item) {
       }
 
     case 'CustomizedPage':
-      jumpUrl = "/group/" + objValue.objId;
+      jumpUrl = "/poster/" + objValue.objId;
       (0, _commonUtil.navigateTo)(jumpUrl);
       break;
 

package/lib/composite-comp/dito/components/PcNavigation/pc/index.less

@@ -7,7 +7,7 @@
     display: flex;
     align-items: center;
     min-width: 130px;
-    margin-right: 180px;
+    margin-right: 44px;
 
     &:hover {
       @keyframes show-active{
@@ -39,6 +39,7 @@
     .menu-drop {
       display: flex;
       align-items: center;
+      flex-shrink: 0;
       &> img {
         width: 16px;
         margin-right: 10px;
@@ -91,11 +92,12 @@
   .category-group {
     display: flex;
     overflow-x: auto;
-    // flex: 1;
+    flex: 1;
     scroll-snap-type: x;
     .one-category {
       margin-right: 44px;
       scroll-snap-align: end;
+      width: fit-content !important;
       cursor: pointer;
       &:last-of-type {
         margin-right: 0;

package/lib/composite-comp/dito/components/Recommend/defaultJSON.js

@@ -100,7 +100,7 @@ var recommendGroupSourceJSON = function recommendGroupSourceJSON(parentId, logo,
     },
     sourceType: 'recommend',
     prodIds: '',
-    intelligentType: '',
+    intelligentType: 'Hot',
     intelligentValue: [],
     maxProdNum: 10,
     hover: {

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

@@ -283,7 +283,7 @@ function (_super) {
     };
 
     _this.initTab = function (index, hideTabs) {
-      var selectedTabDom = document.querySelector(".tab-select-wrap .tabTitle:nth-child(" + (index + 1) + ")");
+      var selectedTabDom = document.querySelector(".recommend_" + _this.props.panelProps.id + " .tab-select-wrap .tabTitle:nth-child(" + (index + 1) + ")");
       var tabLeft = 0;
       var tabWidth = 0;
 
@@ -589,7 +589,7 @@ function (_super) {
     if (layout === 'layout1' && contentWidth) imgHeight = (contentWidth - 12) / 2;
     if (layout === 'layout3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-recommend-mobile"
+      className: "m-recommend-mobile recommend_" + panelProps.id
     }, !hideTabs && /*#__PURE__*/_react["default"].createElement("div", {
       className: "tab-select-wrap"
     }, groupSource.map(function (tab, index) {

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

@@ -278,12 +278,14 @@ function (_super) {
       type: "icon-ChatDots"
     }), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"
-    }, messageNum))), data.content && ((_j = data.content.logo) === null || _j === void 0 ? void 0 : _j.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+    }, messageNum))), data.content && ((_j = data.content.logo) === null || _j === void 0 ? void 0 : _j.open) && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "logo"
+    }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       data: data.content.logo,
       style: {
         height: 30
       }
-    }));
+    })));
   };
 
   SearchMobile.defaultProps = {

package/lib/composite-comp/dito/components/SearchBar/mobile/index.less

@@ -47,4 +47,9 @@
       }
     }
   }
+  .logo {
+    img {
+      width: auto;
+    }
+  }
 }

package/lib/composite-comp/dito/second-config-panels/RecommendSecondConfig/AIRecommendation/index.js

@@ -215,7 +215,7 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      intelligentType: 'ALL',
+      intelligentType: 'Hot',
       intelligentValue: [],
       categoryData: [],
       brandData: [],
@@ -255,7 +255,7 @@ function (_super) {
               ];
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/offercatgs/list")];
+              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/offercatgs/list")];
 
             case 1:
               res = _a.sent();
@@ -275,7 +275,7 @@ function (_super) {
               ];
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/brands/list")];
+              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/brands/list")];
 
             case 3:
               res = _a.sent();
@@ -295,7 +295,7 @@ function (_super) {
               ];
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/labels/list")];
+              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/labels/list")];
 
             case 5:
               res = _a.sent();
@@ -356,8 +356,6 @@ function (_super) {
       showSearch: true,
       value: intelligentType
     }, /*#__PURE__*/_react["default"].createElement(Option, {
-      value: "ALL"
-    }, (0, _locale.i18n)('ALL')), /*#__PURE__*/_react["default"].createElement(Option, {
       value: "Hot"
     }, (0, _locale.i18n)('HOT')), /*#__PURE__*/_react["default"].createElement(Option, {
       value: "Like"

package/lib/constants/index.js

@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.urlType = exports.respCodeMap = exports.quickMenuCode = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.STORAGE_KEY = exports.CREDIT_STATE = void 0;
 var STORAGE_KEY = {
-  LOCALE: 'magicLocale'
+  LOCALE: 'magicLocale',
+  MAGIC_RENDER_HTML: 'MAGIC_RENDER_HTML',
+  MAGIC_RENDER_PAGEDATA: 'MAGIC_RENDER_PAGEDATA'
 };
 /** 授信状态 */
 

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

@@ -217,7 +217,7 @@ function (_super) {
     };
 
     _this.getSecondConfigName = function () {
-      var _a, _b, _c, _d, _e, _f;
+      var _a, _b, _c, _d, _e;
 
       var selectedNode = _this.state.selectedNode;
 
@@ -228,6 +228,9 @@ function (_super) {
       var panelProps = selectedNode.groupSource.find(function (src) {
         return src.id === _this.state.clickedGroup;
       });
+      var panelIndex = selectedNode.groupSource.findIndex(function (src) {
+        return src.id === _this.state.clickedGroup;
+      });
 
       if (!panelProps) {
         return;
@@ -249,14 +252,20 @@ function (_super) {
 
         case 'MOBILE_NAVIGATION':
         case 'PC_NAVIGATION':
-          groupName = ((_f = panelProps.groupName) === null || _f === void 0 ? void 0 : _f.title.text) || (0, _locale.i18n)('NAVIGATION_NAME');
+          groupName = (panelProps === null || panelProps === void 0 ? void 0 : panelProps.title.text) || (0, _locale.i18n)('NAVIGATION_NAME');
           break;
 
         case 'RECOMMEND':
           groupName = panelProps.groupName.text;
+          break;
+
+        case 'VIDEO':
+          groupName = 'Video' + (panelIndex + 1);
+          break;
 
         case 'TAG':
-          groupName = '';
+          groupName = panelProps.button.text;
+          break;
       }
 
       return groupName || 'Group Name';

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

@@ -0,0 +1,66 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+require("./index.less");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var LeftTitle =
+/** @class */
+function (_super) {
+  __extends(LeftTitle, _super);
+
+  function LeftTitle() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {};
+    return _this;
+  }
+
+  LeftTitle.prototype.render = function () {
+    var title = this.props.title;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "left-title-container"
+    }, title);
+  };
+
+  LeftTitle.defaultProps = {
+    title: '邮件模板'
+  };
+  return LeftTitle;
+}(_react["default"].Component);
+
+var _default = LeftTitle;
+exports["default"] = _default;

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

@@ -0,0 +1,9 @@
+.left-title-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 18px;
+  font-weight: 700;
+  height: 100%;
+  color: #232F46;
+}

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

@@ -11,6 +11,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _antd = require("antd");
+
 var _mobx = require("../../../mobx");
 
 var _Button = _interopRequireDefault(require("../../../common/Button"));
@@ -19,11 +21,9 @@ var _Iconfont = _interopRequireDefault(require("../../../common/Iconfont"));
 
 var _constants = require("../../../constants");
 
-require("./index.less");
-
 var _locale = require("../../../locale");
 
-var _antd = require("antd");
+require("./index.less");
 
 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); }
 
@@ -113,7 +113,10 @@ function (_super) {
         device = _a.device,
         undoDisable = _a.undoDisable,
         redoDisable = _a.redoDisable,
-        language = _a.language;
+        language = _a.language,
+        outputType = _a.outputType,
+        onHtmlSave = _a.onHtmlSave,
+        onHtmlBack = _a.onHtmlBack;
     var languageTemp = langBook[language] || {};
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "quick_menu_wrap"
@@ -169,7 +172,14 @@ function (_super) {
       icon: "icon-next",
       onClick: this.onBtnClick,
       type: "icon"
-    }))), /*#__PURE__*/_react["default"].createElement("div", {
+    }))), outputType == 'html' ? /*#__PURE__*/_react["default"].createElement("div", {
+      className: "menu_right"
+    }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      onClick: onHtmlBack
+    }, (0, _locale.i18n)('BACK')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      onClick: onHtmlSave,
+      type: "light"
+    }, (0, _locale.i18n)('SAVE'))) : /*#__PURE__*/_react["default"].createElement("div", {
       className: "menu_right"
     }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
       "data-code": _constants.quickMenuCode.PREVIEW,

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

@@ -0,0 +1,89 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _Renderer = _interopRequireDefault(require("../../Renderer"));
+
+require("./index.less");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var RenderHtml =
+/** @class */
+function (_super) {
+  __extends(RenderHtml, _super);
+
+  function RenderHtml() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {
+      renderProps: null
+    };
+
+    _this.renderHtml = function (renderProps) {
+      return new Promise(function (resolve) {
+        _this.setState({
+          renderProps: renderProps
+        }, function () {
+          var html = document.querySelector('#render-html-wrap').innerHTML;
+          resolve(html.replace(/url\("((\S|\s)*)"\)/g, 'url($1)'));
+
+          _this.setState({
+            renderProps: null
+          });
+        });
+      });
+    };
+
+    return _this;
+  }
+
+  RenderHtml.prototype.render = function () {
+    var renderProps = this.state.renderProps;
+    if (!renderProps) return null;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      id: "render-html-wrap"
+    }, /*#__PURE__*/_react["default"].createElement(_Renderer["default"], _extends({}, renderProps, {
+      outputType: "html"
+    })));
+  };
+
+  RenderHtml.defaultProps = {};
+  return RenderHtml;
+}(_react["default"].Component);
+
+var _default = RenderHtml;
+exports["default"] = _default;

package/lib/core/Designer/RenderHtml/index.less

@@ -0,0 +1,5 @@
+#render-html-wrap {
+  position: fixed;
+  top: 10px;
+  left: 0;
+}