@fonixtree/magic-design 2.0.135 → 2.0.137

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 (17) hide show
  1. package/es/common/SwitchCollapse/index.js +4 -0
  2. package/es/composite-comp/common/components/MonpayProductItem/index.js +5 -18
  3. package/es/composite-comp/common/components/MonpayProductItem/index.less +2 -0
  4. package/es/composite-comp/dito/components/FlashDeal/mobile/index.js +8 -8
  5. package/es/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.less +3 -0
  6. package/es/composite-comp/monpay/components/MonpayFlashDeal/mobile/index.js +1 -4
  7. package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +1 -0
  8. package/es/composite-comp/monpay/config-panels/MonpayRecommendConfig/RecommendConfigContent/index.js +2 -10
  9. package/lib/common/SwitchCollapse/index.js +4 -0
  10. package/lib/composite-comp/common/components/MonpayProductItem/index.js +5 -18
  11. package/lib/composite-comp/common/components/MonpayProductItem/index.less +2 -0
  12. package/lib/composite-comp/dito/components/FlashDeal/mobile/index.js +8 -8
  13. package/lib/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.less +3 -0
  14. package/lib/composite-comp/monpay/components/MonpayFlashDeal/mobile/index.js +1 -4
  15. package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +1 -0
  16. package/lib/composite-comp/monpay/config-panels/MonpayRecommendConfig/RecommendConfigContent/index.js +2 -10
  17. package/package.json +1 -1
package/es/common/SwitchCollapse/index.js CHANGED
@@ -97,6 +97,10 @@ function (_super) {
97
97
  };
98
98
 
