@fonixtree/magic-design 2.0.20 → 2.0.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (63) hide show
  1. package/es/assets/fonts/magic-box-iconfont.css +3 -3
  2. package/es/assets/fonts/magic-box-iconfont.css.bak +3 -3
  3. package/es/assets/fonts/magic-box-iconfont.js +1 -1
  4. package/es/assets/fonts/magic-box-iconfont.js.bak +1 -1
  5. package/es/assets/fonts/magic-box-iconfont.ttf +0 -0
  6. package/es/assets/fonts/magic-box-iconfont.woff +0 -0
  7. package/es/assets/fonts/magic-box-iconfont.woff2 +0 -0
  8. package/es/common/LinkModal/FilteredProductModal/index.js +2 -2
  9. package/es/common/LinkModal/ProductDetailPage/index.js +1 -1
  10. package/es/common/ProductModal/index.js +2 -2
  11. package/es/composite-comp/dito/components/Recommend/mobile/index.js +2 -1
  12. package/es/composite-comp/dito/components/Recommend/pc/index.js +2 -1
  13. package/es/core/Designer/AiImageGenerator/History/index.less +2 -0
  14. package/es/core/Designer/AiImageGenerator/index.less +5 -1
  15. package/es/core/Designer/ChatRobot/index.js +10 -2
  16. package/es/core/Designer/TextEditModal/ToolBar/ToolBtn/components/ColorPickerBtn/index.js +8 -2
  17. package/es/core/Designer/TextEditModal/ToolBar/ToolBtn/images/BackgroundSVG.js +27 -0
  18. package/es/core/Designer/TextEditModal/ToolBar/ToolBtn/index.js +7 -0
  19. package/es/core/Designer/TextEditModal/ToolBar/index.js +10 -0
  20. package/es/core/Designer/ToolBarModal/ToolBtn/components/ColorPickerBtn/index.js +12 -2
  21. package/es/core/Designer/ToolBarModal/ToolBtn/images/BackgroundSVG.js +29 -0
  22. package/es/core/Designer/ToolBarModal/ToolBtn/images/UnderlineSVG.js +3 -1
  23. package/es/core/Designer/ToolBarModal/ToolBtn/index.js +12 -0
  24. package/es/core/Designer/ToolBarModal/index.js +85 -24
  25. package/es/meta-comp/components/Text/index.js +8 -10
  26. package/es/meta-comp/config-panels/TextConfig/UnderlineSelect/index.js +108 -0
  27. package/es/meta-comp/config-panels/TextConfig/UnderlineSelect/index.less +26 -0
  28. package/es/meta-comp/config-panels/TextConfig/index.js +9 -30
  29. package/es/meta-comp/config-panels/TextConfig/index.less +0 -23
  30. package/es/utils/androidUtil.js +6 -0
  31. package/lib/assets/fonts/magic-box-iconfont.css +3 -3
  32. package/lib/assets/fonts/magic-box-iconfont.css.bak +3 -3
  33. package/lib/assets/fonts/magic-box-iconfont.js +1 -1
  34. package/lib/assets/fonts/magic-box-iconfont.js.bak +1 -1
  35. package/lib/assets/fonts/magic-box-iconfont.ttf +0 -0
  36. package/lib/assets/fonts/magic-box-iconfont.woff +0 -0
  37. package/lib/assets/fonts/magic-box-iconfont.woff2 +0 -0
  38. package/lib/common/LinkModal/FilteredProductModal/index.js +2 -2
  39. package/lib/common/LinkModal/ProductDetailPage/index.js +1 -1
  40. package/lib/common/ProductModal/index.js +2 -2
  41. package/lib/composite-comp/dito/components/Recommend/mobile/index.js +2 -1
  42. package/lib/composite-comp/dito/components/Recommend/pc/index.js +2 -1
  43. package/lib/core/Designer/AiImageGenerator/History/index.less +2 -0
  44. package/lib/core/Designer/AiImageGenerator/index.less +5 -1
  45. package/lib/core/Designer/ChatRobot/index.js +10 -2
  46. package/lib/core/Designer/TextEditModal/ToolBar/ToolBtn/components/ColorPickerBtn/index.js +8 -2
  47. package/lib/core/Designer/TextEditModal/ToolBar/ToolBtn/images/BackgroundSVG.js +27 -0
  48. package/lib/core/Designer/TextEditModal/ToolBar/ToolBtn/index.js +7 -0
  49. package/lib/core/Designer/TextEditModal/ToolBar/index.js +10 -0
  50. package/lib/core/Designer/ToolBarModal/ToolBtn/components/ColorPickerBtn/index.js +12 -2
  51. package/lib/core/Designer/ToolBarModal/ToolBtn/images/BackgroundSVG.js +29 -0
  52. package/lib/core/Designer/ToolBarModal/ToolBtn/images/UnderlineSVG.js +3 -1
  53. package/lib/core/Designer/ToolBarModal/ToolBtn/index.js +12 -0
  54. package/lib/core/Designer/ToolBarModal/index.js +85 -24
  55. package/lib/meta-comp/components/Text/index.js +8 -10
  56. package/lib/meta-comp/config-panels/TextConfig/UnderlineSelect/index.js +108 -0
  57. package/lib/meta-comp/config-panels/TextConfig/UnderlineSelect/index.less +26 -0
  58. package/lib/meta-comp/config-panels/TextConfig/index.js +9 -30
  59. package/lib/meta-comp/config-panels/TextConfig/index.less +0 -23
  60. package/lib/utils/androidUtil.js +6 -0
  61. package/package.json +1 -1
  62. package/es/assets/fonts/.DS_Store +0 -0
  63. package/lib/assets/fonts/.DS_Store +0 -0
