@fonixtree/magic-design 1.0.7 → 1.0.9

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.
@@ -18,7 +18,7 @@
18
18
  .cylon-modal-body {
19
19
  padding: 16px 16px 12px 16px !important;
20
20
  max-height: 800px !important;
21
- overflow: scroll;
21
+ // overflow: scroll;
22
22
  }
23
23
  }
24
24
  }
@@ -532,12 +532,14 @@ var FilteredProductModal = function FilteredProductModal(props) {
532
532
  layout: "vertical"
533
533
  }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
534
534
  label: "Category"
535
- }, /*#__PURE__*/_react["default"].createElement(_antd.TreeSelect, {
536
- allowClear: true,
535
+ }, /*#__PURE__*/_react["default"].createElement(_antd.TreeSelect // allowClear
536
+ , {
537
537
  dropdownStyle: {
538
538
  maxHeight: 400,
539
539
  overflow: 'auto'
540
540
  },
541
+ maxTagCount: 2,
542
+ maxTagTextLength: 5,
541
543
  multiple: true,
542
544
  onChange: onChange,
543
545
  placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
@@ -549,6 +551,8 @@ var FilteredProductModal = function FilteredProductModal(props) {
549
551
  label: "Brand"
550
552
  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
551
553
  defaultValue: [],
554
+ maxTagCount: 2,
555
+ maxTagTextLength: 5,
552
556
  mode: "multiple",
553
557
  onChange: handleBrandChange,
554
558
  placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
@@ -84,7 +84,7 @@
84
84
  }
85
85
 
86
86
  .leftCot {
87
- width: 230px;
87
+ width: 280px;
88
88
  // height: 400px;
89
89
  box-sizing: border-box;
90
90
  border-right: 1px solid #e0e0e0;
@@ -285,7 +285,7 @@ var LinkModal = function LinkModal(props) {
285
285
  ,
286
286
  title: (0, _locale.i18n)('URL_SETUP'),
287
287
  visible: visible,
288
- width: "900px",
288
+ width: "1000px",
289
289
  wrapClassName: "magicLinkModal"
290
290
  }, /*#__PURE__*/_react["default"].createElement(_antd.Tabs, {
291
291
  activeKey: selected,
@@ -377,21 +377,18 @@ var ProductModal = function ProductModal(props) {
377
377
 
378
378
  var queryOfferCatgs = function queryOfferCatgs() {
379
379
  return __awaiter(void 0, void 0, void 0, function () {
380
- var res, arr;
380
+ var res, tree;
381
381
  return __generator(this, function (_a) {
382
382
  switch (_a.label) {
383
383
  case 0:
384
384
  return [4
385
385
  /*yield*/
386
- , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/storeoffercatgs", {}, 'GET')];
386
+ , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/offercatgs/list", {}, 'GET')];
387
387
 
388
388
  case 1:
389
389
  res = _a.sent();
390
- arr = [];
391
- res.forEach(function (f) {
392
- if (f.children) arr.push.apply(arr, f.children);
393
- });
394
- setCatgsList(arr);
390
+ tree = (0, _businessUtil.listToTree)(res);
391
+ setCatgsList(tree);
395
392
  return [2
396
393
  /*return*/
397
394
  ];
@@ -565,35 +562,33 @@ var ProductModal = function ProductModal(props) {
565
562
  layout: "vertical"
566
563
  }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
567
564
  label: "Category"
568
- }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
569
- mode: "multiple",
570
- onChange: function onChange(value, option) {
565
+ }, /*#__PURE__*/_react["default"].createElement(_antd.TreeSelect, {
566
+ dropdownStyle: {
567
+ maxHeight: 400,
568
+ overflow: 'auto'
569
+ },
570
+ maxTagCount: 2,
571
+ maxTagTextLength: 5,
572
+ multiple: true,
573
+ onChange: function onChange(value) {
571
574
  setSelCatgsList(value);
572
575
  },
573
576
  placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
574
577
  size: "small",
578
+ treeData: catgsList,
579
+ treeDefaultExpandAll: true,
575
580
  value: selCatgsList
576
- }, catgsList.map(function (item) {
577
- return /*#__PURE__*/_react["default"].createElement(OptGroup, {
578
- key: item.model.catgId,
579
- label: item.model.catgName
580
- }, (item.children || []).map(function (i) {
581
- return /*#__PURE__*/_react["default"].createElement(Option, {
582
- key: i.model.catgId,
583
- value: i.model.catgId
584
- }, i.model.catgName);
585
- }));
586
- }))), /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
581
+ })), /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
587
582
  label: "Brand"
588
583
  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
589
584
  mode: "multiple",
590
- onChange: function onChange(value, option) {
585
+ onChange: function onChange(value) {
591
586
  setSelBrandsList(value);
592
587
  },
593
588
  placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
594
589
  size: "small",
595
590
  value: selBrandsList
596
- }, brandsList.map(function (item, index) {
591
+ }, brandsList.map(function (item) {
597
592
  return /*#__PURE__*/_react["default"].createElement(Option, {
598
593
  key: item.catgId,
599
594
  value: item.brandId
@@ -228,8 +228,8 @@ function (_super) {
228
228
  this.setState({
229
229
  intelligentType: type,
230
230
  intelligentValue: []
231
- });
232
- this.getTypeData(type);
231
+ }); // this.getTypeData(type);
232
+
233
233
  this.props.onChange({
234
234
  intelligentType: type,
235
235
  intelligentValue: []
@@ -255,7 +255,7 @@ function (_super) {
255
255
  ];
256
256
  return [4
257
257
  /*yield*/
258
- , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/offercatgs/list")];
258
+ , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/offercatgs/list")];
259
259
 
260
260
  case 1:
261
261
  res = _a.sent();
@@ -11,6 +11,8 @@ var _antd = require("antd");
11
11
 
12
12
  require("./index.less");
13
13
 
14
+ var _lodash = require("lodash");
15
+
14
16
  var _locale = require("../../../locale");
15
17
 
16
18
  var _SpacingConfig = _interopRequireDefault(require("../../../composite-comp/common/config-panels/SpacingConfig"));
@@ -104,11 +106,11 @@ function (_super) {
104
106
 
105
107
  _this.updateAttr(data, 'hover', {
106
108
  open: true,
107
- buttonBorder: data.buttonBorder,
108
- buttonIcon: data.buttonIcon,
109
- buttonText: data.buttonText,
109
+ buttonBorder: (0, _lodash.cloneDeep)(data.buttonBorder),
110
+ buttonIcon: (0, _lodash.cloneDeep)(data.buttonIcon),
111
+ buttonText: (0, _lodash.cloneDeep)(data.buttonText),
110
112
  content: {
111
- backgroundColor: data.content.backgroundColor
113
+ backgroundColor: (0, _lodash.cloneDeep)(data.content.backgroundColor)
112
114
  }
113
115
  }); // console.log('--ffd, button hover first click', data);
114
116
 
@@ -228,16 +230,16 @@ function (_super) {
228
230
  })));
229
231
  };
230
232
 
231
- var ButtonBorderSetting = function ButtonBorderSetting(data) {
233
+ var ButtonBorderSetting = function ButtonBorderSetting(_data) {
232
234
  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
233
235
  split: true,
234
236
  title: (0, _locale.i18n)('BORDER_COLOR')
235
237
  }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
236
238
  colorType: "rgba",
237
239
  onChange: function onChange(value) {
238
- _this.updateAttr(data, 'borderColor', value);
240
+ _this.updateAttr(_data, 'borderColor', value);
239
241
  },
240
- value: data.borderColor
242
+ value: _data.borderColor
241
243
  })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
242
244
  title: (0, _locale.i18n)('BORDER_RADIUS')
243
245
  }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
@@ -245,15 +247,15 @@ function (_super) {
245
247
  onChange: function onChange(_a) {
246
248
  var count = _a.count;
247
249
 
248
- _this.updateAttr(data, 'borderRadius', count);
250
+ _this.updateAttr(_data, 'borderRadius', count);
249
251
  },
250
252
  value: {
251
- count: data.borderRadius
253
+ count: _data.borderRadius
252
254
  }
253
255
  })));
254
256
  };
255
257
 
256
- var ButtonIconSetting = function ButtonIconSetting(data) {
258
+ var ButtonIconSetting = function ButtonIconSetting(_data) {
257
259
  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
258
260
  title: (0, _locale.i18n)('ICON')
259
261
  }, /*#__PURE__*/_react["default"].createElement(_common.IconPicker, {
@@ -262,18 +264,18 @@ function (_super) {
262
264
  },
263
265
  onClick: function onClick() {
264
266
  _this.setState({
265
- isHover: data == _this.props.data.hover.buttonIcon
267
+ isHover: _data == _this.props._data.hover.buttonIcon
266
268
  });
267
269
  },
268
- value: data.iconUrl
269
- })), data.iconUrl && /*#__PURE__*/_react["default"].createElement(_common.Field, {
270
+ value: _data.iconUrl
271
+ })), _data.iconUrl && /*#__PURE__*/_react["default"].createElement(_common.Field, {
270
272
  title: (0, _locale.i18n)('ICON_PLACEMENT')
271
273
  }, /*#__PURE__*/_react["default"].createElement(_common.ButtonIconLayout, {
272
- icon: data.iconUrl,
274
+ icon: _data.iconUrl,
273
275
  onChange: function onChange(value) {
274
- return _this.updateAttr(data, 'layout', value);
276
+ return _this.updateAttr(_data, 'layout', value);
275
277
  },
276
- value: data.layout
278
+ value: _data.layout
277
279
  })));
278
280
  };
279
281
 
@@ -18,7 +18,7 @@
18
18
  .cylon-modal-body {
19
19
  padding: 16px 16px 12px 16px !important;
20
20
  max-height: 800px !important;
21
- overflow: scroll;
21
+ // overflow: scroll;
22
22
  }
23
23
  }
24
24
  }
@@ -532,12 +532,14 @@ var FilteredProductModal = function FilteredProductModal(props) {
532
532
  layout: "vertical"
533
533
  }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
534
534
  label: "Category"
535
- }, /*#__PURE__*/_react["default"].createElement(_antd.TreeSelect, {
536
- allowClear: true,
535
+ }, /*#__PURE__*/_react["default"].createElement(_antd.TreeSelect // allowClear
536
+ , {
537
537
  dropdownStyle: {
538
538
  maxHeight: 400,
539
539
  overflow: 'auto'
540
540
  },
541
+ maxTagCount: 2,
542
+ maxTagTextLength: 5,
541
543
  multiple: true,
542
544
  onChange: onChange,
543
545
  placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
@@ -549,6 +551,8 @@ var FilteredProductModal = function FilteredProductModal(props) {
549
551
  label: "Brand"
550
552
  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
551
553
  defaultValue: [],
554
+ maxTagCount: 2,
555
+ maxTagTextLength: 5,
552
556
  mode: "multiple",
553
557
  onChange: handleBrandChange,
554
558
  placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
@@ -84,7 +84,7 @@
84
84
  }
85
85
 
86
86
  .leftCot {
87
- width: 230px;
87
+ width: 280px;
88
88
  // height: 400px;
89
89
  box-sizing: border-box;
90
90
  border-right: 1px solid #e0e0e0;
@@ -285,7 +285,7 @@ var LinkModal = function LinkModal(props) {
285
285
  ,
286
286
  title: (0, _locale.i18n)('URL_SETUP'),
287
287
  visible: visible,
288
- width: "900px",
288
+ width: "1000px",
289
289
  wrapClassName: "magicLinkModal"
290
290
  }, /*#__PURE__*/_react["default"].createElement(_antd.Tabs, {
291
291
  activeKey: selected,
@@ -377,21 +377,18 @@ var ProductModal = function ProductModal(props) {
377
377
 
378
378
  var queryOfferCatgs = function queryOfferCatgs() {
379
379
  return __awaiter(void 0, void 0, void 0, function () {
380
- var res, arr;
380
+ var res, tree;
381
381
  return __generator(this, function (_a) {
382
382
  switch (_a.label) {
383
383
  case 0:
384
384
  return [4
385
385
  /*yield*/
386
- , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/storeoffercatgs", {}, 'GET')];
386
+ , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/offercatgs/list", {}, 'GET')];
387
387
 
388
388
  case 1:
389
389
  res = _a.sent();
390
- arr = [];
391
- res.forEach(function (f) {
392
- if (f.children) arr.push.apply(arr, f.children);
393
- });
394
- setCatgsList(arr);
390
+ tree = (0, _businessUtil.listToTree)(res);
391
+ setCatgsList(tree);
395
392
  return [2
396
393
  /*return*/
397
394
  ];
@@ -565,35 +562,33 @@ var ProductModal = function ProductModal(props) {
565
562
  layout: "vertical"
566
563
  }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
567
564
  label: "Category"
568
- }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
569
- mode: "multiple",
570
- onChange: function onChange(value, option) {
565
+ }, /*#__PURE__*/_react["default"].createElement(_antd.TreeSelect, {
566
+ dropdownStyle: {
567
+ maxHeight: 400,
568
+ overflow: 'auto'
569
+ },
570
+ maxTagCount: 2,
571
+ maxTagTextLength: 5,
572
+ multiple: true,
573
+ onChange: function onChange(value) {
571
574
  setSelCatgsList(value);
572
575
  },
573
576
  placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
574
577
  size: "small",
578
+ treeData: catgsList,
579
+ treeDefaultExpandAll: true,
575
580
  value: selCatgsList
576
- }, catgsList.map(function (item) {
577
- return /*#__PURE__*/_react["default"].createElement(OptGroup, {
578
- key: item.model.catgId,
579
- label: item.model.catgName
580
- }, (item.children || []).map(function (i) {
581
- return /*#__PURE__*/_react["default"].createElement(Option, {
582
- key: i.model.catgId,
583
- value: i.model.catgId
584
- }, i.model.catgName);
585
- }));
586
- }))), /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
581
+ })), /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
587
582
  label: "Brand"
588
583
  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
589
584
  mode: "multiple",
590
- onChange: function onChange(value, option) {
585
+ onChange: function onChange(value) {
591
586
  setSelBrandsList(value);
592
587
  },
593
588
  placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
594
589
  size: "small",
595
590
  value: selBrandsList
596
- }, brandsList.map(function (item, index) {
591
+ }, brandsList.map(function (item) {
597
592
  return /*#__PURE__*/_react["default"].createElement(Option, {
598
593
  key: item.catgId,
599
594
  value: item.brandId
@@ -228,8 +228,8 @@ function (_super) {
228
228
  this.setState({
229
229
  intelligentType: type,
230
230
  intelligentValue: []
231
- });
232
- this.getTypeData(type);
231
+ }); // this.getTypeData(type);
232
+
233
233
  this.props.onChange({
234
234
  intelligentType: type,
235
235
  intelligentValue: []
@@ -255,7 +255,7 @@ function (_super) {
255
255
  ];
256
256
  return [4
257
257
  /*yield*/
258
- , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/offercatgs/list")];
258
+ , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/offercatgs/list")];
259
259
 
260
260
  case 1:
261
261
  res = _a.sent();
@@ -11,6 +11,8 @@ var _antd = require("antd");
11
11
 
12
12
  require("./index.less");
13
13
 
14
+ var _lodash = require("lodash");
15
+
14
16
  var _locale = require("../../../locale");
15
17
 
16
18
  var _SpacingConfig = _interopRequireDefault(require("../../../composite-comp/common/config-panels/SpacingConfig"));
@@ -104,11 +106,11 @@ function (_super) {
104
106
 
105
107
  _this.updateAttr(data, 'hover', {
106
108
  open: true,
107
- buttonBorder: data.buttonBorder,
108
- buttonIcon: data.buttonIcon,
109
- buttonText: data.buttonText,
109
+ buttonBorder: (0, _lodash.cloneDeep)(data.buttonBorder),
110
+ buttonIcon: (0, _lodash.cloneDeep)(data.buttonIcon),
111
+ buttonText: (0, _lodash.cloneDeep)(data.buttonText),
110
112
  content: {
111
- backgroundColor: data.content.backgroundColor
113
+ backgroundColor: (0, _lodash.cloneDeep)(data.content.backgroundColor)
112
114
  }
113
115
  }); // console.log('--ffd, button hover first click', data);
114
116
 
@@ -228,16 +230,16 @@ function (_super) {
228
230
  })));
229
231
  };
230
232
 
231
- var ButtonBorderSetting = function ButtonBorderSetting(data) {
233
+ var ButtonBorderSetting = function ButtonBorderSetting(_data) {
232
234
  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
233
235
  split: true,
234
236
  title: (0, _locale.i18n)('BORDER_COLOR')
235
237
  }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
236
238
  colorType: "rgba",
237
239
  onChange: function onChange(value) {
238
- _this.updateAttr(data, 'borderColor', value);
240
+ _this.updateAttr(_data, 'borderColor', value);
239
241
  },
240
- value: data.borderColor
242
+ value: _data.borderColor
241
243
  })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
242
244
  title: (0, _locale.i18n)('BORDER_RADIUS')
243
245
  }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
@@ -245,15 +247,15 @@ function (_super) {
245
247
  onChange: function onChange(_a) {
246
248
  var count = _a.count;
247
249
 
248
- _this.updateAttr(data, 'borderRadius', count);
250
+ _this.updateAttr(_data, 'borderRadius', count);
249
251
  },
250
252
  value: {
251
- count: data.borderRadius
253
+ count: _data.borderRadius
252
254
  }
253
255
  })));
254
256
  };
255
257
 
256
- var ButtonIconSetting = function ButtonIconSetting(data) {
258
+ var ButtonIconSetting = function ButtonIconSetting(_data) {
257
259
  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
258
260
  title: (0, _locale.i18n)('ICON')
259
261
  }, /*#__PURE__*/_react["default"].createElement(_common.IconPicker, {
@@ -262,18 +264,18 @@ function (_super) {
262
264
  },
263
265
  onClick: function onClick() {
264
266
  _this.setState({
265
- isHover: data == _this.props.data.hover.buttonIcon
267
+ isHover: _data == _this.props._data.hover.buttonIcon
266
268
  });
267
269
  },
268
- value: data.iconUrl
269
- })), data.iconUrl && /*#__PURE__*/_react["default"].createElement(_common.Field, {
270
+ value: _data.iconUrl
271
+ })), _data.iconUrl && /*#__PURE__*/_react["default"].createElement(_common.Field, {
270
272
  title: (0, _locale.i18n)('ICON_PLACEMENT')
271
273
  }, /*#__PURE__*/_react["default"].createElement(_common.ButtonIconLayout, {
272
- icon: data.iconUrl,
274
+ icon: _data.iconUrl,
273
275
  onChange: function onChange(value) {
274
- return _this.updateAttr(data, 'layout', value);
276
+ return _this.updateAttr(_data, 'layout', value);
275
277
  },
276
- value: data.layout
278
+ value: _data.layout
277
279
  })));
278
280
  };
279
281
 
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fonixtree/magic-design",
3
3
  "author": "Cylon Team",
4
- "version": "1.0.7",
4
+ "version": "1.0.9",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",