@fonixtree/magic-design 2.0.62 → 2.0.64

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

@@ -58,21 +58,24 @@ function (_super) {
         _this.setState({
           renderProps: renderProps
         }, function () {
-          document.querySelector('#render-html-wrap > div').style = 'max-width:600px;margin:auto;';
-          /** 去除设计器模式下元素 */
-
-          document.querySelectorAll('#render-html-wrap > div .composite_mask').forEach(function (el) {
-            el.remove();
-          });
-          var html = document.querySelector('#render-html-wrap').innerHTML;
-          /** 处理背景图资源引号问题 */
-
-          html = html.replace(/url\("((\S|\s)*)"\)/g, 'url($1)');
-          resolve(html);
-
-          _this.setState({
-            renderProps: null
-          });
+          /** 兼容分批加载 */
+          setTimeout(function () {
+            document.querySelector('#render-html-wrap > div').style = 'max-width:600px;margin:auto;';
+            /** 去除设计器模式下元素 */
+
+            document.querySelectorAll('#render-html-wrap > div .composite_mask').forEach(function (el) {
+              el.remove();
+            });
+            var html = document.querySelector('#render-html-wrap').innerHTML;
+            /** 处理背景图资源引号问题 */
+
+            html = html.replace(/url\("((\S|\s)*)"\)/g, 'url($1)');
+            resolve(html);
+
+            _this.setState({
+              renderProps: null
+            });
+          }, 1000);
         });
       });
     };

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

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

package/es/core/Designer/ToolBarModal/index.js

@@ -160,6 +160,8 @@ function (_super) {
         _this.props.quillRef.format('font', value);
       } else if (type == 'font-weight') {
         _this.props.quillRef.format('font-weight', value);
+      } else if (type == 'text-align') {
+        _this.props.quillRef.format('text-align', value);
       } else if (type == 'font-style') {
         _this.props.quillRef.format('font-style', 'italic' === quillFormat['font-style'] ? '' : 'italic');
       } else if (type == 'font-family') {
@@ -231,7 +233,6 @@ function (_super) {
     var _this = this;
 
     var quillFormat = this.state.quillFormat;
-    console.log('quillFormat render', quillFormat);
 
     var _fontWeightList = quillFormat['font-family'] === 'OpenSans' ? OpenSansFontWeightList : fontWeightList;
 
@@ -370,25 +371,25 @@ function (_super) {
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "tool-item"
     }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
-      active: quillFormat['align'] === undefined,
+      active: quillFormat['text-align'] === 'left',
       onChange: function onChange() {
-        _this.onToolBtnClick('align', '');
+        _this.onToolBtnClick('text-align', 'left');
       },
       type: "alignLeft"
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "tool-item"
     }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
-      active: quillFormat['align'] === 'center',
+      active: quillFormat['text-align'] === 'center',
       onChange: function onChange() {
-        _this.onToolBtnClick('align', 'center');
+        _this.onToolBtnClick('text-align', 'center');
       },
       type: "alignCenter"
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "tool-item"
     }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
