@fonixtree/magic-design 0.0.150 → 0.0.151

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,64 @@ 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);
+
+              if (this.props.onHtmlSave) {
+                this.props.onHtmlSave(html);
+              }
+
+              return [2
+              /*return*/
+              ];
+          }
+        });
+      });
+    };
+
+    _this.onHtmlBack = function () {
+      return __awaiter(_this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+          if (this.props.onHtmlBack) {
+            this.props.onHtmlBack();
+          }
+
+          return [2
+          /*return*/
+          ];
+        });
+      });
+    };
+
     _this.renderHeader = function () {
       return /*#__PURE__*/_react["default"].createElement(_QuickMenuBar["default"], {
         device: _this.state.device,
         language: _this.props.language,
         onBtnClick: _this.onQuickMenuClick,
+        onHtmlBack: _this.onHtmlBack,
+        onHtmlSave: _this.onHtmlSave,
+        outputType: _this.props.outputType,
         redoDisable: !_this.history.redoAble(),
         undoDisable: !_this.history.undoAble()
       });
@@ -398,6 +602,7 @@ function (_super) {
 
     var pageData = props.pageData,
         config = props.config,
+        outputType = props.outputType,
         locale = props.locale;
     var MPageData = pageData.childNodes || [];
     _this.configRef = /*#__PURE__*/_react["default"].createRef(); // this.viewAreaRef = React.createRef();
@@ -415,7 +620,9 @@ function (_super) {
       device: _constants.deviceTypeMap.PHONE,
       appointmentVisible: false
     };
-    setDesignConfig(config);
+    setDesignConfig(__assign(__assign({}, config), {
+      outputType: outputType
+    }));
     return _this;
   }
 
@@ -481,7 +688,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 +713,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 +742,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/core/Renderer/index.js

@@ -58,7 +58,8 @@ var setDesignConfig = function setDesignConfig(props) {
 
 
 var Renderer = function Renderer(props) {
-  var pageData = props.pageData; // console.log('pageData: ', pageData);
+  var pageData = props.pageData,
+      outputType = props.outputType; // console.log('pageData: ', pageData);
 
   setDesignConfig(props);
   window.magicDesignPageData = pageData;
@@ -102,7 +103,9 @@ var Renderer = function Renderer(props) {
     }
 
     var newInstanceProps = __assign(__assign({}, nodeData), {
-      nodeData: nodeData
+      nodeData: nodeData,
+      mode: 'renderer',
+      outputType: outputType
     });
 
     return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/decorator/compositeDecorator.js

@@ -130,8 +130,8 @@ function compositeDecorator(WrappedComponent) {
             wrapStyle.opacity = background.opacity ? background.opacity : 1;
           } else {
             wrapStyle.backgroundImage = "url(" + background.image + ")";
-            wrapStyle.backgroundPosition = '0px 0px';
-            wrapStyle.backgroundSize = 'auto 100%';
+            wrapStyle.backgroundPosition = 'center center';
+            wrapStyle.backgroundSize = 'cover';
             wrapStyle.backgroundRepeat = 'no-repeat';
           }
         } // 复合组件宽度

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/meta-comp/components/Text/index.js

@@ -319,7 +319,8 @@ function (_super) {
       node.appendChild(closeNode);
     };
 
-    _this.renderText = function (data) {
+    _this.renderText = function (data, mode) {
+      var outputType = _this.props.outputType || window.magicDesign.outputType;
       if (!_this.textRef.current) return;
 
       _this.textRef.current.blur();
@@ -332,23 +333,57 @@ function (_super) {
       /** 渲染html */
 
       if (data.specialContent.length == 0) {
-        _this.textRef.current.innerHTML = data.text;
+        if (outputType == 'html' && mode == 'renderer') {
+          if (data === null || data === void 0 ? void 0 : data.content.clickUrl) {
+            var a = document.createElement('a');
+            a.href = data.content.clickUrl;
+            a.target = '_blank';
+            a.innerHTML = data.text;
+            _this.textRef.current.innerHTML = '';
+
+            _this.textRef.current.appendChild(a);
+          } else {
+            _this.textRef.current.innerHTML = data.text;
+          }
+        } else {
+          _this.textRef.current.innerHTML = data.text;
+        }
       } else {
         _this.textRef.current.innerHTML = '';
         data.specialContent.forEach(function (c, index) {
-          var _a;
+          var _a, _b, _c;
 
           var node = document.createElement('span');
           node.style = (0, _commonUtil.styleStringify)(contentStyle(c.content));
-          node.innerText = (_a = data.text).slice.apply(_a, c.range);
 
-          node.onclick = function (e) {
-            if (c.content.clickUrl) {
-              e.stopPropagation();
-            }
+          if (c === null || c === void 0 ? void 0 : c.content.clickUrl) {
+            if (outputType == 'html' && mode == 'renderer') {
+              var a = document.createElement('a');
+              a.href = c.content.clickUrl;
+              a.target = '_blank';
+
+              if (mode == 'designer') {
+                a.onclick = function (e) {
+                  e.preventDefault();
+                };
+              }
 
-            (0, _coreUtil.clickUrl)(c.content.clickUrl);
-          };
+              a.innerText = (_a = data.text).slice.apply(_a, c.range);
+              node.appendChild(a);
+            } else {
+              node.innerText = (_b = data.text).slice.apply(_b, c.range);
+
+              node.onclick = function (e) {
+                if (c.content.clickUrl) {
+                  e.stopPropagation();
+                }
+
+                (0, _coreUtil.clickUrl)(c.content.clickUrl);
+              };
+            }
+          } else {
+            node.innerText = (_c = data.text).slice.apply(_c, c.range);
+          }
 
           _this.selectionRefMap[JSON.stringify(c.range)] = node;
 
@@ -356,7 +391,7 @@ function (_super) {
           /** 找到当前选中的区域 */
 
 
-          if (_mobx.store.textSelection == c.content) {
+          if (_mobx.store.textSelection == (c === null || c === void 0 ? void 0 : c.content)) {
             /** 添加删除按钮 */
             _this.createHoverClose(node, function () {
               /** 第一步去除选中区域 */
@@ -402,14 +437,14 @@ function (_super) {
   Text.prototype.componentDidMount = function () {
     var _this = this;
 
-    this.renderText(this.props.data);
+    this.renderText(this.props.data, this.props.mode);
     initSelectionEvent();
     appendSelectionTarget({
       target: this.textRef.current,
       data: this.props.data,
       selectionRefMap: this.selectionRefMap,
       refresh: function refresh() {
-        _this.renderText(_this.props.data);
+        _this.renderText(_this.props.data, _this.props.mode);
       }
     });
   };
@@ -421,7 +456,7 @@ function (_super) {
     var result = should1 || should2 || should3;
 
     if (result) {
-      this.renderText(nextProps.data);
+      this.renderText(nextProps.data, this.props.mode);
     }
 
     return result;
@@ -438,7 +473,8 @@ function (_super) {
         data = _a.data,
         className = _a.className,
         readonly = _a.readonly,
-        onTextInput = _a.onTextInput;
+        onTextInput = _a.onTextInput,
+        mode = _a.mode;
     var style = contentStyle(data.content);
 
     if (data.underline) {
@@ -461,12 +497,14 @@ function (_super) {
     //   textDecorationColor: data?.underline.textDecorationColor,
     //   textDecorationStyle: data?.underline.textDecorationStyle,
     // };
+    // mode == 'designer' && !readonly
+    // console.log('!readonly: ', mode, readonly);
 
 
     return /*#__PURE__*/_react["default"].createElement("div", {
       ref: this.textRef,
       className: (0, _classnames["default"])('m-meta-text', className),
-      contentEditable: (0, _coreUtil.isDesignMode)() && !readonly,
+      contentEditable: mode == 'designer' && !readonly,
       onClick: function onClick() {
         (0, _coreUtil.clickUrl)(data.content.clickUrl);
       },
@@ -495,6 +533,7 @@ function (_super) {
 
   Text.defaultProps = {
     readonly: false,
+    mode: 'designer',
     onTextInput: function onTextInput() {}
   };
   Text = __decorate([_decorator.metaDecorator], Text);

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/lib/utils/commonUtil.js

@@ -9,6 +9,7 @@ exports.checkFileName = exports.calcLastTime = void 0;
 exports.commonFetch = commonFetch;
 exports.convertImageUrl = convertImageUrl;
 exports.copy2ClipBoard = copy2ClipBoard;
+exports.covertKey = covertKey;
 exports.dragSource = void 0;
 exports.ensure = ensure;
 exports.getColorRgba = void 0;
@@ -22,6 +23,8 @@ exports.styleStringify = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
+var _lodash = require("lodash");
+
 var _qs = _interopRequireDefault(require("qs"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -463,4 +466,12 @@ function pushGA(data) {
     pageName_moduleName_groupName: 'pageName_moduleName_groupName' + random,
     pageName_moduleName_groupName_elementNam: 'pageName_moduleName_groupName_elementNam' + random
   }, data)); // }, 1000);
+}
+/** react key 计算 */
+
+
+function covertKey(data, func) {
+  var newData = (0, _lodash.cloneDeep)(data);
+  func(newData);
+  return JSON.stringify(newData);
 }

package/lib/utils/coreUtil.js

@@ -287,9 +287,9 @@ var getCoupon = function getCoupon(couponId) {
 };
 
 var clickUrl = function clickUrl(url) {
-  console.log('url', url);
+  console.log('clickUrl...', url);
 
-  if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url) {
+  if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
     return;
   }
 
@@ -310,9 +310,13 @@ var clickUrl = function clickUrl(url) {
     if (url.startsWith('/')) {
       (0, _commonUtil.navigateTo)(url);
     } else {
-      // location.href = url;
       var newUrl = isPc() ? pcLink : h5Link;
-      (0, _commonUtil.navigateTo)(newUrl);
+
+      if (newUrl.startsWith('/')) {
+        (0, _commonUtil.navigateTo)(newUrl);
+      } else {
+        window.location.href = newUrl;
+      }
     }
 
     return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.0.150",
+  "version": "0.0.151",
   "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",