@fairys/taro-tools-react 1.0.1 → 1.0.3

package/esm/context/page.data.instance.d.ts

@@ -13,7 +13,7 @@ export interface PageDataInstanceState extends Object {
     /**是否最后一页*/
     hasLastPage?: boolean;
     /**查询条件*/
-    search?: Object;
+    search?: Record<string, any>;
     /**表格数据*/
     dataList?: any[];
     /**选择行数据*/
@@ -97,7 +97,7 @@ export declare class PageDataInstance<T extends PageDataInstanceState = PageData
     /**内置——查询方法*/
     main_onSearch: () => void;
     /**加载更多*/
-    main_onLoadMore: () => void;
+    main_onLoadMore: () => Promise<void>;
 }
 export interface PageDataOptions<T extends PageDataInstanceState = PageDataInstanceState> {
     /**初始值*/

package/esm/context/page.data.instance.js

@@ -210,7 +210,7 @@ class page_data_instance_PageDataInstance extends ProxyInstanceObjectBase {
         this.main_onPageChange(1);
         this.store.expandSearch = false;
     };
-    main_onLoadMore = ()=>{
+    main_onLoadMore = async ()=>{
         if (this.store.loading?.pageLoading) return;
         const isTabs = this.store.isTabs;
         if (isTabs) {
@@ -233,10 +233,12 @@ class page_data_instance_PageDataInstance extends ProxyInstanceObjectBase {
                 [`${tabKey}LoadMore`]: true
             });
             this._setValues({
-                [`${tabKey}Page`]: nextPage,
+                [`${tabKey}Page`]: nextPage
+            });
+            await this.main_getList();
+            this._setValues({
                 [`${tabKey}HasLastPage`]: hasLastPage
             });
-            this.main_getList();
             return;
         }
         const total = this.store.total || 0;
@@ -255,10 +257,12 @@ class page_data_instance_PageDataInstance extends ProxyInstanceObjectBase {
         if (nextPage >= count && total) hasLastPage = true;
         this.store.loading.loadMore = true;
         this._setValues({
-            page: nextPage,
+            page: nextPage
+        });
+        await this.main_getList();
+        this._setValues({
             hasLastPage
         });
-        this.main_getList();
     };
 }
 function usePageDataInstance(instance) {

package/package.json

@@ -3,7 +3,7 @@
   "author": "SunLxy <1011771396@qq.com>",
   "description": "框架组件库",
   "homepage": "https://github.com/autumn-fairy-tales/fairys-taro-react",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "main": "lib/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",

package/src/context/page.data.instance.tsx

@@ -18,7 +18,7 @@ export interface PageDataInstanceState extends Object {
   /**是否最后一页*/
   hasLastPage?: boolean;
   /**查询条件*/
-  search?: Object;
+  search?: Record<string, any>;
   /**表格数据*/
   dataList?: any[];
   /**选择行数据*/
@@ -301,7 +301,7 @@ export class PageDataInstance<
     this.store.expandSearch = false;
   };
   /**加载更多*/
-  main_onLoadMore = () => {
+  main_onLoadMore = async () => {
     if (this.store.loading?.pageLoading) {
       // 加载中，不进行请求
       return;
@@ -329,9 +329,9 @@ export class PageDataInstance<
       // 判断是否最后一页数据
       this._setValues({
         [`${tabKey}Page`]: nextPage,
-        [`${tabKey}HasLastPage`]: hasLastPage,
       });
-      this.main_getList();
+      await this.main_getList();
+      this._setValues({ [`${tabKey}HasLastPage`]: hasLastPage });
       return;
     }
     const total = this.store.total || 0;
@@ -352,8 +352,9 @@ export class PageDataInstance<
     }
     this.store.loading.loadMore = true;
     // 判断是否最后一页数据
-    this._setValues({ page: nextPage, hasLastPage });
-    this.main_getList();
+    this._setValues({ page: nextPage });
+    await this.main_getList();
+    this._setValues({ hasLastPage });
   };
 }
 
@@ -442,6 +443,7 @@ export function PageDataInstanceContextProvider<T extends PageDataInstanceState
     isMountLoad,
     title,
   } = props;
+
   const pageInstance = usePageDataInstance(instance);
 
   instance.onBefore = onBefore;