kn-hooks 0.0.40 → 0.0.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kn-hooks",
-  "version": "0.0.40",
+  "version": "0.0.41",
   "scripts": {
     "dev": "cross-env env_api=dev env_package=dev webpack-dev-server --progress",
     "build": "cross-env env_api=prod env_package=prod webpack --config webpack.config.js",

package/src/usePagination/index.js

@@ -102,7 +102,7 @@ const usePagination=(props)=>{
   const DEFAULT_PAGE_CURRENT=1; 
   const [pagination,setPagination] = useState({
     current: DEFAULT_PAGE_CURRENT,
-    pageSize: props?.pagination?.pageSize??DEFAULT_PAGE_SIZE
+    pageSize: props?.pagination?.pageSize??DEFAULT_PAGE_SIZE,
   });
   const [data,setData] = useState(null);
   const [scrollData,setScrollData] = useState(null);
@@ -119,7 +119,13 @@ const usePagination=(props)=>{
 
     const {current,pageSize} = _pagination;
 
-    let params = {current,pageSize};
+    let params = {pageSize};
+    if(mode==MODE.scrollLoad){
+      params.cursor = _pagination.cursor;
+    }else{
+      params.current= current;
+    }
+
     let listener=refListener.current;
 
     loading.open();
@@ -153,46 +159,49 @@ const usePagination=(props)=>{
     if(debug)console.log('[usePagination] response',req)
     let response={};
     if(req?.code==0){
-      let {page:{current,total=0},data:reqData} = req;
+      let {page:{current=1,total=0,cursor=undefined},data:reqData} = req;
       let _pageSize=pageSize;
       // 兼容没数据的时候如果pageSize为0会导致接下来刷新的时候也按0的pageSize来写入
       if(req?.page?.pageSize){
         _pageSize=+req?.page?.pageSize;
       }
-      current=+current;
       total=+total;
-      const startIdx= (current-1)*_pageSize;
+      let startIdx=0;
       let more;
       if(mode==MODE.pagination){
+        current=+current;
+        startIdx= (current-1)*_pageSize;
         more = current*_pageSize<total;
       }else{
         more = req.page.more;
       }
       response.pagination={
-        current,pageSize:_pageSize,total,startIdx,more
+        current,pageSize:_pageSize,total,startIdx,more,cursor
       };
       setPagination(response.pagination);
-      response.data= clear?[]:(data||[]);
 
-      if(response.data.length<current){
-        for(let i=0;i<current;i++){
-          response.data[i]=response.data[i]||[];
-        }
-      }
-      let pageIdx= current-1;
-      response.data[pageIdx]= response.data[pageIdx]||[];
-      response.data[pageIdx]= reqData||[];
-      response.data=[...response.data];
-      setData(response.data);
-
-      // 滚动加载模式的数据组装
-      if(mode==MODE.scrollLoad){
-        let _scrollData=[];
-        for(let data of response.data ){
-          if(data!=null && Array.isArray(data) ){
-            _scrollData = [..._scrollData,...data];
+
+      if(mode==MODE.pagination){
+        response.data= clear?[]:(data||[]);
+        if(response.data.length<current){
+          for(let i=0;i<current;i++){
+            response.data[i]=response.data[i]||[];
           }
         }
+        let pageIdx= current-1;
+        response.data[pageIdx]= response.data[pageIdx]||[];
+        response.data[pageIdx]= reqData||[];
+        response.data=[...response.data];
+        setData(response.data);
+      }
+      else if(mode==MODE.scrollLoad){// 滚动加载模式的数据组装
+        let _scrollData=clear?[]:(scrollData||[]);
+        _scrollData = [..._scrollData,...reqData];
+        // for(let data of response.data ){
+        //   if(data!=null && Array.isArray(data) ){
+        //     _scrollData = [..._scrollData,...data];
+        //   }
+        // }
         setScrollData(_scrollData)
       }
     }else{
@@ -211,7 +220,7 @@ const usePagination=(props)=>{
   }
 
   const reset= ()=>{
-    return update({pagination:{current:1},clear:true})
+    return update({pagination:{current:1,cursor:''},clear:true})
   }
 
   const addListener=(type,fn)=>{