@fonixtree/magic-design 0.0.158 → 0.0.160

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 (47) hide show
  1. package/es/common/ImageModal/CommonModal/index.js +0 -1
  2. package/es/common/LinkModal/FilteredProductModal/index.js +1 -1
  3. package/es/common/ProductSource/index.js +1 -1
  4. package/es/common/Video/index.js +1 -1
  5. package/es/composite-comp/bol/components/Video/components/ShareBtn/index.less +2 -2
  6. package/es/composite-comp/bol/components/Video/components/VideoTag/index.js +6 -1
  7. package/es/composite-comp/bol/components/Video/components/VideoTag/index.less +1 -0
  8. package/es/composite-comp/bol/components/Video/mobile/Layout1/index.js +1 -1
  9. package/es/composite-comp/bol/components/Video/mobile/Layout1/index.less +1 -0
  10. package/es/composite-comp/bol/components/Video/mobile/Layout2/index.js +2 -2
  11. package/es/composite-comp/bol/components/Video/mobile/Layout2/index.less +1 -0
  12. package/es/composite-comp/bol/components/Video/mobile/Layout3/index.js +1 -1
  13. package/es/composite-comp/bol/components/Video/mobile/Layout3/index.less +1 -0
  14. package/es/composite-comp/bol/components/Video/mobile/index.js +0 -1
  15. package/es/composite-comp/bol/components/Video/pc/Layout1/index.less +1 -0
  16. package/es/composite-comp/bol/components/Video/pc/Layout2/index.js +1 -1
  17. package/es/composite-comp/bol/components/Video/pc/Layout2/index.less +2 -0
  18. package/es/composite-comp/bol/components/Video/pc/Layout3/index.less +1 -0
  19. package/es/composite-comp/bol/components/Video/pc/Layout4/index.less +1 -0
  20. package/es/composite-comp/bol/components/Video/pc/Layout5/index.less +1 -0
  21. package/es/locale/en/en.json +1 -0
  22. package/es/locale/es/es.json +1 -0
  23. package/es/locale/id/id.json +1 -0
  24. package/lib/common/ImageModal/CommonModal/index.js +0 -1
  25. package/lib/common/LinkModal/FilteredProductModal/index.js +1 -1
  26. package/lib/common/ProductSource/index.js +1 -1
  27. package/lib/common/Video/index.js +1 -1
  28. package/lib/composite-comp/bol/components/Video/components/ShareBtn/index.less +2 -2
  29. package/lib/composite-comp/bol/components/Video/components/VideoTag/index.js +6 -1
  30. package/lib/composite-comp/bol/components/Video/components/VideoTag/index.less +1 -0
  31. package/lib/composite-comp/bol/components/Video/mobile/Layout1/index.js +1 -1
  32. package/lib/composite-comp/bol/components/Video/mobile/Layout1/index.less +1 -0
  33. package/lib/composite-comp/bol/components/Video/mobile/Layout2/index.js +2 -2
  34. package/lib/composite-comp/bol/components/Video/mobile/Layout2/index.less +1 -0
  35. package/lib/composite-comp/bol/components/Video/mobile/Layout3/index.js +1 -1
  36. package/lib/composite-comp/bol/components/Video/mobile/Layout3/index.less +1 -0
  37. package/lib/composite-comp/bol/components/Video/mobile/index.js +0 -1
  38. package/lib/composite-comp/bol/components/Video/pc/Layout1/index.less +1 -0
  39. package/lib/composite-comp/bol/components/Video/pc/Layout2/index.js +1 -1
  40. package/lib/composite-comp/bol/components/Video/pc/Layout2/index.less +2 -0
  41. package/lib/composite-comp/bol/components/Video/pc/Layout3/index.less +1 -0
  42. package/lib/composite-comp/bol/components/Video/pc/Layout4/index.less +1 -0
  43. package/lib/composite-comp/bol/components/Video/pc/Layout5/index.less +1 -0
  44. package/lib/locale/en/en.json +1 -0
  45. package/lib/locale/es/es.json +1 -0
  46. package/lib/locale/id/id.json +1 -0
  47. package/package.json +1 -1
