@fonixtree/magic-design 0.0.150 → 0.0.151
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/ImageModal/index.js +75 -31
- 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/UrlPicker/index.js +1 -1
- package/es/common/Video/closeImg.png +0 -0
- package/es/common/Video/index.js +14 -1
- package/es/common/Video/index.less +10 -6
- package/es/composite-comp/bol/components/Text/index.js +22 -8
- package/es/composite-comp/bol/components/Text/index.less +4 -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/common/components/ImageLabel/index.less +3 -2
- package/es/composite-comp/common/components/ProductItem/index.js +3 -2
- package/es/composite-comp/common/components/ProductItem/index.less +4 -9
- package/es/composite-comp/dito/components/PcNavigation/pc/index.js +1 -1
- package/es/composite-comp/dito/components/PcNavigation/pc/index.less +4 -2
- package/es/composite-comp/dito/components/Recommend/defaultJSON.js +1 -1
- package/es/composite-comp/dito/components/Recommend/mobile/index.js +2 -2
- package/es/composite-comp/dito/components/SearchBar/mobile/index.js +4 -2
- package/es/composite-comp/dito/components/SearchBar/mobile/index.less +5 -0
- package/es/composite-comp/dito/second-config-panels/RecommendSecondConfig/AIRecommendation/index.js +4 -6
- package/es/constants/index.js +3 -1
- package/es/core/Designer/ConfigPanel/index.js +12 -3
- package/es/core/Designer/LeftTitle/index.js +66 -0
- package/es/core/Designer/LeftTitle/index.less +9 -0
- package/es/core/Designer/QuickMenuBar/index.js +15 -5
- package/es/core/Designer/RenderHtml/index.js +89 -0
- package/es/core/Designer/RenderHtml/index.less +5 -0
- package/es/core/Designer/index.js +223 -4
- package/es/core/Renderer/index.js +5 -2
- package/es/decorator/compositeDecorator.js +2 -2
- package/es/locale/en/en.json +1 -0
- package/es/locale/es/es.json +1 -0
- package/es/locale/id/id.json +1 -0
- package/es/meta-comp/components/Text/index.js +55 -16
- package/es/utils/businessUtil.js +3 -3
- package/es/utils/commonUtil.js +11 -0
- package/es/utils/coreUtil.js +8 -4
- package/lib/assets/images/layout-icon/layout-video-h5-1.png +0 -0
- package/lib/common/ImageModal/index.js +75 -31
- 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/UrlPicker/index.js +1 -1
- package/lib/common/Video/closeImg.png +0 -0
- package/lib/common/Video/index.js +14 -1
- package/lib/common/Video/index.less +10 -6
- package/lib/composite-comp/bol/components/Text/index.js +22 -8
- package/lib/composite-comp/bol/components/Text/index.less +4 -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/common/components/ImageLabel/index.less +3 -2
- package/lib/composite-comp/common/components/ProductItem/index.js +3 -2
- package/lib/composite-comp/common/components/ProductItem/index.less +4 -9
- package/lib/composite-comp/dito/components/PcNavigation/pc/index.js +1 -1
- package/lib/composite-comp/dito/components/PcNavigation/pc/index.less +4 -2
- package/lib/composite-comp/dito/components/Recommend/defaultJSON.js +1 -1
- package/lib/composite-comp/dito/components/Recommend/mobile/index.js +2 -2
- package/lib/composite-comp/dito/components/SearchBar/mobile/index.js +4 -2
- package/lib/composite-comp/dito/components/SearchBar/mobile/index.less +5 -0
- package/lib/composite-comp/dito/second-config-panels/RecommendSecondConfig/AIRecommendation/index.js +4 -6
- package/lib/constants/index.js +3 -1
- package/lib/core/Designer/ConfigPanel/index.js +12 -3
- package/lib/core/Designer/LeftTitle/index.js +66 -0
- package/lib/core/Designer/LeftTitle/index.less +9 -0
- package/lib/core/Designer/QuickMenuBar/index.js +15 -5
- package/lib/core/Designer/RenderHtml/index.js +89 -0
- package/lib/core/Designer/RenderHtml/index.less +5 -0
- package/lib/core/Designer/index.js +223 -4
- package/lib/core/Renderer/index.js +5 -2
- package/lib/decorator/compositeDecorator.js +2 -2
- package/lib/locale/en/en.json +1 -0
- package/lib/locale/es/es.json +1 -0
- package/lib/locale/id/id.json +1 -0
- package/lib/meta-comp/components/Text/index.js +55 -16
- package/lib/utils/businessUtil.js +3 -3
- package/lib/utils/commonUtil.js +11 -0
- package/lib/utils/coreUtil.js +8 -4
- package/package.json +3 -2
|
Binary file
|
|
@@ -243,45 +243,49 @@ function ImageModal(_a) {
|
|
|
243
243
|
selectedPics = _f[0],
|
|
244
244
|
setSelectedPics = _f[1];
|
|
245
245
|
|
|
246
|
-
var _g = (0, _react.useState)(
|
|
247
|
-
|
|
248
|
-
|
|
246
|
+
var _g = (0, _react.useState)(''),
|
|
247
|
+
wapUrl = _g[0],
|
|
248
|
+
setWapUrl = _g[1];
|
|
249
249
|
|
|
250
|
-
var _h = (0, _react.useState)(
|
|
251
|
-
|
|
252
|
-
|
|
250
|
+
var _h = (0, _react.useState)([]),
|
|
251
|
+
contents = _h[0],
|
|
252
|
+
setContents = _h[1];
|
|
253
253
|
|
|
254
|
-
var _j = (0, _react.useState)(
|
|
255
|
-
|
|
256
|
-
|
|
254
|
+
var _j = (0, _react.useState)(0),
|
|
255
|
+
total = _j[0],
|
|
256
|
+
setTotal = _j[1];
|
|
257
257
|
|
|
258
|
-
var _k = (0, _react.useState)(
|
|
259
|
-
|
|
260
|
-
|
|
258
|
+
var _k = (0, _react.useState)(1),
|
|
259
|
+
pageIndex = _k[0],
|
|
260
|
+
setPageIndex = _k[1];
|
|
261
261
|
|
|
262
|
-
var _l = (0, _react.useState)(
|
|
263
|
-
|
|
264
|
-
|
|
262
|
+
var _l = (0, _react.useState)(20),
|
|
263
|
+
pageSize = _l[0],
|
|
264
|
+
setPageSize = _l[1];
|
|
265
265
|
|
|
266
|
-
var _m = (0, _react.useState)(
|
|
267
|
-
|
|
268
|
-
|
|
266
|
+
var _m = (0, _react.useState)(false),
|
|
267
|
+
spinning = _m[0],
|
|
268
|
+
setSpinning = _m[1];
|
|
269
269
|
|
|
270
|
-
var _o = (0, _react.useState)(
|
|
271
|
-
|
|
272
|
-
|
|
270
|
+
var _o = (0, _react.useState)(''),
|
|
271
|
+
name = _o[0],
|
|
272
|
+
setName = _o[1];
|
|
273
273
|
|
|
274
|
-
var _p = (0, _react.useState)(
|
|
275
|
-
|
|
276
|
-
|
|
274
|
+
var _p = (0, _react.useState)([]),
|
|
275
|
+
contentcatgsList = _p[0],
|
|
276
|
+
setContentcatgsList = _p[1];
|
|
277
277
|
|
|
278
|
-
var _q = (0, _react.useState)(
|
|
279
|
-
|
|
280
|
-
|
|
278
|
+
var _q = (0, _react.useState)(''),
|
|
279
|
+
searchValue = _q[0],
|
|
280
|
+
setSearchValue = _q[1];
|
|
281
281
|
|
|
282
|
-
var _r = (0, _react.useState)(
|
|
283
|
-
|
|
284
|
-
|
|
282
|
+
var _r = (0, _react.useState)([]),
|
|
283
|
+
expandedKeys = _r[0],
|
|
284
|
+
setExpandedKeys = _r[1];
|
|
285
|
+
|
|
286
|
+
var _s = (0, _react.useState)(true),
|
|
287
|
+
autoExpandParent = _s[0],
|
|
288
|
+
setAutoExpandParent = _s[1]; // const currentUser = sessionUtil.getUser() || {};
|
|
285
289
|
// const { _csrf } = currentUser;
|
|
286
290
|
// const headers = {};
|
|
287
291
|
// if (_csrf && _csrf.headerName) {
|
|
@@ -425,8 +429,44 @@ function ImageModal(_a) {
|
|
|
425
429
|
});
|
|
426
430
|
};
|
|
427
431
|
|
|
432
|
+
var getPreConfig = function getPreConfig() {
|
|
433
|
+
return __awaiter(_this, void 0, void 0, function () {
|
|
434
|
+
var wapUrl_1, error_1;
|
|
435
|
+
return __generator(this, function (_a) {
|
|
436
|
+
switch (_a.label) {
|
|
437
|
+
case 0:
|
|
438
|
+
_a.trys.push([0, 2,, 3]);
|
|
439
|
+
|
|
440
|
+
return [4
|
|
441
|
+
/*yield*/
|
|
442
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/pages/platforminfo")];
|
|
443
|
+
|
|
444
|
+
case 1:
|
|
445
|
+
wapUrl_1 = _a.sent().wapUrl;
|
|
446
|
+
setWapUrl(wapUrl_1);
|
|
447
|
+
return [3
|
|
448
|
+
/*break*/
|
|
449
|
+
, 3];
|
|
450
|
+
|
|
451
|
+
case 2:
|
|
452
|
+
error_1 = _a.sent();
|
|
453
|
+
console.error(error_1);
|
|
454
|
+
return [3
|
|
455
|
+
/*break*/
|
|
456
|
+
, 3];
|
|
457
|
+
|
|
458
|
+
case 3:
|
|
459
|
+
return [2
|
|
460
|
+
/*return*/
|
|
461
|
+
];
|
|
462
|
+
}
|
|
463
|
+
});
|
|
464
|
+
});
|
|
465
|
+
};
|
|
466
|
+
|
|
428
467
|
(0, _react.useEffect)(function () {
|
|
429
468
|
getContentCatgs();
|
|
469
|
+
getPreConfig();
|
|
430
470
|
}, []);
|
|
431
471
|
|
|
432
472
|
var selectFolder = function selectFolder(id) {
|
|
@@ -676,7 +716,11 @@ function ImageModal(_a) {
|
|
|
676
716
|
},
|
|
677
717
|
onCancel: onCancel,
|
|
678
718
|
onOk: function onOk() {
|
|
679
|
-
return _onOk(selectedPics)
|
|
719
|
+
return _onOk(selectedPics.map(function (item) {
|
|
720
|
+
return __assign(__assign({}, item), {
|
|
721
|
+
url: wapUrl + item.url
|
|
722
|
+
});
|
|
723
|
+
}));
|
|
680
724
|
},
|
|
681
725
|
visible: visible
|
|
682
726
|
}, /*#__PURE__*/_react["default"].createElement(_antd.Row, {
|
|
@@ -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();
|
|
@@ -80,7 +80,7 @@ function (_super) {
|
|
|
80
80
|
value: value
|
|
81
81
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
82
82
|
className: "icon-btns"
|
|
83
|
-
}, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
|
|
83
|
+
}, window.magicDesign.outputType != 'html' && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
|
|
84
84
|
color: "#000",
|
|
85
85
|
onClick: function onClick() {
|
|
86
86
|
return _this.setState({
|
|
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,9 +331,20 @@ 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
|
-
document.body.appendChild(modelWrap);
|
|
347
|
+
(document.querySelector('[magic_designer]') || document.body).document.body.appendChild(modelWrap);
|
|
335
348
|
createVideo('-modal-' + videoId, __assign(__assign({}, _this.props.opts), {
|
|
336
349
|
autoplay: true
|
|
337
350
|
}));
|
|
@@ -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
|
}
|
|
@@ -15,8 +15,6 @@ var _components = require("../../../../meta-comp/components");
|
|
|
15
15
|
|
|
16
16
|
var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
|
|
17
17
|
|
|
18
|
-
require("./index.less");
|
|
19
|
-
|
|
20
18
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
21
19
|
|
|
22
20
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
@@ -61,6 +59,11 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
|
|
|
61
59
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
62
60
|
};
|
|
63
61
|
|
|
62
|
+
// import './index.less';
|
|
63
|
+
// less to css 在线地址 https://tool.oschina.net/less
|
|
64
|
+
// css 压缩地址 https://www.runoob.com/csspack
|
|
65
|
+
var style = '.m-text{display: flex;flex-direction: column;}.m-text .title-wrap{font-weight:500;font-size:20px;}.m-text .sub-title{font-size:15px;color:#b7b7b7;margin-top:10px;}.m-text .group-content-wrap{width:100%;}.m-text .group-content-wrap .group-wrap-container{padding:10px 20px;}.m-text .group-content-wrap .group-wrap{display:flex;flex-direction:column;width:100%;}.m-text .group-content-wrap .group-wrap .group-title{font-size:14px;}.m-text .group-content-wrap.col-1 .group-wrap{width:100%;}.m-text .group-content-wrap.col-2{display:grid;grid-template-columns:50% 50%;}.m-text .group-content-wrap.col-3{display:grid;grid-template-columns:33.3% 33.3% 33.3%;}.m-text .group-content-wrap.mobile{display:block;}';
|
|
66
|
+
|
|
64
67
|
var Text =
|
|
65
68
|
/** @class */
|
|
66
69
|
function (_super) {
|
|
@@ -73,18 +76,25 @@ function (_super) {
|
|
|
73
76
|
Text.prototype.render = function () {
|
|
74
77
|
var _a;
|
|
75
78
|
|
|
76
|
-
var
|
|
79
|
+
var _b = this.props,
|
|
80
|
+
nodeData = _b.nodeData,
|
|
81
|
+
mode = _b.mode,
|
|
82
|
+
outputType = _b.outputType;
|
|
77
83
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
78
84
|
className: "m-text",
|
|
79
85
|
onClick: this.onComponentClick
|
|
80
|
-
}, nodeData.title.headline.open && /*#__PURE__*/_react["default"].createElement("div", {
|
|
86
|
+
}, /*#__PURE__*/_react["default"].createElement("style", null, style), nodeData.title.headline.open && /*#__PURE__*/_react["default"].createElement("div", {
|
|
81
87
|
className: "title-wrap"
|
|
82
88
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
83
|
-
data: nodeData.title.headline
|
|
89
|
+
data: nodeData.title.headline,
|
|
90
|
+
mode: mode,
|
|
91
|
+
outputType: outputType
|
|
84
92
|
})), nodeData.title.subtitle.open && /*#__PURE__*/_react["default"].createElement("div", {
|
|
85
93
|
className: "sub-title"
|
|
86
94
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
87
|
-
data: nodeData.title.subtitle
|
|
95
|
+
data: nodeData.title.subtitle,
|
|
96
|
+
mode: mode,
|
|
97
|
+
outputType: outputType
|
|
88
98
|
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
89
99
|
className: (0, _classnames["default"])('group-content-wrap', 'col-' + nodeData.customize.pcRowNum, (_a = {}, _a[window.magicDesign.device] = true, _a))
|
|
90
100
|
}, nodeData.groupSource.map(function (group) {
|
|
@@ -99,11 +109,15 @@ function (_super) {
|
|
|
99
109
|
}, group.content.title.open && /*#__PURE__*/_react["default"].createElement("div", {
|
|
100
110
|
className: "group-title"
|
|
101
111
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
102
|
-
data: group.content.title
|
|
112
|
+
data: group.content.title,
|
|
113
|
+
mode: mode,
|
|
114
|
+
outputType: outputType
|
|
103
115
|
})), group.content.text.open && /*#__PURE__*/_react["default"].createElement("div", {
|
|
104
116
|
className: "group-content"
|
|
105
117
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
106
|
-
data: group.content.text
|
|
118
|
+
data: group.content.text,
|
|
119
|
+
mode: mode,
|
|
120
|
+
outputType: outputType
|
|
107
121
|
}))));
|
|
108
122
|
})));
|
|
109
123
|
};
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
.m-text {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
display: flex;
|
|
3
|
+
flex-direction: column;
|
|
4
|
+
|
|
6
5
|
.title-wrap {
|
|
7
6
|
font-weight: 500;
|
|
8
7
|
font-size: 20px;
|
|
@@ -18,13 +17,12 @@
|
|
|
18
17
|
width: 100%;
|
|
19
18
|
|
|
20
19
|
.group-wrap-container {
|
|
21
|
-
padding: 20px;
|
|
20
|
+
padding: 10px 20px;
|
|
22
21
|
}
|
|
23
22
|
|
|
24
23
|
.group-wrap {
|
|
25
24
|
display: flex;
|
|
26
25
|
flex-direction: column;
|
|
27
|
-
margin-top: 20px;
|
|
28
26
|
width: 100%;
|
|
29
27
|
|
|
30
28
|
.group-title {
|
|
@@ -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) {
|