@fonixtree/magic-design 0.0.99 → 0.0.100
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/imageGalleryLayout1.png +0 -0
- package/es/composite-comp/bol/components/Carousel/defaultJSON.js +4 -4
- package/es/composite-comp/bol/components/Carousel/mobile/index.js +2 -5
- package/es/composite-comp/bol/components/Carousel/mobile/index.less +8 -7
- package/es/composite-comp/bol/components/Carousel/pc/index.js +1 -4
- package/es/composite-comp/bol/components/Carousel/pc/index.less +8 -7
- package/es/composite-comp/bol/components/ImageGallery/defaultJSON.js +4 -4
- package/es/composite-comp/bol/components/ImageGallery/mobile/index.js +3 -3
- package/es/composite-comp/bol/components/ImageGallery/mobile/index.less +0 -3
- package/es/composite-comp/bol/components/ImageGallery/pc/index.js +6 -4
- package/es/composite-comp/bol/components/ImageGallery/pc/index.less +0 -3
- package/es/composite-comp/dito/components/SearchBar/defaultJSON.js +3 -3
- package/es/composite-comp/dito/components/SearchBar/imgs/xt-logo.png +0 -0
- package/es/core/Designer/AppointmentModal/index.js +4 -1
- package/es/core/Designer/ViewArea/index.less +2 -1
- package/es/core/Designer/index.js +1 -1
- package/lib/assets/images/layout-icon/imageGalleryLayout1.png +0 -0
- package/lib/composite-comp/bol/components/Carousel/defaultJSON.js +4 -4
- package/lib/composite-comp/bol/components/Carousel/mobile/index.js +2 -5
- package/lib/composite-comp/bol/components/Carousel/mobile/index.less +8 -7
- package/lib/composite-comp/bol/components/Carousel/pc/index.js +1 -4
- package/lib/composite-comp/bol/components/Carousel/pc/index.less +8 -7
- package/lib/composite-comp/bol/components/ImageGallery/defaultJSON.js +4 -4
- package/lib/composite-comp/bol/components/ImageGallery/mobile/index.js +3 -3
- package/lib/composite-comp/bol/components/ImageGallery/mobile/index.less +0 -3
- package/lib/composite-comp/bol/components/ImageGallery/pc/index.js +6 -4
- package/lib/composite-comp/bol/components/ImageGallery/pc/index.less +0 -3
- package/lib/composite-comp/dito/components/SearchBar/defaultJSON.js +3 -3
- package/lib/composite-comp/dito/components/SearchBar/imgs/xt-logo.png +0 -0
- package/lib/core/Designer/AppointmentModal/index.js +4 -1
- package/lib/core/Designer/ViewArea/index.less +2 -1
- package/lib/core/Designer/index.js +1 -1
- package/package.json +1 -1
|
Binary file
|
|
@@ -260,13 +260,13 @@ var getDefaultJSON = function getDefaultJSON() {
|
|
|
260
260
|
},
|
|
261
261
|
spacing: {
|
|
262
262
|
pc: {
|
|
263
|
-
paddingTop:
|
|
264
|
-
paddingBottom:
|
|
263
|
+
paddingTop: 0,
|
|
264
|
+
paddingBottom: 0,
|
|
265
265
|
marginBottom: window.magicDesign.compSpacing * 1.5
|
|
266
266
|
},
|
|
267
267
|
mobile: {
|
|
268
|
-
paddingTop:
|
|
269
|
-
paddingBottom:
|
|
268
|
+
paddingTop: 0,
|
|
269
|
+
paddingBottom: 0,
|
|
270
270
|
marginBottom: window.magicDesign.compSpacing
|
|
271
271
|
}
|
|
272
272
|
},
|
|
@@ -210,9 +210,7 @@ function (_super) {
|
|
|
210
210
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
211
211
|
className: "m-carousel-mobile"
|
|
212
212
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
213
|
-
className:
|
|
214
|
-
isHorizontal: colNum === 1
|
|
215
|
-
}),
|
|
213
|
+
className: "content",
|
|
216
214
|
style: {
|
|
217
215
|
paddingBottom: data.setting.dots.open && data.groupSource.length / colNum > 1 ? '20px' : '0'
|
|
218
216
|
}
|
|
@@ -228,8 +226,7 @@ function (_super) {
|
|
|
228
226
|
className: "img"
|
|
229
227
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
|
|
230
228
|
data: item.image,
|
|
231
|
-
maxHeight: MOBILE_IMG_SIZE[colNum - 1].maxH
|
|
232
|
-
maxWidth: MOBILE_IMG_SIZE[colNum - 1].maxW
|
|
229
|
+
maxHeight: MOBILE_IMG_SIZE[colNum - 1].maxH
|
|
233
230
|
})), showText && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.title.open && /*#__PURE__*/_react["default"].createElement("div", {
|
|
234
231
|
className: "title"
|
|
235
232
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
@@ -5,12 +5,6 @@
|
|
|
5
5
|
.content {
|
|
6
6
|
display: flex;
|
|
7
7
|
margin: 0 auto;
|
|
8
|
-
|
|
9
|
-
&.isHorizontal {
|
|
10
|
-
.slick-track {
|
|
11
|
-
gap: 0;
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
8
|
}
|
|
15
9
|
|
|
16
10
|
.slider-wrap {
|
|
@@ -21,7 +15,14 @@
|
|
|
21
15
|
.slick-track {
|
|
22
16
|
display: flex;
|
|
23
17
|
align-items: center;
|
|
24
|
-
|
|
18
|
+
|
|
19
|
+
.slick-slide {
|
|
20
|
+
margin-right: 12px;
|
|
21
|
+
|
|
22
|
+
&:last-child {
|
|
23
|
+
margin-right: 0;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
25
26
|
}
|
|
26
27
|
|
|
27
28
|
.img-wrap {
|
|
@@ -207,9 +207,7 @@ function (_super) {
|
|
|
207
207
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
208
208
|
className: "m-carousel-pc"
|
|
209
209
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
210
|
-
className:
|
|
211
|
-
isHorizontal: colNum === 1
|
|
212
|
-
}),
|
|
210
|
+
className: "content",
|
|
213
211
|
style: {
|
|
214
212
|
paddingBottom: data.setting.dots.open && data.groupSource.length / colNum > 1 ? '30px' : '0'
|
|
215
213
|
}
|
|
@@ -235,7 +233,6 @@ function (_super) {
|
|
|
235
233
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
|
|
236
234
|
data: item.image,
|
|
237
235
|
maxHeight: PC_IMG_SIZE[colNum - 1].maxH,
|
|
238
|
-
maxWidth: PC_IMG_SIZE[colNum - 1].maxW,
|
|
239
236
|
minHeight: PC_IMG_SIZE[colNum - 1].minH,
|
|
240
237
|
minWidth: PC_IMG_SIZE[colNum - 1].minW
|
|
241
238
|
})), showText && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.title.open && !((0, _coreUtil.isPc)() && item.title.pcText === '') && /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -5,12 +5,6 @@
|
|
|
5
5
|
.content {
|
|
6
6
|
display: flex;
|
|
7
7
|
margin: 0 auto;
|
|
8
|
-
|
|
9
|
-
&.isHorizontal {
|
|
10
|
-
.slick-track {
|
|
11
|
-
gap: 0;
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
8
|
}
|
|
15
9
|
|
|
16
10
|
.carousel-icon-left {
|
|
@@ -31,7 +25,14 @@
|
|
|
31
25
|
.slick-track {
|
|
32
26
|
display: flex;
|
|
33
27
|
align-items: center;
|
|
34
|
-
|
|
28
|
+
|
|
29
|
+
.slick-slide {
|
|
30
|
+
margin-right: 24px;
|
|
31
|
+
|
|
32
|
+
&:last-child {
|
|
33
|
+
margin-right: 0;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
35
36
|
}
|
|
36
37
|
|
|
37
38
|
.img-wrap {
|
|
@@ -48,13 +48,13 @@ var getDefaultJSON = function getDefaultJSON() {
|
|
|
48
48
|
groupSource: [imagesGroupSourceJSON()],
|
|
49
49
|
spacing: {
|
|
50
50
|
pc: {
|
|
51
|
-
paddingTop:
|
|
52
|
-
paddingBottom:
|
|
51
|
+
paddingTop: 0,
|
|
52
|
+
paddingBottom: 0,
|
|
53
53
|
marginBottom: window.magicDesign.compSpacing * 1.5
|
|
54
54
|
},
|
|
55
55
|
mobile: {
|
|
56
|
-
paddingTop:
|
|
57
|
-
paddingBottom:
|
|
56
|
+
paddingTop: 0,
|
|
57
|
+
paddingBottom: 0,
|
|
58
58
|
marginBottom: window.magicDesign.compSpacing
|
|
59
59
|
}
|
|
60
60
|
},
|
|
@@ -114,9 +114,9 @@ function (_super) {
|
|
|
114
114
|
className: (0, _classnames["default"])('line', {
|
|
115
115
|
isHorizontal: isHorizontal
|
|
116
116
|
}),
|
|
117
|
-
style: {
|
|
117
|
+
style: isHorizontal ? {
|
|
118
118
|
gap: MOBILE_IMG_SIZE[colNum].gap
|
|
119
|
-
}
|
|
119
|
+
} : {}
|
|
120
120
|
}, arr.map(function (item) {
|
|
121
121
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
122
122
|
key: item.id,
|
|
@@ -127,7 +127,7 @@ function (_super) {
|
|
|
127
127
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
|
|
128
128
|
data: item.image,
|
|
129
129
|
maxHeight: MOBILE_IMG_SIZE[colNum].maxH,
|
|
130
|
-
maxWidth:
|
|
130
|
+
maxWidth: "100%"
|
|
131
131
|
}));
|
|
132
132
|
}));
|
|
133
133
|
})));
|
|
@@ -61,6 +61,8 @@ var PC_IMG_SIZE = {
|
|
|
61
61
|
maxW: 1280,
|
|
62
62
|
minH: 150,
|
|
63
63
|
maxH: 960,
|
|
64
|
+
defW: 1072,
|
|
65
|
+
defH: 400,
|
|
64
66
|
gap: 20
|
|
65
67
|
},
|
|
66
68
|
2: {
|
|
@@ -131,9 +133,9 @@ function (_super) {
|
|
|
131
133
|
className: (0, _classnames["default"])('line', {
|
|
132
134
|
isHorizontal: isHorizontal
|
|
133
135
|
}),
|
|
134
|
-
style: {
|
|
136
|
+
style: isHorizontal ? {
|
|
135
137
|
gap: PC_IMG_SIZE[colNum].gap
|
|
136
|
-
}
|
|
138
|
+
} : {}
|
|
137
139
|
}, arr.map(function (item) {
|
|
138
140
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
139
141
|
key: item.id,
|
|
@@ -143,8 +145,8 @@ function (_super) {
|
|
|
143
145
|
}
|
|
144
146
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
|
|
145
147
|
data: item.image,
|
|
146
|
-
maxHeight: PC_IMG_SIZE[colNum].maxH,
|
|
147
|
-
maxWidth: PC_IMG_SIZE[colNum].
|
|
148
|
+
maxHeight: item.image.content.pcImgSrc ? PC_IMG_SIZE[colNum].maxH : PC_IMG_SIZE[colNum].defH,
|
|
149
|
+
maxWidth: item.image.content.pcImgSrc ? '100%' : PC_IMG_SIZE[colNum].defW,
|
|
148
150
|
minHeight: PC_IMG_SIZE[colNum].minH,
|
|
149
151
|
minWidth: PC_IMG_SIZE[colNum].minW
|
|
150
152
|
}));
|
|
@@ -7,7 +7,7 @@ exports.getDefaultJSON = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _uuid = require("uuid");
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _xtLogo = _interopRequireDefault(require("./imgs/xt-logo.png"));
|
|
11
11
|
|
|
12
12
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
13
13
|
|
|
@@ -25,8 +25,8 @@ var getDefaultJSON = function getDefaultJSON() {
|
|
|
25
25
|
content: {
|
|
26
26
|
h5Name: 'name2',
|
|
27
27
|
pcName: 'name2',
|
|
28
|
-
h5ImgSrc:
|
|
29
|
-
pcImgSrc:
|
|
28
|
+
h5ImgSrc: _xtLogo["default"],
|
|
29
|
+
pcImgSrc: _xtLogo["default"],
|
|
30
30
|
clickUrl: ''
|
|
31
31
|
},
|
|
32
32
|
hover: {
|
|
Binary file
|
|
@@ -36,7 +36,7 @@ function AppointmentModal(props) {
|
|
|
36
36
|
};
|
|
37
37
|
|
|
38
38
|
var disabledDate = function disabledDate(current) {
|
|
39
|
-
return current && current < (0, _moment["default"])().add(30, 'minutes');
|
|
39
|
+
return current && (current < (0, _moment["default"])().add(30, 'minutes') || current > (0, _moment["default"])().add(30, 'days'));
|
|
40
40
|
};
|
|
41
41
|
|
|
42
42
|
return /*#__PURE__*/_react["default"].createElement(_antd.Modal, {
|
|
@@ -62,6 +62,9 @@ function AppointmentModal(props) {
|
|
|
62
62
|
}, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
|
|
63
63
|
autoComplete: "off",
|
|
64
64
|
form: form,
|
|
65
|
+
initialValues: {
|
|
66
|
+
date: (0, _moment["default"])().add(31, 'minutes')
|
|
67
|
+
},
|
|
65
68
|
layout: "vertical",
|
|
66
69
|
onFinish: onFinish
|
|
67
70
|
}, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
transition-timing-function: ease;
|
|
11
11
|
|
|
12
12
|
.appointment_wrap {
|
|
13
|
+
flex-shrink: 0;
|
|
13
14
|
height: 44px;
|
|
14
15
|
background-color: #FFF8F0;
|
|
15
16
|
display: flex;
|
|
@@ -28,7 +29,7 @@
|
|
|
28
29
|
font-family: 'Open Sans';
|
|
29
30
|
font-style: normal;
|
|
30
31
|
font-weight: 400;
|
|
31
|
-
font-size:
|
|
32
|
+
font-size: 13px;
|
|
32
33
|
margin-left: 10px;
|
|
33
34
|
display: flex;
|
|
34
35
|
align-items: center;
|
|
@@ -516,7 +516,7 @@ function (_super) {
|
|
|
516
516
|
onCancelPublish: onCancelPublish,
|
|
517
517
|
pageData: MPageData,
|
|
518
518
|
renderHeader: this.renderHeader
|
|
519
|
-
})), /*#__PURE__*/_react["default"].createElement(_AppointmentModal["default"], {
|
|
519
|
+
})), appointmentVisible && /*#__PURE__*/_react["default"].createElement(_AppointmentModal["default"], {
|
|
520
520
|
onClose: function onClose() {
|
|
521
521
|
return _this.setState({
|
|
522
522
|
appointmentVisible: false
|
|
Binary file
|
|
@@ -260,13 +260,13 @@ var getDefaultJSON = function getDefaultJSON() {
|
|
|
260
260
|
},
|
|
261
261
|
spacing: {
|
|
262
262
|
pc: {
|
|
263
|
-
paddingTop:
|
|
264
|
-
paddingBottom:
|
|
263
|
+
paddingTop: 0,
|
|
264
|
+
paddingBottom: 0,
|
|
265
265
|
marginBottom: window.magicDesign.compSpacing * 1.5
|
|
266
266
|
},
|
|
267
267
|
mobile: {
|
|
268
|
-
paddingTop:
|
|
269
|
-
paddingBottom:
|
|
268
|
+
paddingTop: 0,
|
|
269
|
+
paddingBottom: 0,
|
|
270
270
|
marginBottom: window.magicDesign.compSpacing
|
|
271
271
|
}
|
|
272
272
|
},
|
|
@@ -210,9 +210,7 @@ function (_super) {
|
|
|
210
210
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
211
211
|
className: "m-carousel-mobile"
|
|
212
212
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
213
|
-
className:
|
|
214
|
-
isHorizontal: colNum === 1
|
|
215
|
-
}),
|
|
213
|
+
className: "content",
|
|
216
214
|
style: {
|
|
217
215
|
paddingBottom: data.setting.dots.open && data.groupSource.length / colNum > 1 ? '20px' : '0'
|
|
218
216
|
}
|
|
@@ -228,8 +226,7 @@ function (_super) {
|
|
|
228
226
|
className: "img"
|
|
229
227
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
|
|
230
228
|
data: item.image,
|
|
231
|
-
maxHeight: MOBILE_IMG_SIZE[colNum - 1].maxH
|
|
232
|
-
maxWidth: MOBILE_IMG_SIZE[colNum - 1].maxW
|
|
229
|
+
maxHeight: MOBILE_IMG_SIZE[colNum - 1].maxH
|
|
233
230
|
})), showText && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.title.open && /*#__PURE__*/_react["default"].createElement("div", {
|
|
234
231
|
className: "title"
|
|
235
232
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
@@ -5,12 +5,6 @@
|
|
|
5
5
|
.content {
|
|
6
6
|
display: flex;
|
|
7
7
|
margin: 0 auto;
|
|
8
|
-
|
|
9
|
-
&.isHorizontal {
|
|
10
|
-
.slick-track {
|
|
11
|
-
gap: 0;
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
8
|
}
|
|
15
9
|
|
|
16
10
|
.slider-wrap {
|
|
@@ -21,7 +15,14 @@
|
|
|
21
15
|
.slick-track {
|
|
22
16
|
display: flex;
|
|
23
17
|
align-items: center;
|
|
24
|
-
|
|
18
|
+
|
|
19
|
+
.slick-slide {
|
|
20
|
+
margin-right: 12px;
|
|
21
|
+
|
|
22
|
+
&:last-child {
|
|
23
|
+
margin-right: 0;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
25
26
|
}
|
|
26
27
|
|
|
27
28
|
.img-wrap {
|
|
@@ -207,9 +207,7 @@ function (_super) {
|
|
|
207
207
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
208
208
|
className: "m-carousel-pc"
|
|
209
209
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
210
|
-
className:
|
|
211
|
-
isHorizontal: colNum === 1
|
|
212
|
-
}),
|
|
210
|
+
className: "content",
|
|
213
211
|
style: {
|
|
214
212
|
paddingBottom: data.setting.dots.open && data.groupSource.length / colNum > 1 ? '30px' : '0'
|
|
215
213
|
}
|
|
@@ -235,7 +233,6 @@ function (_super) {
|
|
|
235
233
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
|
|
236
234
|
data: item.image,
|
|
237
235
|
maxHeight: PC_IMG_SIZE[colNum - 1].maxH,
|
|
238
|
-
maxWidth: PC_IMG_SIZE[colNum - 1].maxW,
|
|
239
236
|
minHeight: PC_IMG_SIZE[colNum - 1].minH,
|
|
240
237
|
minWidth: PC_IMG_SIZE[colNum - 1].minW
|
|
241
238
|
})), showText && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.title.open && !((0, _coreUtil.isPc)() && item.title.pcText === '') && /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -5,12 +5,6 @@
|
|
|
5
5
|
.content {
|
|
6
6
|
display: flex;
|
|
7
7
|
margin: 0 auto;
|
|
8
|
-
|
|
9
|
-
&.isHorizontal {
|
|
10
|
-
.slick-track {
|
|
11
|
-
gap: 0;
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
8
|
}
|
|
15
9
|
|
|
16
10
|
.carousel-icon-left {
|
|
@@ -31,7 +25,14 @@
|
|
|
31
25
|
.slick-track {
|
|
32
26
|
display: flex;
|
|
33
27
|
align-items: center;
|
|
34
|
-
|
|
28
|
+
|
|
29
|
+
.slick-slide {
|
|
30
|
+
margin-right: 24px;
|
|
31
|
+
|
|
32
|
+
&:last-child {
|
|
33
|
+
margin-right: 0;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
35
36
|
}
|
|
36
37
|
|
|
37
38
|
.img-wrap {
|
|
@@ -48,13 +48,13 @@ var getDefaultJSON = function getDefaultJSON() {
|
|
|
48
48
|
groupSource: [imagesGroupSourceJSON()],
|
|
49
49
|
spacing: {
|
|
50
50
|
pc: {
|
|
51
|
-
paddingTop:
|
|
52
|
-
paddingBottom:
|
|
51
|
+
paddingTop: 0,
|
|
52
|
+
paddingBottom: 0,
|
|
53
53
|
marginBottom: window.magicDesign.compSpacing * 1.5
|
|
54
54
|
},
|
|
55
55
|
mobile: {
|
|
56
|
-
paddingTop:
|
|
57
|
-
paddingBottom:
|
|
56
|
+
paddingTop: 0,
|
|
57
|
+
paddingBottom: 0,
|
|
58
58
|
marginBottom: window.magicDesign.compSpacing
|
|
59
59
|
}
|
|
60
60
|
},
|
|
@@ -114,9 +114,9 @@ function (_super) {
|
|
|
114
114
|
className: (0, _classnames["default"])('line', {
|
|
115
115
|
isHorizontal: isHorizontal
|
|
116
116
|
}),
|
|
117
|
-
style: {
|
|
117
|
+
style: isHorizontal ? {
|
|
118
118
|
gap: MOBILE_IMG_SIZE[colNum].gap
|
|
119
|
-
}
|
|
119
|
+
} : {}
|
|
120
120
|
}, arr.map(function (item) {
|
|
121
121
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
122
122
|
key: item.id,
|
|
@@ -127,7 +127,7 @@ function (_super) {
|
|
|
127
127
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
|
|
128
128
|
data: item.image,
|
|
129
129
|
maxHeight: MOBILE_IMG_SIZE[colNum].maxH,
|
|
130
|
-
maxWidth:
|
|
130
|
+
maxWidth: "100%"
|
|
131
131
|
}));
|
|
132
132
|
}));
|
|
133
133
|
})));
|
|
@@ -61,6 +61,8 @@ var PC_IMG_SIZE = {
|
|
|
61
61
|
maxW: 1280,
|
|
62
62
|
minH: 150,
|
|
63
63
|
maxH: 960,
|
|
64
|
+
defW: 1072,
|
|
65
|
+
defH: 400,
|
|
64
66
|
gap: 20
|
|
65
67
|
},
|
|
66
68
|
2: {
|
|
@@ -131,9 +133,9 @@ function (_super) {
|
|
|
131
133
|
className: (0, _classnames["default"])('line', {
|
|
132
134
|
isHorizontal: isHorizontal
|
|
133
135
|
}),
|
|
134
|
-
style: {
|
|
136
|
+
style: isHorizontal ? {
|
|
135
137
|
gap: PC_IMG_SIZE[colNum].gap
|
|
136
|
-
}
|
|
138
|
+
} : {}
|
|
137
139
|
}, arr.map(function (item) {
|
|
138
140
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
139
141
|
key: item.id,
|
|
@@ -143,8 +145,8 @@ function (_super) {
|
|
|
143
145
|
}
|
|
144
146
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
|
|
145
147
|
data: item.image,
|
|
146
|
-
maxHeight: PC_IMG_SIZE[colNum].maxH,
|
|
147
|
-
maxWidth: PC_IMG_SIZE[colNum].
|
|
148
|
+
maxHeight: item.image.content.pcImgSrc ? PC_IMG_SIZE[colNum].maxH : PC_IMG_SIZE[colNum].defH,
|
|
149
|
+
maxWidth: item.image.content.pcImgSrc ? '100%' : PC_IMG_SIZE[colNum].defW,
|
|
148
150
|
minHeight: PC_IMG_SIZE[colNum].minH,
|
|
149
151
|
minWidth: PC_IMG_SIZE[colNum].minW
|
|
150
152
|
}));
|
|
@@ -7,7 +7,7 @@ exports.getDefaultJSON = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _uuid = require("uuid");
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _xtLogo = _interopRequireDefault(require("./imgs/xt-logo.png"));
|
|
11
11
|
|
|
12
12
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
13
13
|
|
|
@@ -25,8 +25,8 @@ var getDefaultJSON = function getDefaultJSON() {
|
|
|
25
25
|
content: {
|
|
26
26
|
h5Name: 'name2',
|
|
27
27
|
pcName: 'name2',
|
|
28
|
-
h5ImgSrc:
|
|
29
|
-
pcImgSrc:
|
|
28
|
+
h5ImgSrc: _xtLogo["default"],
|
|
29
|
+
pcImgSrc: _xtLogo["default"],
|
|
30
30
|
clickUrl: ''
|
|
31
31
|
},
|
|
32
32
|
hover: {
|
|
Binary file
|
|
@@ -36,7 +36,7 @@ function AppointmentModal(props) {
|
|
|
36
36
|
};
|
|
37
37
|
|
|
38
38
|
var disabledDate = function disabledDate(current) {
|
|
39
|
-
return current && current < (0, _moment["default"])().add(30, 'minutes');
|
|
39
|
+
return current && (current < (0, _moment["default"])().add(30, 'minutes') || current > (0, _moment["default"])().add(30, 'days'));
|
|
40
40
|
};
|
|
41
41
|
|
|
42
42
|
return /*#__PURE__*/_react["default"].createElement(_antd.Modal, {
|
|
@@ -62,6 +62,9 @@ function AppointmentModal(props) {
|
|
|
62
62
|
}, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
|
|
63
63
|
autoComplete: "off",
|
|
64
64
|
form: form,
|
|
65
|
+
initialValues: {
|
|
66
|
+
date: (0, _moment["default"])().add(31, 'minutes')
|
|
67
|
+
},
|
|
65
68
|
layout: "vertical",
|
|
66
69
|
onFinish: onFinish
|
|
67
70
|
}, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
transition-timing-function: ease;
|
|
11
11
|
|
|
12
12
|
.appointment_wrap {
|
|
13
|
+
flex-shrink: 0;
|
|
13
14
|
height: 44px;
|
|
14
15
|
background-color: #FFF8F0;
|
|
15
16
|
display: flex;
|
|
@@ -28,7 +29,7 @@
|
|
|
28
29
|
font-family: 'Open Sans';
|
|
29
30
|
font-style: normal;
|
|
30
31
|
font-weight: 400;
|
|
31
|
-
font-size:
|
|
32
|
+
font-size: 13px;
|
|
32
33
|
margin-left: 10px;
|
|
33
34
|
display: flex;
|
|
34
35
|
align-items: center;
|
|
@@ -516,7 +516,7 @@ function (_super) {
|
|
|
516
516
|
onCancelPublish: onCancelPublish,
|
|
517
517
|
pageData: MPageData,
|
|
518
518
|
renderHeader: this.renderHeader
|
|
519
|
-
})), /*#__PURE__*/_react["default"].createElement(_AppointmentModal["default"], {
|
|
519
|
+
})), appointmentVisible && /*#__PURE__*/_react["default"].createElement(_AppointmentModal["default"], {
|
|
520
520
|
onClose: function onClose() {
|
|
521
521
|
return _this.setState({
|
|
522
522
|
appointmentVisible: false
|