|
@@ -7,18 +7,32 @@ import './index.less'
|
7
|
7
|
|
8
|
8
|
export default function ScrollPageRefresh (props) {
|
9
|
9
|
|
10
|
|
- const { Reset = false, CloseReset = () => {}, KeepChildren = null, SearchKey = null, IsEmpty = false, ApiName = '', ListRefresh = true, ListName = 'records', RequestParams = {}, RequestData = null, RequestUrlData = null, PageSize = 10, Refresh = () => { }, Push = () => { }, RefreshBg = 'none' } = props
|
|
10
|
+ const { AutoRequest = true, Reset = false, CloseReset = () => { }, KeepChildren = null, SearchKey = null, IsEmpty = false, ApiName = '', ListRefresh = true, ListName = 'records', RequestParams = {}, RequestData = null, RequestUrlData = null, PageSize = 10, Refresh = () => { }, Push = () => { }, RefreshBg = 'none' } = props
|
|
11
|
+ const [FirstRequest, setFirstRequest] = useState(true)
|
11
|
12
|
const [IsPullUp, setIsPullUp] = useState(false)
|
12
|
13
|
const [IsPullDown, setIsPullDown] = useState(false)
|
13
|
14
|
const [HasNextPage, setHasNextPage] = useState(true)
|
14
|
15
|
const [PageNum, setPageNum] = useState(1)
|
15
|
16
|
|
16
|
17
|
useEffect(() => {
|
17
|
|
- if (ListRefresh) {
|
18
|
|
- GetPageList(() => {
|
19
|
|
- setIsPullDown(false)
|
20
|
|
- setIsPullUp(false)
|
21
|
|
- })
|
|
18
|
+ if (AutoRequest) {
|
|
19
|
+ if (ListRefresh) {
|
|
20
|
+ setFirstRequest(false)
|
|
21
|
+ GetPageList(() => {
|
|
22
|
+ setIsPullDown(false)
|
|
23
|
+ setIsPullUp(false)
|
|
24
|
+ })
|
|
25
|
+ }
|
|
26
|
+ } else {
|
|
27
|
+ if (!FirstRequest) {
|
|
28
|
+ if (ListRefresh) {
|
|
29
|
+ setFirstRequest(false)
|
|
30
|
+ GetPageList(() => {
|
|
31
|
+ setIsPullDown(false)
|
|
32
|
+ setIsPullUp(false)
|
|
33
|
+ })
|
|
34
|
+ }
|
|
35
|
+ }
|
22
|
36
|
}
|
23
|
37
|
}, [PageNum])
|
24
|
38
|
|
|
@@ -29,10 +43,6 @@ export default function ScrollPageRefresh (props) {
|
29
|
43
|
}
|
30
|
44
|
}, [Reset])
|
31
|
45
|
|
32
|
|
- useEffect(() => {
|
33
|
|
- console.log(props.children)
|
34
|
|
- }, [])
|
35
|
|
-
|
36
|
46
|
useEffect(() => {
|
37
|
47
|
if (SearchKey !== null) {
|
38
|
48
|
OnRefresh()
|