@fonixtree/magic-design 0.0.131 → 0.0.135
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.
- package/es/assets/images/layout-icon/layout-video-h5-1.png +0 -0
- package/es/common/LinkModal/BundleCampaign/index.js +2 -2
- package/es/common/LinkModal/CatgTable/index.js +1 -1
- package/es/common/LinkModal/CouponTable/index.js +1 -1
- package/es/common/LinkModal/FilteredProductModal/index.js +5 -5
- package/es/common/LinkModal/FunctionTable/index.js +1 -1
- package/es/common/LinkModal/ProductDetailPage/index.js +3 -3
- package/es/common/LinkModal/index.js +2 -2
- package/es/common/ProductModal/index.js +4 -4
- package/es/common/Video/closeImg.png +0 -0
- package/es/common/Video/index.js +13 -0
- package/es/common/Video/index.less +10 -6
- package/es/composite-comp/bol/components/Video/components/ShareBtn/index.less +7 -4
- package/es/composite-comp/bol/components/Video/components/VideoTag/index.js +9 -3
- package/es/composite-comp/bol/components/Video/components/VideoTag/index.less +2 -2
- package/es/composite-comp/bol/components/Video/defaultJSON.js +1 -1
- package/es/composite-comp/bol/components/Video/mobile/Layout1/index.js +7 -2
- package/es/composite-comp/bol/components/Video/mobile/Layout1/index.less +2 -2
- package/es/composite-comp/bol/components/Video/mobile/Layout2/index.js +8 -5
- package/es/composite-comp/bol/components/Video/mobile/Layout2/index.less +3 -3
- package/es/composite-comp/bol/components/Video/mobile/Layout3/index.js +17 -8
- package/es/composite-comp/bol/components/Video/mobile/Layout3/index.less +16 -3
- package/es/composite-comp/bol/components/Video/pc/Layout1/index.js +9 -11
- package/es/composite-comp/bol/components/Video/pc/Layout2/index.js +7 -4
- package/es/composite-comp/bol/components/Video/pc/Layout3/index.js +1 -0
- package/es/composite-comp/bol/components/Video/pc/Layout4/index.js +9 -2
- package/es/composite-comp/bol/components/Video/pc/Layout4/index.less +11 -4
- package/es/composite-comp/bol/components/Video/pc/Layout5/index.js +9 -2
- package/es/composite-comp/bol/components/Video/pc/Layout5/index.less +9 -2
- package/es/composite-comp/bol/components/Video/pc/index.js +14 -5
- package/es/composite-comp/dito/components/PcNavigation/pc/index.less +1 -0
- package/es/composite-comp/dito/components/Recommend/defaultJSON.js +1 -1
- package/es/composite-comp/dito/second-config-panels/RecommendSecondConfig/AIRecommendation/index.js +4 -6
- package/es/core/Designer/ConfigPanel/index.js +11 -2
- package/es/core/Designer/QuickMenuBar/index.js +3 -4
- package/es/core/Designer/index.js +20 -1
- package/es/utils/commonUtil.js +11 -0
- package/lib/assets/images/layout-icon/layout-video-h5-1.png +0 -0
- package/lib/common/LinkModal/BundleCampaign/index.js +2 -2
- package/lib/common/LinkModal/CatgTable/index.js +1 -1
- package/lib/common/LinkModal/CouponTable/index.js +1 -1
- package/lib/common/LinkModal/FilteredProductModal/index.js +5 -5
- package/lib/common/LinkModal/FunctionTable/index.js +1 -1
- package/lib/common/LinkModal/ProductDetailPage/index.js +3 -3
- package/lib/common/LinkModal/index.js +2 -2
- package/lib/common/ProductModal/index.js +4 -4
- package/lib/common/Video/closeImg.png +0 -0
- package/lib/common/Video/index.js +13 -0
- package/lib/common/Video/index.less +10 -6
- package/lib/composite-comp/bol/components/Video/components/ShareBtn/index.less +7 -4
- package/lib/composite-comp/bol/components/Video/components/VideoTag/index.js +9 -3
- package/lib/composite-comp/bol/components/Video/components/VideoTag/index.less +2 -2
- package/lib/composite-comp/bol/components/Video/defaultJSON.js +1 -1
- package/lib/composite-comp/bol/components/Video/mobile/Layout1/index.js +7 -2
- package/lib/composite-comp/bol/components/Video/mobile/Layout1/index.less +2 -2
- package/lib/composite-comp/bol/components/Video/mobile/Layout2/index.js +8 -5
- package/lib/composite-comp/bol/components/Video/mobile/Layout2/index.less +3 -3
- package/lib/composite-comp/bol/components/Video/mobile/Layout3/index.js +17 -8
- package/lib/composite-comp/bol/components/Video/mobile/Layout3/index.less +16 -3
- package/lib/composite-comp/bol/components/Video/pc/Layout1/index.js +9 -11
- package/lib/composite-comp/bol/components/Video/pc/Layout2/index.js +7 -4
- package/lib/composite-comp/bol/components/Video/pc/Layout3/index.js +1 -0
- package/lib/composite-comp/bol/components/Video/pc/Layout4/index.js +9 -2
- package/lib/composite-comp/bol/components/Video/pc/Layout4/index.less +11 -4
- package/lib/composite-comp/bol/components/Video/pc/Layout5/index.js +9 -2
- package/lib/composite-comp/bol/components/Video/pc/Layout5/index.less +9 -2
- package/lib/composite-comp/bol/components/Video/pc/index.js +14 -5
- package/lib/composite-comp/dito/components/PcNavigation/pc/index.less +1 -0
- package/lib/composite-comp/dito/components/Recommend/defaultJSON.js +1 -1
- package/lib/composite-comp/dito/second-config-panels/RecommendSecondConfig/AIRecommendation/index.js +4 -6
- package/lib/core/Designer/ConfigPanel/index.js +11 -2
- package/lib/core/Designer/QuickMenuBar/index.js +3 -4
- package/lib/core/Designer/index.js +20 -1
- package/lib/utils/commonUtil.js +11 -0
- package/package.json +1 -1
|
Binary file
|
|
@@ -251,7 +251,7 @@ var BundleCampaign = function BundleCampaign(props) {
|
|
|
251
251
|
case 0:
|
|
252
252
|
return [4
|
|
253
253
|
/*yield*/
|
|
254
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/bundle/list", params, 'GET')];
|
|
254
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/bundle/list", params, 'GET')];
|
|
255
255
|
|
|
256
256
|
case 1:
|
|
257
257
|
res = _a.sent();
|
|
@@ -284,7 +284,7 @@ var BundleCampaign = function BundleCampaign(props) {
|
|
|
284
284
|
case 0:
|
|
285
285
|
return [4
|
|
286
286
|
/*yield*/
|
|
287
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
|
|
287
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/stores/list", {}, 'GET')];
|
|
288
288
|
|
|
289
289
|
case 1:
|
|
290
290
|
res = _a.sent();
|
|
@@ -184,7 +184,7 @@ function CatgTable(props) {
|
|
|
184
184
|
setLoading(true);
|
|
185
185
|
return [4
|
|
186
186
|
/*yield*/
|
|
187
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/offercatgs/list", {}, 'GET')];
|
|
187
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/offercatgs/list", {}, 'GET')];
|
|
188
188
|
|
|
189
189
|
case 1:
|
|
190
190
|
res = _a.sent();
|
|
@@ -250,7 +250,7 @@ function CouponTable(props) {
|
|
|
250
250
|
setLoading(true);
|
|
251
251
|
return [4
|
|
252
252
|
/*yield*/
|
|
253
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/coupons/couponList/page?tableFlag=effective&isPublic=Y&state=A&pageTotal=false&couponLocation=Promotion", params, 'GET')];
|
|
253
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/coupons/couponList/page?tableFlag=effective&isPublic=Y&state=A&pageTotal=false&couponLocation=Promotion", params, 'GET')];
|
|
254
254
|
|
|
255
255
|
case 1:
|
|
256
256
|
res = _a.sent();
|
|
@@ -346,7 +346,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
|
|
|
346
346
|
case 0:
|
|
347
347
|
return [4
|
|
348
348
|
/*yield*/
|
|
349
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/offercatgs/list", {}, 'GET')];
|
|
349
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/offercatgs/list", {}, 'GET')];
|
|
350
350
|
|
|
351
351
|
case 1:
|
|
352
352
|
res = _a.sent();
|
|
@@ -368,7 +368,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
|
|
|
368
368
|
case 0:
|
|
369
369
|
return [4
|
|
370
370
|
/*yield*/
|
|
371
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/brands/list", {}, 'GET')];
|
|
371
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/brands/list", {}, 'GET')];
|
|
372
372
|
|
|
373
373
|
case 1:
|
|
374
374
|
res = _a.sent();
|
|
@@ -390,7 +390,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
|
|
|
390
390
|
case 0:
|
|
391
391
|
return [4
|
|
392
392
|
/*yield*/
|
|
393
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/labels/list", {}, 'GET')];
|
|
393
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/labels/list", {}, 'GET')];
|
|
394
394
|
|
|
395
395
|
case 1:
|
|
396
396
|
res = _a.sent();
|
|
@@ -412,7 +412,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
|
|
|
412
412
|
case 0:
|
|
413
413
|
return [4
|
|
414
414
|
/*yield*/
|
|
415
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
|
|
415
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/stores/list", {}, 'GET')];
|
|
416
416
|
|
|
417
417
|
case 1:
|
|
418
418
|
res = _a.sent();
|
|
@@ -468,7 +468,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
|
|
|
468
468
|
};
|
|
469
469
|
return [4
|
|
470
470
|
/*yield*/
|
|
471
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/offers/es", params, 'POST')];
|
|
471
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/offers/es", params, 'POST')];
|
|
472
472
|
|
|
473
473
|
case 1:
|
|
474
474
|
res = _a.sent(); // const res = await commonFetch(`${window.magicDesign.MBaseUrl}/products`, params, 'GET');
|
|
@@ -193,7 +193,7 @@ function FunctionTable(props) {
|
|
|
193
193
|
setLoading(true);
|
|
194
194
|
return [4
|
|
195
195
|
/*yield*/
|
|
196
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/pages/functions", {}, 'GET')];
|
|
196
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/pages/functions", {}, 'GET')];
|
|
197
197
|
|
|
198
198
|
case 1:
|
|
199
199
|
res = _a.sent();
|
|
@@ -279,7 +279,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
|
|
|
279
279
|
case 0:
|
|
280
280
|
return [4
|
|
281
281
|
/*yield*/
|
|
282
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/products", params, 'GET')];
|
|
282
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/products", params, 'GET')];
|
|
283
283
|
|
|
284
284
|
case 1:
|
|
285
285
|
res = _a.sent();
|
|
@@ -304,7 +304,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
|
|
|
304
304
|
case 0:
|
|
305
305
|
return [4
|
|
306
306
|
/*yield*/
|
|
307
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/brands/list", {}, 'GET')];
|
|
307
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/brands/list", {}, 'GET')];
|
|
308
308
|
|
|
309
309
|
case 1:
|
|
310
310
|
res = _a.sent();
|
|
@@ -326,7 +326,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
|
|
|
326
326
|
case 0:
|
|
327
327
|
return [4
|
|
328
328
|
/*yield*/
|
|
329
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
|
|
329
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/stores/list", {}, 'GET')];
|
|
330
330
|
|
|
331
331
|
case 1:
|
|
332
332
|
res = _a.sent();
|
|
@@ -276,11 +276,11 @@ var LinkModal = function LinkModal(props) {
|
|
|
276
276
|
onChange: function onChange(value) {
|
|
277
277
|
return setLinkUrl(value);
|
|
278
278
|
}
|
|
279
|
-
}), selected === '
|
|
279
|
+
}), selected === 'ProductDetailPage' && /*#__PURE__*/_react["default"].createElement(_ProductDetailPage["default"], {
|
|
280
280
|
setUrl: function setUrl(url) {
|
|
281
281
|
return setLinkUrl(url);
|
|
282
282
|
}
|
|
283
|
-
}), selected === '
|
|
283
|
+
}), selected === 'FilteredProduct' && /*#__PURE__*/_react["default"].createElement(_FilteredProductModal["default"], {
|
|
284
284
|
onDataChange: function onDataChange(url, t) {
|
|
285
285
|
setLinkUrl(url);
|
|
286
286
|
setTotal(t);
|
|
@@ -356,7 +356,7 @@ var ProductModal = function ProductModal(props) {
|
|
|
356
356
|
case 0:
|
|
357
357
|
return [4
|
|
358
358
|
/*yield*/
|
|
359
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/products", data, 'GET')];
|
|
359
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/products", data, 'GET')];
|
|
360
360
|
|
|
361
361
|
case 1:
|
|
362
362
|
res = _a.sent();
|
|
@@ -407,7 +407,7 @@ var ProductModal = function ProductModal(props) {
|
|
|
407
407
|
case 0:
|
|
408
408
|
return [4
|
|
409
409
|
/*yield*/
|
|
410
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/offerdiscatgs/brands", {}, 'GET')];
|
|
410
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/offerdiscatgs/brands", {}, 'GET')];
|
|
411
411
|
|
|
412
412
|
case 1:
|
|
413
413
|
res = _a.sent();
|
|
@@ -429,7 +429,7 @@ var ProductModal = function ProductModal(props) {
|
|
|
429
429
|
case 0:
|
|
430
430
|
return [4
|
|
431
431
|
/*yield*/
|
|
432
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/labels/list", {}, 'GET')];
|
|
432
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/labels/list", {}, 'GET')];
|
|
433
433
|
|
|
434
434
|
case 1:
|
|
435
435
|
res = _a.sent();
|
|
@@ -451,7 +451,7 @@ var ProductModal = function ProductModal(props) {
|
|
|
451
451
|
case 0:
|
|
452
452
|
return [4
|
|
453
453
|
/*yield*/
|
|
454
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
|
|
454
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/stores/list", {}, 'GET')];
|
|
455
455
|
|
|
456
456
|
case 1:
|
|
457
457
|
res = _a.sent();
|
|
Binary file
|
package/es/common/Video/index.js
CHANGED
|
@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
|
|
10
10
|
var _components = _interopRequireDefault(require("./components"));
|
|
11
11
|
|
|
12
|
+
var _closeImg = _interopRequireDefault(require("./closeImg.png"));
|
|
13
|
+
|
|
12
14
|
var _commonUtil = require("../../utils/commonUtil");
|
|
13
15
|
|
|
14
16
|
require("./index.less");
|
|
@@ -329,6 +331,17 @@ function (_super) {
|
|
|
329
331
|
var videoDom = document.createElement('div');
|
|
330
332
|
videoDom.id = 'video-modal-' + videoId;
|
|
331
333
|
contentWrap.appendChild(videoDom);
|
|
334
|
+
var closeImgDom = document.createElement('img');
|
|
335
|
+
closeImgDom.src = _closeImg["default"];
|
|
336
|
+
closeImgDom.className = 'close-img-wrap';
|
|
337
|
+
|
|
338
|
+
closeImgDom.onclick = function () {
|
|
339
|
+
var _a;
|
|
340
|
+
|
|
341
|
+
(_a = document.querySelector("[video-id=\"" + videoId + "\"]")) === null || _a === void 0 ? void 0 : _a.remove();
|
|
342
|
+
};
|
|
343
|
+
|
|
344
|
+
contentWrap.appendChild(closeImgDom);
|
|
332
345
|
modelWrap.appendChild(shadowWrap);
|
|
333
346
|
modelWrap.appendChild(contentWrap);
|
|
334
347
|
document.body.appendChild(modelWrap);
|
|
@@ -1,12 +1,7 @@
|
|
|
1
1
|
.video-container {
|
|
2
2
|
position: relative;
|
|
3
3
|
height: 100%;
|
|
4
|
-
background:
|
|
5
|
-
background-size: cover;
|
|
6
|
-
// .prism-player .prism-liveshift-progress,
|
|
7
|
-
// .prism-player .prism-progress {
|
|
8
|
-
// bottom: 10px !important;
|
|
9
|
-
// }
|
|
4
|
+
background-image: linear-gradient(0, rgba(0, 0, 0, .2), rgba(0, 0, 0, .1), rgba(0, 0, 0, .2));
|
|
10
5
|
|
|
11
6
|
.prism-player .prism-cover {
|
|
12
7
|
z-index: 0;
|
|
@@ -43,5 +38,14 @@
|
|
|
43
38
|
border-radius: 5px;
|
|
44
39
|
z-index: 1001;
|
|
45
40
|
position: fixed;
|
|
41
|
+
|
|
42
|
+
.close-img-wrap {
|
|
43
|
+
position: absolute;
|
|
44
|
+
right: 14px;
|
|
45
|
+
top: 14px;
|
|
46
|
+
width: 20px;
|
|
47
|
+
height: 20px;
|
|
48
|
+
cursor: pointer;
|
|
49
|
+
}
|
|
46
50
|
}
|
|
47
51
|
}
|
|
@@ -1,17 +1,20 @@
|
|
|
1
1
|
.video-share-btn {
|
|
2
|
-
height:
|
|
3
|
-
width:
|
|
2
|
+
height: 44px;
|
|
3
|
+
width: 44px;
|
|
4
4
|
position: relative;
|
|
5
5
|
flex-shrink: 0;
|
|
6
6
|
z-index: 9;
|
|
7
7
|
margin-left: auto;
|
|
8
|
+
position: absolute;
|
|
9
|
+
right: 12px;
|
|
10
|
+
bottom: 12px;
|
|
8
11
|
|
|
9
12
|
&.pc {
|
|
10
13
|
position: absolute;
|
|
11
14
|
right: 48px;
|
|
12
15
|
bottom: 48px;
|
|
13
|
-
height:
|
|
14
|
-
width:
|
|
16
|
+
height: 60px;
|
|
17
|
+
width: 60px;
|
|
15
18
|
}
|
|
16
19
|
|
|
17
20
|
.share-img {
|
|
@@ -66,14 +66,17 @@ function (_super) {
|
|
|
66
66
|
position = _b === void 0 ? 'absolute' : _b,
|
|
67
67
|
noShare = _a.noShare,
|
|
68
68
|
padding = _a.padding,
|
|
69
|
-
share = _a.share
|
|
69
|
+
share = _a.share,
|
|
70
|
+
layout = _a.layout,
|
|
71
|
+
align = _a.align;
|
|
72
|
+
var showBtn = data.video.playButton == 'Bottom Left' && !['h5-layout3', 'pc-layout4', 'pc-layout5'].includes(layout);
|
|
70
73
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
71
74
|
className: "video-tag-container",
|
|
72
75
|
style: {
|
|
73
76
|
position: position,
|
|
74
77
|
padding: padding
|
|
75
78
|
}
|
|
76
|
-
},
|
|
79
|
+
}, showBtn && /*#__PURE__*/_react["default"].createElement("div", {
|
|
77
80
|
className: "left-wrap"
|
|
78
81
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
79
82
|
className: "play-btn center"
|
|
@@ -97,7 +100,10 @@ function (_super) {
|
|
|
97
100
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
|
|
98
101
|
data: data.secondButtonTag
|
|
99
102
|
}))), /*#__PURE__*/_react["default"].createElement("div", {
|
|
100
|
-
className: "text-wrap"
|
|
103
|
+
className: "text-wrap",
|
|
104
|
+
style: {
|
|
105
|
+
textAlign: align
|
|
106
|
+
}
|
|
101
107
|
}, data.title.open && /*#__PURE__*/_react["default"].createElement("div", {
|
|
102
108
|
className: "title-text"
|
|
103
109
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
@@ -7,6 +7,8 @@ exports["default"] = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
|
|
10
|
+
var _index = _interopRequireDefault(require("../../components/ShareBtn/index"));
|
|
11
|
+
|
|
10
12
|
var _common = require("../../../../../../common");
|
|
11
13
|
|
|
12
14
|
var _playCircle = _interopRequireDefault(require("../../imgs/play-circle.png"));
|
|
@@ -145,9 +147,12 @@ function (_super) {
|
|
|
145
147
|
}, /*#__PURE__*/_react["default"].createElement("img", {
|
|
146
148
|
alt: "",
|
|
147
149
|
src: _playCircle["default"]
|
|
148
|
-
})),
|
|
150
|
+
})), /*#__PURE__*/_react["default"].createElement(_index["default"], {
|
|
151
|
+
data: data
|
|
152
|
+
}), !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
|
|
153
|
+
align: data.customize.align,
|
|
149
154
|
data: group,
|
|
150
|
-
noShare:
|
|
155
|
+
noShare: true,
|
|
151
156
|
share: __assign({
|
|
152
157
|
url: (0, _commonUtil.addUrlQuery)(window.location.href, {
|
|
153
158
|
scroll: 'node-' + data.id
|
|
@@ -7,6 +7,8 @@ exports["default"] = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
|
|
10
|
+
var _index = _interopRequireDefault(require("../../components/ShareBtn/index"));
|
|
11
|
+
|
|
10
12
|
var _common = require("../../../../../../common");
|
|
11
13
|
|
|
12
14
|
var _playCircle = _interopRequireDefault(require("../../imgs/play-circle.png"));
|
|
@@ -15,10 +17,10 @@ var _commonUtil = require("../../../../../../utils/commonUtil");
|
|
|
15
17
|
|
|
16
18
|
var _coreUtil = require("../../../../../../utils/coreUtil");
|
|
17
19
|
|
|
18
|
-
require("./index.less");
|
|
19
|
-
|
|
20
20
|
var _VideoTag = _interopRequireDefault(require("../../components/VideoTag"));
|
|
21
21
|
|
|
22
|
+
require("./index.less");
|
|
23
|
+
|
|
22
24
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
23
25
|
|
|
24
26
|
var __extends = void 0 && (void 0).__extends || function () {
|
|
@@ -69,8 +71,6 @@ var __assign = void 0 && (void 0).__assign || function () {
|
|
|
69
71
|
/* eslint-disable no-plusplus */
|
|
70
72
|
|
|
71
73
|
|
|
72
|
-
var debug = require('debug')('worker:Layout1');
|
|
73
|
-
|
|
74
74
|
var Layout1 =
|
|
75
75
|
/** @class */
|
|
76
76
|
function (_super) {
|
|
@@ -181,14 +181,17 @@ function (_super) {
|
|
|
181
181
|
alt: "",
|
|
182
182
|
src: _playCircle["default"]
|
|
183
183
|
})), !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
|
|
184
|
+
align: data.customize.align,
|
|
184
185
|
data: group,
|
|
185
|
-
noShare:
|
|
186
|
+
noShare: true,
|
|
186
187
|
share: __assign({
|
|
187
188
|
url: (0, _commonUtil.addUrlQuery)(window.location.href, {
|
|
188
189
|
scroll: 'node-' + data.id
|
|
189
190
|
})
|
|
190
191
|
}, data.share)
|
|
191
192
|
}));
|
|
193
|
+
}), /*#__PURE__*/_react["default"].createElement(_index["default"], {
|
|
194
|
+
data: data
|
|
192
195
|
}))), /*#__PURE__*/_react["default"].createElement(_common.SwiperBan, {
|
|
193
196
|
data: data.groupSource,
|
|
194
197
|
onChange: function onChange(i) {
|
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
display: flex;
|
|
13
13
|
transform: translateX(-100%);
|
|
14
14
|
transition: all .3s linear;
|
|
15
|
+
position: relative;
|
|
15
16
|
|
|
16
17
|
&.noAnimation {
|
|
17
18
|
animation: none;
|
|
@@ -21,7 +22,6 @@
|
|
|
21
22
|
.video-item-wrap {
|
|
22
23
|
height: 212px;
|
|
23
24
|
position: relative;
|
|
24
|
-
margin-bottom: 10px;
|
|
25
25
|
width: 100%;
|
|
26
26
|
flex-shrink: 0;
|
|
27
27
|
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
top: 50%;
|
|
35
35
|
left: 50%;
|
|
36
36
|
transform: translate(-50%, -50%);
|
|
37
|
-
width:
|
|
38
|
-
height:
|
|
37
|
+
width: 60px;
|
|
38
|
+
height: 60px;
|
|
39
39
|
z-index: 1;
|
|
40
40
|
|
|
41
41
|
img {
|
|
@@ -7,6 +7,8 @@ exports["default"] = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
|
|
10
|
+
var _classnames = _interopRequireDefault(require("classnames"));
|
|
11
|
+
|
|
10
12
|
var _common = require("../../../../../../common");
|
|
11
13
|
|
|
12
14
|
var _playCircle = _interopRequireDefault(require("../../imgs/play-circle.png"));
|
|
@@ -15,10 +17,12 @@ var _commonUtil = require("../../../../../../utils/commonUtil");
|
|
|
15
17
|
|
|
16
18
|
var _coreUtil = require("../../../../../../utils/coreUtil");
|
|
17
19
|
|
|
18
|
-
require("./index.less");
|
|
19
|
-
|
|
20
20
|
var _VideoTag = _interopRequireDefault(require("../../components/VideoTag"));
|
|
21
21
|
|
|
22
|
+
var _ShareBtn = _interopRequireDefault(require("../../components/ShareBtn"));
|
|
23
|
+
|
|
24
|
+
require("./index.less");
|
|
25
|
+
|
|
22
26
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
23
27
|
|
|
24
28
|
var __extends = void 0 && (void 0).__extends || function () {
|
|
@@ -65,8 +69,6 @@ var __assign = void 0 && (void 0).__assign || function () {
|
|
|
65
69
|
/* eslint-disable no-lonely-if */
|
|
66
70
|
|
|
67
71
|
|
|
68
|
-
var debug = require('debug')('worker:Layout3');
|
|
69
|
-
|
|
70
72
|
var Layout3 =
|
|
71
73
|
/** @class */
|
|
72
74
|
function (_super) {
|
|
@@ -137,14 +139,21 @@ function (_super) {
|
|
|
137
139
|
source: group.video.sourceUrl
|
|
138
140
|
}),
|
|
139
141
|
videoId: group.id
|
|
140
|
-
}), !isPlaying &&
|
|
141
|
-
className: "play-btn
|
|
142
|
+
}), !isPlaying && /*#__PURE__*/_react["default"].createElement("div", {
|
|
143
|
+
className: (0, _classnames["default"])('play-btn', {
|
|
144
|
+
middle: group.video.playButton == 'Middle',
|
|
145
|
+
bottomLeft: group.video.playButton == 'Bottom Left'
|
|
146
|
+
})
|
|
142
147
|
}, /*#__PURE__*/_react["default"].createElement("img", {
|
|
143
148
|
alt: "",
|
|
144
149
|
src: _playCircle["default"]
|
|
145
|
-
}))
|
|
150
|
+
})), data.share.open && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
|
|
151
|
+
data: data.share
|
|
152
|
+
})), /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
|
|
153
|
+
align: data.customize.align,
|
|
146
154
|
data: group,
|
|
147
|
-
|
|
155
|
+
layout: 'h5-' + data.customize.layout.h5Layout,
|
|
156
|
+
noShare: true,
|
|
148
157
|
position: "relative",
|
|
149
158
|
share: __assign({
|
|
150
159
|
url: (0, _commonUtil.addUrlQuery)(window.location.href, {
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
flex-direction: column;
|
|
8
8
|
margin-bottom: 10px;
|
|
9
9
|
|
|
10
|
-
&:last-child{
|
|
10
|
+
&:last-child {
|
|
11
11
|
margin-bottom: 0;
|
|
12
12
|
}
|
|
13
13
|
}
|
|
@@ -26,14 +26,27 @@
|
|
|
26
26
|
top: 50%;
|
|
27
27
|
left: 50%;
|
|
28
28
|
transform: translate(-50%, -50%);
|
|
29
|
-
width:
|
|
30
|
-
height:
|
|
29
|
+
width: 60px;
|
|
30
|
+
height: 60px;
|
|
31
31
|
z-index: 1;
|
|
32
32
|
|
|
33
33
|
img {
|
|
34
34
|
width: 100%;
|
|
35
35
|
height: 100%;
|
|
36
36
|
}
|
|
37
|
+
|
|
38
|
+
&.bottomLeft {
|
|
39
|
+
left: 16px;
|
|
40
|
+
bottom: 16px;
|
|
41
|
+
transform: unset;
|
|
42
|
+
top: unset;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
.video-share-btn {
|
|
47
|
+
position: absolute;
|
|
48
|
+
right: 20px;
|
|
49
|
+
bottom: 20px;
|
|
37
50
|
}
|
|
38
51
|
}
|
|
39
52
|
}
|
|
@@ -65,8 +65,6 @@ var __assign = void 0 && (void 0).__assign || function () {
|
|
|
65
65
|
return __assign.apply(this, arguments);
|
|
66
66
|
};
|
|
67
67
|
|
|
68
|
-
var debug = require('debug')('worker:Layout1');
|
|
69
|
-
|
|
70
68
|
var Layout1 =
|
|
71
69
|
/** @class */
|
|
72
70
|
function (_super) {
|
|
@@ -86,7 +84,6 @@ function (_super) {
|
|
|
86
84
|
var _this = this;
|
|
87
85
|
|
|
88
86
|
var data = this.props.data;
|
|
89
|
-
console.log('data: ', data);
|
|
90
87
|
var hasPlaying = Object.keys(this.videoRefMap).find(function (key) {
|
|
91
88
|
return _this.videoRefMap[key].playing;
|
|
92
89
|
});
|
|
@@ -145,18 +142,19 @@ function (_super) {
|
|
|
145
142
|
alt: "",
|
|
146
143
|
src: _playCircle["default"]
|
|
147
144
|
})), !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
|
|
145
|
+
align: data.customize.align,
|
|
148
146
|
data: group,
|
|
149
147
|
noShare: true,
|
|
150
148
|
padding: 48
|
|
149
|
+
}), data.share.open && !hasPlaying && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
|
|
150
|
+
data: __assign({
|
|
151
|
+
url: (0, _commonUtil.addUrlQuery)(window.location.href, {
|
|
152
|
+
scroll: 'node-' + data.id
|
|
153
|
+
})
|
|
154
|
+
}, data.share),
|
|
155
|
+
pc: true
|
|
151
156
|
}));
|
|
152
|
-
}))
|
|
153
|
-
data: __assign({
|
|
154
|
-
url: (0, _commonUtil.addUrlQuery)(window.location.href, {
|
|
155
|
-
scroll: 'node-' + data.id
|
|
156
|
-
})
|
|
157
|
-
}, data.share),
|
|
158
|
-
pc: true
|
|
159
|
-
}));
|
|
157
|
+
})));
|
|
160
158
|
};
|
|
161
159
|
|
|
162
160
|
Layout1.defaultProps = {};
|
|
@@ -85,15 +85,16 @@ function (_super) {
|
|
|
85
85
|
Layout2.prototype.render = function () {
|
|
86
86
|
var _this = this;
|
|
87
87
|
|
|
88
|
-
var _a;
|
|
89
|
-
|
|
90
88
|
var data = this.props.data;
|
|
91
|
-
console.log('data: ', data);
|
|
92
89
|
var hasPlaying = Object.keys(this.videoRefMap).find(function (key) {
|
|
93
90
|
return _this.videoRefMap[key].playing;
|
|
94
91
|
});
|
|
95
92
|
var firstGroup = data.groupSource[0] || null;
|
|
96
|
-
var isFirstGroupPlaying =
|
|
93
|
+
var isFirstGroupPlaying = (0, _commonUtil.ensure)(function () {
|
|
94
|
+
var _a;
|
|
95
|
+
|
|
96
|
+
return !!((_a = _this.videoRefMap[firstGroup.id]) === null || _a === void 0 ? void 0 : _a.playing);
|
|
97
|
+
}, false);
|
|
97
98
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
98
99
|
className: "video-pc-layout2-wrap",
|
|
99
100
|
style: {
|
|
@@ -139,6 +140,7 @@ function (_super) {
|
|
|
139
140
|
alt: "",
|
|
140
141
|
src: _playCircle["default"]
|
|
141
142
|
})), !isFirstGroupPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
|
|
143
|
+
align: data.customize.align,
|
|
142
144
|
data: firstGroup,
|
|
143
145
|
noShare: true,
|
|
144
146
|
padding: 32
|
|
@@ -194,6 +196,7 @@ function (_super) {
|
|
|
194
196
|
alt: "",
|
|
195
197
|
src: _playCircle["default"]
|
|
196
198
|
})), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
|
|
199
|
+
align: data.customize.align,
|
|
197
200
|
data: group,
|
|
198
201
|
noShare: true,
|
|
199
202
|
padding: 32
|
|
@@ -151,6 +151,7 @@ function (_super) {
|
|
|
151
151
|
alt: "",
|
|
152
152
|
src: _playCircle["default"]
|
|
153
153
|
})), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
|
|
154
|
+
align: data.customize.align,
|
|
154
155
|
data: group,
|
|
155
156
|
noShare: true,
|
|
156
157
|
padding: 20
|
|
@@ -7,6 +7,8 @@ exports["default"] = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
|
|
10
|
+
var _classnames = _interopRequireDefault(require("classnames"));
|
|
11
|
+
|
|
10
12
|
var _common = require("../../../../../../common");
|
|
11
13
|
|
|
12
14
|
var _playCircle = _interopRequireDefault(require("../../imgs/play-circle.png"));
|
|
@@ -137,8 +139,11 @@ function (_super) {
|
|
|
137
139
|
source: group.video.sourceUrl
|
|
138
140
|
}),
|
|
139
141
|
videoId: group.id
|
|
140
|
-
}), !isPlaying &&
|
|
141
|
-
className: "play-btn
|
|
142
|
+
}), !isPlaying && /*#__PURE__*/_react["default"].createElement("div", {
|
|
143
|
+
className: (0, _classnames["default"])('play-btn', {
|
|
144
|
+
middle: group.video.playButton == 'Middle',
|
|
145
|
+
bottomLeft: group.video.playButton == 'Bottom Left'
|
|
146
|
+
})
|
|
142
147
|
}, /*#__PURE__*/_react["default"].createElement("img", {
|
|
143
148
|
alt: "",
|
|
144
149
|
src: _playCircle["default"]
|
|
@@ -153,7 +158,9 @@ function (_super) {
|
|
|
153
158
|
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
154
159
|
className: "video-tag-wrap"
|
|
155
160
|
}, /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
|
|
161
|
+
align: data.customize.align,
|
|
156
162
|
data: group,
|
|
163
|
+
layout: 'pc-' + data.customize.layout.pcLayout,
|
|
157
164
|
noShare: true,
|
|
158
165
|
position: "relative"
|
|
159
166
|
})));
|