@fonixtree/magic-design 1.0.112 → 1.0.114

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 (11) hide show
  1. package/es/composite-comp/common/components/ProductItem/index.js +40 -24
  2. package/es/composite-comp/dito/components/Recommend/defaultJSON.js +1 -4
  3. package/es/composite-comp/dito/components/SearchBanner/mobile/index.js +1 -1
  4. package/es/composite-comp/dito/config-panels/RecommendConfig/RecommendConfigContent/index.js +0 -5
  5. package/es/composite-comp/dito/config-panels/SearchBannerConfig/ConfigContent/index.js +1 -1
  6. package/lib/composite-comp/common/components/ProductItem/index.js +40 -24
  7. package/lib/composite-comp/dito/components/Recommend/defaultJSON.js +1 -4
  8. package/lib/composite-comp/dito/components/SearchBanner/mobile/index.js +1 -1
  9. package/lib/composite-comp/dito/config-panels/RecommendConfig/RecommendConfigContent/index.js +0 -5
  10. package/lib/composite-comp/dito/config-panels/SearchBannerConfig/ConfigContent/index.js +1 -1
  11. package/package.json +1 -1
package/es/composite-comp/common/components/ProductItem/index.js CHANGED
@@ -97,21 +97,21 @@ function (_super) {
97
97
  }
98
98
 
99
99
  ProductItem.prototype.render = function () {
100
- var _a, _b, _c, _d, _e;
101
-
102
- var _f = this.props,
103
- data = _f.data,
104
- type = _f.type,
105
- panelProps = _f.panelProps,
106
- onItemClick = _f.onItemClick,
107
- showProName = _f.showProName,
108
- showProgress = _f.showProgress,
109
- fixHeight = _f.fixHeight,
110
- layout = _f.layout,
111
- imgHeight = _f.imgHeight,
112
- imgWidth = _f.imgWidth,
113
- unknownPrice = _f.unknownPrice,
114
- rest = __rest(_f, ["data", "type", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
100
+ var _a, _b, _c, _d, _e, _f;
101
+
102
+ var _g = this.props,
103
+ data = _g.data,
104
+ type = _g.type,
105
+ panelProps = _g.panelProps,
106
+ onItemClick = _g.onItemClick,
107
+ showProName = _g.showProName,
108
+ showProgress = _g.showProgress,
109
+ fixHeight = _g.fixHeight,
110
+ layout = _g.layout,
111
+ imgHeight = _g.imgHeight,
112
+ imgWidth = _g.imgWidth,
113
+ unknownPrice = _g.unknownPrice,
114
+ rest = __rest(_g, ["data", "type", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
115
115
 
116
116
  var promotions = (0, _businessUtil.getPromotionList)(data);
117
117
  var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
@@ -146,12 +146,22 @@ function (_super) {
146
146
  var salePercent = Number(data.salePercent) / 100 || 0;
147
147
  var imgStyle = {};
148
148
  if (imgWidth) imgStyle.width = imgWidth;
149
- if (imgHeight) imgStyle.height = imgHeight;
149
+ if (imgHeight) imgStyle.height = imgHeight; // data.labels = [
150
+ // {
151
+ // position: 1,
152
+ // imgUrl: '/get/resource/platform/20241129/picture/Group1162591862390719062056960.png',
153
+ // },
154
+ // ];
155
+
150
156
  var imgLabels = ((_a = data.labels) === null || _a === void 0 ? void 0 : _a.filter(function (f) {
151
157
  return f.position !== '6' && f.position !== '7';
152
- })) || []; // const prodLabels = data.labels?.filter(f => f.position === '6') || [];
153
- // const priceLabels = data.labels?.filter(f => f.position === '7') || [];
154
-
158
+ })) || [];
159
+ var prodLabels = ((_b = data.labels) === null || _b === void 0 ? void 0 : _b.filter(function (f) {
160
+ return f.position === '6';
161
+ })) || [];
162
+ var priceLabels = ((_c = data.labels) === null || _c === void 0 ? void 0 : _c.filter(function (f) {
163
+ return f.position === '7';
164
+ })) || [];
155
165
  var soldNumber = data.salesCnt > 250 ? "" + (data.salesCnt - data.salesCnt % 250) : data.salesCnt || 0;
156
166
  return /*#__PURE__*/_react["default"].createElement("div", _extends({
157
167
  className: (0, _classnames["default"])('m-product-item-wrap', {
@@ -171,7 +181,7 @@ function (_super) {
171
181
  lazy: true,
172
182
  src: (0, _commonUtil.convertImageUrl)(data.productImg || data.imgUrlContent || data.productImageUrlContent),
173
183
  style: imgStyle
174
- }), ((_b = panelProps.labels) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
184
+ }), /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
175
185
  labels: imgLabels,
176
186
  small: true
177
187
  })), /*#__PURE__*/_react["default"].createElement("div", {
@@ -197,7 +207,10 @@ function (_super) {
197
207
  className: "product-name-wrap"
198
208
  }, /*#__PURE__*/_react["default"].createElement("div", {
199
209
  className: "box"
200
- }, showProName && panelProps.productName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
210
+ }, prodLabels.length > 0 && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
211
+ labels: prodLabels,
212
+ small: true
213
+ }), showProName && panelProps.productName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
201
214
  data: __assign(__assign({}, panelProps.productName), {
202
215
  text: data.offerName
203
216
  }),
@@ -212,6 +225,9 @@ function (_super) {
212
225
  text: _price
213
226
  }),
214
227
  readonly: true
228
+ }), priceLabels.length > 0 && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
229
+ labels: priceLabels,
230
+ small: true
215
231
  })), panelProps.salesPrice.open && (!!discount || oldPrice) && /*#__PURE__*/_react["default"].createElement("div", {
216
232
  className: "price-sold-wrap"
217
233
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -229,14 +245,14 @@ function (_super) {
229
245
  }
230
246
  })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && data.displaySalesCntFlag === 'Y' && /*#__PURE__*/_react["default"].createElement("div", {
231
247
  className: "sold-count"
232
- }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))), ((_c = panelProps.sold) === null || _c === void 0 ? void 0 : _c.open) && /*#__PURE__*/_react["default"].createElement("div", {
248
+ }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))), ((_d = panelProps.sold) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
233
249
  className: "sold"
234
250
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
235
251
  data: __assign(__assign({}, panelProps.sold), {
236
252
  text: (0, _locale.i18n)('SOLD') + " " + soldNumber + "+"
237
253
  }),
238
254
  readonly: true
239
- })), showProgress && ((_d = panelProps.salesProgressVisible) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
255
+ })), showProgress && ((_e = panelProps.salesProgressVisible) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
240
256
  className: "progress-wrap"
241
257
  }, /*#__PURE__*/_react["default"].createElement("span", {
242
258
  className: "text"
@@ -246,7 +262,7 @@ function (_super) {
246
262
  className: "progress",
247
263
  style: {
248
264
  width: salePercent + "%",
249
- backgroundColor: (_e = panelProps.salesProgressVisible) === null || _e === void 0 ? void 0 : _e.color
265
+ backgroundColor: (_f = panelProps.salesProgressVisible) === null || _f === void 0 ? void 0 : _f.color
250
266
  }
251
267
  })))));
