@fonixtree/magic-design 0.0.130 → 0.0.131

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,9 @@ function (_super) {
         device = _a.device,
         undoDisable = _a.undoDisable,
         redoDisable = _a.redoDisable,
-        language = _a.language;
+        language = _a.language,
+        outputType = _a.outputType,
+        onHtmlSave = _a.onHtmlSave;
     var languageTemp = langBook[language] || {};
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "quick_menu_wrap"
@@ -169,7 +171,16 @@ 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: function onClick() {
+        window.close();
+      }
+    }, (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,85 @@
+"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 }; }
+
+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);
+
+          _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"], renderProps));
+  };
+
+  RenderHtml.defaultProps = {};
+  return RenderHtml;
+}(_react["default"].Component);
+
+var _default = RenderHtml;
+exports["default"] = _default;

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

@@ -0,0 +1,4 @@
+#render-html-wrap {
+  position: fixed;
+  top: -9999px;
+}

package/lib/core/Designer/index.js

@@ -29,6 +29,10 @@ var _History = _interopRequireDefault(require("./History"));
 
 var _AppointmentModal = _interopRequireDefault(require("./AppointmentModal"));
 
+var _LeftTitle = _interopRequireDefault(require("./LeftTitle"));
+
+var _RenderHtml = _interopRequireDefault(require("./RenderHtml"));
+
 var _componentTypes = require("../../constants/component-types");
 
 var _mobx = require("../../mobx");
@@ -39,6 +43,8 @@ require("./index.less");
 
 var _common = require("../../common");
 
+var _storeUtil = require("../../utils/storeUtil");
+
 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); }
@@ -87,6 +93,149 @@ var __assign = void 0 && (void 0).__assign || function () {
   return __assign.apply(this, arguments);
 };
 
+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
+    };
+  }
+};
+
 var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
   for (var s = 0, i = 0, il = arguments.length; i < il; i++) {
     s += arguments[i].length;
@@ -129,6 +278,8 @@ function (_super) {
   function Designer(props) {
     var _this = _super.call(this, props) || this;
 
+    _this.renderHtmlRef = /*#__PURE__*/_react["default"].createRef();
+
     _this.closeCompList = function () {
       if (_this.compListRef.current.open) {
         _this.compListRef.current.onClose();
@@ -366,11 +517,45 @@ function (_super) {
       }
     };
 
+    _this.onHtmlSave = function () {
+      return __awaiter(_this, void 0, void 0, function () {
+        var _a, device, MPageData, renderProps, html;
+
+        return __generator(this, function (_b) {
+          switch (_b.label) {
+            case 0:
+              _a = this.state, device = _a.device, MPageData = _a.MPageData;
+              renderProps = {
+                pageData: {
+                  id: (0, _uuid.v4)(),
+                  childNodes: MPageData
+                },
+                device: device
+              };
+              return [4
+              /*yield*/
+              , this.renderHtmlRef.current.renderHtml(renderProps)];
+
+            case 1:
+              html = _b.sent();
+              (0, _storeUtil.setStore)(_constants.STORAGE_KEY.MAGIC_RENDER_HTML, html);
+              (0, _storeUtil.setStore)(_constants.STORAGE_KEY.MAGIC_RENDER_PAGEDATA, renderProps.pageData);
+              window.close();
+              return [2
+              /*return*/
+              ];
+          }
+        });
+      });
+    };
+
     _this.renderHeader = function () {
       return /*#__PURE__*/_react["default"].createElement(_QuickMenuBar["default"], {
         device: _this.state.device,
         language: _this.props.language,
         onBtnClick: _this.onQuickMenuClick,
+        onHtmlSave: _this.onHtmlSave,
+        outputType: _this.props.outputType,
         redoDisable: !_this.history.redoAble(),
         undoDisable: !_this.history.undoAble()
       });
@@ -481,7 +666,17 @@ function (_super) {
         pagesManager = _b.pagesManager,
         compSource = _b.compSource,
         pageName = _b.pageName,
-        onCancelPublish = _b.onCancelPublish;
+        onCancelPublish = _b.onCancelPublish,
+        leftTitle = _b.leftTitle,
+        outputType = _b.outputType;
+    var renderPagesManage = pagesManager;
+
+    if (outputType == 'html') {
+      renderPagesManage = /*#__PURE__*/_react["default"].createElement(_LeftTitle["default"], {
+        title: leftTitle
+      });
+    }
+
     return /*#__PURE__*/_react["default"].createElement(_mobxReact.Provider, {
       store: _mobx.store
     }, /*#__PURE__*/_react["default"].createElement(_antd.ConfigProvider, {
@@ -496,7 +691,7 @@ function (_super) {
       onAdd: this.onAdd,
       pageData: MPageData,
       pageName: pageName,
-      renderPagesManage: pagesManager,
+      renderPagesManage: renderPagesManage,
       setPageData: this.setPageData
     }), /*#__PURE__*/_react["default"].createElement(_CompListPanel["default"], {
       ref: this.compListRef,
@@ -525,7 +720,9 @@ function (_super) {
       },
       onConfirm: this.onAppointmentConfirm,
       visible: appointmentVisible
-    })), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_common.SystemNotification, null))));
+    })), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_common.SystemNotification, null))), /*#__PURE__*/_react["default"].createElement(_RenderHtml["default"], {
+      ref: this.renderHtmlRef
+    }));
   };
 
   return Designer;

package/lib/locale/en/en.json

@@ -1,4 +1,5 @@
 {
+  "BACK": "Back",
   "VIDEO_HEIGHT": "Video Height",
   "HEIGHT": "Height",
   "SOCIAL_IMAGE": "Social Image",

package/lib/locale/es/es.json

@@ -1,4 +1,5 @@
 {
+  "BACK": "Back",
   "VIDEO_HEIGHT": "Video Height",
   "HEIGHT": "Height",
   "SOCIAL_IMAGE": "Social Image",

package/lib/locale/id/id.json

@@ -1,4 +1,5 @@
 {
+  "BACK": "Back",
   "VIDEO_HEIGHT": "Video Height",
   "HEIGHT": "Height",
   "SOCIAL_IMAGE": "Social Image",

package/lib/utils/businessUtil.js

@@ -57,12 +57,12 @@ var parseUrl = function parseUrl(url) {
 
     case _constants.urlType.CUSTOMIZED:
       // 自定义页面
-      pcLink = "/group/" + arg1;
-      h5Link = "/group/" + arg1;
+      pcLink = "/poster/" + arg1;
+      h5Link = "/poster/" + arg1;
       params = {
         type: 'CUSTOMIZED',
         data: {
-          url: "/group/" + arg1
+          url: "/poster/" + arg1
         }
       };
       break;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.0.130",
+  "version": "0.0.131",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",
@@ -35,7 +35,8 @@
     "react-slick": "^0.29.0",
     "replace": "^1.2.1",
     "shortid": "^2.2.16",
-    "slick-carousel": "^1.8.1"
+    "slick-carousel": "^1.8.1",
+    "styled-components": "^5.3.9"
   },
   "peerDependencies": {
     "react": ">=16.11.0",