@fonixtree/magic-design 0.0.82 → 0.0.84
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/composite-comp/bol/components/Banner/mobile/index.js +5 -1
- package/es/composite-comp/bol/components/Button/index.less +8 -9
- package/es/composite-comp/bol/components/Carousel/mobile/index.js +69 -18
- package/es/composite-comp/bol/components/Carousel/mobile/index.less +9 -4
- package/es/composite-comp/bol/components/Carousel/pc/index.js +79 -31
- package/es/composite-comp/bol/components/Carousel/pc/index.less +10 -9
- package/es/composite-comp/bol/components/ImageGallery/defaultJSON.js +9 -3
- package/es/composite-comp/bol/components/ImageGallery/mobile/index.js +53 -15
- package/es/composite-comp/bol/components/ImageGallery/mobile/index.less +11 -63
- package/es/composite-comp/bol/components/ImageText/defaultJSON.js +28 -8
- package/es/composite-comp/bol/components/ImageText/mobile/index.js +1 -0
- package/es/composite-comp/bol/components/Newsletter/index.less +1 -1
- package/es/composite-comp/bol/config-panels/ButtonCompConfig/ButtonConfigGroup/index.js +4 -2
- package/es/composite-comp/bol/config-panels/ButtonCompConfig/imgs/layout1.png +0 -0
- package/es/composite-comp/bol/config-panels/ButtonCompConfig/imgs/layout2.png +0 -0
- package/es/composite-comp/bol/config-panels/CarouselConfig/index.js +0 -1
- package/es/composite-comp/bol/config-panels/ImageGalleryConfig/ImageGalleryConfigImageGroup/index.js +4 -2
- package/es/composite-comp/bol/config-panels/ImageGalleryConfig/index.js +4 -3
- package/es/composite-comp/bol/config-panels/TagCompConfig/TagConfigGroup/index.js +4 -2
- package/es/composite-comp/bol/second-config-panels/ImageGallerySecondConfig/index.js +6 -17
- package/es/composite-comp/common/components/ProductItem/index.less +1 -0
- package/es/composite-comp/common/config-panels/CustomizeConfig/index.js +30 -20
- package/es/composite-comp/common/config-panels/SpacingConfig/index.js +2 -4
- package/es/composite-comp/dito/components/FlashDeal/defaultJSON.js +9 -10
- package/es/composite-comp/dito/components/PcNavigation/pc/index.less +8 -0
- package/es/composite-comp/dito/components/Recommend/mobile/index.js +8 -5
- package/es/composite-comp/dito/components/Recommend/pc/index.js +6 -4
- package/es/composite-comp/dito/components/Recommend/pc/index.less +1 -0
- package/es/composite-comp/dito/components/SearchBar/defaultJSON.js +2 -2
- package/es/composite-comp/dito/components/SearchBar/mobile/index.js +8 -6
- package/es/composite-comp/dito/config-panels/FlashDealConfig/index.js +0 -1
- package/es/composite-comp/dito/config-panels/RecommendConfig/RecommendConfigGroup/index.js +1 -1
- package/es/composite-comp/dito/config-panels/RecommendConfig/index.js +2 -0
- package/es/constants/component-types.js +3 -1
- package/es/constants/layout.js +1 -6
- package/es/core/Designer/ConfigPanel/index.js +1 -0
- 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/Image/index.js +5 -0
- package/es/meta-comp/components/Image/index.less +2 -2
- package/es/meta-comp/components/Text/index.less +1 -0
- package/lib/composite-comp/bol/components/Banner/mobile/index.js +5 -1
- package/lib/composite-comp/bol/components/Button/index.less +8 -9
- package/lib/composite-comp/bol/components/Carousel/mobile/index.js +69 -18
- package/lib/composite-comp/bol/components/Carousel/mobile/index.less +9 -4
- package/lib/composite-comp/bol/components/Carousel/pc/index.js +79 -31
- package/lib/composite-comp/bol/components/Carousel/pc/index.less +10 -9
- package/lib/composite-comp/bol/components/ImageGallery/defaultJSON.js +9 -3
- package/lib/composite-comp/bol/components/ImageGallery/mobile/index.js +53 -15
- package/lib/composite-comp/bol/components/ImageGallery/mobile/index.less +11 -63
- package/lib/composite-comp/bol/components/ImageText/defaultJSON.js +28 -8
- package/lib/composite-comp/bol/components/ImageText/mobile/index.js +1 -0
- package/lib/composite-comp/bol/components/Newsletter/index.less +1 -1
- package/lib/composite-comp/bol/config-panels/ButtonCompConfig/ButtonConfigGroup/index.js +4 -2
- package/lib/composite-comp/bol/config-panels/ButtonCompConfig/imgs/layout1.png +0 -0
- package/lib/composite-comp/bol/config-panels/ButtonCompConfig/imgs/layout2.png +0 -0
- package/lib/composite-comp/bol/config-panels/CarouselConfig/index.js +0 -1
- package/lib/composite-comp/bol/config-panels/ImageGalleryConfig/ImageGalleryConfigImageGroup/index.js +4 -2
- package/lib/composite-comp/bol/config-panels/ImageGalleryConfig/index.js +4 -3
- package/lib/composite-comp/bol/config-panels/TagCompConfig/TagConfigGroup/index.js +4 -2
- package/lib/composite-comp/bol/second-config-panels/ImageGallerySecondConfig/index.js +6 -17
- package/lib/composite-comp/common/components/ProductItem/index.less +1 -0
- package/lib/composite-comp/common/config-panels/CustomizeConfig/index.js +30 -20
- package/lib/composite-comp/common/config-panels/SpacingConfig/index.js +2 -4
- package/lib/composite-comp/dito/components/FlashDeal/defaultJSON.js +9 -10
- package/lib/composite-comp/dito/components/PcNavigation/pc/index.less +8 -0
- package/lib/composite-comp/dito/components/Recommend/mobile/index.js +8 -5
- package/lib/composite-comp/dito/components/Recommend/pc/index.js +6 -4
- package/lib/composite-comp/dito/components/Recommend/pc/index.less +1 -0
- package/lib/composite-comp/dito/components/SearchBar/defaultJSON.js +2 -2
- package/lib/composite-comp/dito/components/SearchBar/mobile/index.js +8 -6
- package/lib/composite-comp/dito/config-panels/FlashDealConfig/index.js +0 -1
- package/lib/composite-comp/dito/config-panels/RecommendConfig/RecommendConfigGroup/index.js +1 -1
- package/lib/composite-comp/dito/config-panels/RecommendConfig/index.js +2 -0
- package/lib/constants/component-types.js +3 -1
- package/lib/constants/layout.js +1 -6
- package/lib/core/Designer/ConfigPanel/index.js +1 -0
- 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/Image/index.js +5 -0
- package/lib/meta-comp/components/Image/index.less +2 -2
- package/lib/meta-comp/components/Text/index.less +1 -0
- package/package.json +1 -1
|
@@ -1,73 +1,21 @@
|
|
|
1
|
-
.m-
|
|
2
|
-
|
|
3
|
-
// .turnPage {
|
|
4
|
-
// position: absolute;
|
|
5
|
-
// top: 50%;
|
|
6
|
-
// transform: translateY(-50%);
|
|
7
|
-
// z-index: 3;
|
|
8
|
-
// cursor: pointer;
|
|
9
|
-
// }
|
|
10
|
-
// .leftBtn {
|
|
11
|
-
// left: 20px;
|
|
12
|
-
// }
|
|
13
|
-
// .rightBtn {
|
|
14
|
-
// right: 20px;
|
|
15
|
-
// }
|
|
1
|
+
.m-image-gallery-mobile {
|
|
2
|
+
overflow-x: auto;
|
|
16
3
|
|
|
17
|
-
.
|
|
18
|
-
height: 386px;
|
|
19
|
-
position: relative;
|
|
4
|
+
.content {
|
|
20
5
|
display: flex;
|
|
6
|
+
flex-direction: column;
|
|
7
|
+
flex-wrap: wrap;
|
|
8
|
+
width: 345px;
|
|
9
|
+
margin: 0 auto;
|
|
21
10
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
position: relative;
|
|
25
|
-
z-index: 2;
|
|
26
|
-
display: flex;
|
|
27
|
-
flex-direction: column;
|
|
28
|
-
margin-bottom: auto;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
.title {
|
|
32
|
-
margin-bottom: 8px;
|
|
11
|
+
&.horizontal {
|
|
12
|
+
flex-direction: row;
|
|
33
13
|
}
|
|
34
14
|
|
|
35
|
-
.
|
|
36
|
-
margin-bottom: 20px;
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
.btn-wrap {
|
|
15
|
+
.img-wrap {
|
|
40
16
|
display: flex;
|
|
41
17
|
align-items: center;
|
|
42
|
-
justify-content:
|
|
43
|
-
|
|
44
|
-
.btn {
|
|
45
|
-
margin-right: 12px;
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
.swiper-ban {
|
|
51
|
-
position: absolute;
|
|
52
|
-
width: 100%;
|
|
53
|
-
bottom: 10px;
|
|
54
|
-
display: flex;
|
|
55
|
-
align-items: center;
|
|
56
|
-
justify-content: center;
|
|
57
|
-
|
|
58
|
-
.ban {
|
|
59
|
-
font-size: 16px;
|
|
60
|
-
width: 1.5em;
|
|
61
|
-
height: 0.3em;
|
|
62
|
-
background: #FFF;
|
|
63
|
-
cursor: inherit;
|
|
64
|
-
margin-right: 0.3em;
|
|
65
|
-
transition: all .5s;
|
|
66
|
-
|
|
67
|
-
&.active {
|
|
68
|
-
width: 1.5em;
|
|
69
|
-
opacity: 1;
|
|
70
|
-
}
|
|
18
|
+
justify-content: center;
|
|
71
19
|
}
|
|
72
20
|
}
|
|
73
21
|
}
|
|
@@ -103,6 +103,20 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
|
|
|
103
103
|
iconUrl: '',
|
|
104
104
|
layout: 'right'
|
|
105
105
|
},
|
|
106
|
+
spacing: {
|
|
107
|
+
pc: {
|
|
108
|
+
paddingTop: 6,
|
|
109
|
+
paddingBottom: 6,
|
|
110
|
+
paddingLeft: 10,
|
|
111
|
+
paddingRight: 10
|
|
112
|
+
},
|
|
113
|
+
mobile: {
|
|
114
|
+
paddingTop: 6,
|
|
115
|
+
paddingBottom: 6,
|
|
116
|
+
paddingLeft: 10,
|
|
117
|
+
paddingRight: 10
|
|
118
|
+
}
|
|
119
|
+
},
|
|
106
120
|
hover: {
|
|
107
121
|
open: false,
|
|
108
122
|
content: {
|
|
@@ -125,10 +139,6 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
|
|
|
125
139
|
iconUrl: '',
|
|
126
140
|
layout: 'right'
|
|
127
141
|
}
|
|
128
|
-
},
|
|
129
|
-
spacing: {
|
|
130
|
-
pc: {},
|
|
131
|
-
mobile: {}
|
|
132
142
|
}
|
|
133
143
|
},
|
|
134
144
|
secondButton: {
|
|
@@ -158,6 +168,20 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
|
|
|
158
168
|
iconUrl: '',
|
|
159
169
|
layout: 'right'
|
|
160
170
|
},
|
|
171
|
+
spacing: {
|
|
172
|
+
pc: {
|
|
173
|
+
paddingTop: 6,
|
|
174
|
+
paddingBottom: 6,
|
|
175
|
+
paddingLeft: 10,
|
|
176
|
+
paddingRight: 10
|
|
177
|
+
},
|
|
178
|
+
mobile: {
|
|
179
|
+
paddingTop: 6,
|
|
180
|
+
paddingBottom: 6,
|
|
181
|
+
paddingLeft: 10,
|
|
182
|
+
paddingRight: 10
|
|
183
|
+
}
|
|
184
|
+
},
|
|
161
185
|
hover: {
|
|
162
186
|
open: false,
|
|
163
187
|
content: {
|
|
@@ -180,10 +204,6 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
|
|
|
180
204
|
iconUrl: '',
|
|
181
205
|
layout: 'right'
|
|
182
206
|
}
|
|
183
|
-
},
|
|
184
|
-
spacing: {
|
|
185
|
-
pc: {},
|
|
186
|
-
mobile: {}
|
|
187
207
|
}
|
|
188
208
|
},
|
|
189
209
|
background: {
|
|
@@ -123,6 +123,7 @@ function (_super) {
|
|
|
123
123
|
cardBtnStyle.justifyContent = _AlignSelector.alignItemMap[data.customize.align];
|
|
124
124
|
}
|
|
125
125
|
|
|
126
|
+
console.log('source', data);
|
|
126
127
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
127
128
|
className: (0, _classnames["default"])('image-text-mobile', data.customize.layout.h5Layout),
|
|
128
129
|
style: wrapStyle
|
|
@@ -21,6 +21,8 @@ require("./index.less");
|
|
|
21
21
|
|
|
22
22
|
var _locale = require("../../../../../locale");
|
|
23
23
|
|
|
24
|
+
var _decorator = require("../../../../../decorator");
|
|
25
|
+
|
|
24
26
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
25
27
|
|
|
26
28
|
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
@@ -98,7 +100,7 @@ function (_super) {
|
|
|
98
100
|
className: "card_wrap"
|
|
99
101
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
100
102
|
className: "name"
|
|
101
|
-
},
|
|
103
|
+
}, src.button.text));
|
|
102
104
|
};
|
|
103
105
|
|
|
104
106
|
return _this;
|
|
@@ -133,7 +135,7 @@ function (_super) {
|
|
|
133
135
|
AComponent.defaultProps = {
|
|
134
136
|
source: []
|
|
135
137
|
};
|
|
136
|
-
AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer], AComponent);
|
|
138
|
+
AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], AComponent);
|
|
137
139
|
return AComponent;
|
|
138
140
|
}(_react["default"].Component);
|
|
139
141
|
|
|
Binary file
|
|
Binary file
|
package/es/composite-comp/bol/config-panels/ImageGalleryConfig/ImageGalleryConfigImageGroup/index.js
CHANGED
|
@@ -21,6 +21,8 @@ var _defaultImg = _interopRequireDefault(require("../imgs/defaultImg.png"));
|
|
|
21
21
|
|
|
22
22
|
var _locale = require("../../../../../locale");
|
|
23
23
|
|
|
24
|
+
var _decorator = require("../../../../../decorator");
|
|
25
|
+
|
|
24
26
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
25
27
|
|
|
26
28
|
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
@@ -110,7 +112,7 @@ function (_super) {
|
|
|
110
112
|
src: ((0, _coreUtil.isPc)() ? src.image.content.pcImgSrc : src.image.content.h5ImgSrc) || _defaultImg["default"]
|
|
111
113
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
112
114
|
className: "name"
|
|
113
|
-
}, src.
|
|
115
|
+
}, (0, _coreUtil.isPc)() ? src.image.content.pcName : src.image.content.h5Name));
|
|
114
116
|
};
|
|
115
117
|
|
|
116
118
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -138,7 +140,7 @@ function (_super) {
|
|
|
138
140
|
AComponent.defaultProps = {
|
|
139
141
|
source: []
|
|
140
142
|
};
|
|
141
|
-
AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer], AComponent);
|
|
143
|
+
AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], AComponent);
|
|
142
144
|
return AComponent;
|
|
143
145
|
}(_react["default"].Component);
|
|
144
146
|
|
|
@@ -30,7 +30,7 @@ function ImageGalleryConfig(props) {
|
|
|
30
30
|
headerSize: "large",
|
|
31
31
|
source: [{
|
|
32
32
|
key: '1',
|
|
33
|
-
name: (0, _locale.i18n)('
|
|
33
|
+
name: (0, _locale.i18n)('IMAGES'),
|
|
34
34
|
value: /*#__PURE__*/_react["default"].createElement(_ImageGalleryConfigImageGroup["default"], {
|
|
35
35
|
source: data.groupSource
|
|
36
36
|
})
|
|
@@ -41,14 +41,15 @@ function ImageGalleryConfig(props) {
|
|
|
41
41
|
data: data.spacing
|
|
42
42
|
})
|
|
43
43
|
}, {
|
|
44
|
-
key: '
|
|
44
|
+
key: '3',
|
|
45
45
|
name: (0, _locale.i18n)('CUSTOMIZE'),
|
|
46
46
|
value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
|
|
47
|
+
component: "imageGallery",
|
|
47
48
|
data: data.customize,
|
|
48
49
|
layoutSource: _layout.imageGalleryLayout
|
|
49
50
|
})
|
|
50
51
|
}, {
|
|
51
|
-
key: '
|
|
52
|
+
key: '4',
|
|
52
53
|
name: (0, _locale.i18n)('BACKGROUND'),
|
|
53
54
|
value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
|
|
54
55
|
data: data.background
|
|
@@ -21,6 +21,8 @@ require("./index.less");
|
|
|
21
21
|
|
|
22
22
|
var _locale = require("../../../../../locale");
|
|
23
23
|
|
|
24
|
+
var _decorator = require("../../../../../decorator");
|
|
25
|
+
|
|
24
26
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
25
27
|
|
|
26
28
|
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
@@ -98,7 +100,7 @@ function (_super) {
|
|
|
98
100
|
className: "card_wrap"
|
|
99
101
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
100
102
|
className: "name"
|
|
101
|
-
},
|
|
103
|
+
}, src.button.text));
|
|
102
104
|
};
|
|
103
105
|
|
|
104
106
|
return _this;
|
|
@@ -133,7 +135,7 @@ function (_super) {
|
|
|
133
135
|
AComponent.defaultProps = {
|
|
134
136
|
source: []
|
|
135
137
|
};
|
|
136
|
-
AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer], AComponent);
|
|
138
|
+
AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], AComponent);
|
|
137
139
|
return AComponent;
|
|
138
140
|
}(_react["default"].Component);
|
|
139
141
|
|
|
@@ -7,10 +7,6 @@ exports["default"] = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
|
|
10
|
-
var _locale = require("../../../../locale");
|
|
11
|
-
|
|
12
|
-
var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
|
|
13
|
-
|
|
14
10
|
var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
|
|
15
11
|
|
|
16
12
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
@@ -55,20 +51,13 @@ function (_super) {
|
|
|
55
51
|
|
|
56
52
|
ImageGallerySecondConfig.prototype.render = function () {
|
|
57
53
|
var panelProps = this.props.panelProps;
|
|
58
|
-
console.log('panelProps...', panelProps);
|
|
59
54
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
60
|
-
className: "image_gallery_second_conf_wrap"
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
name: (0, _locale.i18n)('IMAGE'),
|
|
67
|
-
value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
|
|
68
|
-
data: panelProps.image
|
|
69
|
-
}),
|
|
70
|
-
metaOption: panelProps.image
|
|
71
|
-
}]
|
|
55
|
+
className: "image_gallery_second_conf_wrap",
|
|
56
|
+
style: {
|
|
57
|
+
marginTop: '20px'
|
|
58
|
+
}
|
|
59
|
+
}, /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
|
|
60
|
+
data: panelProps.image
|
|
72
61
|
}));
|
|
73
62
|
};
|
|
74
63
|
|
|
@@ -91,21 +91,12 @@ function (_super) {
|
|
|
91
91
|
showRowNum: true
|
|
92
92
|
};
|
|
93
93
|
|
|
94
|
-
_this.
|
|
94
|
+
_this.onInit = function (v) {
|
|
95
95
|
var _a;
|
|
96
96
|
|
|
97
97
|
var _b = _this.props,
|
|
98
|
-
selectedLayoutFun = _b.selectedLayoutFun,
|
|
99
|
-
data = _b.data,
|
|
100
98
|
component = _b.component,
|
|
101
|
-
id = _b.id;
|
|
102
|
-
|
|
103
|
-
if (selectedLayoutFun) {
|
|
104
|
-
selectedLayoutFun(v);
|
|
105
|
-
} else {
|
|
106
|
-
data.layout = v;
|
|
107
|
-
} // 轮播组件特殊处理
|
|
108
|
-
|
|
99
|
+
id = _b.id; // 轮播组件特殊处理
|
|
109
100
|
|
|
110
101
|
if (component === 'carousel') {
|
|
111
102
|
if (v === 'layout2') {
|
|
@@ -136,6 +127,19 @@ function (_super) {
|
|
|
136
127
|
});
|
|
137
128
|
}
|
|
138
129
|
}
|
|
130
|
+
} // imageGallery 第二种布局可选列数
|
|
131
|
+
|
|
132
|
+
|
|
133
|
+
if (component === 'imageGallery') {
|
|
134
|
+
if (v === 'layout2') {
|
|
135
|
+
_this.setState({
|
|
136
|
+
showRowNum: true
|
|
137
|
+
});
|
|
138
|
+
} else {
|
|
139
|
+
_this.setState({
|
|
140
|
+
showRowNum: false
|
|
141
|
+
});
|
|
142
|
+
}
|
|
139
143
|
} // 移动端导航特殊处理
|
|
140
144
|
// 更改需求,两个布局都需 可选行数
|
|
141
145
|
// if (component == 'mobileNavigation') {
|
|
@@ -146,6 +150,20 @@ function (_super) {
|
|
|
146
150
|
// }
|
|
147
151
|
// }
|
|
148
152
|
|
|
153
|
+
};
|
|
154
|
+
|
|
155
|
+
_this.layoutChange = function (v) {
|
|
156
|
+
var _a = _this.props,
|
|
157
|
+
selectedLayoutFun = _a.selectedLayoutFun,
|
|
158
|
+
data = _a.data;
|
|
159
|
+
|
|
160
|
+
if (selectedLayoutFun) {
|
|
161
|
+
selectedLayoutFun(v);
|
|
162
|
+
} else {
|
|
163
|
+
data.layout = v;
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
_this.onInit(v);
|
|
149
167
|
|
|
150
168
|
_this.selfRender(); // this.setState({});
|
|
151
169
|
|
|
@@ -169,15 +187,7 @@ function (_super) {
|
|
|
169
187
|
CustomizeConfig.prototype.componentDidMount = function () {
|
|
170
188
|
var _a;
|
|
171
189
|
|
|
172
|
-
|
|
173
|
-
this.setState({
|
|
174
|
-
showRowNum: false
|
|
175
|
-
});
|
|
176
|
-
} else {
|
|
177
|
-
this.setState({
|
|
178
|
-
showRowNum: true
|
|
179
|
-
});
|
|
180
|
-
}
|
|
190
|
+
this.onInit((_a = this.props.data) === null || _a === void 0 ? void 0 : _a.layout);
|
|
181
191
|
};
|
|
182
192
|
|
|
183
193
|
CustomizeConfig.prototype.render = function () {
|
|
@@ -62,7 +62,6 @@ function (_super) {
|
|
|
62
62
|
|
|
63
63
|
var _a = this.props,
|
|
64
64
|
data = _a.data,
|
|
65
|
-
configPaddingLR = _a.configPaddingLR,
|
|
66
65
|
configCompSpace = _a.configCompSpace,
|
|
67
66
|
configWidth = _a.configWidth;
|
|
68
67
|
var obj = data[window.magicDesign.device] || {};
|
|
@@ -107,7 +106,7 @@ function (_super) {
|
|
|
107
106
|
_this.selfRender();
|
|
108
107
|
},
|
|
109
108
|
value: obj.paddingBottom || 0
|
|
110
|
-
})),
|
|
109
|
+
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
111
110
|
className: "padding-item"
|
|
112
111
|
}, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
|
|
113
112
|
type: "icon-padding-left"
|
|
@@ -129,7 +128,7 @@ function (_super) {
|
|
|
129
128
|
_this.selfRender();
|
|
130
129
|
},
|
|
131
130
|
value: obj.paddingRight || 0
|
|
132
|
-
}))))
|
|
131
|
+
})))), configCompSpace && /*#__PURE__*/_react["default"].createElement(_common.Field, {
|
|
133
132
|
title: (0, _locale.i18n)('COMPONENT_SPACING')
|
|
134
133
|
}, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
|
|
135
134
|
maxVal: 100,
|
|
@@ -146,7 +145,6 @@ function (_super) {
|
|
|
146
145
|
};
|
|
147
146
|
|
|
148
147
|
SpacingConfig.defaultProps = {
|
|
149
|
-
configPaddingLR: true,
|
|
150
148
|
configCompSpace: true,
|
|
151
149
|
configWidth: false,
|
|
152
150
|
data: {
|
|
@@ -104,8 +104,7 @@ var getDefaultJSON = function getDefaultJSON() {
|
|
|
104
104
|
fontWeight: 600,
|
|
105
105
|
fontSize: 8,
|
|
106
106
|
fontStyle: 'normal',
|
|
107
|
-
color: '#fff'
|
|
108
|
-
padding: '0 5px'
|
|
107
|
+
color: '#fff'
|
|
109
108
|
},
|
|
110
109
|
buttonBorder: {
|
|
111
110
|
open: true,
|
|
@@ -114,16 +113,16 @@ var getDefaultJSON = function getDefaultJSON() {
|
|
|
114
113
|
},
|
|
115
114
|
spacing: {
|
|
116
115
|
pc: {
|
|
117
|
-
paddingTop:
|
|
118
|
-
paddingBottom:
|
|
119
|
-
paddingLeft:
|
|
120
|
-
paddingRight:
|
|
116
|
+
paddingTop: 0,
|
|
117
|
+
paddingBottom: 0,
|
|
118
|
+
paddingLeft: 4,
|
|
119
|
+
paddingRight: 4
|
|
121
120
|
},
|
|
122
121
|
mobile: {
|
|
123
|
-
paddingTop:
|
|
124
|
-
paddingBottom:
|
|
125
|
-
paddingLeft:
|
|
126
|
-
paddingRight:
|
|
122
|
+
paddingTop: 0,
|
|
123
|
+
paddingBottom: 0,
|
|
124
|
+
paddingLeft: 4,
|
|
125
|
+
paddingRight: 4
|
|
127
126
|
}
|
|
128
127
|
},
|
|
129
128
|
buttonIcon: {
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
width: fit-content;
|
|
7
7
|
display: flex;
|
|
8
8
|
align-items: center;
|
|
9
|
+
min-width: 130px;
|
|
9
10
|
|
|
10
11
|
&:hover {
|
|
11
12
|
@keyframes show-active{
|
|
@@ -89,8 +90,15 @@
|
|
|
89
90
|
.category-group {
|
|
90
91
|
margin-left: 180px;
|
|
91
92
|
display: flex;
|
|
93
|
+
overflow-x: scroll;
|
|
94
|
+
flex: 1;
|
|
95
|
+
scroll-snap-type: x;
|
|
92
96
|
.one-category {
|
|
93
97
|
margin-right: 44px;
|
|
98
|
+
scroll-snap-align: end;
|
|
99
|
+
&:last-of-type {
|
|
100
|
+
margin-right: 0;
|
|
101
|
+
}
|
|
94
102
|
}
|
|
95
103
|
}
|
|
96
104
|
|
|
@@ -229,7 +229,7 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
|
|
|
229
229
|
var LAYOUT_IMAGE_SIZE = {
|
|
230
230
|
layout1: {
|
|
231
231
|
w: '100%',
|
|
232
|
-
h:
|
|
232
|
+
h: ''
|
|
233
233
|
},
|
|
234
234
|
layout2: {
|
|
235
235
|
w: 100,
|
|
@@ -237,7 +237,7 @@ var LAYOUT_IMAGE_SIZE = {
|
|
|
237
237
|
},
|
|
238
238
|
layout3: {
|
|
239
239
|
w: '100%',
|
|
240
|
-
h:
|
|
240
|
+
h: ''
|
|
241
241
|
},
|
|
242
242
|
layout4: {
|
|
243
243
|
w: 96,
|
|
@@ -568,12 +568,15 @@ function (_super) {
|
|
|
568
568
|
return groupSource[tabIndex].seeAll;
|
|
569
569
|
}, '');
|
|
570
570
|
|
|
571
|
-
var imgHeight = (0, _commonUtil.ensure)(function () {
|
|
572
|
-
return LAYOUT_IMAGE_SIZE[layout].h;
|
|
573
|
-
}, 140);
|
|
574
571
|
var imgWidth = (0, _commonUtil.ensure)(function () {
|
|
575
572
|
return LAYOUT_IMAGE_SIZE[layout].w;
|
|
576
573
|
}, 140);
|
|
574
|
+
var imgHeight = (0, _commonUtil.ensure)(function () {
|
|
575
|
+
return LAYOUT_IMAGE_SIZE[layout].h;
|
|
576
|
+
}, 140);
|
|
577
|
+
var macyContainerDom = document.querySelector('.m-recommend-mobile');
|
|
578
|
+
if (layout === 'layout1' && macyContainerDom) imgHeight = (macyContainerDom.clientWidth - 32) / 2 - 6;
|
|
579
|
+
if (layout === 'layout3' && macyContainerDom) imgHeight = (macyContainerDom.clientWidth - 32) / 3 - 8;
|
|
577
580
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
578
581
|
className: "m-recommend-mobile",
|
|
579
582
|
style: bgStyle
|
|
@@ -233,7 +233,7 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
|
|
|
233
233
|
var LAYOUT_IMAGE_SIZE = {
|
|
234
234
|
layout1: {
|
|
235
235
|
w: '100%',
|
|
236
|
-
h:
|
|
236
|
+
h: ''
|
|
237
237
|
},
|
|
238
238
|
layout2_col6: {
|
|
239
239
|
w: 160,
|
|
@@ -636,12 +636,14 @@ function (_super) {
|
|
|
636
636
|
return groupSource[tabIndex].seeAll;
|
|
637
637
|
}, '');
|
|
638
638
|
|
|
639
|
-
var imgHeight = (0, _commonUtil.ensure)(function () {
|
|
640
|
-
return layout === 'layout1' ? LAYOUT_IMAGE_SIZE[layout].h : LAYOUT_IMAGE_SIZE[layout + "_col" + panelProps.customize.pcRowNum].h;
|
|
641
|
-
}, 140);
|
|
642
639
|
var imgWidth = (0, _commonUtil.ensure)(function () {
|
|
643
640
|
return layout === 'layout1' ? LAYOUT_IMAGE_SIZE[layout].w : LAYOUT_IMAGE_SIZE[layout + "_col" + panelProps.customize.pcRowNum].w;
|
|
644
641
|
}, 140);
|
|
642
|
+
var imgHeight = (0, _commonUtil.ensure)(function () {
|
|
643
|
+
return layout === 'layout1' ? LAYOUT_IMAGE_SIZE[layout].h : LAYOUT_IMAGE_SIZE[layout + "_col" + panelProps.customize.pcRowNum].h;
|
|
644
|
+
}, 140);
|
|
645
|
+
var macyContainerDom = document.querySelector('.tab-list');
|
|
646
|
+
if (layout === 'layout1' && macyContainerDom) imgHeight = (macyContainerDom.clientWidth - 12 * (panelProps.customize.pcRowNum - 1)) / panelProps.customize.pcRowNum;
|
|
645
647
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
646
648
|
className: "m-recommend-pc",
|
|
647
649
|
style: bgStyle
|
|
@@ -42,7 +42,7 @@ var getDefaultJSON = function getDefaultJSON() {
|
|
|
42
42
|
open: true,
|
|
43
43
|
color: {
|
|
44
44
|
pc: '#D92929',
|
|
45
|
-
mobile: '#
|
|
45
|
+
mobile: '#8493AF'
|
|
46
46
|
}
|
|
47
47
|
},
|
|
48
48
|
icon: {
|
|
@@ -50,7 +50,7 @@ var getDefaultJSON = function getDefaultJSON() {
|
|
|
50
50
|
open: true,
|
|
51
51
|
color: {
|
|
52
52
|
pc: '#D92929',
|
|
53
|
-
mobile: '#
|
|
53
|
+
mobile: '#232F46'
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
},
|
|
@@ -232,6 +232,8 @@ function (_super) {
|
|
|
232
232
|
};
|
|
233
233
|
|
|
234
234
|
SearchMobile.prototype.render = function () {
|
|
235
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
236
|
+
|
|
235
237
|
var data = this.props.data;
|
|
236
238
|
console.log('----search ', data);
|
|
237
239
|
var messageNum = this.state.messageNum; // let styleWrap = {};
|
|
@@ -253,22 +255,22 @@ function (_super) {
|
|
|
253
255
|
className: "m-search-bar"
|
|
254
256
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
255
257
|
className: "right"
|
|
256
|
-
}, data.content && data.content.box.open && /*#__PURE__*/_react["default"].createElement("div", {
|
|
258
|
+
}, data.content && ((_a = data.content.box) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement("div", {
|
|
257
259
|
className: "search-input-wrap",
|
|
258
260
|
onClick: function onClick() {
|
|
259
261
|
return (0, _coreUtil.clickUrl)('/search-page');
|
|
260
262
|
},
|
|
261
263
|
style: {
|
|
262
|
-
borderColor: data.content.box.color.mobile
|
|
264
|
+
borderColor: (_c = (_b = data.content.box) === null || _b === void 0 ? void 0 : _b.color) === null || _c === void 0 ? void 0 : _c.mobile
|
|
263
265
|
}
|
|
264
266
|
}, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
|
|
265
|
-
color: data.content.box.color.mobile,
|
|
267
|
+
color: (_e = (_d = data.content.box) === null || _d === void 0 ? void 0 : _d.color) === null || _e === void 0 ? void 0 : _e.mobile,
|
|
266
268
|
size: 24,
|
|
267
269
|
type: "icon-search2"
|
|
268
|
-
})), data.content && data.content.icon.open && /*#__PURE__*/_react["default"].createElement("div", {
|
|
270
|
+
})), data.content && ((_f = data.content.icon) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement("div", {
|
|
269
271
|
className: "message-wrap"
|
|
270
272
|
}, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
|
|
271
|
-
color: data.content.icon.color.mobile,
|
|
273
|
+
color: (_h = (_g = data.content.icon) === null || _g === void 0 ? void 0 : _g.color) === null || _h === void 0 ? void 0 : _h.mobile,
|
|
272
274
|
onClick: function onClick() {
|
|
273
275
|
return (0, _coreUtil.clickUrl)('/message-center');
|
|
274
276
|
},
|
|
@@ -276,7 +278,7 @@ function (_super) {
|
|
|
276
278
|
type: "icon-ChatDots"
|
|
277
279
|
}), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
|
|
278
280
|
className: "num"
|
|
279
|
-
}, messageNum))), data.content && data.content.logo.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
|
|
281
|
+
}, messageNum))), data.content && ((_j = data.content.logo) === null || _j === void 0 ? void 0 : _j.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
|
|
280
282
|
data: data.content.logo,
|
|
281
283
|
style: {
|
|
282
284
|
height: 30
|