@@ -271,7 +271,7 @@ var ProductModal = function ProductModal(props) {
271
271
  productCode = _m[0],
272
272
  setProductCode = _m[1];
273
273
 
274
- var _o = (0, _react.useState)([]),
274
+ var _o = (0, _react.useState)(window.magicDesign.storeId ? [window.magicDesign.storeId] : []),
275
275
  storeId = _o[0],
276
276
  setStoreId = _o[1];
277
277
 
@@ -491,7 +491,7 @@ var ProductModal = function ProductModal(props) {
491
491
  setSelCatgsList([]);
492
492
  setSelLabelData([]);
493
493
  setProductName('');
494
- setStoreId([]);
494
+ setStoreId(window.magicDesign.storeId ? [window.magicDesign.storeId] : []);
495
495
  setProductCode('');
496
496
  setMinPrice('');
497
497
  setMaxPrice('');
@@ -384,7 +384,8 @@ function (_super) {
384
384
  sortType: '1',
385
385
  intelligentType: intelligentType,
386
386
  intelligentValue: intelligentValue.join(','),
387
- aggregation: false
387
+ aggregation: false,
388
+ storeId: window.magicDesign.storeId || ''
388
389
  }, 'POST')];
389
390
 
390
391
  case 4:
@@ -379,7 +379,8 @@ function (_super) {
379
379
  sortType: '1',
380
380
  intelligentType: intelligentType,
381
381
  intelligentValue: intelligentValue.join(','),
382
- aggregation: false
382
+ aggregation: false,
383
+ storeId: window.magicDesign.storeId || ''
383
384
  }, 'POST')];
384
385
 
385
386
  case 4:
@@ -31,6 +31,8 @@
31
31
  background-color: #FFF;
32
32
  border-radius: 50%;
33
33
  display: flex;
34
+ width: 18px;
35
+ height: 18px;
34
36
  align-items: center;
35
37
  justify-content: center;
36
38
  }
@@ -82,9 +82,13 @@
82
82
  top: 12px;
83
83
  right: 12px;
84
84
  border-radius: 50%;
85
- height: 22px;
85
+ height: 19px;
86
+ width: 19px;
86
87
  display: flex;
88
+ justify-content: center;
89
+ align-items: center;
87
90
  background: #FFF;
91
+
88
92
  }
89
93
  }