@@ -35,7 +35,6 @@ function CommonModal(_a) {
35
35
  okText: okText || 'Confirm',
36
36
  cancelText: cancelText || 'Cancel'
37
37
  };
38
- console.log('CommonModal render');
39
38
  return /*#__PURE__*/_react["default"].createElement(_antd.Modal, _extends({}, modalCommonProps, modalOpts, {
40
39
  confirmLoading: confirmLoading,
41
40
  onCancel: onCancel,
@@ -461,7 +461,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
461
461
  startPrice: minimum * precision || '',
462
462
  endPrice: maximum * precision || '',
463
463
  // storeName:storeName,
464
- cmpTypeId: promotions.key || '',
464
+ campaignType: promotions.key || '',
465
465
  pageSize: paginationParams.pageSize,
466
466
  pageIndex: paginationParams.current,
467
467
  state: 'A'
@@ -193,7 +193,7 @@ function ProductSource(_a) {
193
193
  , 2];
194
194
  return [4
195
195
  /*yield*/
196
- , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "products", {
196
+ , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", {
197
197
  products: value
198
198
  }, 'GET')];
199
199
 
@@ -344,7 +344,7 @@ function (_super) {
344
344
  contentWrap.appendChild(closeImgDom);
345
345
  modelWrap.appendChild(shadowWrap);
346
346
  modelWrap.appendChild(contentWrap);
347
- (document.querySelector('[magic_designer]') || document.body).document.body.appendChild(modelWrap);
347
+ (document.querySelector('[magic_design]') || document.body).appendChild(modelWrap);
348
348
  createVideo('-modal-' + videoId, __assign(__assign({}, _this.props.opts), {
349
349
  autoplay: true
350
350
  }));
@@ -11,8 +11,8 @@
11
11
 
12
12
  &.pc {
13
13
  position: absolute;
14
- right: 48px;
15
- bottom: 48px;
14
+ right: 20px;
15
+ bottom: 20px;
16
16
  height: 60px;
17
17
  width: 60px;
18
18
  }
@@ -17,6 +17,8 @@ var _index = _interopRequireDefault(require("../ShareBtn/index"));
17
17
 
18
18
  require("./index.less");
19
19
 
20
+ var _AlignSelector = require("../../../../../../common/AlignSelector");
21
+
20
22
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
21
23
 
22
24
  var __extends = void 0 && (void 0).__extends || function () {
@@ -86,7 +88,10 @@ function (_super) {
86
88
  }))), /*#__PURE__*/_react["default"].createElement("div", {
87
89
  className: "right-wrap"
88
90
  }, /*#__PURE__*/_react["default"].createElement("div", {
89
- className: "tag-wrap"
91
+ className: "tag-wrap",
92
+ style: {
93
+ justifyContent: _AlignSelector.alignItemMap[align]
94
+ }
90
95
  }, data.imageTag.open && /*#__PURE__*/_react["default"].createElement("div", {
91
96
  className: "tag-image"
92
97
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
@@ -21,6 +21,7 @@
21
21
  width: 60px;
22
22
  height: 60px;
23
23
  z-index: 1;
24
+ cursor: pointer;
24
25
 
25
26
  img {
26
27
  width: 100%;
@@ -147,7 +147,7 @@ function (_super) {
147
147
  }, /*#__PURE__*/_react["default"].createElement("img", {
148
148
  alt: "",
149
149
  src: _playCircle["default"]
150
- })), /*#__PURE__*/_react["default"].createElement(_index["default"], {
150
+ })), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_index["default"], {
151
151
  data: data
152
152
  }), !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
153
153
  align: data.customize.align,
@@ -19,6 +19,7 @@
19
19
  width: 60px;
20
20
  height: 60px;
21
21
  z-index: 1;
22
+ cursor: pointer;
22
23
 
23
24
  img {
24
25
  width: 100%;
@@ -189,9 +189,9 @@ function (_super) {
189
189
  scroll: 'node-' + data.id
190
190
  })
191
191
  }, data.share)
192
+ }), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_index["default"], {
193
+ data: data
192
194
  }));
