diff --git a/src/api/device/types.ts b/src/api/device/types.ts index e857d52c..c7b63efd 100644 --- a/src/api/device/types.ts +++ b/src/api/device/types.ts @@ -1,7 +1,7 @@ -import type { BaseQueryParams } from "@/api/common"; +import type { PageQuery } from "@/api/common"; /** 应用图标分页查询参数 */ -export interface AppIconQuery extends BaseQueryParams { +export interface AppIconQuery extends PageQuery { /** 应用包名(可选,不传则返回全部) */ packageName?: string; } diff --git a/src/api/system/developer/types.ts b/src/api/system/developer/types.ts index 808ccc88..0485986d 100644 --- a/src/api/system/developer/types.ts +++ b/src/api/system/developer/types.ts @@ -2,10 +2,10 @@ * Developer 设备开发者选项类型定义 */ -import type { BaseQueryParams } from "@/api/common"; +import type { PageQuery } from "@/api/common"; /** 开发者选项分页查询参数 */ -export interface DeveloperQueryParams extends BaseQueryParams { +export interface DeveloperQueryParams extends PageQuery { /** 搜索关键字(设备序列号) */ keywords?: string; /** 开发者选项开关(0关闭,1开启) */ diff --git a/src/api/system/device/types.ts b/src/api/system/device/types.ts index d3ff4fd1..022514c4 100644 --- a/src/api/system/device/types.ts +++ b/src/api/system/device/types.ts @@ -2,7 +2,7 @@ * Device 用户类型定义 */ -import type { BaseQueryParams } from "@/api/common"; +import type { PageQuery } from "@/api/common"; /** 登录用户信息 */ export interface DeviceInfo { @@ -23,7 +23,7 @@ export interface DeviceInfo { } /** 用户分页查询参数 */ -export interface DeviceQueryParams extends BaseQueryParams { +export interface DeviceQueryParams extends PageQuery { /** 搜索关键字 */ keywords?: string; /** 用户状态 */ diff --git a/src/components/DeviceSn/usePage.ts b/src/components/DeviceSn/usePage.ts index 45fd36c7..38572c45 100644 --- a/src/components/DeviceSn/usePage.ts +++ b/src/components/DeviceSn/usePage.ts @@ -30,8 +30,8 @@ function usePage() { // 编辑 async function handleEditClick( row: IObject, - callback?: (result?: IObject) => IObject, - RefImpl?: Ref + callback?: (result?: IObject) => IObject | Promise, + RefImpl?: Ref, ) { if (RefImpl) { RefImpl.value?.setModalVisible(); @@ -48,8 +48,8 @@ function usePage() { // 查看 async function handleViewClick( row: IObject, - callback?: (result?: IObject) => IObject, - RefImpl?: Ref + callback?: (result?: IObject) => IObject | Promise, + RefImpl?: Ref, ) { if (RefImpl) { RefImpl.value?.setModalVisible(); diff --git a/src/utils/request.ts b/src/utils/request.ts index 3fc4dede..41172597 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -1,4 +1,4 @@ -import axios, { type AxiosResponse } from "axios"; +import axios, { type AxiosResponse, type InternalAxiosRequestConfig } from "axios"; import qs from "qs"; import { ApiCodeEnum } from "@/enums/api"; @@ -91,7 +91,7 @@ function setupInterceptors(instance: typeof http) { // Token 过期 if (code === ApiCodeEnum.ACCESS_TOKEN_INVALID) { if (!config || retriedRequests.has(config)) { - await useUserStoreHook().redirectToLogin("expired"); + await useUserStoreHook().redirectToLogin(); return Promise.reject(new Error("Token Invalid")); } @@ -108,14 +108,14 @@ function setupInterceptors(instance: typeof http) { return instance(config); } catch { - await useUserStoreHook().redirectToLogin("expired"); + await useUserStoreHook().redirectToLogin(); return Promise.reject(new Error("Token Invalid")); } } // Refresh token 失效 if (code === ApiCodeEnum.REFRESH_TOKEN_INVALID) { - await useUserStoreHook().redirectToLogin("expired"); + await useUserStoreHook().redirectToLogin(); return Promise.reject(new Error("Token Invalid")); } diff --git a/src/utils/sse.ts b/src/utils/sse.ts index 55541794..5eaca2c9 100644 --- a/src/utils/sse.ts +++ b/src/utils/sse.ts @@ -264,7 +264,7 @@ function createSseConnection(options: UseSseOptions = {}) { } catch (err) { logError("SSE 令牌刷新失败:", err); // 续期失败即会话失效,走统一出口弹窗提示后跳登录页 - await userStore.redirectToLogin("expired"); + await userStore.redirectToLogin(); } } isManualDisconnect = true; diff --git a/src/views/devices/sn/config/add.ts b/src/views/devices/sn/config/add.ts index e9dceca9..78a2b2a6 100644 --- a/src/views/devices/sn/config/add.ts +++ b/src/views/devices/sn/config/add.ts @@ -126,4 +126,4 @@ const modalConfig: IModalConfig = { }; // 如果有异步数据会修改配置的,推荐用reactive包裹,而纯静态配置的可以直接导出 -export default reactive(modalConfig); +export default reactive(modalConfig) as IModalConfig; diff --git a/src/views/devices/sn/config/edit.ts b/src/views/devices/sn/config/edit.ts index 80bf40c2..1db8f436 100644 --- a/src/views/devices/sn/config/edit.ts +++ b/src/views/devices/sn/config/edit.ts @@ -60,4 +60,4 @@ const modalConfig: IModalConfig = { ], }; -export default reactive(modalConfig); +export default reactive(modalConfig) as IModalConfig;