@skyfox2000/webui 1.3.21 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/webui",
-   "version": "1.3.21",
+   "version": "1.4.0",
    "description": "后台前端通用组件定义",
    "type": "module",
    "keywords": [],
@@ -26,7 +26,6 @@
    },
    "scripts": {
       "build": "pnpm i && vue-tsc -b && vite build",
-      "build:dev": "pnpm link ../502428_WebBase/ && vue-tsc -b && vite build",
       "build:dts": "vue-tsc -b && vite-dts-declaration",
       "build:types": "vue-tsc --declaration --emitDeclarationOnly"
    },

package/src/components/layout/header/headerExits.vue

@@ -12,7 +12,7 @@ const confirmExit = () => {
    if (mainAppApis.value) {
       mainAppApis.value.userLogout!();
    } else {
-      userInfoStore.logout();
+      userInfoStore.logout(true);
    }
 };
 </script>

package/src/stores/appInfo.ts

@@ -10,12 +10,12 @@ import {
    RouteRecord,
    EnvConfig,
 } from '@skyfox2000/microbase';
-import AppRouter, { addAppRoutes, continueNavigation, flattenRoute, LOGIN_PATH } from '@/router';
+import AppRouter, { addAppRoutes, continueNavigation, flattenRoute } from '@/router';
 import { usePageInfo } from './pageInfo';
 import { isEmpty } from '@/utils/isEmpty';
 
 import { Component, h, nextTick } from 'vue';
-import { useUserInfo } from './userInfo';
+import { LoginExpiredError, useUserInfo } from './userInfo';
 import { ApiResponse, httpPost, IUrlInfo, ResStatus } from '@skyfox2000/fapi';
 import message from 'vue-m-message';
 
@@ -240,6 +240,10 @@ export const useAppInfo = defineStore('appInfo', {
             if (result?.status === ResStatus.SUCCESS && result.data) {
                this.appList.length = 0;
                this.appList.push(...(result.data as AppInfo[]));
+            } else if (result?.errno == LoginExpiredError) {
+               const userInfoStore = useUserInfo();
+               userInfoStore.logout(false);
+               return;
             }
          });
       },
