@fonixtree/magic-design 1.0.11 → 1.0.13

package/lib/composite-comp/dito/components/SearchBar/mobile/index.less

@@ -1,51 +1,58 @@
 .m-search-bar {
-  height: 0.96rem;
-  padding: 0.16rem 0;
+  height: 48px;
+  padding: 8px 0;
   display: flex;
   flex-direction: row-reverse;
   align-items: center;
   justify-content: space-between;
   width: 100%;
-}
-.m-search-bar .right {
-  display: flex;
-  flex: 1;
-  margin-left: 0.3rem;
-  align-items: center;
-  justify-content: space-between;
-}
-.m-search-bar .right .search-input-wrap {
-  flex: 1;
-  background: #fff;
-  border-radius: 0.08rem;
-  border: 0.02rem solid #D2D9E5;
-  padding: 0.08rem 0.24rem;
-  height: 0.64rem;
-  text-align: right;
-  display: flex;
-  justify-content: flex-end;
-}
-.m-search-bar .right .message-wrap {
-  position: relative;
-  margin-left: 0.2rem;
-}
-.m-search-bar .right .message-wrap .num {
-  position: absolute;
-  top: -0.12rem;
-  right: -0.12rem;
-  display: inline-block;
-  padding: 0.02rem 0.04rem;
-  min-width: 0.34rem;
-  text-align: center;
-  background-color: #CE1126;
-  border: 0.02rem solid #fff;
-  border-radius: 0.16rem;
-  font-family: 'Montserrat';
-  font-style: normal;
-  font-weight: 600;
-  font-size: 0.16rem;
-  color: #FFFFFF;
-}
-.m-search-bar .logo img {
-  width: auto;
-}
+
+  .right {
+    display: flex;
+    flex: 1;
+    margin-left: 15px;
+    align-items: center;
+    justify-content: space-between;
+
+    .search-input-wrap {
+      flex: 1;
+      background: #fff;
+      border-radius: 4px;
+      border: 1px solid #D2D9E5;
+      padding: 4px 12px;
+      height: 32px;
+      text-align: right;
+      display: flex;
+      justify-content: flex-end;
+    }
+
+    .message-wrap {
+      position: relative;
+      margin-left: 10px;
+
+      .num {
+        position: absolute;
+        top: -6px;
+        right: -6px;
+        display: inline-block;
+        padding: 1px 2px;
+        min-width: 17px;
+        text-align: center;
+        background-color: #CE1126;
+        border: 1px solid #fff;
+        border-radius: 8px;
+        font-family: 'Montserrat';
+        font-style: normal;
+        font-weight: 600;
+        font-size: 8px;
+        color: #FFFFFF;
+      }
+    }
+  }
+
+  .logo {
+    img {
+      width: auto;
+    }
+  }
+}

package/lib/composite-comp/dito/components/SignBoard/mobile/index.less

