|
|
@@ -9,11 +9,13 @@ export default React.forwardRef((props, ref) => {
|
|
9
|
9
|
|
|
10
|
10
|
const pageSize = 5;
|
|
11
|
11
|
const pageNumRef = React.useRef(0);
|
|
12
|
|
- const listRef = React.useRef([]);
|
|
13
|
12
|
const [loading, setLoading] = React.useState(false);
|
|
14
|
13
|
const [list, setList] = React.useState([]);
|
|
15
|
14
|
const [finished, setFinished] = React.useState(true);
|
|
|
15
|
+ const listRef = React.useRef([]);
|
|
|
16
|
+ const paramsRef = React.useRef();
|
|
16
|
17
|
listRef.current = list;
|
|
|
18
|
+ paramsRef.current = params || {};
|
|
17
|
19
|
|
|
18
|
20
|
const changeLoading = (val) => {
|
|
19
|
21
|
setLoading(val);
|
|
|
@@ -28,7 +30,7 @@ export default React.forwardRef((props, ref) => {
|
|
28
|
30
|
changeLoading(true);
|
|
29
|
31
|
request({
|
|
30
|
32
|
pageSize,
|
|
31
|
|
- ...(params || {}),
|
|
|
33
|
+ ...paramsRef.current,
|
|
32
|
34
|
...options,
|
|
33
|
35
|
})
|
|
34
|
36
|
.then((res) => {
|
|
|
@@ -53,7 +55,7 @@ export default React.forwardRef((props, ref) => {
|
|
53
|
55
|
});
|
|
54
|
56
|
});
|
|
55
|
57
|
},
|
|
56
|
|
- [request, params]
|
|
|
58
|
+ []
|
|
57
|
59
|
);
|
|
58
|
60
|
|
|
59
|
61
|
const refresh = React.useCallback(() => {
|
|
|
@@ -70,32 +72,24 @@ export default React.forwardRef((props, ref) => {
|
|
70
|
72
|
pageNumRef.current += 1;
|
|
71
|
73
|
queryData({ pageNum: pageNumRef.current });
|
|
72
|
74
|
},
|
|
73
|
|
- [queryData]
|
|
|
75
|
+ []
|
|
74
|
76
|
);
|
|
75
|
77
|
|
|
76
|
78
|
useShow(() => {
|
|
77
|
79
|
refresh();
|
|
78
|
80
|
});
|
|
79
|
|
- // 后加的
|
|
80
|
|
- React.useEffect(() => {
|
|
81
|
|
- onScrollToLower();
|
|
82
|
|
- }, [onScrollToLower]);
|
|
83
|
81
|
|
|
|
82
|
+
|
|
84
|
83
|
React.useEffect(() => {
|
|
85
|
84
|
refresh();
|
|
86
|
|
- }, [refresh]);
|
|
|
85
|
+ }, [refresh, params]);
|
|
87
|
86
|
|
|
88
|
87
|
React.useImperativeHandle(ref, () => ({
|
|
89
|
88
|
refresh,
|
|
90
|
89
|
updateData: (dt) => setList(dt),
|
|
91
|
90
|
}));
|
|
92
|
|
- const onScrolls = (e) => {
|
|
93
|
|
- console.log(e.target.scrollTop);
|
|
94
|
|
- };
|
|
95
|
|
- const onClicks = (e) => {
|
|
96
|
|
- console.log(132);
|
|
97
|
|
- console.log(e);
|
|
98
|
|
- };
|
|
|
91
|
+
|
|
|
92
|
+
|
|
99
|
93
|
return (
|
|
100
|
94
|
<PowerScrollView
|
|
101
|
95
|
scrollY
|
|
|
@@ -106,7 +100,6 @@ export default React.forwardRef((props, ref) => {
|
|
106
|
100
|
finished={finished}
|
|
107
|
101
|
onScrollToLower={onScrollToLower}
|
|
108
|
102
|
style={{ height: "100%", overflowY: "auto" }}
|
|
109
|
|
- onScroll={onScrolls}
|
|
110
|
103
|
renderLoading={loading ? <view>加载中...</view> : <view></view>}
|
|
111
|
104
|
>
|
|
112
|
105
|
{list.map(renderItem)}
|