90
94
  .noDataWrap {
@@ -149,7 +149,7 @@ function (_super) {
149
149
  };
150
150
 
151
151
  _this.copyToClipboard = function (text) {
152
- navigator.clipboard.writeText(text);
152
+ (0, _commonUtil.copy2ClipBoard)(text);
153
153
  };
154
154
 
155
155
  _this.chatGpt = new _FonixtreeGpt["default"]({
@@ -277,7 +277,15 @@ function (_super) {
277
277
  }, /*#__PURE__*/_react["default"].createElement("div", {
278
278
  className: "content_wrap markdown-body",
279
279
  id: "content_wrap"
280
- }, context.length > 0 && context.map(function (ctxNode) {
280
+ }, /*#__PURE__*/_react["default"].createElement("div", {
281
+ className: (0, _classnames["default"])('messageOuterWrap', {
282
+ assistantMessage: true
283
+ })
284
+ }, /*#__PURE__*/_react["default"].createElement("div", {
285
+ className: "messageWrap"
286
+ }, /*#__PURE__*/_react["default"].createElement("div", {
287
+ className: "messageContentWrap"
288
+ }, "What would like to create?"))), context.length > 0 && context.map(function (ctxNode) {
281
289
  return /*#__PURE__*/_react["default"].createElement("div", {
282
290
  className: (0, _classnames["default"])('messageOuterWrap', {
283
291
  userMessage: ctxNode.role === 'user',
@@ -11,6 +11,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
11
11
 
12
12
  var _FontColorSVG = _interopRequireDefault(require("../../images/FontColorSVG"));
13
13
 
14
+ var _BackgroundSVG = _interopRequireDefault(require("../../images/BackgroundSVG"));
15
+
14
16
  var _ColorPicker = _interopRequireDefault(require("../../../../../../../common/ColorPicker"));
15
17
 
16
18
  require("./index.less");
@@ -62,7 +64,9 @@ function (_super) {
62
64
 
63
65
  var _a = this.props,
64
66
  value = _a.value,
65
- onChange = _a.onChange;
67
+ onChange = _a.onChange,
68
+ _b = _a.type,
69
+ type = _b === void 0 ? 'color' : _b;
66
70
  var visibility = this.state.visibility;
67
71
  var color = value === null || value === void 0 ? void 0 : value.color;
68
72
  return /*#__PURE__*/_react["default"].createElement("div", {
@@ -72,7 +76,9 @@ function (_super) {
72
76
  visibility: !visibility
73
77
  });
74
78
  }
75
- }, /*#__PURE__*/_react["default"].createElement(_FontColorSVG["default"], {
79
+ }, type == 'color' ? /*#__PURE__*/_react["default"].createElement(_FontColorSVG["default"], {
80
+ color: color || '#262626'
81
+ }) : /*#__PURE__*/_react["default"].createElement(_BackgroundSVG["default"], {
76
82
  color: color || '#262626'
77
83
  }), /*#__PURE__*/_react["default"].createElement(_ColorPicker["default"], {
78
84
  color: color,
@@ -0,0 +1,27 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports["default"] = void 0;
7
+
8
+ var _react = _interopRequireDefault(require("react"));
9
+
10
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
11
+
12
+ var _default = function _default(_a) {
13
+ var onChange = _a.onChange;
14
+ return /*#__PURE__*/_react["default"].createElement("svg", {
15
+ fill: "none",
16
+ onClick: onChange,
17
+ viewBox: "0 0 256 256",
18
+ xmlns: "http://www.w3.org/2000/svg"
19
+ }, /*#__PURE__*/_react["default"].createElement("path", {
20
+ clipRule: "evenodd",
21
+ d: "M3.375 2.25H14.625C14.9234 2.25 15.2095 2.36853 15.4205 2.5795C15.6315 2.79048 15.75 3.07663 15.75 3.375V14.625C15.75 14.9234 15.6315 15.2095 15.4205 15.4205C15.2095 15.6315 14.9234 15.75 14.625 15.75H3.375C3.07663 15.75 2.79048 15.6315 2.5795 15.4205C2.36853 15.2095 2.25 14.9234 2.25 14.625V3.375C2.25 3.07663 2.36853 2.79048 2.5795 2.5795C2.79048 2.36853 3.07663 2.25 3.375 2.25ZM9.00012 4.5C9.21318 4.5 9.40796 4.62038 9.50324 4.81094L12.3142 10.4328L12.3177 10.4398L13.4407 12.6859C13.5797 12.9638 13.467 13.3017 13.1892 13.4406C12.9113 13.5795 12.5734 13.4669 12.4345 13.1891L11.465 11.25H6.53527L5.56574 13.1891C5.42681 13.4669 5.08893 13.5795 4.81107 13.4406C4.5332 13.3017 4.42058 12.9638 4.55951 12.6859L5.67705 10.4509C5.68161 10.441 5.68644 10.4314 5.69153 10.4219L8.49701 4.81094C8.59229 4.62038 8.78706 4.5 9.00012 4.5ZM9.00012 6.32029L10.9025 10.125L7.09777 10.125L9.00012 6.32029Z",
22
+ fill: "#232F46",
23
+ fillRule: "evenodd"
24
+ }));
25
+ };
26
+
27
+ exports["default"] = _default;
@@ -31,6 +31,8 @@ require("./index.less");
31
31
 
32
32
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
33
33
 
34
+ function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
35
+
34
36
  var __extends = void 0 && (void 0).__extends || function () {
35
37
  var _extendStatics = function extendStatics(d, b) {
36
38
  _extendStatics = Object.setPrototypeOf || {
@@ -63,6 +65,11 @@ var iconTypeMap = {
63
65
  strike: _StrikeSVG["default"],
64
66
  underline: _UnderlineSVG["default"],
65
67
  listOrder: _OrderSVG["default"],
68
+ background: function background(props) {
69
+ return /*#__PURE__*/_react["default"].createElement(_ColorPickerBtn["default"], _extends({
70
+ type: "background"
71
+ }, props));
72
+ },
66
73
  listUnOrder: _UnorderSVG["default"],
67
74
  link: function link(props) {
68
75
  return /*#__PURE__*/_react["default"].createElement(_LinkBtn["default"], props);
@@ -165,6 +165,16 @@ function (_super) {
165
165
  }
166
166
  })), /*#__PURE__*/_react["default"].createElement("div", {
167
167
  className: "tool-item"
168
+ }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
169
+ onChange: function onChange(value) {
170
+ _this.onToolBtnClick('background', value);
171
+ },
172
+ type: "background",
173
+ value: {
174
+ color: quillFormat['background']
175
+ }
176
+ })), /*#__PURE__*/_react["default"].createElement("div", {
177
+ className: "tool-item"
168
178
  }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
169
179
  onChange: function onChange(value) {
170
180
  _this.onToolBtnClick('align', value);
@@ -11,6 +11,10 @@ var _classnames = _interopRequireDefault(require("classnames"));
11
11
 
12
12
  var _FontColorSVG = _interopRequireDefault(require("../../images/FontColorSVG"));
13
13
 
14
+ var _BackgroundSVG = _interopRequireDefault(require("../../images/BackgroundSVG"));
15
+
16
+ var _UnderlineSVG = _interopRequireDefault(require("../../images/UnderlineSVG"));
17
+
14
18
  var _ColorPicker = _interopRequireDefault(require("../../../../../../common/ColorPicker"));
15
19
 
16
20
  require("./index.less");
@@ -62,7 +66,9 @@ function (_super) {
62
66
 
63
67
  var _a = this.props,
64
68
  value = _a.value,
65
- onChange = _a.onChange;
69
+ onChange = _a.onChange,
70
+ _b = _a.type,
71
+ type = _b === void 0 ? 'color' : _b;
66
72
  var visibility = this.state.visibility;
67
73
  var color = value === null || value === void 0 ? void 0 : value.color;
68
74
  return /*#__PURE__*/_react["default"].createElement("div", {
@@ -72,7 +78,11 @@ function (_super) {
72
78
  visibility: !visibility
73
79
  });
74
80
  }
75
- }, /*#__PURE__*/_react["default"].createElement(_FontColorSVG["default"], {
81
+ }, type == 'color' && /*#__PURE__*/_react["default"].createElement(_FontColorSVG["default"], {
82
+ color: color || '#262626'
83
+ }), type == 'background' && /*#__PURE__*/_react["default"].createElement(_BackgroundSVG["default"], {
84
+ color: color || '#262626'
85
+ }), type == 'text-decoration-color' && /*#__PURE__*/_react["default"].createElement(_UnderlineSVG["default"], {
76
86
  color: color || '#262626'
77
87
  }), /*#__PURE__*/_react["default"].createElement(_ColorPicker["default"], {
78
88
  color: color,
@@ -0,0 +1,29 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports["default"] = void 0;
7
+
8
+ var _react = _interopRequireDefault(require("react"));
9
+
10
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
11
+
12
+ var _default = function _default(_a) {
13
+ var onChange = _a.onChange,
14
+ _b = _a.color,
15
+ color = _b === void 0 ? 'currentColor' : _b;
16
+ return /*#__PURE__*/_react["default"].createElement("svg", {
17
+ fill: "none",
18
+ onClick: onChange,
19
+ viewBox: "0 0 18 18",
20
+ xmlns: "http://www.w3.org/2000/svg"
21
+ }, /*#__PURE__*/_react["default"].createElement("path", {
22
+ clipRule: "evenodd",
23
+ d: "M3.375 2.25H14.625C14.9234 2.25 15.2095 2.36853 15.4205 2.5795C15.6315 2.79048 15.75 3.07663 15.75 3.375V14.625C15.75 14.9234 15.6315 15.2095 15.4205 15.4205C15.2095 15.6315 14.9234 15.75 14.625 15.75H3.375C3.07663 15.75 2.79048 15.6315 2.5795 15.4205C2.36853 15.2095 2.25 14.9234 2.25 14.625V3.375C2.25 3.07663 2.36853 2.79048 2.5795 2.5795C2.79048 2.36853 3.07663 2.25 3.375 2.25ZM9.00012 4.5C9.21318 4.5 9.40796 4.62038 9.50324 4.81094L12.3142 10.4328L12.3177 10.4398L13.4407 12.6859C13.5797 12.9638 13.467 13.3017 13.1892 13.4406C12.9113 13.5795 12.5734 13.4669 12.4345 13.1891L11.465 11.25H6.53527L5.56574 13.1891C5.42681 13.4669 5.08893 13.5795 4.81107 13.4406C4.5332 13.3017 4.42058 12.9638 4.55951 12.6859L5.67705 10.4509C5.68161 10.441 5.68644 10.4314 5.69153 10.4219L8.49701 4.81094C8.59229 4.62038 8.78706 4.5 9.00012 4.5ZM9.00012 6.32029L10.9025 10.125L7.09777 10.125L9.00012 6.32029Z",
24
+ fill: color,
25
+ fillRule: "evenodd"
26
+ }));
27
+ };
28
+
29
+ exports["default"] = _default;
@@ -10,7 +10,8 @@ var _react = _interopRequireDefault(require("react"));
10
10
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
11
11
 
12
12
  var _default = function _default(_a) {
13
- var onChange = _a.onChange;
13
+ var onChange = _a.onChange,
14
+ color = _a.color;
14
15
  return /*#__PURE__*/_react["default"].createElement("svg", {
15
16
  id: "ne-t-underline",
16
17
  onClick: onChange,
@@ -23,6 +24,7 @@ var _default = function _default(_a) {
23
24
  d: "M184 24c5.43 0 9.848 4.327 9.996 9.72L194 34v94.393C194 161.1 164.16 187 128 187c-35.8 0-65.403-25.385-65.991-57.628l-.009-.98V34c0-5.523 4.477-10 10-10 5.43 0 9.848 4.327 9.996 9.72L82 34v94.393C82 149.375 102.305 167 128 167c25.438 0 45.593-17.274 45.994-37.979l.006-.628V34c0-5.523 4.477-10 10-10Z",
24
25
  fillRule: "nonzero"
25
26
  }), /*#__PURE__*/_react["default"].createElement("rect", {
27
+ fill: color,
26
28
  height: "22",
27
29
  rx: "11",
28
30
  width: "176",
@@ -31,6 +31,8 @@ require("./index.less");
31
31
 
32
32
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
33
33
 
34
+ function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
35
+
34
36
  var __extends = void 0 && (void 0).__extends || function () {
35
37
  var _extendStatics = function extendStatics(d, b) {
36
38
  _extendStatics = Object.setPrototypeOf || {
@@ -64,6 +66,11 @@ var iconTypeMap = {
64
66
  underline: _UnderlineSVG["default"],
65
67
  listOrder: _OrderSVG["default"],
66
68
  listUnOrder: _UnorderSVG["default"],
69
+ background: function background(props) {
70
+ return /*#__PURE__*/_react["default"].createElement(_ColorPickerBtn["default"], _extends({
71
+ type: "background"
72
+ }, props));
73
+ },
67
74
  link: function link(props) {
68
75
  return /*#__PURE__*/_react["default"].createElement(_LinkBtn["default"], props);
69
76
  },
@@ -72,6 +79,11 @@ var iconTypeMap = {
72
79
  },
73
80
  align: function align(props) {
74
81
  return /*#__PURE__*/_react["default"].createElement(_AlignPicker["default"], props);
82
+ },
83
+ 'text-decoration-color': function textDecorationColor(props) {
84
+ return /*#__PURE__*/_react["default"].createElement(_ColorPickerBtn["default"], _extends({
85
+ type: "text-decoration-color"
86
+ }, props));
75
87
  }
76
88
  };
77
89
 
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.fontSizeList = exports.fontFamilyList = exports["default"] = void 0;
6
+ exports.fontWeightList = exports.fontSizeList = exports.fontFamilyList = exports["default"] = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
@@ -13,6 +13,8 @@ var _ToolBtn = _interopRequireDefault(require("./ToolBtn"));
13
13
 
14
14
  var _coreUtil = require("../../../utils/coreUtil");
15
15
 
16
+ var _UnderlineSelect = _interopRequireDefault(require("../../../meta-comp/config-panels/TextConfig/UnderlineSelect"));
17
+
16
18
  require("./index.less");
17
19
 
18
20
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -48,17 +50,25 @@ exports.fontSizeList = fontSizeList;
48
50
  var fontFamilyList = [{
49
51
  name: 'Montserrat',
50
52
  value: 'Montserrat'
51
- }, {
52
- name: 'Montserrat Bold',
53
- value: 'MontserratBold'
54
53
  }, {
55
54
  name: 'Open Sans',
56
55
  value: 'OpenSans'
57
- }, {
58
- name: 'Open Sans Bold',
59
- value: 'OpenSansBold'
60
56
  }];
61
57
  exports.fontFamilyList = fontFamilyList;
58
+ var fontWeightList = [{
59
+ name: 'Regular',
60
+ value: '400'
61
+ }, {
62
+ name: 'Medium',
63
+ value: '500'
64
+ }, {
65
+ name: 'Semibold',
66
+ value: '600'
67
+ }, {
68
+ name: 'Bold',
69
+ value: '700'
70
+ }];
71
+ exports.fontWeightList = fontWeightList;
62
72
 
63
73
  var ToolBarModal =
64
74
  /** @class */
@@ -102,6 +112,7 @@ function (_super) {
102
112
  };
103
113
 
104
114
  _this.onToolBtnClick = function (type, value) {
115
+ console.log('type: ', type, value);
105
116
  window._maginc_clickUrl = _coreUtil.clickUrl;
106
117
  var quillFormat = _this.state.quillFormat;
107
118
 
@@ -115,6 +126,8 @@ function (_super) {
115
126
  _this.props.quillRef.format('underline', !quillFormat['underline']);
116
127
  } else if (type == 'color') {
117
128
  _this.props.quillRef.format('color', value);
129
+ } else if (type == 'background') {
130
+ _this.props.quillRef.format('background', value);
118
131
  } else if (type == 'align') {
119
132
  _this.props.quillRef.format('align', value);
120
133
  } else if (type == 'listOrder') {
@@ -126,13 +139,27 @@ function (_super) {
126
139
 
127
140
  _this.props.quillRef.format('list', currentListType == 'bullet' ? '' : 'bullet');
128
141
  } else if (type == 'link') {
129
- console.log('link value: ', value);
130
-
131
142
  _this.props.quillRef.format('link', JSON.stringify(value));
132
143
  } else if (type == 'size') {
133
144
  _this.props.quillRef.format('size', value + 'px');
134
145
  } else if (type == 'font') {
135
146
  _this.props.quillRef.format('font', value);
147
+ } else if (type == 'font-weight') {
148
+ _this.props.quillRef.format('font-weight', value);
149
+ } else if (type == 'font-family') {
150
+ _this.props.quillRef.format('font-family', value);
151
+ } else if (type == 'text-decoration-style') {
152
+ _this.props.quillRef.format('text-decoration-style', value);
153
+ } else if (type == 'text-decoration-color') {
154
+ if (value) {
155
+ _this.props.quillRef.format('underline', true);
156
+ } else {
157
+ _this.props.quillRef.format('underline', false);
158
+
159
+ _this.props.quillRef.format('text-decoration-style', '');
160
+ }
161
+
162
+ _this.props.quillRef.format('text-decoration-color', value);
136
163
  }
137
164
 
138
165
  _this.onSelectionChange();
@@ -169,14 +196,14 @@ function (_super) {
169
196
  className: "tool-item"
170
197
  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
171
198
  onChange: function onChange(v) {
172
- _this.onToolBtnClick('font', v);
199
+ _this.onToolBtnClick('font-family', v);
173
200
  },
174
201
  placeholder: "Font Family",
175
202
  size: "small",
176
203
  style: {
177
204
  width: '150px'
178
205
  },
179
- value: quillFormat['font']
206
+ value: quillFormat['font-family']
180
207
  }, fontFamilyList.map(function (v) {
181
208
  return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
182
209
  label: v.name,
@@ -184,6 +211,23 @@ function (_super) {
184
211
  }, v.name);
185
212
  }))), /*#__PURE__*/_react["default"].createElement("div", {
186
213
  className: "tool-item"
214
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
215
+ onChange: function onChange(v) {
216
+ _this.onToolBtnClick('font-weight', v);
217
+ },
218
+ placeholder: "Font Weight",
219
+ size: "small",
220
+ style: {
221
+ width: '150px'
222
+ },
223
+ value: quillFormat['font-weight']
224
+ }, fontWeightList.map(function (v) {
225
+ return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
226
+ label: v.name,
227
+ value: v.value
228
+ }, v.name);
229
+ }))), /*#__PURE__*/_react["default"].createElement("div", {
230
+ className: "tool-item"
187
231
  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
188
232
  onChange: function onChange(v) {
189
233
  _this.onToolBtnClick('size', v);
@@ -199,17 +243,22 @@ function (_super) {
199
243
  label: v.name,
200
244
  value: v
201
245
  }, v, "px");
202
- })))), /*#__PURE__*/_react["default"].createElement("div", {
203
- className: "toolbar-row"
204
- }, /*#__PURE__*/_react["default"].createElement("div", {
246
+ }))), /*#__PURE__*/_react["default"].createElement("div", {
205
247
  className: "tool-item"
206
- }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
207
- active: quillFormat['bold'],
208
- onChange: function onChange() {
209
- _this.onToolBtnClick('bold');
248
+ }, /*#__PURE__*/_react["default"].createElement(_UnderlineSelect["default"], {
249
+ onChange: function onChange(v) {
250
+ _this.onToolBtnClick('text-decoration-style', v);
210
251
  },
211
- type: "bold"
212
- })), /*#__PURE__*/_react["default"].createElement("div", {
252
+ placeholder: "Underline Style",
253
+ repeatCount: 28,
254
+ size: "small",
255
+ style: {
256
+ width: '140px'
257
+ },
258
+ value: quillFormat['text-decoration-style']
259
+ }))), /*#__PURE__*/_react["default"].createElement("div", {
260
+ className: "toolbar-row"
261
+ }, /*#__PURE__*/_react["default"].createElement("div", {
213
262
  className: "tool-item"
214
263
  }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
215
264
  active: quillFormat['italic'],
@@ -228,11 +277,13 @@ function (_super) {
228
277
  })), /*#__PURE__*/_react["default"].createElement("div", {
229
278
  className: "tool-item"
230
279
  }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
231
- active: quillFormat['underline'],
232
- onChange: function onChange() {
233
- _this.onToolBtnClick('underline');
280
+ onChange: function onChange(value) {
281
+ _this.onToolBtnClick('text-decoration-color', value);
234
282
  },
235
- type: "underline"
283
+ type: "text-decoration-color",
284
+ value: {
285
+ color: quillFormat['text-decoration-color']
286
+ }
236
287
  })), /*#__PURE__*/_react["default"].createElement("div", {
237
288
  className: "tooll-line"
238
289
  }), /*#__PURE__*/_react["default"].createElement("div", {
@@ -247,6 +298,16 @@ function (_super) {
247
298
  }
248
299
  })), /*#__PURE__*/_react["default"].createElement("div", {
249
300
  className: "tool-item"
301
+ }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
302
+ onChange: function onChange(value) {
303
+ _this.onToolBtnClick('background', value);
304
+ },
305
+ type: "background",
306
+ value: {
307
+ color: quillFormat['background']
308
+ }
309
+ })), /*#__PURE__*/_react["default"].createElement("div", {
310
+ className: "tool-item"
250
311
  }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
251
312
  active: quillFormat['list'] == 'bullet',
252
313
  onChange: function onChange() {
@@ -11,6 +11,14 @@ var _classnames = _interopRequireDefault(require("classnames"));
11
11
 
12
12
  var _quill = _interopRequireDefault(require("quill"));
13
13
 
14
+ require("./formats/fontWeight");
15
+
16
+ require("./formats/fontFamily");
17
+
18
+ require("./formats/textDecorationColor");
19
+
20
+ require("./formats/textDecorationStyle");
21
+
14
22
  var _decorator = require("../../../decorator");
15
23
 
16
24
  var _coreUtil = require("../../../utils/coreUtil");
@@ -19,8 +27,6 @@ var _commonUtil = require("../../../utils/commonUtil");
19
27
 
20
28
  var _mobx = require("../../../mobx");
21
29
 
22
- var _ToolBarModal = require("../../../core/Designer/ToolBarModal");
23
-
24
30
  require("./index.less");
25
31
 
26
32
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -101,14 +107,6 @@ sizeStyle.whitelist = null;
101
107
 
102
108
  _quill["default"].register(sizeStyle, true);
103
109
 
104
- var fonts = _quill["default"]["import"]('formats/font');
105
-
106
- fonts.whitelist = _ToolBarModal.fontFamilyList.map(function (item) {
107
- return item.value;
108
- });
109
-
110
- _quill["default"].register(fonts, true);
111
-
112
110
  var contentStyle = function contentStyle(content) {
113
111
  return {
114
112
  fontSize: window.magicDesign.device == 'pc' ? content.pcFontSize : content.fontSize,
@@ -0,0 +1,108 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports["default"] = void 0;
7
+
8
+ var _antd = require("antd");
9
+
10
+ var _react = _interopRequireDefault(require("react"));
11
+
12
+ require("./index.less");
13
+
14
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
15
+
16
+ function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
17
+
18
+ var __extends = void 0 && (void 0).__extends || function () {
19
+ var _extendStatics = function extendStatics(d, b) {
20
+ _extendStatics = Object.setPrototypeOf || {
21
+ __proto__: []
22
+ } instanceof Array && function (d, b) {
23
+ d.__proto__ = b;
24
+ } || function (d, b) {
25
+ for (var p in b) {
26
+ if (b.hasOwnProperty(p)) d[p] = b[p];
27
+ }
28
+ };
29
+
30
+ return _extendStatics(d, b);
31
+ };
32
+
33
+ return function (d, b) {
34
+ _extendStatics(d, b);
35
+
36
+ function __() {
37
+ this.constructor = d;
38
+ }
39
+
40
+ d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
41
+ };
42
+ }();
43
+ /* eslint-disable react/no-danger */
44
+
45
+
46
+ var UnderlineSelect =
47
+ /** @class */
48
+ function (_super) {
49
+ __extends(UnderlineSelect, _super);
50
+
51
+ function UnderlineSelect() {
52
+ var _this = _super !== null && _super.apply(this, arguments) || this;
53
+
54
+ _this.containerRef = /*#__PURE__*/_react["default"].createRef();
55
+ return _this;
56
+ }
57
+
58
+ UnderlineSelect.prototype.render = function () {
59
+ var _this = this;
60
+
61
+ var _a = this.props.repeatCount,
62
+ repeatCount = _a === void 0 ? 50 : _a;
63
+ return /*#__PURE__*/_react["default"].createElement("div", {
64
+ ref: this.containerRef,
65
+ className: "underline-select-wrap"
66
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Select, _extends({
67
+ getPopupContainer: function getPopupContainer() {
68
+ return _this.containerRef.current;
69
+ }
70
+ }, this.props), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
71
+ value: "solid"
72
+ }, /*#__PURE__*/_react["default"].createElement("div", {
73
+ className: "line-config line-solid",
74
+ dangerouslySetInnerHTML: {
75
+ __html: '&nbsp;'.repeat(repeatCount)
76
+ }
77
+ })), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
78
+ value: "dashed"
79
+ }, /*#__PURE__*/_react["default"].createElement("div", {
80
+ className: "line-config dashed-line",
81
+ dangerouslySetInnerHTML: {
82
+ __html: '&nbsp;'.repeat(repeatCount)
83
+ }
84
+ })), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
85
+ value: "double"
86
+ }, /*#__PURE__*/_react["default"].createElement("div", {
87
+ className: "line-config double-line",
88
+ dangerouslySetInnerHTML: {
89
+ __html: '&nbsp;'.repeat(repeatCount)
90
+ }
91
+ })), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
92
+ value: "wavy"
93
+ }, /*#__PURE__*/_react["default"].createElement("div", {
94
+ className: "line-config wavy-line",
95
+ dangerouslySetInnerHTML: {
96
+ __html: '&nbsp;'.repeat(repeatCount)
97
+ }
98
+ }))));
99
+ };
100
+
101
+ UnderlineSelect.defaultProps = {
102
+ repeatCount: 50
103
+ };
104
+ return UnderlineSelect;
105
+ }(_react["default"].Component);
106
+
107
+ var _default = UnderlineSelect;
108
+ exports["default"] = _default;