@@ -1,64 +1,68 @@
 .m-sign-board-bar {
   width: 100%;
-}
-.m-sign-board-bar .search {
-  width: 100%;
-  background: #EEEEEE;
-  border-radius: 0.16rem;
-  padding: 0.16rem 0.24rem;
-  height: 0.72rem;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 0.08rem;
-}
-.m-sign-board-bar .search .search-input {
-  height: 0.4rem;
-  font-weight: 400;
-  font-size: 0.32rem;
-  line-height: 0.4rem;
-  padding: 0;
-  background-color: transparent;
-  border: none;
-}
-.m-sign-board-bar .store-info-wrap {
-  display: flex;
-  align-items: center;
-  margin-top: 0.4rem;
-}
-.m-sign-board-bar .store-info-wrap .number {
-  font-family: 'Montserrat';
-  font-weight: 400;
-  font-size: 0.24rem;
-  line-height: 0.32rem;
-  color: #696973;
-  display: flex;
-  align-items: center;
-}
-.m-sign-board-bar .store-info-wrap .number > img {
-  width: 0.28rem;
-}
-.m-sign-board-bar .store-info-wrap .number > span {
-  font-weight: 700;
-  font-size: 0.28rem;
-  line-height: 0.36rem;
-  color: #333333;
-  margin: 0 0.08rem;
-}
-.m-sign-board-bar .store-info-wrap .number:nth-child(2) {
-  margin-left: 0.48rem;
-  flex: 1;
-}
-.m-sign-board-bar .store-info-wrap .chat-btn {
-  padding: 0.1rem 0.24rem;
-  background: #FFFFFF;
-  border: 0.02rem solid #333333;
-  border-radius: 0.08rem;
-  width: fit-content;
-  font-family: 'Montserrat';
-  font-weight: 400;
-  font-size: 0.24rem;
-  line-height: 0.32rem;
-  text-transform: uppercase;
-  color: #333333;
-}
+
+  .search {
+    width: 100%;
+    background: #EEEEEE;
+    border-radius: 8px;
+    padding: 8px 12px;
+    height: 36px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 4px;
+    .search-input {
+      height: 20px;
+      font-weight: 400;
+      font-size: 16px;
+      line-height: 20px;
+      padding: 0;
+      background-color: transparent;
+      border: none;
+    }
+  }
+
+  .store-info-wrap {
+    display: flex;
+    align-items: center;
+    margin-top: 20px;
+    .number {
+      font-family: 'Montserrat';
+      font-weight: 400;
+      font-size: 12px;
+      line-height: 16px;
+      color: #696973;
+      display: flex;
+      align-items: center;
+      &> img {
+        width: 14px;
+      }
+      &> span {
+        font-weight: 700;
+        font-size: 14px;
+        line-height: 18px;
+        color: #333333;
+        margin: 0 4px;
+      }
+      &:nth-child(2) {
+        margin-left: 24px;
+        flex: 1;
+      }
+    }
+    .chat-btn {
+      padding: 5px 12px;
+      // height: 26px;
+      background: #FFFFFF;
+      border: 1px solid #333333;
+      border-radius: 4px;
+      width: fit-content;
+      font-family: 'Montserrat';
+      font-weight: 400;
+      font-size: 12px;
+      line-height: 16px;
+      text-transform: uppercase;
+      color: #333333;
+    }
+  }
+
+}

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

