@fairys/taro-tools-react 1.0.2 → 1.0.4

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

@@ -65,6 +65,14 @@ export declare class AuthDataInstance<T = any> {
      * @returns 是否有指定权限
      */
     hasPermission(permission: string): boolean;
+    /**
+     * 清除登录凭证（token）、权限列表、菜单权限列表、用户信息
+     */
+    clear(): void;
+    /**
+     * 初始化认证数据实例
+     */
+    constructor();
 }
 export declare const authDataInstance: AuthDataInstance<any>;
 /**

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

@@ -76,6 +76,22 @@ class AuthDataInstance {
         if (!globalSettingDataInstance.store.isEnableAuth) return true;
         return this.permissions.includes(permission);
     }
+    clear() {
+        this.token = '';
+        this.permissions = [];
+        this.menusPermissions = [];
+        this.userInfo = void 0;
+    }
+    constructor(){
+        try {
+            this.store.userInfo = this.userInfo;
+            this.store.token = this.token;
+            this.store.permissions = this.permissions;
+            this.store.menusPermissions = this.menusPermissions;
+        } catch (error) {
+            console.error("\u521D\u59CB\u5316\u8BA4\u8BC1\u6570\u636E\u5B9E\u4F8B\u5931\u8D25", error);
+        }
+    }
 }
 const authDataInstance = new AuthDataInstance();
 function useAuthData() {

package/esm/context/index.d.ts

@@ -1,4 +1,5 @@
 export * from './global.data.instance';
 export * from './page.data.instance';
 export * from './page.info.data.instance';
+export * from './auth.data.instance';
 export * from './global.setting.data.instance';

package/esm/context/index.js

@@ -1,4 +1,5 @@
 export * from "./global.data.instance.js";
 export * from "./page.data.instance.js";
 export * from "./page.info.data.instance.js";
+export * from "./auth.data.instance.js";
 export * from "./global.setting.data.instance.js";

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

@@ -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.2",
+  "version": "1.0.4",
   "main": "lib/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",

package/src/context/auth.data.instance.ts

@@ -162,6 +162,30 @@ export class AuthDataInstance<T = any> {
     }
     return this.permissions.includes(permission);
   }
+
+  /**
+   * 清除登录凭证（token）、权限列表、菜单权限列表、用户信息
+   */
+  clear() {
+    this.token = '';
+    this.permissions = [];
+    this.menusPermissions = [];
+    this.userInfo = undefined;
+  }
+
+  /**
+   * 初始化认证数据实例
+   */
+  constructor() {
+    try {
+      this.store.userInfo = this.userInfo;
+      this.store.token = this.token;
+      this.store.permissions = this.permissions;
+      this.store.menusPermissions = this.menusPermissions;
+    } catch (error) {
+      console.error('初始化认证数据实例失败', error);
+    }
+  }
 }
 
 export const authDataInstance = new AuthDataInstance();

package/src/context/index.ts

@@ -1,4 +1,5 @@
 export * from './global.data.instance';
 export * from './page.data.instance';
 export * from './page.info.data.instance';
+export * from './auth.data.instance';
 export * from './global.setting.data.instance';

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

@@ -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 });
   };
 }