252
268
  };
package/es/composite-comp/dito/components/Recommend/defaultJSON.js CHANGED
@@ -272,7 +272,7 @@ var getDefaultJSON = function getDefaultJSON() {
272
272
  },
273
273
  sold: {
274
274
  id: (0, _uuid.v4)(),
275
- open: true,
275
+ open: false,
276
276
  type: 'TEXT',
277
277
  specialContent: [],
278
278
  text: '',
@@ -294,9 +294,6 @@ var getDefaultJSON = function getDefaultJSON() {
294
294
  lineHeight: 18
295
295
  }
296
296
  },
297
- labels: {
298
- open: true
299
- },
300
297
  salesProgressVisible: {
301
298
  open: true
302
299
  }
package/es/composite-comp/dito/components/SearchBanner/mobile/index.js CHANGED
@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  require("./index.less");
11
11
 
12
- var _antd = require("antd4");
12
+ var _antd = require("antd");
13
13
 
14
14
  var _classnames = _interopRequireDefault(require("classnames"));
15
15
 
package/es/composite-comp/dito/config-panels/RecommendConfig/RecommendConfigContent/index.js CHANGED
@@ -106,11 +106,6 @@ function (_super) {
106
106
  data: panelProps.sold
107
107
  }),
108
108
  metaOption: panelProps.sold