@@ -146,18 +146,30 @@ function (_super) {
         _this.props.quillRef.format('font', value);
       } else if (type == 'font-weight') {
         _this.props.quillRef.format('font-weight', value);
+      } else if (type == 'font-style') {
+        _this.props.quillRef.format('font-style', 'italic' === quillFormat['font-style'] ? '' : 'italic');
       } else if (type == 'font-family') {
         _this.props.quillRef.format('font-family', value);
       } else if (type == 'text-decoration-style') {
+        _this.props.quillRef.format('underline', true);
+
         _this.props.quillRef.format('text-decoration-style', value);
       } else if (type == 'bullet') {
         _this.props.quillRef.format('list-style-type', value);
 
-        _this.props.quillRef.format('list', 'bullet');
+        if (value === quillFormat['list-style-type']) {
+          _this.props.quillRef.format('list', '');
+        } else {
+          _this.props.quillRef.format('list', 'bullet');
+        }
       } else if (type == 'ordered') {
         _this.props.quillRef.format('list-style-type', value);
 
-        _this.props.quillRef.format('list', 'ordered');
+        if (value === quillFormat['list-style-type']) {
+          _this.props.quillRef.format('list', '');
+        } else {
+          _this.props.quillRef.format('list', 'ordered');
+        }
       } else if (type == 'text-decoration-color') {
         if (value) {
           _this.props.quillRef.format('underline', true);
@@ -269,9 +281,9 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "tool-item"
     }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
-      active: quillFormat['italic'],
+      active: quillFormat['font-style'] === 'italic',
       onChange: function onChange() {
-        _this.onToolBtnClick('italic');
+        _this.onToolBtnClick('font-style');
       },
       type: "italic"
     })), /*#__PURE__*/_react["default"].createElement("div", {

package/lib/meta-comp/components/Text/formats/fontStyle.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FontStyleAttributor = exports.FontStyle = 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 FontStyleAttributor =
+/** @class */
+function (_super) {
+  __extends(FontStyleAttributor, _super);
+
+  function FontStyleAttributor() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  return FontStyleAttributor;
+}(Parchment.Attributor.Style);
+
+exports.FontStyleAttributor = FontStyleAttributor;
+var FontStyle = new FontStyleAttributor('font-style', 'font-style', {
+  scope: Parchment.Scope.INLINE
+});
+exports.FontStyle = FontStyle;
+
+_quill["default"].register('formats/font-style', FontStyle, true);

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

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

package/lib/utils/commonUtil.js

@@ -743,7 +743,8 @@ var asyncNextTick = function asyncNextTick(asyncFunc, interval, count) {
 exports.asyncNextTick = asyncNextTick;
 
 var convertToRem = function convertToRem(value) {
-  // return value; // PTO项目 解开注释
+  return value; // PTO项目 解开注释
+
   if (window.magicDesign.device === 'pc') {
     return value + "px";
   }
@@ -762,7 +763,8 @@ var convertToRem = function convertToRem(value) {
 exports.convertToRem = convertToRem;
 
 var pxToRem = function pxToRem(styleObj) {
-  // return styleObj; // PTO项目 解开注释
+  return styleObj; // PTO项目 解开注释
+
   if (window.magicDesign.device === 'pc') {
     return styleObj;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",

package/es/core/Designer/TextEditModal/ToolBar/ToolBtn/components/AlignPicker/AlignSelectPicker/index.js

@@ -1,99 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
-var _AlignLeftSVG = _interopRequireDefault(require("../images/AlignLeftSVG"));
-
-var _AlignCenterSVG = _interopRequireDefault(require("../images/AlignCenterSVG"));
-
-var _AlignRightSVG = _interopRequireDefault(require("../images/AlignRightSVG"));
-
-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 AlignSelectPicker =
-/** @class */
-function (_super) {
-  __extends(AlignSelectPicker, _super);
-
-  function AlignSelectPicker() {
-    return _super !== null && _super.apply(this, arguments) || this;
-  }
-
-  AlignSelectPicker.prototype.render = function () {
-    var _a = this.props,
-        visibility = _a.visibility,
-        value = _a.value,
-        _onChange = _a.onChange;
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "align-select-picker-panel"
-    }, visibility && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
-      className: "panel-bg"
-    }), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "select-modal-content"
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])('select-item', {
-        active: value == 'left'
-      })
-    }, /*#__PURE__*/_react["default"].createElement(_AlignLeftSVG["default"], {
-      onChange: function onChange() {
-        return _onChange('');
-      }
-    })), /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])('select-item', {
-        active: value == 'center'
-      })
-    }, /*#__PURE__*/_react["default"].createElement(_AlignCenterSVG["default"], {
-      onChange: function onChange() {
-        return _onChange('center');
-      }
-    })), /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])('select-item', {
-        active: value == 'right'
-      })
-    }, /*#__PURE__*/_react["default"].createElement(_AlignRightSVG["default"], {
-      onChange: function onChange() {
-        return _onChange('right');
-      }
-    })))));
-  };
-
-  return AlignSelectPicker;
-}(_react["default"].Component);
-
-var _default = AlignSelectPicker;
-exports["default"] = _default;

package/es/core/Designer/TextEditModal/ToolBar/ToolBtn/components/AlignPicker/AlignSelectPicker/index.less

@@ -1,54 +0,0 @@
-.align-select-picker-panel {
-  z-index: 999;
-  position: absolute;
-  top: 100%;
-  left: 0;
-
-  .panel-bg {
-    position: fixed;
-    z-index: 0;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-  }
-
-  .select-modal-content {
-    display: flex;
-    align-items: center;
-    padding: 5px;
-    background-color: #fff;
-    border: 1px solid #E7E9E8;
-    box-shadow: 0 8px 16px 4px hsla(0, 0%, 0%, 0.04);
-    color: #262626;
-    border-radius: 6px;
-
-    .select-item {
-      width: 26px;
-      height: 26px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      cursor: pointer;
-      border-radius: 6px;
-      padding: 0;
-      border: none;
-      transition: .2s all linear;
-      position: relative;
-      margin: 0 5px;
-
-      &:hover {
-        background: #f8f8f8;
-      }
-
-      &.active {
-        background: #E7E9E8;
-      }
-
-      svg {
-        height: 18px;
-        height: 18px;
-      }
-    }
-  }
-}

package/es/core/Designer/TextEditModal/ToolBar/ToolBtn/components/AlignPicker/images/AlignCenterSVG.js

