Skip to content

Commit 848d728

Browse files
Miles-hxyMiles-hxy
authored
Merge branch 'feat_v3.x' into feat_taroe2e_ci
2 parents a9ec3ef + fe50c4b commit 848d728

File tree

20 files changed

+241
-210
lines changed

20 files changed

+241
-210
lines changed

‎src/packages/animate/animate.scss‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
.nut-animate {
2-
.nut-ani-container {
3-
display: inline-block;
4-
}
52
/* Animation css */
63
[class*='nut-animate-'] {
74
animation-duration: 0.5s;

‎src/packages/animate/demos/h5/demo1.tsx‎

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,23 @@
11
import React from 'react'
2-
import { Animate, Button } from '@nutui/nutui-react'
2+
import { Animate, Button, Space } from '@nutui/nutui-react'
33

4-
const Demo1 = () => {
5-
const style = {
6-
marginBottom: '10px',
7-
}
4+
const Demo = () => {
85
return (
9-
<>
10-
<div style={style}>
11-
<Animate type="slide-right" action="click">
12-
<Button type="primary">由右向左划入</Button>
13-
</Animate>
14-
</div>
15-
16-
<div style={style}>
17-
<Animate type="slide-left" action="click">
18-
<Button type="primary">由左向右划入</Button>
19-
</Animate>
20-
</div>
21-
22-
<div style={style}>
23-
<Animate type="slide-top" action="click">
24-
<Button type="primary">由上至下划入</Button>
25-
</Animate>
26-
</div>
27-
28-
<div style={style}>
29-
<Animate type="slide-bottom" action="click">
30-
<Button type="primary">由下至上划入</Button>
31-
</Animate>
32-
</div>
33-
</>
6+
<Space direction="vertical">
7+
<Animate type="slide-right" action="click">
8+
<Button type="primary">由右向左划入</Button>
9+
</Animate>
10+
<Animate type="slide-left" action="click">
11+
<Button type="primary">由左向右划入</Button>
12+
</Animate>
13+
<Animate type="slide-top" action="click">
14+
<Button type="primary">由上至下划入</Button>
15+
</Animate>
16+
<Animate type="slide-bottom" action="click">
17+
<Button type="primary">由下至上划入</Button>
18+
</Animate>
19+
</Space>
3420
)
3521
}
3622

37-
export default Demo1
23+
export default Demo

‎src/packages/animate/demos/h5/demo2.tsx‎

Lines changed: 26 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,32 @@
11
import React from 'react'
2-
import { Animate, Button } from '@nutui/nutui-react'
2+
import { Animate, Button, Space } from '@nutui/nutui-react'
33

4-
const Demo2 = () => {
5-
const style = {
6-
marginBottom: '10px',
7-
}
4+
const Demo = () => {
85
return (
9-
<>
10-
<div style={style}>
11-
<Animate type="shake" loop>
12-
<Button type="primary">shake-抖动</Button>
13-
</Animate>
14-
</div>
15-
16-
<div style={style}>
17-
<Animate type="ripple" loop>
18-
<Button type="primary">ripple-心跳</Button>
19-
</Animate>
20-
</div>
21-
22-
<div style={style}>
23-
<Animate type="breath" loop>
24-
<Button type="primary">breath-呼吸灯</Button>
25-
</Animate>
26-
</div>
27-
28-
<div style={style}>
29-
<Animate type="twinkle" loop>
30-
<Button type="primary">twinkle-水波</Button>
31-
</Animate>
32-
</div>
33-
34-
<div style={style}>
35-
<Animate type="flicker" loop>
36-
<Button type="primary">flicker-擦亮</Button>
37-
</Animate>
38-
</div>
39-
40-
<div style={style}>
41-
<Animate type="jump" loop>
42-
<Button type="primary">jump-跳跃</Button>
43-
</Animate>
44-
</div>
45-
46-
<div style={style}>
47-
<Animate type="float" loop>
48-
<Button type="primary">float-漂浮</Button>
49-
</Animate>
50-
</div>
51-
</>
6+
<Space direction="vertical">
7+
<Animate type="shake" loop>
8+
<Button type="primary">shake-抖动</Button>
9+
</Animate>
10+
<Animate type="ripple" loop>
11+
<Button type="primary">ripple-心跳</Button>
12+
</Animate>
13+
<Animate type="breath" loop>
14+
<Button type="primary">breath-呼吸灯</Button>
15+
</Animate>
16+
<Animate type="twinkle" loop>
17+
<Button type="primary">twinkle-水波</Button>
18+
</Animate>
19+
<Animate type="flicker" loop>
20+
<Button type="primary">flicker-擦亮</Button>
21+
</Animate>
22+
<Animate type="jump" loop>
23+
<Button type="primary">jump-跳跃</Button>
24+
</Animate>
25+
<Animate type="float" loop>
26+
<Button type="primary">float-漂浮</Button>
27+
</Animate>
28+
</Space>
5229
)
5330
}
5431

55-
export default Demo2
32+
export default Demo

‎src/packages/animate/demos/taro/demo1.tsx‎

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,23 @@
11
import React from 'react'
2-
import { View } from '@tarojs/components'
3-
import { Animate, Button } from '@nutui/nutui-react-taro'
2+
import { Animate, Button, Space } from '@nutui/nutui-react-taro'
43

5-
const Demo1 = () => {
6-
const style = {
7-
marginBottom: '10px',
8-
}
4+
const Demo = () => {
95
return (
10-
<>
11-
<View style={style}>
12-
<Animate type="slide-right" action="click">
13-
<Button type="primary">由右向左划入</Button>
14-
</Animate>
15-
</View>
16-
17-
<View style={style}>
18-
<Animate type="slide-left" action="click">
19-
<Button type="primary">由左向右划入</Button>
20-
</Animate>
21-
</View>
22-
23-
<View style={style}>
24-
<Animate type="slide-top" action="click">
25-
<Button type="primary">由上至下划入</Button>
26-
</Animate>
27-
</View>
28-
29-
<View style={style}>
30-
<Animate type="slide-bottom" action="click">
31-
<Button type="primary">由下至上划入</Button>
32-
</Animate>
33-
</View>
34-
</>
6+
<Space direction="vertical">
7+
<Animate type="slide-right" action="click">
8+
<Button type="primary">由右向左划入</Button>
9+
</Animate>
10+
<Animate type="slide-left" action="click">
11+
<Button type="primary">由左向右划入</Button>
12+
</Animate>
13+
<Animate type="slide-top" action="click">
14+
<Button type="primary">由上至下划入</Button>
15+
</Animate>
16+
<Animate type="slide-bottom" action="click">
17+
<Button type="primary">由下至上划入</Button>
18+
</Animate>
19+
</Space>
3520
)
3621
}
3722

38-
export default Demo1
23+
export default Demo

‎src/packages/animate/demos/taro/demo2.tsx‎

Lines changed: 26 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,32 @@
11
import React from 'react'
2-
import { View } from '@tarojs/components'
3-
import { Animate, Button } from '@nutui/nutui-react-taro'
2+
import { Animate, Button, Space } from '@nutui/nutui-react-taro'
43

5-
const Demo2 = () => {
6-
const style = {
7-
marginBottom: '10px',
8-
}
4+
const Demo = () => {
95
return (
10-
<>
11-
<View style={style}>
12-
<Animate type="shake" loop>
13-
<Button type="primary">shake-抖动</Button>
14-
</Animate>
15-
</View>
16-
17-
<View style={style}>
18-
<Animate type="ripple" loop>
19-
<Button type="primary">ripple-心跳</Button>
20-
</Animate>
21-
</View>
22-
23-
<View style={style}>
24-
<Animate type="breath" loop>
25-
<Button type="primary">breath-呼吸灯</Button>
26-
</Animate>
27-
</View>
28-
29-
<View style={style}>
30-
<Animate type="twinkle" loop>
31-
<Button type="primary">twinkle-水波</Button>
32-
</Animate>
33-
</View>
34-
35-
<View style={style}>
36-
<Animate type="flicker" loop>
37-
<Button type="primary">flicker-擦亮</Button>
38-
</Animate>
39-
</View>
40-
41-
<View style={style}>
42-
<Animate type="jump" loop>
43-
<Button type="primary">jump-跳跃</Button>
44-
</Animate>
45-
</View>
46-
47-
<View style={style}>
48-
<Animate type="float" loop>
49-
<Button type="primary">float-漂浮</Button>
50-
</Animate>
51-
</View>
52-
</>
6+
<Space direction="vertical">
7+
<Animate type="shake" loop>
8+
<Button type="primary">shake-抖动</Button>
9+
</Animate>
10+
<Animate type="ripple" loop>
11+
<Button type="primary">ripple-心跳</Button>
12+
</Animate>
13+
<Animate type="breath" loop>
14+
<Button type="primary">breath-呼吸灯</Button>
15+
</Animate>
16+
<Animate type="twinkle" loop>
17+
<Button type="primary">twinkle-水波</Button>
18+
</Animate>
19+
<Animate type="flicker" loop>
20+
<Button type="primary">flicker-擦亮</Button>
21+
</Animate>
22+
<Animate type="jump" loop>
23+
<Button type="primary">jump-跳跃</Button>
24+
</Animate>
25+
<Animate type="float" loop>
26+
<Button type="primary">float-漂浮</Button>
27+
</Animate>
28+
</Space>
5329
)
5430
}
5531

56-
export default Demo2
32+
export default Demo

‎src/packages/elevator/elevator.scss‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,23 @@
5151
}
5252

5353
&-fixed {
54+
display: flex;
55+
align-items: center;
5456
width: 100%;
5557
position: absolute;
5658
top: 0;
5759
left: 0;
5860
z-index: 1;
5961
padding: $elevator-list-item-padding;
6062
height: $elevator-list-item-code-height;
61-
line-height: $elevator-list-item-code-line-height;
62-
font-size: $elevator-list-item-code-font-size;
63-
color: $elevator-list-fixed-color;
64-
font-weight: $elevator-list-item-code-font-weight;
6563
background-color: $elevator-list-fixed-bg-color;
6664
box-sizing: border-box;
6765
box-shadow: $elevator-list-fixed-box-shadow;
66+
&-title {
67+
font-size: $elevator-list-item-code-font-size;
68+
color: $elevator-list-fixed-color;
69+
font-weight: $elevator-list-item-code-font-weight;
70+
}
6871
}
6972
}
7073

0 commit comments

Comments
 (0)