@fonixtree/magic-design 1.0.171 → 1.0.173

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 (35) hide show
  1. package/es/composite-comp/bol/components/Video/components/VideoTag/index.js +16 -14
  2. package/es/composite-comp/bol/components/Video/defaultJSON.js +1 -1
  3. package/es/composite-comp/common/components/ProductItem/index.js +13 -5
  4. package/es/composite-comp/common/components/ProductItem/index.less +3 -1
  5. package/es/composite-comp/dito/components/Campaign/mobile/components/Bargain/index.js +1 -1
  6. package/es/composite-comp/dito/components/Campaign/mobile/components/CountDown/index.js +1 -1
  7. package/es/composite-comp/dito/components/Campaign/mobile/components/FlashSale/index.js +19 -21
  8. package/es/composite-comp/dito/components/Campaign/mobile/components/GroupBuy/index.js +1 -1
  9. package/es/composite-comp/dito/components/Campaign/mobile/components/ProductItem/index.js +1 -1
  10. package/es/composite-comp/dito/components/Campaign/mobile/index.js +1 -1
  11. package/es/composite-comp/dito/components/Campaign/mobile/index.less +3 -0
  12. package/es/composite-comp/dito/components/Recommend/mobile/index.js +5 -0
  13. package/es/core/Designer/ConfigPanel/index.js +2 -2
  14. package/es/core/Designer/PageCompList/index.js +1 -1
  15. package/es/core/Designer/index.js +4 -2
  16. package/es/core/Renderer/index.js +4 -2
  17. package/es/meta-comp/config-panels/ImageConfig/index.js +0 -2
  18. package/lib/composite-comp/bol/components/Video/components/VideoTag/index.js +16 -14
  19. package/lib/composite-comp/bol/components/Video/defaultJSON.js +1 -1
  20. package/lib/composite-comp/common/components/ProductItem/index.js +13 -5
  21. package/lib/composite-comp/common/components/ProductItem/index.less +3 -1
  22. package/lib/composite-comp/dito/components/Campaign/mobile/components/Bargain/index.js +1 -1
  23. package/lib/composite-comp/dito/components/Campaign/mobile/components/CountDown/index.js +1 -1
  24. package/lib/composite-comp/dito/components/Campaign/mobile/components/FlashSale/index.js +19 -21
  25. package/lib/composite-comp/dito/components/Campaign/mobile/components/GroupBuy/index.js +1 -1
  26. package/lib/composite-comp/dito/components/Campaign/mobile/components/ProductItem/index.js +1 -1
  27. package/lib/composite-comp/dito/components/Campaign/mobile/index.js +1 -1
  28. package/lib/composite-comp/dito/components/Campaign/mobile/index.less +3 -0
  29. package/lib/composite-comp/dito/components/Recommend/mobile/index.js +5 -0
  30. package/lib/core/Designer/ConfigPanel/index.js +2 -2
  31. package/lib/core/Designer/PageCompList/index.js +1 -1
  32. package/lib/core/Designer/index.js +4 -2
  33. package/lib/core/Renderer/index.js +4 -2
  34. package/lib/meta-comp/config-panels/ImageConfig/index.js +0 -2
  35. package/package.json +1 -1
package/es/composite-comp/bol/components/Video/components/VideoTag/index.js CHANGED
@@ -82,19 +82,21 @@ function (_super) {
82
82
  }
83
83
 
84
84
  VideoTag.prototype.render = function () {
85
- var _a = this.props,
86
- onPlayClick = _a.onPlayClick,
87
- data = _a.data,
88
- _b = _a.position,
89
- position = _b === void 0 ? 'absolute' : _b,
90
- noShare = _a.noShare,
91
- padding = _a.padding,
92
- share = _a.share,
93
- layout = _a.layout,
94
- customize = _a.customize,
95
- GAData = _a.GAData,
96
- _c = _a.notVertical,
97
- notVertical = _c === void 0 ? false : _c;
85
+ var _a;
86
+
87
+ var _b = this.props,
88
+ onPlayClick = _b.onPlayClick,
89
+ data = _b.data,
90
+ _c = _b.position,
91
+ position = _c === void 0 ? 'absolute' : _c,
92
+ noShare = _b.noShare,
93
+ padding = _b.padding,
94
+ share = _b.share,
95
+ layout = _b.layout,
96
+ customize = _b.customize,
97
+ GAData = _b.GAData,
98
+ _d = _b.notVertical,
99
+ notVertical = _d === void 0 ? false : _d;
98
100
  var align = customize.align,
99
101
  vertical = customize.vertical;
100
102
  var showBtn = data.video.playButton == 'Bottom Left' && !['h5-layout3', 'pc-layout4', 'pc-layout5'].includes(layout);
@@ -120,7 +122,7 @@ function (_super) {
120
122
  position: position,
121
123
  padding: padding
122
124
  }, distanceObj))
