@fonixtree/magic-design 1.0.8 → 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.
Files changed (13) hide show
  1. package/es/assets/less/modal.less +1 -1
  2. package/es/common/LinkModal/FilteredProductModal/index.js +6 -2
  3. package/es/common/LinkModal/FilteredProductModal/index.less +1 -1
  4. package/es/common/LinkModal/index.js +1 -1
  5. package/es/common/ProductModal/index.js +18 -23
  6. package/es/composite-comp/dito/second-config-panels/RecommendSecondConfig/AIRecommendation/index.js +1 -1
  7. package/lib/assets/less/modal.less +1 -1
  8. package/lib/common/LinkModal/FilteredProductModal/index.js +6 -2
  9. package/lib/common/LinkModal/FilteredProductModal/index.less +1 -1
  10. package/lib/common/LinkModal/index.js +1 -1
  11. package/lib/common/ProductModal/index.js +18 -23
  12. package/lib/composite-comp/dito/second-config-panels/RecommendSecondConfig/AIRecommendation/index.js +1 -1
  13. package/package.json +1 -1
package/es/assets/less/modal.less CHANGED
@@ -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
  }
package/es/common/LinkModal/FilteredProductModal/index.js CHANGED
@@ -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'),
package/es/common/LinkModal/FilteredProductModal/index.less CHANGED
@@ -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;
package/es/common/LinkModal/index.js CHANGED
@@ -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,
package/es/common/ProductModal/index.js CHANGED
@@ -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
package/es/composite-comp/dito/second-config-panels/RecommendSecondConfig/AIRecommendation/index.js CHANGED
@@ -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();
package/lib/assets/less/modal.less CHANGED
@@ -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
  }
package/lib/common/LinkModal/FilteredProductModal/index.js CHANGED
@@ -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'),
package/lib/common/LinkModal/FilteredProductModal/index.less CHANGED
@@ -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;
package/lib/common/LinkModal/index.js CHANGED
@@ -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,
package/lib/common/ProductModal/index.js CHANGED
@@ -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
package/lib/composite-comp/dito/second-config-panels/RecommendSecondConfig/AIRecommendation/index.js CHANGED
@@ -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();
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.8",
4
+ "version": "1.0.9",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",