109
- }, {
110
- key: '6',
111
- name: (0, _locale.i18n)('PRODUCT_LABEL'),
112
- value: null,
113
- metaOption: panelProps.labels
114
109
  }],
115
110
  type: "switch"
116
111
  }));
package/es/composite-comp/dito/config-panels/SearchBannerConfig/ConfigContent/index.js CHANGED
@@ -9,7 +9,7 @@ exports["default"] = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
- var _antd = require("antd4");
12
+ var _antd = require("antd");
13
13
 
14
14
  var _common = require("../../../../../common");
15
15
 
package/lib/composite-comp/common/components/ProductItem/index.js CHANGED
@@ -97,21 +97,21 @@ function (_super) {
97
97
  }
98
98
 
99
99
  ProductItem.prototype.render = function () {
100
- var _a, _b, _c, _d, _e;
101
-
102
- var _f = this.props,
103
- data = _f.data,
104
- type = _f.type,
105
- panelProps = _f.panelProps,
106
- onItemClick = _f.onItemClick,
107
- showProName = _f.showProName,
108
- showProgress = _f.showProgress,
109
- fixHeight = _f.fixHeight,
110
- layout = _f.layout,
111
- imgHeight = _f.imgHeight,
112
- imgWidth = _f.imgWidth,
113
- unknownPrice = _f.unknownPrice,
114
- rest = __rest(_f, ["data", "type", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
100
+ var _a, _b, _c, _d, _e, _f;
101
+
102
+ var _g = this.props,
103
+ data = _g.data,
104
+ type = _g.type,
105
+ panelProps = _g.panelProps,
106
+ onItemClick = _g.onItemClick,
107
+ showProName = _g.showProName,
108
+ showProgress = _g.showProgress,
109
+ fixHeight = _g.fixHeight,
110
+ layout = _g.layout,
111
+ imgHeight = _g.imgHeight,
112
+ imgWidth = _g.imgWidth,
113
+ unknownPrice = _g.unknownPrice,
114
+ rest = __rest(_g, ["data", "type", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
115
115
 
116
116
  var promotions = (0, _businessUtil.getPromotionList)(data);
117
117
  var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
@@ -146,12 +146,22 @@ function (_super) {
146
146
  var salePercent = Number(data.salePercent) / 100 || 0;
147
147
  var imgStyle = {};
148
148
  if (imgWidth) imgStyle.width = imgWidth;
149
- if (imgHeight) imgStyle.height = imgHeight;
149
+ if (imgHeight) imgStyle.height = imgHeight; // data.labels = [
150
+ // {
151
+ // position: 1,
152
+ // imgUrl: '/get/resource/platform/20241129/picture/Group1162591862390719062056960.png',
153
+ // },
154
+ // ];
155
+
150
156
  var imgLabels = ((_a = data.labels) === null || _a === void 0 ? void 0 : _a.filter(function (f) {
151
157
  return f.position !== '6' && f.position !== '7';
152
- })) || []; // const prodLabels = data.labels?.filter(f => f.position === '6') || [];
153
- // const priceLabels = data.labels?.filter(f => f.position === '7') || [];
154
-
158
+ })) || [];
159
+ var prodLabels = ((_b = data.labels) === null || _b === void 0 ? void 0 : _b.filter(function (f) {
160
+ return f.position === '6';
161
+ })) || [];
162
+ var priceLabels = ((_c = data.labels) === null || _c === void 0 ? void 0 : _c.filter(function (f) {
163
+ return f.position === '7';
164
+ })) || [];
155
165
  var soldNumber = data.salesCnt > 250 ? "" + (data.salesCnt - data.salesCnt % 250) : data.salesCnt || 0;
156
166
  return /*#__PURE__*/_react["default"].createElement("div", _extends({
157
167
  className: (0, _classnames["default"])('m-product-item-wrap', {
@@ -171,7 +181,7 @@ function (_super) {
171
181
  lazy: true,
172
182
  src: (0, _commonUtil.convertImageUrl)(data.productImg || data.imgUrlContent || data.productImageUrlContent),
173
183
  style: imgStyle
174
- }), ((_b = panelProps.labels) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
184
+ }), /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
175
185
  labels: imgLabels,
176
186
  small: true
177
187
  })), /*#__PURE__*/_react["default"].createElement("div", {
@@ -197,7 +207,10 @@ function (_super) {
197
207
  className: "product-name-wrap"
198
208
  }, /*#__PURE__*/_react["default"].createElement("div", {
199
209
  className: "box"
200
- }, showProName && panelProps.productName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
210
+ }, prodLabels.length > 0 && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
211
+ labels: prodLabels,
212
+ small: true
213
+ }), showProName && panelProps.productName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
201
214
  data: __assign(__assign({}, panelProps.productName), {
202
215
  text: data.offerName
203
216
  }),
@@ -212,6 +225,9 @@ function (_super) {
212
225
  text: _price
213
226
  }),
214
227
  readonly: true
228
+ }), priceLabels.length > 0 && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
229
+ labels: priceLabels,
230
+ small: true
215
231
  })), panelProps.salesPrice.open && (!!discount || oldPrice) && /*#__PURE__*/_react["default"].createElement("div", {
216
232
  className: "price-sold-wrap"
217
233
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -229,14 +245,14 @@ function (_super) {
229
245
  }
230
246
  })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && data.displaySalesCntFlag === 'Y' && /*#__PURE__*/_react["default"].createElement("div", {
231
247
  className: "sold-count"
232
- }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))), ((_c = panelProps.sold) === null || _c === void 0 ? void 0 : _c.open) && /*#__PURE__*/_react["default"].createElement("div", {
248
+ }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))), ((_d = panelProps.sold) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
233
249
  className: "sold"
234
250
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
235
251
  data: __assign(__assign({}, panelProps.sold), {
236
252
  text: (0, _locale.i18n)('SOLD') + " " + soldNumber + "+"
237
253
  }),
238
254
  readonly: true
239
- })), showProgress && ((_d = panelProps.salesProgressVisible) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
255
+ })), showProgress && ((_e = panelProps.salesProgressVisible) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
240
256
  className: "progress-wrap"
241
257
  }, /*#__PURE__*/_react["default"].createElement("span", {
242
258
  className: "text"
@@ -246,7 +262,7 @@ function (_super) {
246
262
  className: "progress",
247
263
  style: {
248
264
  width: salePercent + "%",
249
- backgroundColor: (_e = panelProps.salesProgressVisible) === null || _e === void 0 ? void 0 : _e.color
265
+ backgroundColor: (_f = panelProps.salesProgressVisible) === null || _f === void 0 ? void 0 : _f.color
250
266
  }
251
267
  })))));