@@ -1,27 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var _default = function _default(_a) {
-  var onChange = _a.onChange;
-  return /*#__PURE__*/_react["default"].createElement("svg", {
-    id: "ne-t-alignment-center",
-    onClick: onChange,
-    viewBox: "0 0 256 256",
-    xmlns: "http://www.w3.org/2000/svg"
-  }, /*#__PURE__*/_react["default"].createElement("g", {
-    fill: "currentColor",
-    fillRule: "nonzero"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M181 148c5.523 0 10 4.477 10 10 0 5.43-4.327 9.848-9.72 9.996L181 168H76c-5.523 0-10-4.477-10-10 0-5.43 4.327-9.848 9.72-9.996L76 148h105ZM218 89c5.523 0 10 4.477 10 10 0 5.43-4.327 9.848-9.72 9.996L218 109H38c-5.523 0-10-4.477-10-10 0-5.43 4.327-9.848 9.72-9.996L38 89h180ZM181 30c5.523 0 10 4.477 10 10 0 5.43-4.327 9.848-9.72 9.996L181 50H76c-5.523 0-10-4.477-10-10 0-5.43 4.327-9.848 9.72-9.996L76 30h105ZM218 207c5.523 0 10 4.477 10 10 0 5.43-4.327 9.848-9.72 9.996L218 227H38c-5.523 0-10-4.477-10-10 0-5.43 4.327-9.848 9.72-9.996L38 207h180Z"
-  })));
-};
-
-exports["default"] = _default;

package/es/core/Designer/TextEditModal/ToolBar/ToolBtn/components/AlignPicker/images/AlignLeftSVG.js

@@ -1,27 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var _default = function _default(_a) {
-  var onChange = _a.onChange;
-  return /*#__PURE__*/_react["default"].createElement("svg", {
-    id: "ne-t-alignment-left",
-    onClick: onChange,
-    viewBox: "0 0 256 256",
-    xmlns: "http://www.w3.org/2000/svg"
-  }, /*#__PURE__*/_react["default"].createElement("g", {
-    fill: "currentColor",
-    fillRule: "nonzero"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M143 148c5.523 0 10 4.477 10 10 0 5.43-4.327 9.848-9.72 9.996L143 168H38c-5.523 0-10-4.477-10-10 0-5.43 4.327-9.848 9.72-9.996L38 148h105ZM218 89c5.523 0 10 4.477 10 10 0 5.43-4.327 9.848-9.72 9.996L218 109H38c-5.523 0-10-4.477-10-10 0-5.43 4.327-9.848 9.72-9.996L38 89h180ZM143 30c5.523 0 10 4.477 10 10 0 5.43-4.327 9.848-9.72 9.996L143 50H38c-5.523 0-10-4.477-10-10 0-5.43 4.327-9.848 9.72-9.996L38 30h105ZM218 207c5.523 0 10 4.477 10 10 0 5.43-4.327 9.848-9.72 9.996L218 227H38c-5.523 0-10-4.477-10-10 0-5.43 4.327-9.848 9.72-9.996L38 207h180Z"
-  })));
-};
-
-exports["default"] = _default;

package/es/core/Designer/TextEditModal/ToolBar/ToolBtn/components/AlignPicker/images/AlignRightSVG.js

@@ -1,27 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var _default = function _default(_a) {
-  var onChange = _a.onChange;
-  return /*#__PURE__*/_react["default"].createElement("svg", {
-    id: "ne-t-alignment-right",
-    onClick: onChange,
-    viewBox: "0 0 256 256",
-    xmlns: "http://www.w3.org/2000/svg"
-  }, /*#__PURE__*/_react["default"].createElement("g", {
-    fill: "currentColor",
-    fillRule: "nonzero"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M218 148c5.523 0 10 4.477 10 10 0 5.43-4.327 9.848-9.72 9.996L218 168H113c-5.523 0-10-4.477-10-10 0-5.43 4.327-9.848 9.72-9.996L113 148h105ZM218 89c5.523 0 10 4.477 10 10 0 5.43-4.327 9.848-9.72 9.996L218 109H38c-5.523 0-10-4.477-10-10 0-5.43 4.327-9.848 9.72-9.996L38 89h180ZM218 30c5.523 0 10 4.477 10 10 0 5.43-4.327 9.848-9.72 9.996L218 50H113c-5.523 0-10-4.477-10-10 0-5.43 4.327-9.848 9.72-9.996L113 30h105ZM218 207c5.523 0 10 4.477 10 10 0 5.43-4.327 9.848-9.72 9.996L218 227H38c-5.523 0-10-4.477-10-10 0-5.43 4.327-9.848 9.72-9.996L38 207h180Z"
-  })));
-};
-
-exports["default"] = _default;