@fonixtree/magic-design 1.0.165 → 1.0.167

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 (43) hide show
  1. package/es/assets/fonts/AvenirNext-Bold.ttf +0 -0
  2. package/es/assets/fonts/AvenirNext-DemiBold.ttf +0 -0
  3. package/es/assets/fonts/AvenirNext-Medium.ttf +0 -0
  4. package/es/assets/fonts/AvenirNext-Regular.ttf +0 -0
  5. package/es/assets/less/font.less +29 -0
  6. package/es/composite-comp/bol/config-panels/NewsletterConfig/InputField/index.js +14 -10
  7. package/es/composite-comp/dito/components/GroupedCarousel/defaultJSON.js +0 -7
  8. package/es/composite-comp/dito/components/News/defaultJSON.js +0 -4
  9. package/es/composite-comp/dito/components/Recommend/mobile/index.js +36 -14
  10. package/es/composite-comp/dito/components/SearchDITO/defaultJSON.js +0 -1
  11. package/es/composite-comp/dito/components/SlideImage/defaultJSON.js +0 -1
  12. package/es/composite-comp/dito/config-panels/PcNavigationConfig/TextOnlyFontConfig/index.js +14 -10
  13. package/es/constants/index.js +34 -1
  14. package/es/core/Designer/ToolBarModal/index.js +5 -39
  15. package/es/core/Renderer/index.js +4 -2
  16. package/es/locale/en/en.json +1 -1
  17. package/es/locale/es/es.json +1 -1
  18. package/es/locale/id/id.json +1 -1
  19. package/es/meta-comp/config-panels/ButtonConfig/index.js +14 -10
  20. package/es/meta-comp/config-panels/TextConfig/index.js +14 -14
  21. package/es/utils/commonUtil.js +15 -5
  22. package/lib/assets/fonts/AvenirNext-Bold.ttf +0 -0
  23. package/lib/assets/fonts/AvenirNext-DemiBold.ttf +0 -0
  24. package/lib/assets/fonts/AvenirNext-Medium.ttf +0 -0
  25. package/lib/assets/fonts/AvenirNext-Regular.ttf +0 -0
  26. package/lib/assets/less/font.less +29 -0
  27. package/lib/composite-comp/bol/config-panels/NewsletterConfig/InputField/index.js +14 -10
  28. package/lib/composite-comp/dito/components/GroupedCarousel/defaultJSON.js +0 -7
  29. package/lib/composite-comp/dito/components/News/defaultJSON.js +0 -4
  30. package/lib/composite-comp/dito/components/Recommend/mobile/index.js +36 -14
  31. package/lib/composite-comp/dito/components/SearchDITO/defaultJSON.js +0 -1
  32. package/lib/composite-comp/dito/components/SlideImage/defaultJSON.js +0 -1
  33. package/lib/composite-comp/dito/config-panels/PcNavigationConfig/TextOnlyFontConfig/index.js +14 -10
  34. package/lib/constants/index.js +34 -1
  35. package/lib/core/Designer/ToolBarModal/index.js +5 -39
  36. package/lib/core/Renderer/index.js +4 -2
  37. package/lib/locale/en/en.json +1 -1
  38. package/lib/locale/es/es.json +1 -1
  39. package/lib/locale/id/id.json +1 -1
  40. package/lib/meta-comp/config-panels/ButtonConfig/index.js +14 -10
  41. package/lib/meta-comp/config-panels/TextConfig/index.js +14 -14
  42. package/lib/utils/commonUtil.js +15 -5
  43. package/package.json +1 -1
@@ -67,4 +67,33 @@
67
67
  font-weight: 600;
68
68
  font-style: normal;
69
69
  font-display: swap;
