@fonixtree/magic-design 0.0.130 → 0.0.131

package/es/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/es/locale/en/en.json

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

package/es/locale/es/es.json

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

package/es/locale/id/id.json

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

package/es/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/common/ImageModal/index.js

@@ -243,45 +243,49 @@ function ImageModal(_a) {
       selectedPics = _f[0],
       setSelectedPics = _f[1];
 
-  var _g = (0, _react.useState)([]),
-      contents = _g[0],
-      setContents = _g[1];
+  var _g = (0, _react.useState)(''),
+      wapUrl = _g[0],
+      setWapUrl = _g[1];
 
-  var _h = (0, _react.useState)(0),
-      total = _h[0],
-      setTotal = _h[1];
+  var _h = (0, _react.useState)([]),
+      contents = _h[0],
+      setContents = _h[1];
 
-  var _j = (0, _react.useState)(1),
-      pageIndex = _j[0],
-      setPageIndex = _j[1];
+  var _j = (0, _react.useState)(0),
+      total = _j[0],
+      setTotal = _j[1];
 
-  var _k = (0, _react.useState)(20),
-      pageSize = _k[0],
-      setPageSize = _k[1];
+  var _k = (0, _react.useState)(1),
+      pageIndex = _k[0],
+      setPageIndex = _k[1];
 
-  var _l = (0, _react.useState)(false),
-      spinning = _l[0],
-      setSpinning = _l[1];
+  var _l = (0, _react.useState)(20),
+      pageSize = _l[0],
+      setPageSize = _l[1];
 
-  var _m = (0, _react.useState)(''),
-      name = _m[0],
-      setName = _m[1];
+  var _m = (0, _react.useState)(false),
+      spinning = _m[0],
+      setSpinning = _m[1];
 
-  var _o = (0, _react.useState)([]),
-      contentcatgsList = _o[0],
-      setContentcatgsList = _o[1];
+  var _o = (0, _react.useState)(''),
+      name = _o[0],
+      setName = _o[1];
 
-  var _p = (0, _react.useState)(''),
-      searchValue = _p[0],
-      setSearchValue = _p[1];
+  var _p = (0, _react.useState)([]),
+      contentcatgsList = _p[0],
+      setContentcatgsList = _p[1];
 
-  var _q = (0, _react.useState)([]),
-      expandedKeys = _q[0],
-      setExpandedKeys = _q[1];
+  var _q = (0, _react.useState)(''),
+      searchValue = _q[0],
+      setSearchValue = _q[1];
 
-  var _r = (0, _react.useState)(true),
-      autoExpandParent = _r[0],
-      setAutoExpandParent = _r[1]; // const currentUser = sessionUtil.getUser() || {};
+  var _r = (0, _react.useState)([]),
+      expandedKeys = _r[0],
+      setExpandedKeys = _r[1];
+
+  var _s = (0, _react.useState)(true),
+      autoExpandParent = _s[0],
+      setAutoExpandParent = _s[1]; // const currentUser = sessionUtil.getUser() || {};
   // const { _csrf } = currentUser;
   // const headers = {};
   // if (_csrf && _csrf.headerName) {
@@ -425,8 +429,44 @@ function ImageModal(_a) {
     });
   };
 
