@fonixtree/magic-design 2.0.62 → 2.0.63

package/es/composite-comp/bol/components/Video/index.js

@@ -91,8 +91,7 @@ function (_super) {
 
 
   Video.prototype.render = function () {
-    var nodeData = this.props.nodeData; // console.log('---Video', nodeData);
-
+    var nodeData = this.props.nodeData;
     return /*#__PURE__*/_react["default"].createElement("div", null, window.magicDesign.device === 'pc' ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
       data: nodeData
     }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {

package/es/composite-comp/common/components/AffiliateProductItem/index.less

@@ -107,7 +107,7 @@
     }
 
     .producItemName {
-      height: 40px;
+      height: 38px;
     }
   }
 

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

@@ -62,9 +62,11 @@
       text-overflow: ellipsis;
       flex-wrap: wrap;
       line-height: 15px;
+
       .old-price-wrap {
         display: flex;
         line-height: 13px;
+
         .discount {
           margin-right: 3px;
           font-family: 'Montserrat';
@@ -76,6 +78,7 @@
           padding: 0 4px;
           background-color: #CE1126;
         }
+
         .old-price {
           text-decoration: line-through;
           width: fit-content;
@@ -85,7 +88,7 @@
       .sold-count {
         color: #7b7b7b;
         font-size: 12px;
-        text-align: right ;
+        text-align: right;
         flex-grow: 1;
       }
     }

package/es/composite-comp/dito/components/AffiliateRecommend/mobile/index.less

@@ -70,7 +70,7 @@
 .m-recommend-mobile .scrollContainer .scrollProductListRow {
   display: flex;
   flex-direction: row;
-  align-items: stretch;
+  align-items: flex-start;
 }
 .m-recommend-mobile .scrollContainer .scrollProductListRow .productCardRow {
   margin-right: 0.16rem;

package/es/composite-comp/dito/components/HeadNavigation/defaultJSON.js

@@ -0,0 +1,87 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultJSON = void 0;
+
+var _uuid = require("uuid");
+
+var getDefaultJSON = function getDefaultJSON() {
+  return {
+    id: (0, _uuid.v4)(),
+    type: 'HEAD_NAVIGATION',
+    content: {
+      logo: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'IMAGE',
+        content: {
+          h5Name: 'name2',
+          pcName: 'name2',
+          h5ImgSrc: '',
+          pcImgSrc: '',
+          clickUrl: ''
+        },
+        hover: {
+          open: false,
+          backgroundType: 'enlarge',
+          magnification: 1.5,
+          pcImgHoverUrl: '',
+          h5ImgHoverUrl: ''
+        }
+      },
+      box: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        color: {
+          pc: '#D92929',
+          mobile: '#8493AF'
+        }
+      },
+      icon: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        color: {
+          pc: '#D92929',
+          mobile: '#232F46'
+        },
+        cartIcon: {
+          pc: true,
+          mobile: true
+        },
+        messageIcon: {
+          pc: false,
+          mobile: true
+        }
+      }
+    },
+    spacing: {
+      pc: {
+        paddingTop: 20,
+        paddingBottom: 30,
+        marginBottom: window.magicDesign.compSpacing * 1.5,
+        fillUp: false
+      },
+      mobile: {
+        paddingTop: 8,
+        paddingBottom: 8,
+        paddingLeft: 15,
+        paddingRight: 15,
+        marginBottom: window.magicDesign.compSpacing
+      }
+    },
+    customize: {
+      layout: 'left',
+      align: 'left'
+    },
+    background: {
+      opacity: 100,
+      color: '#fff',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;

package/es/composite-comp/dito/components/MenuNavigation/defaultJSON.js

@@ -0,0 +1,79 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultJSON = void 0;
+
+var _uuid = require("uuid");
+
+var defaultMenuName = [{
+  name: 'Home',
+  icon: '',
+  selectedIcon: '',
+  clickUrl: ''
+}, {
+  name: 'Category',
+  icon: '',
+  selectedIcon: '',
+  clickUrl: ''
+}, {
+  name: 'Community',
+  icon: '',
+  selectedIcon: '',
+  clickUrl: ''
+}, {
+  name: 'Cart',
+  icon: '',
+  selectedIcon: '',
+  clickUrl: ''
+}, {
+  name: 'Account',
+  icon: '',
+  selectedIcon: '',
+  clickUrl: ''
+}];
+
+var getDefaultJSON = function getDefaultJSON() {
+  var groupId = (0, _uuid.v4)();
+  return {
+    id: groupId,
+    type: 'MENU_NAVIGATION',
+    groupSource: defaultMenuName.map(function (group) {
+      var itemId = (0, _uuid.v4)();
+      return {
+        id: itemId,
+        parentId: groupId,
+        type: group.name,
+        image: {
+          parentId: itemId,
+          id: (0, _uuid.v4)(),
+          open: true,
+          type: 'IMAGE',
+          content: {
+            h5Name: 'name2',
+            pcName: 'name2',
+            h5ImgSrc: '',
+            pcImgSrc: '',
+            clickUrl: ''
+          },
+          hover: {
+            open: true,
+            backgroundType: 'enlarge',
+            magnification: 1.5,
+            pcImgHoverUrl: '',
+            h5ImgHoverUrl: ''
+          }
+        }
+      };
+    }),
+    background: {
+      opacity: 100,
+      color: '#fff',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;

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

@@ -59,6 +59,8 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
+var TextArea = _antd.Input.TextArea;
+
 var ChatRobot =
 /** @class */
 function (_super) {
@@ -218,14 +220,17 @@ function (_super) {
       closable: false,
       footer: /*#__PURE__*/_react["default"].createElement("div", {
         className: "dialog_bottom"
-      }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "bottom_input"
+      }, /*#__PURE__*/_react["default"].createElement(TextArea, {
+        autoSize: true,
+        className: "text_area",
         onChange: this.onMessageChage,
         onPressEnter: this.onEnter,
         placeholder: "Send a message",
         value: message
-      }), /*#__PURE__*/_react["default"].createElement("div", {
-        className: "btn_wrap"
-      }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+      }), /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+        className: "image_btn",
         color: "#2F54EB",
         onClick: this.generateImage,
         size: 20,
@@ -233,15 +238,12 @@ function (_super) {
           cursor: 'pointer'
         },
         type: "icon-image"
-      }), /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-        color: message.length > 0 ? '#2F54EB' : '#C1C9D7',
-        onClick: this.onEnter,
-        size: 20,
-        style: {
-          cursor: 'pointer'
-        },
-        type: message.length > 0 ? 'icon-send1' : 'icon-send'
-      }))),
+      })), /*#__PURE__*/_react["default"].createElement("div", {
+        className: (0, _classnames["default"])('generate_btn', {
+          disable_btn: message.length === 0
+        }),
+        onClick: this.onEnter
+      }, "Generate")),
       footerStyle: {
         padding: 12
       },