-      active: quillFormat['align'] === 'right',
+      active: quillFormat['text-align'] === 'right',
       onChange: function onChange() {
-        _this.onToolBtnClick('align', 'right');
+        _this.onToolBtnClick('text-align', 'right');
       },
       type: "alignRight"
     })), /*#__PURE__*/_react["default"].createElement("div", {

package/es/core/Designer/index.js

@@ -263,6 +263,7 @@ window.magicDesign = {
 
 var setDesignConfig = function setDesignConfig(data) {
   window.magicDesign = __assign(__assign(__assign({}, window.magicDesign), data), {
+    designMode: true,
     compWidth: Number(data.compWidth),
     compSpacing: Number(data.compSpacing),
     MBaseUrl: data.MBaseUrl || 'operation/v1',
@@ -271,6 +272,13 @@ var setDesignConfig = function setDesignConfig(data) {
 };
 
 var debug = require('debug')('worker:Designer');
+
+_antd.message.config({
+  getContainer: function getContainer() {
+    return document.querySelector('[magic_design]');
+  },
+  prefixCls: 'cylon-message'
+});
 /**
  * @class Designer
  * 主入口。

package/es/core/Renderer/index.js

@@ -43,11 +43,13 @@ var __assign = void 0 && (void 0).__assign || function () {
 
 var setDesignConfig = function setDesignConfig(props) {
   var config = props.config,
-      device = props.device;
+      device = props.device,
+      isPreview = props.isPreview;
   window.magicDesign = __assign(__assign({
     pageBackground: '#f2f2f2',
     mode: 'renderer',
     device: device,
+    designMode: isPreview,
     navigatePreUrl: ''
   }, config), {
     compSpacing: Number(config.compSpacing),

package/es/decorator/compositeDecorator.js

@@ -153,6 +153,19 @@ function compositeDecorator(WrappedComponent) {
 
         if (device === _constants.deviceTypeMap.PC && compWidth && !((_a = spacing === null || spacing === void 0 ? void 0 : spacing.pc) === null || _a === void 0 ? void 0 : _a.fillUp)) {
           wrapStyle.width = compWidth;
+        } // 如果是菜单 则需要设为fixed
+
+
+        if (nodeData.type === 'HEAD_NAVIGATION' || nodeData.type === 'MENU_NAVIGATION') {
+          wrapStyle.position = 'absolute';
+          wrapStyle.left = 0;
+          wrapStyle.width = '100%';
+
+          if (nodeData.type === 'HEAD_NAVIGATION') {
+            wrapStyle.top = 0;
+          } else {
+            wrapStyle.bottom = 0;
+          }
         }
 
         return wrapStyle;
@@ -228,6 +241,15 @@ function compositeDecorator(WrappedComponent) {
         });
       };
 
+      _this.getOuterWrapStyle = function () {
+        var nodeData = _this.props.nodeData;
+
+        if (window.magicDesign.designMode && (nodeData.type === 'HEAD_NAVIGATION' || nodeData.type === 'MENU_NAVIGATION')) {
+          var element = document.querySelector('.phone_view_area .device_border') || document.querySelector('#root .render_wrap');
+          element.style.position = 'relative';
+        }
+      };
+
       return _this;
     }
 
@@ -240,6 +262,7 @@ function compositeDecorator(WrappedComponent) {
           hoveredFloor: _mobx.store.hoveredFloor
         });
       });
+      this.getOuterWrapStyle();
     };
 
     Wrapper.prototype.componentWillUnmount = function () {

package/es/locale/en/en.json

@@ -1,4 +1,7 @@
 {
+  "DISPLAY_PAGE": "Display page",
+  "NAME": "Name",
+  "ADD_MENU": "Add Menu",
   "TIPS": "Tips",
   "AL": "AL",
   "PEEK": "Peek",

package/es/locale/es/es.json

@@ -1,4 +1,7 @@
 {
+  "DISPLAY_PAGE": "Display page",
+  "NAME": "Name",
+  "ADD_MENU": "Add Menu",
   "TIPS": "Tips",
   "AL": "AL",
   "PEEK": "Peek",

package/es/locale/id/id.json

@@ -1,4 +1,7 @@
 {
+  "DISPLAY_PAGE": "Display page",
+  "NAME": "Name",
+  "ADD_MENU": "Add Menu",
   "TIPS": "Tips",
   "AL": "AL",
   "PEEK": "Peek",

package/es/meta-comp/components/Text/formats/textAlign.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TextAlignStyleAttributor = exports.TextAlignStyle = void 0;
+
+var _quill = _interopRequireDefault(require("quill"));
+
+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 Parchment = _quill["default"]["import"]('parchment');
+
+var TextAlignStyleAttributor =
+/** @class */
+function (_super) {
+  __extends(TextAlignStyleAttributor, _super);
+
+  function TextAlignStyleAttributor() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  return TextAlignStyleAttributor;
+}(Parchment.Attributor.Style);
+
+exports.TextAlignStyleAttributor = TextAlignStyleAttributor;
+var TextAlignStyle = new TextAlignStyleAttributor('text-align', 'text-align', {
+  scope: Parchment.Scope.BLOCK_BLOT
+});
+exports.TextAlignStyle = TextAlignStyle;
+
+_quill["default"].register('formats/text-align', TextAlignStyle, true);

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

@@ -19,6 +19,8 @@ require("./formats/textDecorationColor");
 
 require("./formats/fontStyle");
 
+require("./formats/textAlign");
+
 require("./formats/listStyleTypeStyle");
 
 require("./formats/textDecorationStyle");

package/es/meta-comp/config-panels/ButtonConfig/index.js

@@ -11,7 +11,7 @@ var _antd = require("antd");
 
 require("./index.less");
 
-var _lodash = require("lodash");
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
 var _locale = require("../../../locale");
 
@@ -106,11 +106,11 @@ function (_super) {
 
       _this.updateAttr(data, 'hover', {
         open: true,
-        buttonBorder: (0, _lodash.cloneDeep)(data.buttonBorder),
-        buttonIcon: (0, _lodash.cloneDeep)(data.buttonIcon),
-        buttonText: (0, _lodash.cloneDeep)(data.buttonText),
+        buttonBorder: (0, _cloneDeep["default"])(data.buttonBorder),
+        buttonIcon: (0, _cloneDeep["default"])(data.buttonIcon),
+        buttonText: (0, _cloneDeep["default"])(data.buttonText),
         content: {
-          backgroundColor: (0, _lodash.cloneDeep)(data.content.backgroundColor)
+          backgroundColor: (0, _cloneDeep["default"])(data.content.backgroundColor)
         }
       }); // console.log('--ffd, button hover first click', data);
 

package/es/meta-comp/config-panels/ImageConfig/index.js

@@ -202,7 +202,7 @@ function (_super) {
   function ImageConfig() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
-    _this.onClick = function (event) {// console.log(event);
+    _this.onClick = function () {// console.log(event);
     };
 
     _this.getImg = function (v, way) {
@@ -320,7 +320,8 @@ function (_super) {
         needHover = _a.needHover,
         needClickArea = _a.needClickArea,
         needURL = _a.needURL,
-        recommendImgSize = _a.recommendImgSize;
+        recommendImgSize = _a.recommendImgSize,
+        onlySpecificCode = _a.onlySpecificCode;
     var selectImg = this.getSelectedImg(data);
 
     var ContentSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
@@ -348,6 +349,7 @@ function (_super) {
 
         _this.selfRender();
       },
+      onlySpecificCode: onlySpecificCode,
       value: data.content.clickUrl
     })));
 

package/es/utils/businessUtil.js

@@ -7,7 +7,7 @@ exports.renderPreview = exports.parseUrl = exports.newParseUrl = exports.listToT
 
 var _qs = _interopRequireDefault(require("qs"));
 
-var _lodash = require("lodash");
+var _pickBy = _interopRequireDefault(require("lodash/pickBy"));
 
 var _commonUtil = require("./commonUtil");
 
@@ -92,7 +92,7 @@ var newParseUrl = function newParseUrl(urlObj) {
         action: 'jump',
         params: {
           type: 'PRODUCT_LIST',
-          params: (0, _lodash.pickBy)(_qs["default"].parse(value), function (value) {
+          params: (0, _pickBy["default"])(_qs["default"].parse(value), function (value) {
             return value;
           })
         }
@@ -266,7 +266,7 @@ var parseUrl = function parseUrl(url) {
         action: 'jump',
         params: {
           type: 'PRODUCT_LIST',
-          params: (0, _lodash.pickBy)(_qs["default"].parse(arg1), function (value) {
+          params: (0, _pickBy["default"])(_qs["default"].parse(arg1), function (value) {
             return value;
           })
         }

package/es/utils/commonUtil.js

@@ -27,7 +27,7 @@ exports.styleStringify = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
-var _lodash = require("lodash");
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
 var _uuid = require("uuid");
 
@@ -640,7 +640,7 @@ function pushGA(data, eventName) {
 
 
 function covertKey(data, func) {
-  var newData = (0, _lodash.cloneDeep)(data);
+  var newData = (0, _cloneDeep["default"])(data);
   func(newData);
   return JSON.stringify(newData);
 }

package/lib/assets/fonts/magic-box-iconfont.css

@@ -1,9 +1,8 @@
 @font-face {
-  font-family: "magic-box-iconfont";
-  /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1699520254143') format('woff2'),
-    url('magic-box-iconfont.woff?t=1699520254143') format('woff'),
-    url('magic-box-iconfont.ttf?t=1699520254143') format('truetype');
+  font-family: "magic-box-iconfont"; /* Project id 3317752 */
+  src: url('magic-box-iconfont.woff2?t=1700809570587') format('woff2'),
+       url('magic-box-iconfont.woff?t=1700809570587') format('woff'),
+       url('magic-box-iconfont.ttf?t=1700809570587') format('truetype');
 }
 
 .magic-box-iconfont {
@@ -14,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.magic-box-icon-circle-down:before {
+  content: "\e686";
+}
+
+.magic-box-icon-circle-up:before {
+  content: "\e687";
+}
+
+.magic-box-icon-Sidebar:before {
+  content: "\e685";
+}
+
 .magic-box-icon-text-align-center:before {
   content: "\e682";
 }
@@ -504,4 +515,5 @@
 
 .magic-box-icon-image:before {
   content: "\e608";
-}
+}
+

package/lib/assets/fonts/magic-box-iconfont.css.bak

@@ -1,14 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-<<<<<<< HEAD
-  src: url('magic-box-iconfont.woff2?t=1699520254143') format('woff2'),
-       url('magic-box-iconfont.woff?t=1699520254143') format('woff'),
-       url('magic-box-iconfont.ttf?t=1699520254143') format('truetype');
-=======
-  src: url('magic-box-iconfont.woff2?t=1698821773295') format('woff2'),
-       url('magic-box-iconfont.woff?t=1698821773295') format('woff'),
-       url('magic-box-iconfont.ttf?t=1698821773295') format('truetype');
->>>>>>> 86531b2d2d408d9c7659ae4abbc8532b5abc431d
+  src: url('magic-box-iconfont.woff2?t=1700809570587') format('woff2'),
+       url('magic-box-iconfont.woff?t=1700809570587') format('woff'),
+       url('magic-box-iconfont.ttf?t=1700809570587') format('truetype');
 }
 
 .magic-box-iconfont {
@@ -19,7 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-<<<<<<< HEAD
+.icon-circle-down:before {
+  content: "\e686";
+}
+
+.icon-circle-up:before {
+  content: "\e687";
+}
+
+.icon-Sidebar:before {
+  content: "\e685";
+}
+
 .icon-text-align-center:before {
   content: "\e682";
 }
@@ -32,8 +37,6 @@
   content: "\e684";
 }
 
-=======
->>>>>>> 86531b2d2d408d9c7659ae4abbc8532b5abc431d
 .icon-Wallet:before {
   content: "\e681";
 }