@@ -491,12 +495,7 @@ export const useAppInfo = defineStore('appInfo', {
       logout() {
          // 清理应用信息
          this.clean();
-         AppRouter.push({ path: LOGIN_PATH + '#/' });
-         if (isMicroApp()) {
-            if (mainAppApis.value && mainAppApis.value.mainAppPush) {
-               mainAppApis.value.mainAppPush(LOGIN_PATH + '#/');
-            }
-         }
+         window.location.assign('/');
       },
    },
    persist: false,

package/src/stores/userInfo.ts

@@ -6,7 +6,8 @@ import { ref } from 'vue';
 import { useAppInfo } from './appInfo';
 
 const TokenError = 'Token解析失败';
-const LoginExpired = '登录过期，请重新登录';
+export const LoginExpired = '登录过期，请重新登录';
+export const LoginExpiredError = 1401;
 
 /** 登录相关接口 */
 const LoginUrlList: {
@@ -72,6 +73,10 @@ const getRolePermitsApi = <T>(appId: string): Promise<T | null | undefined> => {
    return httpPost<T>(LoginUrlList.auth, authParams).then((result) => {
       if (result?.status === ResStatus.SUCCESS) {
          return result.data as T;
+      } else if (result?.errno == LoginExpiredError) {
+         const userInfoStore = useUserInfo();
+         userInfoStore.logout(false);
+         return;
       }
       message.error('获取授权信息失败，' + result?.msg!);
       return null;
@@ -96,48 +101,6 @@ const logoutApi = <T>(): Promise<T | null | undefined> => {
    });
 };
 
-/**
- * 解析JWT token并检查是否过期
- * @param token JWT token字符串
- * @returns 检查结果
- */
-const isTokenExpired = (token: string): boolean => {
-   try {
-      const payload = JSON.parse(atob(token.split('.')[1])); // 解析payload部分
-      const exp = payload.exp; // 获取过期时间
-
-      const now = Date.now() / 1000; // 当前时间戳转换为秒
-      return now > exp; // 检查是否过期
-   } catch (error) {
-      console.error(TokenError, error);
-      return true; // 如果解析失败，认为token已过期
-   }
-};
-
-/**
- * 检查token是否过期
- * @returns 检查结果
- */
-const checkToken = (token: string, onClose?: () => void): boolean => {
-   if (token == '') {
-      message.error(LoginExpired, {
-         duration: 3000,
-         onClose,
-      });
-      return false;
-   }
-
-   if (isTokenExpired(token)) {
-      message.error(LoginExpired, {
-         duration: 3000,
-         onClose,
-      });
-      return false;
-   }
-
-   return true;
-};
-
 const expandUser = (loginInfo: LoginInfo): boolean => {
    try {
       const payload = JSON.parse(atob(loginInfo.token!.split('.')[1])); // 解析payload部分
@@ -210,7 +173,6 @@ export const useUserInfo = defineStore('userInfo', {
          // 非子应用，则需要检查token
          if (!isMicroApp()) {
             if (this.token) {
-               checkToken(this.token, () => this.clean());
                setToken(this.token);
                userLevel.value = this.userInfo.UserLevel;
                this.isLogin = true;
@@ -336,11 +298,6 @@ export const useUserInfo = defineStore('userInfo', {
        * @param token 用户Token
        */
       setUserInfo(userInfo: UserInfo, token: string) {
-         if (!checkToken(token)) {
-            this.clean();
-            return;
-         }
-
          if (!userLevel.value) {
             // 仅允许设置一次，启动时设置，避免通过其它方式设置
             userLevel.value = userInfo.UserLevel;
@@ -359,13 +316,9 @@ export const useUserInfo = defineStore('userInfo', {
        * @returns 用户Token
        */
       getToken(): string {
-         if (
-            checkToken(this.token!, () => {
-               this.clean();
-               this.logout();
-            })
-         ) {
-            return this.token!;
+         if (!this.token) {
+            this.clean();
+            this.logout(false);
          }
          return '';
       },
@@ -419,22 +372,27 @@ export const useUserInfo = defineStore('userInfo', {
 
       /**
        * 登出操作
+       * @param exit 是否主动退出应用
        * @returns
        */
-      async logout(): Promise<void> {
+      async logout(exit: boolean): Promise<void> {
          try {
-            // 调用后端登出接口
-            await logoutApi<any>();
+            if (exit) {
+               // 调用后端登出接口
+               await logoutApi<any>();
+            }
          } catch (error) {
             console.error('调用登出接口失败', error);
          } finally {
             // 无论登出接口是否成功，都执行本地登出操作
             await this.clean();
 
-            // 跳转到登录页
-            setTimeout(async () => {
-               message.success('已退出登录');
-            }, 1000);
+            if (exit) {
+               // 跳转到登录页
+               setTimeout(async () => {
+                  message.success('已退出登录');
+               }, 1000);
+            }
             setTimeout(async () => {
                const appInfoStore = useAppInfo();
                appInfoStore.logout();

package/src/utils/data.ts

@@ -3,6 +3,7 @@ import { ApiResponse, httpPost, IUrlInfo, ResStatus } from '@skyfox2000/fapi';
 import message from 'vue-m-message';
 import { isEmpty } from './isEmpty';
 import { combineParams } from '@skyfox2000/microbase';
+import { LoginExpiredError, useUserInfo } from '@/stores/userInfo';
 
 /**
  * 合并URL信息
@@ -68,6 +69,11 @@ const doPost = <T>(control: AnyControl, options: PostOptions<T>): Promise<ApiRes
          if (options.loadingState) {
             options.loadingState.value = false;
          }
+         if (result?.errno == LoginExpiredError) {
+            const userInfoStore = useUserInfo();
+            userInfoStore.logout(false);
+            return null;
+         }
 
          return result;
       })

package/src/utils/download.ts

@@ -3,6 +3,7 @@ import { PageControl } from '@/typings/page.d';
 import { ApiResponse, httpPost, IUrlInfo, ReqParams, ResStatus } from '@skyfox2000/fapi';
 import message from 'vue-m-message';
 import { combineParams } from '@skyfox2000/microbase';
+import { LoginExpiredError, useUserInfo } from '@/stores/userInfo';
 
 /** 通用 Blob 下载方法
  *
@@ -67,6 +68,10 @@ export const donwloadFromMinio = <T>(url: IUrlInfo, params?: ReqParams, pageCtrl
 
             // 调用下载方法
             downloadBlob(blob, fileName);
+         } else if (result?.errno == LoginExpiredError) {
+            const userInfoStore = useUserInfo();
+            userInfoStore.logout(false);
+            return;
          } else {
             message.error('下载文件失败！');
          }
@@ -103,9 +108,13 @@ export const previewFromMinio = (url: IUrlInfo, fileName: string, params?: ReqPa
          for (let b = 0; b < byteCharacters.length; b++) {
             byteArrays.push(byteCharacters.charCodeAt(b));
          }
+      } else if (result?.errno == LoginExpiredError) {
+         const userInfoStore = useUserInfo();
+         userInfoStore.logout(false);
+         return;
       } else {
          message.error('文件预览失败！');
       }
       return undefined;
    });
-};
+};

package/src/utils/export-table.ts

@@ -3,6 +3,7 @@ import { ApiResponse, httpPost, IUrlInfo, ResStatus } from '@skyfox2000/fapi';
 import dayjs from 'dayjs';
 import message from 'vue-m-message';
 import { downloadBlob } from './download';
+import { LoginExpiredError, useUserInfo } from '@/stores/userInfo';
 
 // 下载当前选择行
 // 表头相同
@@ -141,6 +142,10 @@ export const exportResults = async <T extends Record<string, any>>(
                const blob = new Blob([`\uFEFF${csvContent}`], { type: 'text/csv' });
                downloadBlob(blob, processedFileName);
             }
+         } else if (result?.errno == LoginExpiredError) {
+            const userInfoStore = useUserInfo();
+            userInfoStore.logout(false);
+            return;
          }
          return undefined;
       });

package/src/utils/form-excel.ts

@@ -8,6 +8,7 @@ import { ValidateRule } from '@/typings/form';
 import { validMessages } from './form-validate';
 import { UploadFile } from '@/typings/upload';
 import { toExcel, type ExcelMarkInfo, excelToNormalized } from './excel-view';
+import { LoginExpiredError, useUserInfo } from '@/stores/userInfo';
 
 // ExcelMarkCell 和 ExcelMarkInfo 类型已移至 excel-view.ts 统一管理
 
@@ -260,16 +261,20 @@ export const checkExcelDuplicates = async (
    });
 
    if (url) {
-      const duplicateRows = await httpPost(url, {
+      const result = await httpPost(url, {
          Data: allKeys,
       });
-      if (duplicateRows?.data) {
-         (duplicateRows.data as number[]).forEach((index) => {
+      if (result?.status == ResStatus.SUCCESS) {
+         const duplicateRows = result?.data;
+         (duplicateRows as number[]).forEach((index) => {
             duplicateIndices.add(index);
          });
-      }
-      if (duplicateRows?.status === ResStatus.ERROR) {
-         throw new Error(duplicateRows.msg);
+      } else if (result?.errno == LoginExpiredError) {
+         const userInfoStore = useUserInfo();
+         userInfoStore.logout(false);
+         throw new Error('登录已过期');
+      } else {
+         throw new Error(result?.msg);
       }
    }
 
@@ -392,14 +397,14 @@ export const validateExcelUnified = async (
             validationMsg,
             duplicateMsg,
             hasFormatError,
-            hasDuplicateError
+            hasDuplicateError,
          };
       } else {
          return {
             validationMsg,
             duplicateMsg,
             hasFormatError,
-            hasDuplicateError
+            hasDuplicateError,
          };
       }
    }
@@ -408,7 +413,7 @@ export const validateExcelUnified = async (
       validationMsg,
       duplicateMsg,
       hasFormatError: false,
-      hasDuplicateError: false
+      hasDuplicateError: false,
    };
 };
 

package/src/utils/main-openapis.ts

@@ -42,7 +42,7 @@ export const userLogin = (loginInfo: LoginInfo): Promise<ApiResponse<LoginInfo>
 export const userLogout = (): Promise<ApiResponse<void> | void> => {
    if (mainAppApis.value && mainAppApis.value.userLogout) return mainAppApis.value.userLogout();
    const userInfoStore = useUserInfo();
-   return userInfoStore.logout();
+   return userInfoStore.logout(true);
 };
 /**
  * 获取授权码
@@ -61,4 +61,4 @@ export const getUserInfo = (): UserInfo => {
    if (mainAppApis.value && mainAppApis.value.getUserInfo) return mainAppApis.value.getUserInfo();
    const userInfoStore = useUserInfo();
    return userInfoStore.getUserInfo();
-};
+};

package/src/utils/micro-openapis.ts

@@ -0,0 +1,146 @@
+/**
+ * 子应用SDK - 提供统一的主应用API调用接口
+ */
+
+// 定义API方法类型
+interface MainApis {
+  getAppInfo: () => Promise<any>;
+  getHostInfo: () => Promise<any>;
+  getUserInfo: () => Promise<any>;
+  getToken: () => Promise<any>;
+  userLogin: (params: any) => Promise<any>;
+  userLogout: () => Promise<any>;
+  mainAppPush: (params: any) => Promise<any>;
+}
+
+// 定义可用的API方法名称
+type MainApiMethod = keyof MainApis;
+
+/**
+ * MicroAppSDK类 - 管理与主应用的通信
+ */
+class MicroAppSDK {
+  constructor() {
+    this.ensureMicroAppReady();
+  }
+
+  /**
+   * 确保micro-app环境就绪
+   */
+  ensureMicroAppReady() {
+    if (typeof window === 'undefined') {
+      throw new Error('MicroAppSDK can only be used in browser environment');
+    }
+  }
+
+  /**
+   * 获取基座API
+   */
+  getMainApis(): Partial<MainApis> {
+    if (this.isInMicroApp() && (window as any).microApp && (window as any).microApp.getData) {
+      const data = (window as any).microApp.getData();
+      return data?.MainApis || {};
+    }
+    return {};
+  }
+
+  /**
+   * 检查是否在微前端环境中
+   */
+  isInMicroApp(): boolean {
+    return !!(window as any).microApp;
+  }
+
+  /**
+   * API调用包装器
+   */
+  async callMainApi<T extends MainApiMethod>(methodName: T, params?: any): Promise<ReturnType<MainApis[T]>> {
+    const mainApis = this.getMainApis();
+    
+    // 使用类型断言解决TypeScript类型检查问题
+    const method = mainApis[methodName] as Function | undefined;
+    
+    if (!method) {
+      throw new Error(`Main API method '${methodName}' is not available`);
+    }
+    
+    try {
+      if (params !== undefined) {
+        return await method(params);
+      } else {
+        return await method();
+      }
+    } catch (error) {
+      console.error(`Failed to call main API '${methodName}':`, error);
+      throw error;
+    }
+  }
+
+  /**
+   * 获取应用信息
+   */
+  async getAppInfo(): Promise<any> {
+    return this.callMainApi('getAppInfo');
+  }
+
+  /**
+   * 获取主机信息
+   */
+  async getHostInfo(): Promise<any> {
+    return this.callMainApi('getHostInfo');
+  }
+
+  /**
+   * 获取用户信息
+   */
+  async getUserInfo(): Promise<any> {
+    return this.callMainApi('getUserInfo');
+  }
+
+  /**
+   * 获取授权令牌
+   */
+  async getToken(): Promise<any> {
+    return this.callMainApi('getToken');
+  }
+
+  /**
+   * 用户登录
+   */
+  async userLogin(params: any): Promise<any> {
+    return this.callMainApi('userLogin', params);
+  }
+
+  /**
+   * 用户登出
+   */
+  async userLogout(): Promise<any> {
+    return this.callMainApi('userLogout');
+  }
+
+  /**
+   * 主应用推送
+   */
+  async mainAppPush(params: any): Promise<any> {
+    return this.callMainApi('mainAppPush', params);
+  }
+}
+
+// 创建单例实例
+const microAppSDKInstance = new MicroAppSDK();
+
+// 导出SDK实例和具体方法
+export default microAppSDKInstance;
+
+// 导出类和实例
+export { MicroAppSDK, microAppSDKInstance };
+
+// 导出所有方法
+export const getAppInfo = microAppSDKInstance.getAppInfo.bind(microAppSDKInstance);
+export const getHostInfo = microAppSDKInstance.getHostInfo.bind(microAppSDKInstance);
+export const getUserInfo = microAppSDKInstance.getUserInfo.bind(microAppSDKInstance);
+export const getToken = microAppSDKInstance.getToken.bind(microAppSDKInstance);
+export const userLogin = microAppSDKInstance.userLogin.bind(microAppSDKInstance);
+export const userLogout = microAppSDKInstance.userLogout.bind(microAppSDKInstance);
+export const mainAppPush = microAppSDKInstance.mainAppPush.bind(microAppSDKInstance);
+export const isInMicroApp = microAppSDKInstance.isInMicroApp.bind(microAppSDKInstance);

package/src/utils/options.ts

@@ -15,6 +15,7 @@ import message from 'vue-m-message';
 import eventBus from './eventbus';
 import { formValidate } from './form-validate';
 import { combineParams } from '@skyfox2000/microbase';
+import { LoginExpiredError, useUserInfo } from '@/stores/userInfo';
 
 /**
  * 自动初始化选择项
@@ -169,6 +170,10 @@ const queryOptions = <T>(
             if (result.data) {
                return result.data as T[];
             }
+         } else if (result?.errno == LoginExpiredError) {
+            const userInfoStore = useUserInfo();
+            userInfoStore.logout(false);
+            return;
          }
          return [];
       })