70
+ }
71
+
72
+
73
+ @font-face {
74
+ font-family: 'AvenirNext';
75
+ src: url('../fonts/AvenirNext-Regular.ttf');
76
+ font-weight: 400;
77
+ font-style: normal;
78
+ }
79
+
80
+ @font-face {
81
+ font-family: 'AvenirNext';
82
+ src: url('../fonts/AvenirNext-Medium.ttf');
83
+ font-weight: 500;
84
+ font-style: normal;
85
+ }
86
+
87
+ @font-face {
88
+ font-family: 'AvenirNext';
89
+ src: url(../fonts/AvenirNext-DemiBold.ttf);
90
+ font-weight: 600;
91
+ font-style: normal;
92
+ }
93
+
94
+ @font-face {
95
+ font-family: 'AvenirNext';
96
+ src: url(../fonts/AvenirNext-Bold.ttf);
97
+ font-weight: 700;
98
+ font-style: normal;
70
99
  }
@@ -19,6 +19,8 @@ var _TextConfig = require("../../../../../meta-comp/config-panels/TextConfig");
19
19
 
20
20
  var _locale = require("../../../../../locale");
21
21
 
22
+ var _constants = require("../../../../../constants");
23
+
22
24
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
23
25
 
24
26
  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); }
@@ -136,11 +138,12 @@ function (_super) {
136
138
  _this.selfRender();
137
139
  },
138
140
  value: textData.fontFamily
139
- }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
140
- value: "Montserrat"
141
- }, "Montserrat"), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
142
- value: "Open Sans"
143
- }, "Open Sans"))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
141
+ }, _constants.fontFamilyList.map(function (v) {
142
+ return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
143
+ label: v.name,
144
+ value: v.value
145
+ }, v.name);
146
+ }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
144
147
  title: (0, _locale.i18n)('FONT_WEIGHT')
145
148
  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
146
149
  onChange: function onChange(v) {
@@ -149,11 +152,12 @@ function (_super) {
149
152
  _this.selfRender();
150
153
  },
151
154
  value: textData.fontWeight
152
- }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
153
- value: 400
154
- }, (0, _locale.i18n)('REGULAR')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
155
- value: 600
156
- }, (0, _locale.i18n)('MEDIUM')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
155
+ }, _constants.fontWeightList.map(function (v) {
156
+ return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
157
+ label: v.name,
158
+ value: v.value
159
+ }, v.name);
160
+ }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
157
161
  title: (0, _locale.i18n)('FONT_SIZE')
158
162
  }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
