|
@@ -9,11 +9,13 @@ export default React.forwardRef((props, ref) => {
|
9
|
9
|
|
10
|
10
|
const pageSize = 5;
|
11
|
11
|
const pageNumRef = React.useRef(1);
|
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) => {
|
|
@@ -55,7 +57,7 @@ export default React.forwardRef((props, ref) => {
|
55
|
57
|
});
|
56
|
58
|
});
|
57
|
59
|
},
|
58
|
|
- [request, params]
|
|
60
|
+ []
|
59
|
61
|
);
|
60
|
62
|
|
61
|
63
|
const refresh = React.useCallback(() => {
|
|
@@ -64,7 +66,7 @@ export default React.forwardRef((props, ref) => {
|
64
|
66
|
queryData({ pageNum: pageNumRef.current });
|
65
|
67
|
console.log("refresh" + pageNumRef.current);
|
66
|
68
|
console.log("refresh\n " + finished);
|
67
|
|
- }, [queryData]);
|
|
69
|
+ }, []);
|
68
|
70
|
|
69
|
71
|
const onScrollToLower = React.useCallback(
|
70
|
72
|
(event = 0, isRefresh = false) => {
|
|
@@ -74,20 +76,21 @@ export default React.forwardRef((props, ref) => {
|
74
|
76
|
queryData({ pageNum: pageNumRef.current });
|
75
|
77
|
// setFinished(isRefresh)
|
76
|
78
|
},
|
77
|
|
- [queryData]
|
|
79
|
+ []
|
78
|
80
|
);
|
79
|
81
|
|
80
|
82
|
useShow(() => {
|
81
|
83
|
refresh();
|
82
|
84
|
});
|
83
|
|
- // 后加的
|
84
|
|
- React.useEffect(() => {
|
85
|
|
- onScrollToLower();
|
86
|
|
- }, [onScrollToLower]);
|
|
85
|
+
|
|
86
|
+ // // 后加的
|
|
87
|
+ // React.useEffect(() => {
|
|
88
|
+ // onScrollToLower();
|
|
89
|
+ // }, [onScrollToLower]);
|
87
|
90
|
|
88
|
91
|
React.useEffect(() => {
|
89
|
92
|
refresh();
|
90
|
|
- }, [refresh]);
|
|
93
|
+ }, [refresh, params]);
|
91
|
94
|
|
92
|
95
|
React.useImperativeHandle(ref, () => ({
|
93
|
96
|
refresh,
|