193
- }), /*#__PURE__*/_react["default"].createElement(_index["default"], {
194
- data: data
195
195
  }))), /*#__PURE__*/_react["default"].createElement(_common.SwiperBan, {
196
196
  data: data.groupSource,
197
197
  onChange: function onChange(i) {
@@ -37,6 +37,7 @@
37
37
  width: 60px;
38
38
  height: 60px;
39
39
  z-index: 1;
40
+ cursor: pointer;
40
41
 
41
42
  img {
42
43
  width: 100%;
@@ -147,7 +147,7 @@ function (_super) {
147
147
  }, /*#__PURE__*/_react["default"].createElement("img", {
148
148
  alt: "",
149
149
  src: _playCircle["default"]
150
- })), data.share.open && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
150
+ })), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
151
151
  data: data.share
152
152
  })), /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
153
153
  align: data.customize.align,
@@ -29,6 +29,7 @@
29
29
  width: 60px;
30
30
  height: 60px;
31
31
  z-index: 1;
32
+ cursor: pointer;
32
33
 
33
34
  img {
34
35
  width: 100%;
@@ -98,7 +98,6 @@ function (_super) {
98
98
 
99
99
  BannerMobile.prototype.render = function () {
100
100
  var data = this.props.data;
101
- console.log('data: ', data);
102
101
  return /*#__PURE__*/_react["default"].createElement("div", {
103
102
  className: "m-video-mobile"
104
103
  }, data.customize.layout.h5Layout == 'layout1' && /*#__PURE__*/_react["default"].createElement(_Layout["default"], {
@@ -27,6 +27,7 @@
27
27
  width: 170px;
28
28
  height: 170px;
29
29
  z-index: 1;
30
+ cursor: pointer;
30
31
 
31
32
  img {
32
33
  width: 100%;
@@ -201,7 +201,7 @@ function (_super) {
201
201
  noShare: true,
202
202
  padding: 32
203
203
  }));
204
- })), !hasPlaying && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
204
+ })), data.share.open && !hasPlaying && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
205
205
  data: __assign({
206
206
  url: (0, _commonUtil.addUrlQuery)(window.location.href, {
207
207
  scroll: 'node-' + data.id
@@ -31,6 +31,7 @@
31
31
  width: 110px;
32
32
  height: 110px;
33
33
  z-index: 1;
34
+ cursor: pointer;
34
35
 
35
36
  img {
36
37
  width: 100%;
@@ -54,6 +55,7 @@
54
55
  width: 110px;
55
56
  height: 110px;
56
57
  z-index: 1;
58
+ cursor: pointer;
57
59
 
58
60
  img {
59
61
  width: 100%;
@@ -28,6 +28,7 @@
28
28
  width: 100px;
29
29
  height: 100px;
30
30
  z-index: 1;
31
+ cursor: pointer;
31
32
 
32
33
  img {
33
34
  width: 100%;
@@ -30,6 +30,7 @@
30
30
  width: 70px;
31
31
  height: 70px;
32
32
  z-index: 1;
33
+ cursor: pointer;
33
34
 
34
35
  img {
35
36
  width: 100%;
@@ -27,6 +27,7 @@
27
27
  width: 60px;
28
28
  height: 60px;
29
29
  z-index: 1;
30
+ cursor: pointer;
30
31
 
31
32
  img {
32
33
  width: 100%;
@@ -1,4 +1,5 @@
1
1
  {
2
+ "VIDEO": "Video",
2
3
  "BACK": "Back",
3
4
  "VIDEO_HEIGHT": "Video Height",
4
5
  "HEIGHT": "Height",
@@ -1,4 +1,5 @@
1
1
  {
2
+ "VIDEO": "Video",
2
3
  "BACK": "Back",
3
4
  "VIDEO_HEIGHT": "Video Height",
4
5
  "HEIGHT": "Height",
@@ -1,4 +1,5 @@
1
1
  {
2
+ "VIDEO": "Video",
2
3
  "BACK": "Back",
3
4
  "VIDEO_HEIGHT": "Video Height",
4
5
  "HEIGHT": "Height",
@@ -35,7 +35,6 @@ function CommonModal(_a) {
35
35
  okText: okText || 'Confirm',
36
36
  cancelText: cancelText || 'Cancel'
37
37
  };
38
- console.log('CommonModal render');
39
38
  return /*#__PURE__*/_react["default"].createElement(_antd.Modal, _extends({}, modalCommonProps, modalOpts, {
40
39
  confirmLoading: confirmLoading,
41
40
  onCancel: onCancel,
@@ -461,7 +461,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
461
461
  startPrice: minimum * precision || '',
462
462
  endPrice: maximum * precision || '',
463
463
  // storeName:storeName,
464
- cmpTypeId: promotions.key || '',
464
+ campaignType: promotions.key || '',
465
465
  pageSize: paginationParams.pageSize,
466
466
  pageIndex: paginationParams.current,
467
467
  state: 'A'
@@ -193,7 +193,7 @@ function ProductSource(_a) {
193
193
  , 2];
194
194
  return [4
195
195
  /*yield*/
196
- , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "products", {
196
+ , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", {
197
197
  products: value
198
198
  }, 'GET')];
199
199
 
@@ -344,7 +344,7 @@ function (_super) {
344
344
  contentWrap.appendChild(closeImgDom);
345
345
  modelWrap.appendChild(shadowWrap);
346
346
  modelWrap.appendChild(contentWrap);
347
- (document.querySelector('[magic_designer]') || document.body).document.body.appendChild(modelWrap);
347
+ (document.querySelector('[magic_design]') || document.body).appendChild(modelWrap);
348
348
  createVideo('-modal-' + videoId, __assign(__assign({}, _this.props.opts), {
349
349
  autoplay: true
350
350
  }));
@@ -11,8 +11,8 @@
11
11
 
12
12
  &.pc {
13
13
  position: absolute;
14
- right: 48px;
15
- bottom: 48px;
14
+ right: 20px;
15
+ bottom: 20px;
16
16
  height: 60px;
17
17
  width: 60px;
18
18
  }
@@ -17,6 +17,8 @@ var _index = _interopRequireDefault(require("../ShareBtn/index"));
17
17
 
18
18
  require("./index.less");
19
19
 
20
+ var _AlignSelector = require("../../../../../../common/AlignSelector");
21
+
20
22
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
21
23
 
22
24
  var __extends = void 0 && (void 0).__extends || function () {
@@ -86,7 +88,10 @@ function (_super) {
86
88
  }))), /*#__PURE__*/_react["default"].createElement("div", {
87
89
  className: "right-wrap"
88
90
  }, /*#__PURE__*/_react["default"].createElement("div", {
89
- className: "tag-wrap"
91
+ className: "tag-wrap",
92
+ style: {
93
+ justifyContent: _AlignSelector.alignItemMap[align]
94
+ }
90
95
  }, data.imageTag.open && /*#__PURE__*/_react["default"].createElement("div", {
91
96
  className: "tag-image"
92
97
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
@@ -21,6 +21,7 @@
21
21
  width: 60px;
22
22
  height: 60px;
23
23
  z-index: 1;
24
+ cursor: pointer;
24
25
 
25
26
  img {
26
27
  width: 100%;
@@ -147,7 +147,7 @@ function (_super) {
147
147
  }, /*#__PURE__*/_react["default"].createElement("img", {
148
148
  alt: "",
149
149
  src: _playCircle["default"]
150
- })), /*#__PURE__*/_react["default"].createElement(_index["default"], {
150
+ })), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_index["default"], {
151
151
  data: data
152
152
  }), !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
153
153
  align: data.customize.align,
@@ -19,6 +19,7 @@
19
19
  width: 60px;
20
20
  height: 60px;
21
21
  z-index: 1;
22
+ cursor: pointer;
22
23
 
23
24
  img {
24
25
  width: 100%;
@@ -189,9 +189,9 @@ function (_super) {
189
189
  scroll: 'node-' + data.id
190
190
  })
191
191
  }, data.share)
192
+ }), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_index["default"], {
193
+ data: data
192
194
  }));
193
- }), /*#__PURE__*/_react["default"].createElement(_index["default"], {
194
- data: data
195
195
  }))), /*#__PURE__*/_react["default"].createElement(_common.SwiperBan, {
196
196
  data: data.groupSource,
197
197
  onChange: function onChange(i) {
@@ -37,6 +37,7 @@
37
37
  width: 60px;
38
38
  height: 60px;
39
39
  z-index: 1;
40
+ cursor: pointer;
40
41
 
41
42
  img {
42
43
  width: 100%;
@@ -147,7 +147,7 @@ function (_super) {
147
147
  }, /*#__PURE__*/_react["default"].createElement("img", {
148
148
  alt: "",
149
149
  src: _playCircle["default"]
150
- })), data.share.open && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
150
+ })), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
151
151
  data: data.share
152
152
  })), /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
153
153
  align: data.customize.align,
@@ -29,6 +29,7 @@
29
29
  width: 60px;
30
30
  height: 60px;
31
31
  z-index: 1;
32
+ cursor: pointer;
32
33
 
33
34
  img {
34
35
  width: 100%;
@@ -98,7 +98,6 @@ function (_super) {
98
98
 
99
99
  BannerMobile.prototype.render = function () {
100
100
  var data = this.props.data;
101
- console.log('data: ', data);
102
101
  return /*#__PURE__*/_react["default"].createElement("div", {
103
102
  className: "m-video-mobile"
104
103
  }, data.customize.layout.h5Layout == 'layout1' && /*#__PURE__*/_react["default"].createElement(_Layout["default"], {
@@ -27,6 +27,7 @@
27
27
  width: 170px;
28
28
  height: 170px;
29
29
  z-index: 1;
30
+ cursor: pointer;
30
31
 
31
32
  img {
32
33
  width: 100%;
@@ -201,7 +201,7 @@ function (_super) {
201
201
  noShare: true,
202
202
  padding: 32
203
203
  }));
204
- })), !hasPlaying && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
204
+ })), data.share.open && !hasPlaying && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
205
205
  data: __assign({
206
206
  url: (0, _commonUtil.addUrlQuery)(window.location.href, {
207
207
  scroll: 'node-' + data.id
@@ -31,6 +31,7 @@
31
31
  width: 110px;
32
32
  height: 110px;
33
33
  z-index: 1;
34
+ cursor: pointer;
34
35
 
35
36
  img {
36
37
  width: 100%;
@@ -54,6 +55,7 @@
54
55
  width: 110px;
55
56
  height: 110px;
56
57
  z-index: 1;
58
+ cursor: pointer;
57
59
 
58
60
  img {
59
61
  width: 100%;
@@ -28,6 +28,7 @@
28
28
  width: 100px;
29
29
  height: 100px;
30
30
  z-index: 1;
31
+ cursor: pointer;
31
32
 
32
33
  img {
33
34
  width: 100%;
@@ -30,6 +30,7 @@
30
30
  width: 70px;
31
31
  height: 70px;
32
32
  z-index: 1;
33
+ cursor: pointer;
33
34
 
34
35
  img {
35
36
  width: 100%;
@@ -27,6 +27,7 @@
27
27
  width: 60px;
28
28
  height: 60px;
29
29
  z-index: 1;
30
+ cursor: pointer;
30
31
 
31
32
  img {
32
33
  width: 100%;
@@ -1,4 +1,5 @@
1
1
  {
2
+ "VIDEO": "Video",
2
3
  "BACK": "Back",
3
4
  "VIDEO_HEIGHT": "Video Height",
4
5
  "HEIGHT": "Height",
@@ -1,4 +1,5 @@
1
1
  {
2
+ "VIDEO": "Video",
2
3
  "BACK": "Back",
3
4
  "VIDEO_HEIGHT": "Video Height",
4
5
  "HEIGHT": "Height",
@@ -1,4 +1,5 @@
1
1
  {
2
+ "VIDEO": "Video",
2
3
  "BACK": "Back",
3
4
  "VIDEO_HEIGHT": "Video Height",
4
5
  "HEIGHT": "Height",
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fonixtree/magic-design",
3
3
  "author": "Cylon Team",
4
- "version": "0.0.158",
4
+ "version": "0.0.160",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",