159
163
  onChange: function onChange(_a) {
@@ -24,7 +24,6 @@ var groupSourceJSON = function groupSourceJSON(parentId, text) {
24
24
  },
25
25
  buttonText: {
26
26
  sizeType: 'Customize font styles',
27
- fontFamily: 'Open Sans',
28
27
  fontWeight: 600,
29
28
  pcFontSize: 14,
30
29
  fontStyle: 'normal',
@@ -84,7 +83,6 @@ var groupSourceJSON = function groupSourceJSON(parentId, text) {
84
83
  text: 'title',
85
84
  content: {
86
85
  sizeType: 'Customize font styles',
87
- fontFamily: 'Open Sans',
88
86
  fontWeight: 700,
89
87
  pcFontSize: 29,
90
88
  color: '#232F46',
@@ -106,7 +104,6 @@ var groupSourceJSON = function groupSourceJSON(parentId, text) {
106
104
  text: 'text',
107
105
  content: {
108
106
  sizeType: 'Customize font styles',
109
- fontFamily: 'Open Sans',
110
107
  fontWeight: 600,
111
108
  pcFontSize: 14,
112
109
  color: '#232F46',
@@ -131,7 +128,6 @@ var groupSourceJSON = function groupSourceJSON(parentId, text) {
131
128
  },
132
129
  buttonText: {
133
130
  sizeType: 'Customize font styles',
134
- fontFamily: 'Open Sans',
135
131
  fontWeight: 600,
136
132
  pcFontSize: 14,
137
133
  fontStyle: 'normal',
@@ -174,7 +170,6 @@ var groupSourceJSON = function groupSourceJSON(parentId, text) {
174
170
  },
175
171
  buttonText: {
176
172
  sizeType: 'Customize font styles',
177
- fontFamily: 'Open Sans',
178
173
  fontWeight: 600,
179
174
  pcFontSize: 14,
180
175
  fontStyle: 'normal',
@@ -219,7 +214,6 @@ var groupSourceJSON = function groupSourceJSON(parentId, text) {
219
214
  },
220
215
  buttonText: {
221
216
  sizeType: 'Customize font styles',
222
- fontFamily: 'Open Sans',
223
217
  fontWeight: 700,
224
218
  pcFontSize: 14,
225
219
  fontStyle: 'normal',
@@ -270,7 +264,6 @@ var getDefaultJSON = function getDefaultJSON() {
270
264
  text: 'Headline',
271
265
  content: {
272
266
  sizeType: 'Customize font styles',
273
- fontFamily: 'Open Sans',
274
267
  fontWeight: 700,
275
268
  pcFontSize: 29,
276
269
  color: '#232F46',
@@ -48,7 +48,6 @@ var groupSourceJSON = function groupSourceJSON() {
48
48
  text: 'MAY 2024',
49
49
  content: {
50
50
  sizeType: 'Customize font styles',
51
- fontFamily: 'Open Sans',
52
51
  fontWeight: 600,
53
52
  pcFontSize: 16,
54
53
  textAlign: 'left',
@@ -70,7 +69,6 @@ var groupSourceJSON = function groupSourceJSON() {
70
69
  text: '7 Work-From-Home Jobs That Benefit From a SG a Internet Connection. 7 Work-From-Home Jobs That Benefit From a SG a Internet Connection',
71
70
  content: {
72
71
  sizeType: 'Customize font styles',
73
- fontFamily: 'Open Sans',
74
72
  fontWeight: 600,
75
73
  pcFontSize: 16,
76
74
  textAlign: 'left',
@@ -103,7 +101,6 @@ var getDefaultJSON = function getDefaultJSON() {
103
101
  text: 'News and Blogs',
104
102
  content: {
105
103
  sizeType: 'Customize font styles',
106
- fontFamily: 'Open Sans',
107
104
  fontWeight: 600,
108
105
  pcFontSize: 26,
109
106
  color: '#232F46',
@@ -128,7 +125,6 @@ var getDefaultJSON = function getDefaultJSON() {
128
125
  text: 'STAY UPDATED WITH OUR LATEST POSTS',
129
126
  content: {
130
127
  sizeType: 'Customize font styles',
131
- fontFamily: 'Open Sans',
132
128
  fontWeight: 600,
133
129
  pcFontSize: 14,
134
130
  color: '#232F46',
@@ -278,17 +278,34 @@ var LAYOUT_IMAGE_SIZE = {
278
278
  */
279
279
 
280
280
  var insertArrayRandomly = function insertArrayRandomly(arr1, arr2) {
281
- // 创建一个复制的第一个数组,以免修改原数组
281
+ if (arr1.length < 1) {
282
+ return [];
283
+ }
284
+
285
+ if (arr1.length < 2) {
286
+ return __spreadArrays(arr1, arr2);
287
+ }
288
+
289
+ if (arr1.length === 2) {
290
+ return __spreadArrays([arr1[0]], arr2, [arr1[1]]);
291
+ }
292
+
293
+ if (arr1.length === 3) {
294
+ return __spreadArrays([arr1[0]], arr2, arr1.splice(1));
295
+ } // 创建一个复制的第一个数组,以免修改原数组
296
+
297
+
282
298
  var result = __spreadArrays(arr1); // 记录已插入元素的位置
283
299
 
284
300
 
285
301
  var insertedIndices = [];
286
302
 
287
303
  var _loop_1 = function _loop_1(i) {
288
- var randomIndex; // 确保生成的随机索引与已插入的索引相隔至少两个位置
304
+ var randomIndex; // 确保生成的随机索引不在首尾,并且与已插入的索引相隔至少两个位置
289
305
 
290
306
  do {
291
- randomIndex = Math.floor(Math.random() * (result.length + 1)); // eslint-disable-next-line no-loop-func
307
+ randomIndex = Math.floor(Math.random() * (result.length - 2)) + 1; // 1 到 result.length - 2
308
+ // eslint-disable-next-line no-loop-func
292
309
  } while (insertedIndices.some(function (index) {
293
310
  return Math.abs(index - randomIndex) < 2;
294
311
  })); // 在随机位置插入第二个数组的元素
@@ -308,10 +325,12 @@ var insertArrayRandomly = function insertArrayRandomly(arr1, arr2) {
308
325
  return result;
309
326
  };
310
327
 
311
- var getRandomItemsAndRemove = function getRandomItemsAndRemove(arr, count) {
328
+ var getRandomItemsAndRemove = function getRandomItemsAndRemove(arr, list) {
329
+ var _count = Math.ceil(list.length / 5);
330
+
312
331
  var result = []; // eslint-disable-next-line no-plusplus
313
332
 
314
- for (var i = 0; i < count && arr.length > 0; i++) {
333
+ for (var i = 0; i < _count && arr.length > 0; i++) {
315
334
  var randomIndex = Math.floor(Math.random() * arr.length);
316
335
  result.push(arr.splice(randomIndex, 1)[0]);
317
336
  }
@@ -379,7 +398,7 @@ function (_super) {
379
398
 
380
399
  _this.getAdvertise = function () {
381
400
  return __awaiter(_this, void 0, void 0, function () {
382
- var res;
401
+ var ad;
383
402
  return __generator(this, function (_a) {
384
403
  switch (_a.label) {
385
404
  case 0:
@@ -388,18 +407,16 @@ function (_super) {
388
407
  , (0, _commonUtil.commonFetch)('/designer/v1/h5/ad/today/valid/MagicDesignRecommendation/list', {}, 'GET')];
389
408
 
390
409
  case 1:
391
- res = _a.sent();
410
+ ad = _a.sent();
392
411
 
393
- if (res === null || res === void 0 ? void 0 : res.length) {
412
+ if (ad === null || ad === void 0 ? void 0 : ad.length) {
394
413
  return [2
395
414
  /*return*/
396
- , res.map(function (it) {
397
- var _a, _b, _c;
398
-
415
+ , ad[0].advertiseContents.map(function (it) {
399
416
  return {
400
417
  type: 'ad',
401
- url: (_b = (_a = it === null || it === void 0 ? void 0 : it.advertiseContents) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.url,
402
- adObj: (_c = it === null || it === void 0 ? void 0 : it.advertiseContents) === null || _c === void 0 ? void 0 : _c[0]
418
+ url: it === null || it === void 0 ? void 0 : it.url,
419
+ adObj: it
403
420
  };
404
421
  })];
405
422
  }
@@ -531,6 +548,9 @@ function (_super) {
531
548
  , 10];
532
549
 
533
550
  case 10:
551
+ if (!window.magicDesign.showRecommendAds) return [3
552
+ /*break*/
553
+ , 12];
534
554
  _h = this;
535
555
  return [4
536
556
  /*yield*/
@@ -538,9 +558,11 @@ function (_super) {
538
558
 
539
559
  case 11:
540
560
  _h.ads = _m.sent();
541
- insertAds = getRandomItemsAndRemove(this.ads, 2);
561
+ insertAds = getRandomItemsAndRemove(this.ads, newData);
542
562
  newData = insertArrayRandomly(newData, insertAds);
563
+ _m.label = 12;
543
564
 
565
+ case 12:
544
566
  if (!(0, _coreUtil.isDesignMode)()) {
545
567
  _cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
546
568
  (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_k = {}, _k["products" + index] = newData, _k.endTime = Date.now() + 3 * 60 * 1000, _k)));
@@ -131,7 +131,6 @@ var getDefaultJSON = function getDefaultJSON() {
131
131
  },
132
132
  buttonText: {
133
133
  sizeType: 'Customize font styles',
134
- fontFamily: 'Open Sans',
135
134
  fontWeight: 500,
136
135
  pcFontSize: 14,
137
136
  fontStyle: 'normal',
@@ -54,7 +54,6 @@ var groupSourceJSON = function groupSourceJSON(parentId) {
54
54
  text: 'Group Name',
55
55
  content: {
56
56
  sizeType: 'Customize font styles',
57
- fontFamily: 'Open Sans',
58
57
  fontWeight: 600,
59
58
  pcFontSize: 22,
60
59
  color: '#232F46',
@@ -21,6 +21,8 @@ var _BaseConfig = _interopRequireDefault(require("../../../../../meta-comp/confi
21
21
 
22
22
  var _locale = require("../../../../../locale");
23
23
 
24
+ var _constants = require("../../../../../constants");
25
+
24
26
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
25
27
 
26
28
  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); }
@@ -162,11 +164,12 @@ function (_super) {
162
164
  _this.selfRender();
163
165
  },
164
166
  value: textData.fontFamily
165
- }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
166
- value: "Montserrat"
167
- }, "Montserrat"), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
168
- value: "Open Sans"
169
- }, "Open Sans"))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
167
+ }, _constants.fontFamilyList.map(function (v) {
168
+ return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
169
+ label: v.name,
170
+ value: v.value
171
+ }, v.name);
172
+ }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
170
173
  title: (0, _locale.i18n)('FONT_WEIGHT')
171
174
  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
172
175
  onChange: function onChange(v) {
@@ -175,11 +178,12 @@ function (_super) {
175
178
  _this.selfRender();
176
179
  },
177
180
  value: textData.fontWeight
178
- }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
179
- value: 400
180
- }, (0, _locale.i18n)('REGULAR')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
181
- value: 600
182
- }, (0, _locale.i18n)('MEDIUM')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
181
+ }, _constants.fontWeightList.map(function (v) {
182
+ return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
183
+ label: v.name,
184
+ value: v.value
185
+ }, v.name);
186
+ }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
183
187
  title: (0, _locale.i18n)('FONT_SIZE')
184
188
  }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
185
189
  onChange: function onChange(_a) {
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.walletType = exports.urlTypeMap = exports.urlType = exports.tempTypeMap = exports.respCodeMap = exports.quickMenuCode = exports.personalInfoType = exports.partyTypeMap = exports.orderStatusType = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.STORE_KEY = exports.STORAGE_KEY = exports.CREDIT_STATE = void 0;
6
+ exports.walletType = exports.urlTypeMap = exports.urlType = exports.tempTypeMap = exports.respCodeMap = exports.quickMenuCode = exports.personalInfoType = exports.partyTypeMap = exports.orderStatusType = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.fontWeightList = exports.fontFamilyList = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.STORE_KEY = exports.STORAGE_KEY = exports.CREDIT_STATE = void 0;
7
7
  var STORAGE_KEY = {
8
8
  LOCALE: 'magicLocale',
9
9
  MAGIC_RENDER_HTML: 'MAGIC_RENDER_HTML',
@@ -60,6 +60,39 @@ var personalInfoType = {
60
60
  VIEWED: 'Recently Viewed'
61
61
  };
62
62
  exports.personalInfoType = personalInfoType;
63
+ var fontFamilyList = [{
64
+ name: 'Montserrat',
65
+ value: 'Montserrat'
66
+ }, {
67
+ name: 'Open Sans',
68
+ value: 'Open Sans'
69
+ }, {
70
+ name: 'Avenir Next',
71
+ value: 'AvenirNext'
72
+ }, {
73
+ name: 'Default',
74
+ value: ''
75
+ }];
76
+ exports.fontFamilyList = fontFamilyList;
77
+ var fontWeightList = [{
78
+ name: 'Regular',
79
+ value: 400
80
+ }, {
81
+ name: 'Medium',
82
+ value: 500
83
+ }, {
84
+ name: 'Semibold',
85
+ value: 600
86
+ }, {
87
+ name: 'Bold',
88
+ value: 700
89
+ }]; // export const otherFontWeightList = [
90
+ // { name: i18n('REGULAR'), value: 400 },
91
+ // { name: i18n('SEMIBOLD'), value: 600 },
92
+ // { name: i18n('BOLD'), value: 700 },
93
+ // ];
94
+
95
+ exports.fontWeightList = fontWeightList;
63
96
  var urlType = {
64
97
  PRODUCT_DETAIL: 'proDetail',
65
98
  CATG_PROD_LIST: 'catg',
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.fontWeightList = exports.fontSizeList = exports.fontFamilyList = exports["default"] = exports.OpenSansFontWeightList = void 0;
6
+ exports.fontSizeList = 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 _constants = require("../../../constants");
17
+
16
18
  require("./index.less");
17
19
 
18
20
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -45,39 +47,6 @@ var __extends = void 0 && (void 0).__extends || function () {
45
47
 
46
48
  var fontSizeList = [12, 13, 14, 15, 16, 19, 22, 24, 29, 32, 40, 48];
47
49
  exports.fontSizeList = fontSizeList;
48
- var fontFamilyList = [{
49
- name: 'Montserrat',
50
- value: 'Montserrat'
51
- }, {
52
- name: 'Open Sans',
53
- value: 'OpenSans'
54
- }];
55
- exports.fontFamilyList = fontFamilyList;
56
- var fontWeightList = [{
57
- name: 'Regular',
58
- value: '400'
59
- }, {
60
- name: 'Medium',
61
- value: '500'
62
- }, {
63
- name: 'Semibold',
64
- value: '600'
65
- }, {
66
- name: 'Bold',
67
- value: '700'
68
- }];
69
- exports.fontWeightList = fontWeightList;
70
- var OpenSansFontWeightList = [{
71
- name: 'Regular',
72
- value: '400'
73
- }, {
74
- name: 'Semibold',
75
- value: '600'
76
- }, {
77
- name: 'Bold',
78
- value: '700'
79
- }];
80
- exports.OpenSansFontWeightList = OpenSansFontWeightList;
81
50
 
82
51
  var ToolBarModal =
83
52
  /** @class */
@@ -237,9 +206,6 @@ function (_super) {
237
206
  var _this = this;
238
207
 
239
208
  var quillFormat = this.state.quillFormat;
240
-
241
- var _fontWeightList = quillFormat['font-family'] === 'OpenSans' ? OpenSansFontWeightList : fontWeightList;
242
-
243
209
  return /*#__PURE__*/_react["default"].createElement("div", {
244
210
  ref: this.toolBarRef,
245
211
  className: "toolbar-wrap"
@@ -257,7 +223,7 @@ function (_super) {
257
223
  width: '150px'
258
224
  },
259
225
  value: quillFormat['font-family']
260
- }, fontFamilyList.map(function (v) {
226
+ }, _constants.fontFamilyList.map(function (v) {
261
227
  return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
262
228
  label: v.name,
263
229
  value: v.value
@@ -274,7 +240,7 @@ function (_super) {
274
240
  width: '150px'
275
241
  },
276
242
  value: quillFormat['font-weight']
277
- }, _fontWeightList.map(function (v) {
243
+ }, _constants.fontWeightList.map(function (v) {
278
244
  return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
279
245
  label: v.name,
280
246
  value: v.value
@@ -45,7 +45,8 @@ var setDesignConfig = function setDesignConfig(props) {
45
45
  var config = props.config,
46
46
  device = props.device,
47
47
  isPreview = props.isPreview,
48
- projectCode = props.projectCode;
48
+ projectCode = props.projectCode,
49
+ showRecommendAds = props.showRecommendAds;
49
50
  window.magicDesign = __assign(__assign({
50
51
  pageBackground: '#f2f2f2',
51
52
  mode: 'renderer',
@@ -55,7 +56,8 @@ var setDesignConfig = function setDesignConfig(props) {
55
56
  }, config), {
56
57
  projectCode: projectCode,
57
58
  compSpacing: Number(config.compSpacing),
58
- compWidth: Number(config.compWidth)
59
+ compWidth: Number(config.compWidth),
60
+ showRecommendAds: showRecommendAds
59
61
  });
60
62
  };
61
63
  /**
@@ -1,5 +1,5 @@
1
1
  {
2
- "COLLECT_VOUCHER_SUCCESS": "Collect voucher success!",
2
+ "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
3
3
  "LOGIN_BUTTON": "Login Button",
4
4
  "SEARCH_ICON": "Search Icon",
5
5
  "NAVIGATION": "Navigation",
@@ -1,5 +1,5 @@
1
1
  {
2
- "COLLECT_VOUCHER_SUCCESS": "Collect voucher success!",
2
+ "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
3
3
  "LOGIN_BUTTON": "Login Button",
4
4
  "SEARCH_ICON": "Search Icon",
5
5
  "NAVIGATION": "Navigation",
@@ -1,5 +1,5 @@
1
1
  {
2
- "COLLECT_VOUCHER_SUCCESS": "Collect voucher success!",
2
+ "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
3
3
  "LOGIN_BUTTON": "Login Button",
4
4
  "SEARCH_ICON": "Search Icon",
5
5
  "NAVIGATION": "Navigation",
@@ -21,6 +21,8 @@ var _common = require("../../../common");
21
21
 
22
22
  var _TextConfig = require("../TextConfig");
23
23
 
24
+ var _constants = require("../../../constants");
25
+
24
26
  var _BaseConfig = _interopRequireDefault(require("../BaseConfig"));
25
27
 
26
28
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -191,22 +193,24 @@ function (_super) {
191
193
  _this.updateAttr(_data, 'fontFamily', v);
192
194
  },
193
195
  value: _data.fontFamily
194
- }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
195
- value: "Montserrat"
196
- }, "Montserrat"), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
197
- value: "Open Sans"
198
- }, "Open Sans"))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
196
+ }, _constants.fontFamilyList.map(function (v) {
197
+ return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
198
+ label: v.name,
199
+ value: v.value
200
+ }, v.name);
201
+ }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
199
202
  title: (0, _locale.i18n)('FONT_WEIGHT')
200
203
  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
201
204
  onChange: function onChange(v) {
202
205
  _this.updateAttr(_data, 'fontWeight', v);
203
206
  },
204
207
  value: _data.fontWeight
205
- }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
206
- value: 400
207
- }, (0, _locale.i18n)('REGULAR')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
208
- value: 600
209
- }, (0, _locale.i18n)('MEDIUM')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
208
+ }, _constants.fontWeightList.map(function (v) {
209
+ return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
210
+ label: v.name,
211
+ value: v.value
212
+ }, v.name);
213
+ }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
210
214
  title: (0, _locale.i18n)('FONT_SIZE')
211
215
  }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
212
216
  onChange: function onChange(_a) {
@@ -25,6 +25,8 @@ var _SpacingConfig = _interopRequireDefault(require("../../../composite-comp/com
25
25
 
26
26
  var _mobx = require("../../../mobx");
27
27
 
28
+ var _constants = require("../../../constants");
29
+
28
30
  var _BaseConfig = _interopRequireDefault(require("../BaseConfig"));
29
31
 
30
32
  require("./index.less");
@@ -228,11 +230,12 @@ function (_super) {
228
230
  _this.selfRender();
229
231
  },
230
232
  value: textData.fontFamily
231
- }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
232
- value: "Montserrat"
233
- }, "Montserrat"), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
234
- value: "Open Sans"
235
- }, "Open Sans"))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
233
+ }, _constants.fontFamilyList.map(function (v) {
234
+ return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
235
+ label: v.name,
236
+ value: v.value
237
+ }, v.name);
238
+ }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
236
239
  title: (0, _locale.i18n)('FONT_WEIGHT')
237
240
  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
238
241
  onChange: function onChange(v) {
@@ -241,15 +244,12 @@ function (_super) {
241
244
  _this.selfRender();
242
245
  },
243
246
  value: textData.fontWeight
244
- }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
245
- value: 400
246
- }, (0, _locale.i18n)('REGULAR')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
247
- value: 500
248
- }, (0, _locale.i18n)('MEDIUM')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
249
- value: 600
250
- }, (0, _locale.i18n)('SEMIBOLD')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
251
- value: 700
252
- }, (0, _locale.i18n)('BOLD')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
247
+ }, _constants.fontWeightList.map(function (v) {
248
+ return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
249
+ label: v.name,
250
+ value: v.value
251
+ }, v.name);
252
+ }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
253
253
  title: (0, _locale.i18n)('FONT_SIZE')
254
254
  }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
255
255
  onChange: function onChange(_a) {