252
268
  };
package/lib/composite-comp/dito/components/Recommend/defaultJSON.js CHANGED
@@ -272,7 +272,7 @@ var getDefaultJSON = function getDefaultJSON() {
272
272
  },
273
273
  sold: {
274
274
  id: (0, _uuid.v4)(),
275
- open: true,
275
+ open: false,
276
276
  type: 'TEXT',
277
277
  specialContent: [],
278
278
  text: '',
@@ -294,9 +294,6 @@ var getDefaultJSON = function getDefaultJSON() {
294
294
  lineHeight: 18
295
295
  }
296
296
  },
297
- labels: {
298
- open: true
299
- },
300
297
  salesProgressVisible: {
301
298
  open: true
302
299
  }
package/lib/composite-comp/dito/components/SearchBanner/mobile/index.js CHANGED
@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  require("./index.less");
11
11
 
12
- var _antd = require("antd4");
12
+ var _antd = require("antd");
13
13
 
14
14
  var _classnames = _interopRequireDefault(require("classnames"));
15
15
 
package/lib/composite-comp/dito/config-panels/RecommendConfig/RecommendConfigContent/index.js CHANGED
@@ -106,11 +106,6 @@ function (_super) {
106
106
  data: panelProps.sold
107
107
  }),
108
108
  metaOption: panelProps.sold
109
- }, {
110
- key: '6',
111
- name: (0, _locale.i18n)('PRODUCT_LABEL'),
112
- value: null,
113
- metaOption: panelProps.labels
114
109
  }],
115
110
  type: "switch"
116
111
  }));
package/lib/composite-comp/dito/config-panels/SearchBannerConfig/ConfigContent/index.js CHANGED
@@ -9,7 +9,7 @@ exports["default"] = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
- var _antd = require("antd4");
12
+ var _antd = require("antd");
13
13
 
14
14
  var _common = require("../../../../../common");
15
15
 
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.112",
4
+ "version": "1.0.114",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",