+  var getPreConfig = function getPreConfig() {
+    return __awaiter(_this, void 0, void 0, function () {
+      var wapUrl_1, error_1;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            _a.trys.push([0, 2,, 3]);
+
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/pages/platforminfo")];
+
+          case 1:
+            wapUrl_1 = _a.sent().wapUrl;
+            setWapUrl(wapUrl_1);
+            return [3
+            /*break*/
+            , 3];
+
+          case 2:
+            error_1 = _a.sent();
+            console.error(error_1);
+            return [3
+            /*break*/
+            , 3];
+
+          case 3:
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
   (0, _react.useEffect)(function () {
     getContentCatgs();
+    getPreConfig();
   }, []);
 
   var selectFolder = function selectFolder(id) {
@@ -676,7 +716,11 @@ function ImageModal(_a) {
     },
     onCancel: onCancel,
     onOk: function onOk() {
-      return _onOk(selectedPics);
+      return _onOk(selectedPics.map(function (item) {
+        return __assign(__assign({}, item), {
+          url: wapUrl + item.url
+        });
+      }));
     },
     visible: visible
   }, /*#__PURE__*/_react["default"].createElement(_antd.Row, {

package/lib/composite-comp/bol/components/Text/index.js

@@ -9,14 +9,14 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+
 var _defaultJSON = require("./defaultJSON");
 
 var _components = require("../../../../meta-comp/components");
 
 var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
 
-require("./index.less");
-
 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); }
@@ -25,6 +25,18 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && 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); }
 
+var __makeTemplateObject = void 0 && (void 0).__makeTemplateObject || function (cooked, raw) {
+  if (Object.defineProperty) {
+    Object.defineProperty(cooked, "raw", {
+      value: raw
+    });
+  } else {
+    cooked.raw = raw;
+  }
+
+  return cooked;
+};
+
 var __extends = void 0 && (void 0).__extends || function () {
   var _extendStatics = function extendStatics(d, b) {
     _extendStatics = Object.setPrototypeOf || {
@@ -61,6 +73,10 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 
+// import './index.less';
+// less to css 在线地址 https://tool.oschina.net/less
+var AppStyle = _styledComponents["default"].div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n.m-text .title-wrap {\n  font-weight: 500;\n  font-size: 20px;\n}\n.m-text .sub-title {\n  font-size: 15px;\n  color: #b7b7b7;\n  margin-top: 10px;\n}\n.m-text .group-content-wrap {\n  width: 100%;\n}\n.m-text .group-content-wrap .group-wrap-container {\n  padding: 20px;\n}\n.m-text .group-content-wrap .group-wrap {\n  display: flex;\n  flex-direction: column;\n  margin-top: 20px;\n  width: 100%;\n}\n.m-text .group-content-wrap .group-wrap .group-title {\n  font-size: 14px;\n}\n.m-text .group-content-wrap.col-1 .group-wrap {\n  width: 100%;\n}\n.m-text .group-content-wrap.col-2 {\n  display: grid;\n  grid-template-columns: 50% 50%;\n}\n.m-text .group-content-wrap.col-3 {\n  display: grid;\n  grid-template-columns: 33.3% 33.3% 33.3%;\n}\n.m-text .group-content-wrap.mobile {\n  display: block;\n}\n"], ["\n.m-text .title-wrap {\n  font-weight: 500;\n  font-size: 20px;\n}\n.m-text .sub-title {\n  font-size: 15px;\n  color: #b7b7b7;\n  margin-top: 10px;\n}\n.m-text .group-content-wrap {\n  width: 100%;\n}\n.m-text .group-content-wrap .group-wrap-container {\n  padding: 20px;\n}\n.m-text .group-content-wrap .group-wrap {\n  display: flex;\n  flex-direction: column;\n  margin-top: 20px;\n  width: 100%;\n}\n.m-text .group-content-wrap .group-wrap .group-title {\n  font-size: 14px;\n}\n.m-text .group-content-wrap.col-1 .group-wrap {\n  width: 100%;\n}\n.m-text .group-content-wrap.col-2 {\n  display: grid;\n  grid-template-columns: 50% 50%;\n}\n.m-text .group-content-wrap.col-3 {\n  display: grid;\n  grid-template-columns: 33.3% 33.3% 33.3%;\n}\n.m-text .group-content-wrap.mobile {\n  display: block;\n}\n"])));
+
 var Text =
 /** @class */
 function (_super) {
@@ -74,7 +90,7 @@ function (_super) {
     var _a;
 
     var nodeData = this.props.nodeData;
-    return /*#__PURE__*/_react["default"].createElement("div", {
+    return /*#__PURE__*/_react["default"].createElement(AppStyle, null, /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-text",
       onClick: this.onComponentClick
     }, nodeData.title.headline.open && /*#__PURE__*/_react["default"].createElement("div", {
@@ -105,7 +121,7 @@ function (_super) {
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         data: group.content.text
       }))));
-    })));
+    }))));
   };
 
   Text.defaultProps = {};
@@ -116,4 +132,5 @@ function (_super) {
 }(_react.Component);
 
 var _default = Text;
-exports["default"] = _default;
+exports["default"] = _default;
+var templateObject_1;

package/lib/composite-comp/bol/components/Text/index.less

@@ -1,7 +1,4 @@
 .m-text {
-  // display: flex;
-  // flex-direction: column;
-  // align-items: center;
 
   .title-wrap {
     font-weight: 500;

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,7 +92,7 @@
   .category-group {
     display: flex;
     overflow-x: auto;
-    // flex: 1;
+    flex: 1;
     scroll-snap-type: x;
     .one-category {
       margin-right: 44px;

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/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;
+}