@@ -321,7 +323,9 @@ function (_super) {
         marginRight: 5
       },
       type: "icon-refresh"
-    }), "Regenerate Response"))), /*#__PURE__*/_react["default"].createElement(_AiImageGenerator["default"], {
+    }), "Regenerate Response"), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "more_condition"
+    }))), /*#__PURE__*/_react["default"].createElement(_AiImageGenerator["default"], {
       onClose: function onClose() {
         return _this.setState({
           aiImageVisible: false

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

@@ -121,18 +121,39 @@
   .dialog_bottom {
     position: relative;
     font-size: 14px;
-    input {
-      padding-right: 60px !important;
+    .bottom_input{
+      display: flex;
+      align-items: flex-start;
+      .text_area {
+        max-height: 200px;
+        padding-right: 30px;
+      }
+      .image_btn {
+        position: absolute;
+        right: 10px;
+        top: 6px;
+      }
+      .toggle_btn {
+        padding: 4px 0 4px 10px;
+        cursor: pointer;
+      }
     }
-    .btn_wrap {
-      position: absolute;
-      right: 15px;
-      top: 0px;
-      width: 50px;
-      height: 36px;
+    .generate_btn {
       display: flex;
       align-items: center;
-      justify-content: space-between;
+      justify-content: center;
+      margin-top: 8px;
+      height: 36px;
+      background: #2F54EB;
+      border-radius: 6px;
+      color:#FFF;
+      font-family: Open Sans;
+      font-size: 14px;
+      font-weight: 600;
+      cursor: pointer;
+    }
+    .disable_btn {
+      background: #C1C9D7;
     }
   }
 }

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

@@ -271,6 +271,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/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/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";
 }