99
99
  _this.onSwitchChange = function (checked, panelInfo) {
100
+ if (!panelInfo.metaOption) {
101
+ panelInfo.metaOption = {};
102
+ }
103
+
100
104
  panelInfo.metaOption.open = checked;
101
105
 
102
106
  if (checked) {
package/es/composite-comp/common/components/MonpayProductItem/index.js CHANGED
@@ -19,8 +19,6 @@ var _ImageLabel = _interopRequireDefault(require("../ImageLabel"));
19
19
 
20
20
  var _components = require("../../../../meta-comp/components");
21
21
 
22
- var _businessUtil = require("../../../../utils/businessUtil");
23
-
24
22
  var _locale = require("../../../../locale");
25
23
 
26
24
  require("./index.less");
@@ -130,10 +128,10 @@ function (_super) {
130
128
  layout = _m.layout,
131
129
  imgHeight = _m.imgHeight,
132
130
  imgWidth = _m.imgWidth,
133
- unknownPrice = _m.unknownPrice,
134
- rest = __rest(_m, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
131
+ showDiscountTag = _m.showDiscountTag,
132
+ rest = __rest(_m, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "showDiscountTag"]); // const promotions = getPromotionList(data);
133
+
135
134
 
136
- var promotions = (0, _businessUtil.getPromotionList)(data);
137
135
  var price = (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
138
136
  var oldPrice = null;
139
137
 
@@ -178,22 +176,11 @@ function (_super) {
178
176
  }), /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
179
177
  labels: imgLabels,
180
178
  small: true
181
- }), ((_d = panelProps.discount) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
179
+ }), (((_d = panelProps.discount) === null || _d === void 0 ? void 0 : _d.open) || showDiscountTag) && data.discountPercent && /*#__PURE__*/_react["default"].createElement("div", {
182
180
  className: "discount-tag"
183
181
  }, data.discountPercent, "% off")), /*#__PURE__*/_react["default"].createElement("div", {
184
182
  className: "content-wrap"
185
- }, panelProps.label.open && /*#__PURE__*/_react["default"].createElement("div", {
186
- className: "promotions-wrap"
187
- }, promotions.map(function (promot, index) {
188
- return /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
189
- key: index,
190
- className: "promotion-item",
191
- data: __assign(__assign({}, panelProps.label), {
192
- text: promot
193
- }),
194
- readonly: true
195
- });
196
- })), /*#__PURE__*/_react["default"].createElement("div", {
183
+ }, /*#__PURE__*/_react["default"].createElement("div", {
197
184
  className: "product-name-wrap"
198
185
  }, /*#__PURE__*/_react["default"].createElement("div", {
199
186
  className: "box"
package/es/composite-comp/common/components/MonpayProductItem/index.less CHANGED
@@ -15,6 +15,7 @@
15
15
  .product-img {
16
16
  width: 140px;
17
17
  height: 140px;
18
+ border-radius: 8px;
18
19
  object-fit: cover;
19
20
  }
20
21
 
@@ -240,6 +241,7 @@
240
241
  width: 100px;
241
242
  height: 100%;
242
243
  min-height: 100px;
244
+ border-radius: 8px 0 0 8px;
243
245
  }
244
246
  }
245
247
 
package/es/composite-comp/dito/components/FlashDeal/mobile/index.js CHANGED
@@ -377,16 +377,16 @@ function (_super) {
377
377
  };
378
378
 
379
379
  FlashDealMobile.prototype.render = function () {
380
- var _a;
380
+ var _a, _b;
381
381
 
382
382
  var panelProps = this.props.panelProps;
383
383
  console.log('flash deal panelProps: ', panelProps);
384
- var _b = this.state,
385
- list = _b.list,
386
- effDate = _b.effDate,
387
- expDate = _b.expDate,
388
- now = _b.now,
389
- isWill = _b.isWill;
384
+ var _c = this.state,
385
+ list = _c.list,
386
+ effDate = _c.effDate,
387
+ expDate = _c.expDate,
388
+ now = _c.now,
389
+ isWill = _c.isWill;
390
390
 
391
391
  var _list = list.length === 0 && (0, _coreUtil.isDesignMode)() ? defaultData : list;
392
392
 
@@ -405,7 +405,7 @@ function (_super) {
405
405
  data: panelProps.title.headline
406
406
  }), isWill && /*#__PURE__*/_react["default"].createElement("span", {
407
407
  className: "sub-title"
408
- }, (0, _locale.i18n)('NEXT')), ((_a = panelProps.title) === null || _a === void 0 ? void 0 : _a.countDown.open) && /*#__PURE__*/_react["default"].createElement(_CountDown["default"], {
408
+ }, (0, _locale.i18n)('NEXT')), ((_a = panelProps.title) === null || _a === void 0 ? void 0 : _a.countDown) && ((_b = panelProps.title.countDown) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement(_CountDown["default"], {
409
409
  effDate: effDate,
410
410
  expDate: expDate,
411
411
  now: now,
package/es/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.less CHANGED
@@ -28,7 +28,10 @@
28
28
  overflow: scroll;
29
29
  }
30
30
  .BundleItemWrap .prodList img {
31
+ height: 1.9rem;
31
32
  width: 1.9rem;
33
+ border-radius: 0.16rem;
34
+ object-fit: cover;
32
35
  }
33
36
  .BundleItemWrap .bottomWrap {
34
37
  border-top: 0.02rem solid #E4E4E4;
package/es/composite-comp/monpay/components/MonpayFlashDeal/mobile/index.js CHANGED
@@ -410,10 +410,7 @@ function (_super) {
410
410
  now: now,
411
411
  refresh: this.getNextFlashSale
412
412
  })), /*#__PURE__*/_react["default"].createElement("div", {
413
- className: "right",
414
- onClick: function onClick() {
415
- return (0, _coreUtil.clickUrl)('/flash-sale');
416
- }
413
+ className: "right"
417
414
  }, panelProps.title.button.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
418
415
  className: "btn",
419
416
  data: panelProps.title.button
package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js CHANGED
@@ -821,6 +821,7 @@ function (_super) {
821
821
  (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
822
822
  },
823
823
  panelProps: panelProps.content,
824
+ showDiscountTag: true,
824
825
  showProgress: false
825
826
  });
826
827
  })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
package/es/composite-comp/monpay/config-panels/MonpayRecommendConfig/RecommendConfigContent/index.js CHANGED
@@ -7,8 +7,6 @@ exports["default"] = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
10
- var _ButtonConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ButtonConfig"));
11
-
12
10
  var _TextConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/TextConfig"));
13
11
 
14
12
  var _coreUtil = require("../../../../../utils/coreUtil");
@@ -76,14 +74,8 @@ function (_super) {
76
74
  name: (0, _locale.i18n)('FILTER'),
77
75
  value: null,
78
76
  metaOption: panelProps.filter
79
- }, {
80
- key: '1',
81
- name: (0, _locale.i18n)('LABEL'),
82
- value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
83
- data: panelProps.label
84
- }),
85
- metaOption: panelProps.label
86
- }, {
77
+ }, // { key: '1', name: i18n('LABEL'), value: <ButtonConfig data={panelProps.label} />, metaOption: panelProps.label },
78
+ {
87
79
  key: '2',
88
80
  name: (0, _locale.i18n)('PRODUCT_NAME'),
89
81
  value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
package/lib/common/SwitchCollapse/index.js CHANGED
@@ -97,6 +97,10 @@ function (_super) {
97
97
  };
98
98
 
99
99
  _this.onSwitchChange = function (checked, panelInfo) {
100
+ if (!panelInfo.metaOption) {
101
+ panelInfo.metaOption = {};
102
+ }
103
+
100
104
  panelInfo.metaOption.open = checked;
101
105
 
102
106
  if (checked) {
package/lib/composite-comp/common/components/MonpayProductItem/index.js CHANGED
@@ -19,8 +19,6 @@ var _ImageLabel = _interopRequireDefault(require("../ImageLabel"));
19
19
 
20
20
  var _components = require("../../../../meta-comp/components");
21
21
 
22
- var _businessUtil = require("../../../../utils/businessUtil");
23
-
24
22
  var _locale = require("../../../../locale");
25
23
 
26
24
  require("./index.less");
@@ -130,10 +128,10 @@ function (_super) {
130
128
  layout = _m.layout,
131
129
  imgHeight = _m.imgHeight,
132
130
  imgWidth = _m.imgWidth,
133
- unknownPrice = _m.unknownPrice,
134
- rest = __rest(_m, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
131
+ showDiscountTag = _m.showDiscountTag,
132
+ rest = __rest(_m, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "showDiscountTag"]); // const promotions = getPromotionList(data);
133
+
135
134
 
136
- var promotions = (0, _businessUtil.getPromotionList)(data);
137
135
  var price = (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
138
136
  var oldPrice = null;
139
137
 
@@ -178,22 +176,11 @@ function (_super) {
178
176
  }), /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
179
177
  labels: imgLabels,
180
178
  small: true
181
- }), ((_d = panelProps.discount) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
179
+ }), (((_d = panelProps.discount) === null || _d === void 0 ? void 0 : _d.open) || showDiscountTag) && data.discountPercent && /*#__PURE__*/_react["default"].createElement("div", {
182
180
  className: "discount-tag"
183
181
  }, data.discountPercent, "% off")), /*#__PURE__*/_react["default"].createElement("div", {
184
182
  className: "content-wrap"
185
- }, panelProps.label.open && /*#__PURE__*/_react["default"].createElement("div", {
186
- className: "promotions-wrap"
187
- }, promotions.map(function (promot, index) {
188
- return /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
189
- key: index,
190
- className: "promotion-item",
191
- data: __assign(__assign({}, panelProps.label), {
192
- text: promot
193
- }),
194
- readonly: true
195
- });
196
- })), /*#__PURE__*/_react["default"].createElement("div", {
183
+ }, /*#__PURE__*/_react["default"].createElement("div", {
197
184
  className: "product-name-wrap"
198
185
  }, /*#__PURE__*/_react["default"].createElement("div", {
199
186
  className: "box"
package/lib/composite-comp/common/components/MonpayProductItem/index.less CHANGED
@@ -15,6 +15,7 @@
15
15
  .product-img {
16
16
  width: 140px;
17
17
  height: 140px;
18
+ border-radius: 8px;
18
19
  object-fit: cover;
19
20
  }
20
21
 
@@ -240,6 +241,7 @@
240
241
  width: 100px;
241
242
  height: 100%;
242
243
  min-height: 100px;
244
+ border-radius: 8px 0 0 8px;
243
245
  }
244
246
  }
245
247
 
package/lib/composite-comp/dito/components/FlashDeal/mobile/index.js CHANGED
@@ -377,16 +377,16 @@ function (_super) {
377
377
  };
378
378
 
379
379
  FlashDealMobile.prototype.render = function () {
380
- var _a;
380
+ var _a, _b;
381
381
 
382
382
  var panelProps = this.props.panelProps;
383
383
  console.log('flash deal panelProps: ', panelProps);
384
- var _b = this.state,
385
- list = _b.list,
386
- effDate = _b.effDate,
387
- expDate = _b.expDate,
388
- now = _b.now,
389
- isWill = _b.isWill;
384
+ var _c = this.state,
385
+ list = _c.list,
386
+ effDate = _c.effDate,
387
+ expDate = _c.expDate,
388
+ now = _c.now,
389
+ isWill = _c.isWill;
390
390
 
391
391
  var _list = list.length === 0 && (0, _coreUtil.isDesignMode)() ? defaultData : list;
392
392
 
@@ -405,7 +405,7 @@ function (_super) {
405
405
  data: panelProps.title.headline
406
406
  }), isWill && /*#__PURE__*/_react["default"].createElement("span", {
407
407
  className: "sub-title"
408
- }, (0, _locale.i18n)('NEXT')), ((_a = panelProps.title) === null || _a === void 0 ? void 0 : _a.countDown.open) && /*#__PURE__*/_react["default"].createElement(_CountDown["default"], {
408
+ }, (0, _locale.i18n)('NEXT')), ((_a = panelProps.title) === null || _a === void 0 ? void 0 : _a.countDown) && ((_b = panelProps.title.countDown) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement(_CountDown["default"], {
409
409
  effDate: effDate,
410
410
  expDate: expDate,
411
411
  now: now,
package/lib/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.less CHANGED
@@ -28,7 +28,10 @@
28
28
  overflow: scroll;
29
29
  }
30
30
  .BundleItemWrap .prodList img {
31
+ height: 1.9rem;
31
32
  width: 1.9rem;
33
+ border-radius: 0.16rem;
34
+ object-fit: cover;
32
35
  }
33
36
  .BundleItemWrap .bottomWrap {
34
37
  border-top: 0.02rem solid #E4E4E4;
package/lib/composite-comp/monpay/components/MonpayFlashDeal/mobile/index.js CHANGED
@@ -410,10 +410,7 @@ function (_super) {
410
410
  now: now,
411
411
  refresh: this.getNextFlashSale
412
412
  })), /*#__PURE__*/_react["default"].createElement("div", {
413
- className: "right",
414
- onClick: function onClick() {
415
- return (0, _coreUtil.clickUrl)('/flash-sale');
416
- }
413
+ className: "right"
417
414
  }, panelProps.title.button.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
418
415
  className: "btn",
419
416
  data: panelProps.title.button
package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js CHANGED
@@ -821,6 +821,7 @@ function (_super) {
821
821
  (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
822
822
  },
823
823
  panelProps: panelProps.content,
824
+ showDiscountTag: true,
824
825
  showProgress: false
825
826
  });
826
827
  })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
package/lib/composite-comp/monpay/config-panels/MonpayRecommendConfig/RecommendConfigContent/index.js CHANGED
@@ -7,8 +7,6 @@ exports["default"] = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
10
- var _ButtonConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ButtonConfig"));
11
-
12
10
  var _TextConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/TextConfig"));
13
11
 
14
12
  var _coreUtil = require("../../../../../utils/coreUtil");
@@ -76,14 +74,8 @@ function (_super) {
76
74
  name: (0, _locale.i18n)('FILTER'),
77
75
  value: null,
78
76
  metaOption: panelProps.filter
79
- }, {
80
- key: '1',
81
- name: (0, _locale.i18n)('LABEL'),
82
- value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
83
- data: panelProps.label
84
- }),
85
- metaOption: panelProps.label
86
- }, {
77
+ }, // { key: '1', name: i18n('LABEL'), value: <ButtonConfig data={panelProps.label} />, metaOption: panelProps.label },
78
+ {
87
79
  key: '2',
88
80
  name: (0, _locale.i18n)('PRODUCT_NAME'),
89
81
  value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fonixtree/magic-design",
3
3
  "author": "Cylon Team",
4
- "version": "2.0.135",
4
+ "version": "2.0.137",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",