123
- }, showBtn && /*#__PURE__*/_react["default"].createElement("div", {
125
+ }, showBtn && ((_a = data === null || data === void 0 ? void 0 : data.playIcon) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement("div", {
124
126
  className: "left-wrap"
125
127
  }, /*#__PURE__*/_react["default"].createElement("div", {
126
128
  className: "play-btn center",
package/es/composite-comp/bol/components/Video/defaultJSON.js CHANGED
@@ -202,7 +202,7 @@ var getDefaultJSON = function getDefaultJSON() {
202
202
  groupSource: [videoGroupSourceJSON(id)],
203
203
  pcHeight: 600,
204
204
  mobileHeight: 212,
205
- arc: 0,
205
+ arc: '',
206
206
  share: {
207
207
  open: false,
208
208
  image: '',
package/es/composite-comp/common/components/ProductItem/index.js CHANGED
@@ -157,14 +157,22 @@ function (_super) {
157
157
 
158
158
  if (data.type === 'ad') {
159
159
  return /*#__PURE__*/_react["default"].createElement("div", {
160
- className: "m-product-item-advertise"
161
- }, data.url && /*#__PURE__*/_react["default"].createElement("img", {
162
- alt: "welcome advertise",
160
+ className: "m-product-item-advertise",
163
161
  onClick: function onClick() {
164
162
  if (window.magicDesign.h5JumpUrlConfig) window.magicDesign.h5JumpUrlConfig(data.adObj, 'voucherRedeemed');
165
- },
163
+ }
164
+ }, data.url && !data.url.includes('.mp4') && /*#__PURE__*/_react["default"].createElement("img", {
165
+ alt: "welcome advertise",
166
166
  src: data.url
167
- }));
167
+ }), data.url && data.url.includes('.mp4') && /*#__PURE__*/_react["default"].createElement("video", {
168
+ autoPlay: true,
169
+ loop: true,
170
+ muted: true,
171
+ playsinline: true
172
+ }, /*#__PURE__*/_react["default"].createElement("source", {
173
+ src: data.url,
174
+ type: "video/mp4"
175
+ })));
168
176
  }
169
177
 
170
178
  return /*#__PURE__*/_react["default"].createElement("div", _extends({
package/es/composite-comp/common/components/ProductItem/index.less CHANGED
@@ -1,5 +1,7 @@
1
1
  .m-product-item-advertise {
2
- img {
2
+
3
+ img,
4
+ video {
3
5
  width: 100%;
4
6
  border-radius: 8px;
5
7
  }
package/es/composite-comp/dito/components/Campaign/mobile/components/Bargain/index.js CHANGED
@@ -304,7 +304,7 @@ function (_super) {
304
304
  key: item.id,
305
305
  data: item,
306
306
  onItemClick: function onItemClick() {
307
- (0, _coreUtil.clickUrl)("proDetail - " + item.offerId + " -" + (item.sppProductId || '') + " ");
307
+ (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
308
308
  }
309
309
  });
310
310
  }))));
package/es/composite-comp/dito/components/Campaign/mobile/components/CountDown/index.js CHANGED
@@ -130,7 +130,7 @@ function (_super) {
130
130
  return null;
131
131
  };
132
132
 
133
- CountDown.prototype.componentDidUpdate = function () {
133
+ CountDown.prototype.componentDidMount = function () {
134
134
  var now = this.state.now;
135
135
 
136
136
  if (this.preTime != now) {
package/es/composite-comp/dito/components/Campaign/mobile/components/FlashSale/index.js CHANGED
@@ -256,7 +256,7 @@ function (_super) {
256
256
  isWill: false
257
257
  };
258
258
 
259
- _this.getFlashData = function (pageSize, campaign) {
259
+ _this.getFlashData = function (pageSize, campaign, index, length) {
260
260
  return __awaiter(_this, void 0, void 0, function () {
261
261
  var res, pageId, _list;
262
262
 
@@ -278,7 +278,7 @@ function (_super) {
278
278
  _list = ((res === null || res === void 0 ? void 0 : res.list) || []).slice(0, 2);
279
279
 
280
280
  if (!(0, _coreUtil.isDesignMode)()) {
281
- if (_list.length === 0) this.props.onEmpty();
281
+ if (_list.length === 0 && index === length - 1) this.props.onEmpty();
282
282
  (0, _storeUtil.setMagicStore)("flashSale_" + pageId + "_" + this.props.panelProps.id, _list);
283
283
  }
284
284
 
@@ -299,10 +299,9 @@ function (_super) {
299
299
 
300
300
  _this.getNextFlashSale = function () {
301
301
  return __awaiter(_this, void 0, void 0, function () {
302
- var data, _i, _a, _b, i, s, v, pageId;
303
-
304
- return __generator(this, function (_c) {
305
- switch (_c.label) {
302
+ var data, i, arr, pageId;
303
+ return __generator(this, function (_a) {
304
+ switch (_a.label) {
306
305
  case 0:
307
306
  return [4
308
307
  /*yield*/
@@ -311,35 +310,34 @@ function (_super) {
311
310
  }, 'GET')];
312
311
 
313
312
  case 1:
314
- data = _c.sent();
313
+ data = _a.sent();
315
314
  if (!(data.length > 0)) return [3
316
315
  /*break*/
317
316
  , 6];
318
- _i = 0, _a = data.entries();
319
- _c.label = 2;
317
+ i = 0;
318
+ _a.label = 2;
320
319
 
321
320
  case 2:
322
- if (!(_i < _a.length)) return [3
321
+ if (!(i < data.length)) return [3
323
322
  /*break*/
324
323
  , 5];
325
- _b = _a[_i], i = _b[0], s = _b[1];
326
324
  return [4
327
325
  /*yield*/
328
- , this.getFlashData(2, s)];
326
+ , this.getFlashData(2, data[i], i, data.length)];
329
327
 
330
328
  case 3:
331
- v = _c.sent();
329
+ arr = _a.sent();
332
330
 
333
- if (v.length > 0) {
334
- return [2
335
- /*return*/
336
- , true]; // 查询到秒杀场次，立即退出
331
+ if (arr.length > 0) {
332
+ return [3
333
+ /*break*/
334
+ , 5]; // 查询到秒杀场次，立即退出
337
335
  }
338
336
 
339
- _c.label = 4;
337
+ _a.label = 4;
340
338
 
341
339
  case 4:
342
- _i++;
340
+ i++;
343
341
  return [3
344
342
  /*break*/
345
343
  , 2];
@@ -361,7 +359,7 @@ function (_super) {
361
359
  (0, _storeUtil.setMagicStore)("flashSale_" + pageId + "_" + this.props.panelProps.id, []);
362
360
  }
363
361
 
364
- _c.label = 7;
362
+ _a.label = 7;
365
363
 
366
364
  case 7:
367
365
  return [2
@@ -418,7 +416,7 @@ function (_super) {
418
416
  salePercent: isWill ? 0 : item.salePercent
419
417
  }),
420
418
  onItemClick: function onItemClick() {
421
- (0, _coreUtil.clickUrl)("proDetail - " + item.offerId + " -" + (item.sppProductId || '') + " ");
419
+ (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
422
420
  }
423
421
  });
424
422
  }))));
package/es/composite-comp/dito/components/Campaign/mobile/components/GroupBuy/index.js CHANGED
@@ -301,7 +301,7 @@ function (_super) {
301
301
  key: item.id,
302
302
  data: item,
303
303
  onItemClick: function onItemClick() {
304
- (0, _coreUtil.clickUrl)("proDetail - " + item.offerId + " -" + (item.sppProductId || '') + " ");
304
+ (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
305
305
  }
306
306
  });
307
307
  }))));
package/es/composite-comp/dito/components/Campaign/mobile/components/ProductItem/index.js CHANGED
@@ -85,7 +85,7 @@ function (_super) {
85
85
 
86
86
 
87
87
  var imgLabels = ((_a = data.labels) === null || _a === void 0 ? void 0 : _a.filter(function (f) {
88
- return f.position !== '6' && f.position !== '7';
88
+ return f.position !== '6' && f.position !== '7' && f.position !== '8';
89
89
  })) || [];
90
90
  return /*#__PURE__*/_react["default"].createElement("div", _extends({
91
91
  className: "m-campaign-product-item",
package/es/composite-comp/dito/components/Campaign/mobile/index.js CHANGED
@@ -86,7 +86,7 @@ function (_super) {
86
86
  }, !carouselHide && /*#__PURE__*/_react["default"].createElement("div", {
87
87
  className: "campaign-left"
88
88
  }, /*#__PURE__*/_react["default"].createElement(_antd.Carousel, {
89
- autoplay: false,
89
+ autoplay: true,
90
90
  autoplaySpeed: 2000
91
91
  }, flashSale.open && !flashSaleHide && /*#__PURE__*/_react["default"].createElement(_FlashSale["default"], {
92
92
  onEmpty: function onEmpty() {
package/es/composite-comp/dito/components/Campaign/mobile/index.less CHANGED
@@ -20,6 +20,9 @@
20
20
  .m-campaign-mobile .campaign-content .campaign-left .slick-track > div > div {
21
21
  height: 100%;
22
22
  }
23
+ .m-campaign-mobile .campaign-content .campaign-left .ant-carousel {
24
+ height: 100%;
25
+ }
23
26
  .m-campaign-mobile .campaign-content .campaign-left .slick-dots {
24
27
  height: 0.06rem;
25
28
  display: flex !important;
package/es/composite-comp/dito/components/Recommend/mobile/index.js CHANGED
@@ -592,6 +592,11 @@ function (_super) {
592
592
  _this.getMacy(".macyContainer_" + _this.props.panelProps.id, LAYOUT_COLUMN[layout]);
593
593
  }
594
594
  });
595
+ setTimeout(function () {
596
+ if (document.querySelector(".macyContainer_" + _this.props.panelProps.id)) {
597
+ _this.getMacy(".macyContainer_" + _this.props.panelProps.id, LAYOUT_COLUMN[layout]);
598
+ }
599
+ }, 2000);
595
600
  };
596
601
 
597
602
  _this.getMacy = function (container, columns) {
package/es/core/Designer/ConfigPanel/index.js CHANGED
@@ -381,8 +381,8 @@ function (_super) {
381
381
  className: "config_header"
382
382
  }, /*#__PURE__*/_react["default"].createElement("span", {
383
383
  className: "title",
384
- title: (_a = _constants.compInfoMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type]) === null || _a === void 0 ? void 0 : _a.name
385
- }, (_b = _constants.compInfoMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type]) === null || _b === void 0 ? void 0 : _b.name), /*#__PURE__*/_react["default"].createElement("div", {
384
+ title: (selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.label) || ((_a = _constants.compInfoMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type]) === null || _a === void 0 ? void 0 : _a.name)
385
+ }, (selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.label) || ((_b = _constants.compInfoMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type]) === null || _b === void 0 ? void 0 : _b.name)), /*#__PURE__*/_react["default"].createElement("div", {
386
386
  className: "right_wrap"
387
387
  }, /*#__PURE__*/_react["default"].createElement(_TerminalSelect["default"], {
388
388
  onChange: this.onTerminalChange,
package/es/core/Designer/PageCompList/index.js CHANGED
@@ -293,7 +293,7 @@ function PageCompList(_a) {
293
293
  type: "icon-drag"
294
294
  }), /*#__PURE__*/_react["default"].createElement("span", {
295
295
  className: "card-title ml16"
296
- }, index + 1, ". ", (_b = _constants.compInfoMap[comp.type]) === null || _b === void 0 ? void 0 : _b.name)), pageType !== 'Menu' && /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
296
+ }, index + 1, ". ", comp.label || ((_b = _constants.compInfoMap[comp.type]) === null || _b === void 0 ? void 0 : _b.name))), pageType !== 'Menu' && /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
297
297
  overlay: menu,
298
298
  placement: "bottomRight",
299
299
  trigger: ['click']
package/es/core/Designer/index.js CHANGED
@@ -425,7 +425,8 @@ function (_super) {
425
425
 
426
426
  _this.addComponent = function (_a) {
427
427
  var type = _a.type,
428
- terminalType = _a.terminalType;
428
+ terminalType = _a.terminalType,
429
+ label = _a.label;
429
430
  var MPageData = _this.state.MPageData;
430
431
  var compType = _componentTypes.componentMap[type];
431
432
 
@@ -438,7 +439,8 @@ function (_super) {
438
439
 
439
440
  var newData = __spreadArrays(MPageData, [__assign(__assign({}, compInst), {
440
441
  terminalType: terminalType,
441
- activeTerminal: terminalType
442
+ activeTerminal: terminalType,
443
+ label: label
442
444
  })]);
443
445
 
444
446
  _this.history.push(newData);
package/es/core/Renderer/index.js CHANGED
@@ -46,7 +46,8 @@ var setDesignConfig = function setDesignConfig(props) {
46
46
  device = props.device,
47
47
  isPreview = props.isPreview,
48
48
  projectCode = props.projectCode,
49
- showRecommendAds = props.showRecommendAds;
49
+ showRecommendAds = props.showRecommendAds,
50
+ h5JumpUrlConfig = props.h5JumpUrlConfig;
50
51
  window.magicDesign = __assign(__assign({
51
52
  pageBackground: '#f2f2f2',
52
53
  mode: 'renderer',
@@ -57,7 +58,8 @@ var setDesignConfig = function setDesignConfig(props) {
57
58
  projectCode: projectCode,
58
59
  compSpacing: Number(config.compSpacing),
59
60
  compWidth: Number(config.compWidth),
60
- showRecommendAds: showRecommendAds
61
+ showRecommendAds: showRecommendAds,
62
+ h5JumpUrlConfig: h5JumpUrlConfig
61
63
  });
62
64
  };
63
65
  /**
package/es/meta-comp/config-panels/ImageConfig/index.js CHANGED
@@ -360,8 +360,6 @@ function (_super) {
360
360
  }];
361
361
 
362
362
  if (needHover) {
363
- console.log('needHover', needHover);
364
-
365
363
  var HoverSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
366
364
  split: data.hover.backgroundType === 'new',
367
365
  title: (0, _locale.i18n)('IMAGE')
package/lib/composite-comp/bol/components/Video/components/VideoTag/index.js CHANGED
@@ -82,19 +82,21 @@ function (_super) {
82
82
  }
83
83
 
84
84
  VideoTag.prototype.render = function () {
85
- var _a = this.props,
86
- onPlayClick = _a.onPlayClick,
87
- data = _a.data,
88
- _b = _a.position,
89
- position = _b === void 0 ? 'absolute' : _b,
90
- noShare = _a.noShare,
91
- padding = _a.padding,
92
- share = _a.share,
93
- layout = _a.layout,
94
- customize = _a.customize,
95
- GAData = _a.GAData,
96
- _c = _a.notVertical,
97
- notVertical = _c === void 0 ? false : _c;
85
+ var _a;
86
+
87
+ var _b = this.props,
88
+ onPlayClick = _b.onPlayClick,
89
+ data = _b.data,
90
+ _c = _b.position,
91
+ position = _c === void 0 ? 'absolute' : _c,
92
+ noShare = _b.noShare,
93
+ padding = _b.padding,
94
+ share = _b.share,
95
+ layout = _b.layout,
96
+ customize = _b.customize,
97
+ GAData = _b.GAData,
98
+ _d = _b.notVertical,
99
+ notVertical = _d === void 0 ? false : _d;
98
100
  var align = customize.align,
99
101
  vertical = customize.vertical;
100
102
  var showBtn = data.video.playButton == 'Bottom Left' && !['h5-layout3', 'pc-layout4', 'pc-layout5'].includes(layout);
@@ -120,7 +122,7 @@ function (_super) {
120
122
  position: position,
121
123
  padding: padding
122
124
  }, distanceObj))
123
- }, showBtn && /*#__PURE__*/_react["default"].createElement("div", {
125
+ }, showBtn && ((_a = data === null || data === void 0 ? void 0 : data.playIcon) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement("div", {
124
126
  className: "left-wrap"
125
127
  }, /*#__PURE__*/_react["default"].createElement("div", {
126
128
  className: "play-btn center",
package/lib/composite-comp/bol/components/Video/defaultJSON.js CHANGED
@@ -202,7 +202,7 @@ var getDefaultJSON = function getDefaultJSON() {
202
202
  groupSource: [videoGroupSourceJSON(id)],
203
203
  pcHeight: 600,
204
204
  mobileHeight: 212,
205
- arc: 0,
205
+ arc: '',
206
206
  share: {
207
207
  open: false,
208
208
  image: '',
package/lib/composite-comp/common/components/ProductItem/index.js CHANGED
@@ -157,14 +157,22 @@ function (_super) {
157
157
 
158
158
  if (data.type === 'ad') {
159
159
  return /*#__PURE__*/_react["default"].createElement("div", {
160
- className: "m-product-item-advertise"
161
- }, data.url && /*#__PURE__*/_react["default"].createElement("img", {
162
- alt: "welcome advertise",
160
+ className: "m-product-item-advertise",
163
161
  onClick: function onClick() {
164
162
  if (window.magicDesign.h5JumpUrlConfig) window.magicDesign.h5JumpUrlConfig(data.adObj, 'voucherRedeemed');
165
- },
163
+ }
164
+ }, data.url && !data.url.includes('.mp4') && /*#__PURE__*/_react["default"].createElement("img", {
165
+ alt: "welcome advertise",
166
166
  src: data.url
167
- }));
167
+ }), data.url && data.url.includes('.mp4') && /*#__PURE__*/_react["default"].createElement("video", {
168
+ autoPlay: true,
169
+ loop: true,
170
+ muted: true,
171
+ playsinline: true
172
+ }, /*#__PURE__*/_react["default"].createElement("source", {
173
+ src: data.url,
174
+ type: "video/mp4"
175
+ })));
168
176
  }
169
177
 
170
178
  return /*#__PURE__*/_react["default"].createElement("div", _extends({
package/lib/composite-comp/common/components/ProductItem/index.less CHANGED
@@ -1,5 +1,7 @@
1
1
  .m-product-item-advertise {
2
- img {
2
+
3
+ img,
4
+ video {
3
5
  width: 100%;
4
6
  border-radius: 8px;
5
7
  }
package/lib/composite-comp/dito/components/Campaign/mobile/components/Bargain/index.js CHANGED
@@ -304,7 +304,7 @@ function (_super) {
304
304
  key: item.id,
305
305
  data: item,
306
306
  onItemClick: function onItemClick() {
307
- (0, _coreUtil.clickUrl)("proDetail - " + item.offerId + " -" + (item.sppProductId || '') + " ");
307
+ (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
308
308
  }
309
309
  });
310
310
  }))));
package/lib/composite-comp/dito/components/Campaign/mobile/components/CountDown/index.js CHANGED
@@ -130,7 +130,7 @@ function (_super) {
130
130
  return null;
131
131
  };
132
132
 
133
- CountDown.prototype.componentDidUpdate = function () {
133
+ CountDown.prototype.componentDidMount = function () {
134
134
  var now = this.state.now;
135
135
 
136
136
  if (this.preTime != now) {
package/lib/composite-comp/dito/components/Campaign/mobile/components/FlashSale/index.js CHANGED
@@ -256,7 +256,7 @@ function (_super) {
256
256
  isWill: false
257
257
  };
258
258
 
259
- _this.getFlashData = function (pageSize, campaign) {
259
+ _this.getFlashData = function (pageSize, campaign, index, length) {
260
260
  return __awaiter(_this, void 0, void 0, function () {
261
261
  var res, pageId, _list;
262
262
 
@@ -278,7 +278,7 @@ function (_super) {
278
278
  _list = ((res === null || res === void 0 ? void 0 : res.list) || []).slice(0, 2);
279
279
 
280
280
  if (!(0, _coreUtil.isDesignMode)()) {
281
- if (_list.length === 0) this.props.onEmpty();
281
+ if (_list.length === 0 && index === length - 1) this.props.onEmpty();
282
282
  (0, _storeUtil.setMagicStore)("flashSale_" + pageId + "_" + this.props.panelProps.id, _list);
283
283
  }
284
284
 
@@ -299,10 +299,9 @@ function (_super) {
299
299
 
300
300
  _this.getNextFlashSale = function () {
301
301
  return __awaiter(_this, void 0, void 0, function () {
302
- var data, _i, _a, _b, i, s, v, pageId;
303
-
304
- return __generator(this, function (_c) {
305
- switch (_c.label) {
302
+ var data, i, arr, pageId;
303
+ return __generator(this, function (_a) {
304
+ switch (_a.label) {
306
305
  case 0:
307
306
  return [4
308
307
  /*yield*/
@@ -311,35 +310,34 @@ function (_super) {
311
310
  }, 'GET')];
312
311
 
313
312
  case 1:
314
- data = _c.sent();
313
+ data = _a.sent();
315
314
  if (!(data.length > 0)) return [3
316
315
  /*break*/
317
316
  , 6];
318
- _i = 0, _a = data.entries();
319
- _c.label = 2;
317
+ i = 0;
318
+ _a.label = 2;
320
319
 
321
320
  case 2:
322
- if (!(_i < _a.length)) return [3
321
+ if (!(i < data.length)) return [3
323
322
  /*break*/
324
323
  , 5];
325
- _b = _a[_i], i = _b[0], s = _b[1];
326
324
  return [4
327
325
  /*yield*/
328
- , this.getFlashData(2, s)];
326
+ , this.getFlashData(2, data[i], i, data.length)];
329
327
 
330
328
  case 3:
331
- v = _c.sent();
329
+ arr = _a.sent();
332
330
 
333
- if (v.length > 0) {
334
- return [2
335
- /*return*/
336
- , true]; // 查询到秒杀场次，立即退出
331
+ if (arr.length > 0) {
332
+ return [3
333
+ /*break*/
334
+ , 5]; // 查询到秒杀场次，立即退出
337
335
  }
338
336
 
339
- _c.label = 4;
337
+ _a.label = 4;
340
338
 
341
339
  case 4:
342
- _i++;
340
+ i++;
343
341
  return [3
344
342
  /*break*/
345
343
  , 2];
@@ -361,7 +359,7 @@ function (_super) {
361
359
  (0, _storeUtil.setMagicStore)("flashSale_" + pageId + "_" + this.props.panelProps.id, []);
362
360
  }
363
361
 
364
- _c.label = 7;
362
+ _a.label = 7;
365
363
 
366
364
  case 7:
367
365
  return [2
@@ -418,7 +416,7 @@ function (_super) {
418
416
  salePercent: isWill ? 0 : item.salePercent
419
417
  }),
420
418
  onItemClick: function onItemClick() {
421
- (0, _coreUtil.clickUrl)("proDetail - " + item.offerId + " -" + (item.sppProductId || '') + " ");
419
+ (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
422
420
  }
423
421
  });
424
422
  }))));
package/lib/composite-comp/dito/components/Campaign/mobile/components/GroupBuy/index.js CHANGED
@@ -301,7 +301,7 @@ function (_super) {
301
301
  key: item.id,
302
302
  data: item,
303
303
  onItemClick: function onItemClick() {
304
- (0, _coreUtil.clickUrl)("proDetail - " + item.offerId + " -" + (item.sppProductId || '') + " ");
304
+ (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
305
305
  }
306
306
  });
307
307
  }))));
package/lib/composite-comp/dito/components/Campaign/mobile/components/ProductItem/index.js CHANGED
@@ -85,7 +85,7 @@ function (_super) {
85
85
 
86
86
 
87
87
  var imgLabels = ((_a = data.labels) === null || _a === void 0 ? void 0 : _a.filter(function (f) {
88
- return f.position !== '6' && f.position !== '7';
88
+ return f.position !== '6' && f.position !== '7' && f.position !== '8';
89
89
  })) || [];
90
90
  return /*#__PURE__*/_react["default"].createElement("div", _extends({
91
91
  className: "m-campaign-product-item",
package/lib/composite-comp/dito/components/Campaign/mobile/index.js CHANGED
@@ -86,7 +86,7 @@ function (_super) {
86
86
  }, !carouselHide && /*#__PURE__*/_react["default"].createElement("div", {
87
87
  className: "campaign-left"
88
88
  }, /*#__PURE__*/_react["default"].createElement(_antd.Carousel, {
89
- autoplay: false,
89
+ autoplay: true,
90
90
  autoplaySpeed: 2000
91
91
  }, flashSale.open && !flashSaleHide && /*#__PURE__*/_react["default"].createElement(_FlashSale["default"], {
92
92
  onEmpty: function onEmpty() {
package/lib/composite-comp/dito/components/Campaign/mobile/index.less CHANGED
@@ -20,6 +20,9 @@
20
20
  .m-campaign-mobile .campaign-content .campaign-left .slick-track > div > div {
21
21
  height: 100%;
22
22
  }
23
+ .m-campaign-mobile .campaign-content .campaign-left .ant-carousel {
24
+ height: 100%;
25
+ }
23
26
  .m-campaign-mobile .campaign-content .campaign-left .slick-dots {
24
27
  height: 0.06rem;
25
28
  display: flex !important;
package/lib/composite-comp/dito/components/Recommend/mobile/index.js CHANGED
@@ -592,6 +592,11 @@ function (_super) {
592
592
  _this.getMacy(".macyContainer_" + _this.props.panelProps.id, LAYOUT_COLUMN[layout]);
593
593
  }
594
594
  });
595
+ setTimeout(function () {
596
+ if (document.querySelector(".macyContainer_" + _this.props.panelProps.id)) {
597
+ _this.getMacy(".macyContainer_" + _this.props.panelProps.id, LAYOUT_COLUMN[layout]);
598
+ }
599
+ }, 2000);
595
600
  };
596
601
 
597
602
  _this.getMacy = function (container, columns) {
package/lib/core/Designer/ConfigPanel/index.js CHANGED
@@ -381,8 +381,8 @@ function (_super) {
381
381
  className: "config_header"
382
382
  }, /*#__PURE__*/_react["default"].createElement("span", {
383
383
  className: "title",
384
- title: (_a = _constants.compInfoMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type]) === null || _a === void 0 ? void 0 : _a.name
385
- }, (_b = _constants.compInfoMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type]) === null || _b === void 0 ? void 0 : _b.name), /*#__PURE__*/_react["default"].createElement("div", {
384
+ title: (selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.label) || ((_a = _constants.compInfoMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type]) === null || _a === void 0 ? void 0 : _a.name)
385
+ }, (selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.label) || ((_b = _constants.compInfoMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type]) === null || _b === void 0 ? void 0 : _b.name)), /*#__PURE__*/_react["default"].createElement("div", {
386
386
  className: "right_wrap"
387
387
  }, /*#__PURE__*/_react["default"].createElement(_TerminalSelect["default"], {
388
388
  onChange: this.onTerminalChange,
package/lib/core/Designer/PageCompList/index.js CHANGED
@@ -293,7 +293,7 @@ function PageCompList(_a) {
293
293
  type: "icon-drag"
294
294
  }), /*#__PURE__*/_react["default"].createElement("span", {
295
295
  className: "card-title ml16"
296
- }, index + 1, ". ", (_b = _constants.compInfoMap[comp.type]) === null || _b === void 0 ? void 0 : _b.name)), pageType !== 'Menu' && /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
296
+ }, index + 1, ". ", comp.label || ((_b = _constants.compInfoMap[comp.type]) === null || _b === void 0 ? void 0 : _b.name))), pageType !== 'Menu' && /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
297
297
  overlay: menu,
298
298
  placement: "bottomRight",
299
299
  trigger: ['click']
package/lib/core/Designer/index.js CHANGED
@@ -425,7 +425,8 @@ function (_super) {
425
425
 
426
426
  _this.addComponent = function (_a) {
427
427
  var type = _a.type,
428
- terminalType = _a.terminalType;
428
+ terminalType = _a.terminalType,
429
+ label = _a.label;
429
430
  var MPageData = _this.state.MPageData;
430
431
  var compType = _componentTypes.componentMap[type];
431
432
 
@@ -438,7 +439,8 @@ function (_super) {
438
439
 
439
440
  var newData = __spreadArrays(MPageData, [__assign(__assign({}, compInst), {
440
441
  terminalType: terminalType,
441
- activeTerminal: terminalType
442
+ activeTerminal: terminalType,
443
+ label: label
442
444
  })]);
443
445
 
444
446
  _this.history.push(newData);
package/lib/core/Renderer/index.js CHANGED
@@ -46,7 +46,8 @@ var setDesignConfig = function setDesignConfig(props) {
46
46
  device = props.device,
47
47
  isPreview = props.isPreview,
48
48
  projectCode = props.projectCode,
49
- showRecommendAds = props.showRecommendAds;
49
+ showRecommendAds = props.showRecommendAds,
50
+ h5JumpUrlConfig = props.h5JumpUrlConfig;
50
51
  window.magicDesign = __assign(__assign({
51
52
  pageBackground: '#f2f2f2',
52
53
  mode: 'renderer',
@@ -57,7 +58,8 @@ var setDesignConfig = function setDesignConfig(props) {
57
58
  projectCode: projectCode,
58
59
  compSpacing: Number(config.compSpacing),
59
60
  compWidth: Number(config.compWidth),
60
- showRecommendAds: showRecommendAds
61
+ showRecommendAds: showRecommendAds,
62
+ h5JumpUrlConfig: h5JumpUrlConfig
61
63
  });
62
64
  };
63
65
  /**
package/lib/meta-comp/config-panels/ImageConfig/index.js CHANGED
@@ -360,8 +360,6 @@ function (_super) {
360
360
  }];
361
361
 
362
362
  if (needHover) {
363
- console.log('needHover', needHover);
364
-
365
363
  var HoverSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
366
364
  split: data.hover.backgroundType === 'new',
367
365
  title: (0, _locale.i18n)('IMAGE')
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.171",
4
+ "version": "1.0.173",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",