From fcd28837b2ef7115c86eab9a6551fd0d6ca14c64 Mon Sep 17 00:00:00 2001 From: xiaoming <1923740402@qq.com> Date: Thu, 8 Jan 2026 11:23:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20`RePureTableBar`=E4=B8=8E`ReVxeTabl?= =?UTF-8?q?eBar`=E7=BB=84=E4=BB=B6=E5=AE=9E=E7=8E=B0=E5=85=A8=E9=87=8F?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=9B=BD=E9=99=85=E5=8C=96=20(#1251)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/en.yaml | 16 +++++++++- locales/zh-CN.yaml | 16 +++++++++- src/components/RePureTableBar/src/bar.tsx | 38 +++++++++++++++-------- src/components/ReVxeTableBar/src/bar.tsx | 38 +++++++++++++++-------- 4 files changed, 80 insertions(+), 28 deletions(-) diff --git a/locales/en.yaml b/locales/en.yaml index 1b38890a1..89008e379 100644 --- a/locales/en.yaml +++ b/locales/en.yaml @@ -238,4 +238,18 @@ login: purePassWordRuleReg: The password format should be any combination of 8-18 digits purePassWordSureReg: Please enter confirm password purePassWordDifferentReg: The two passwords do not match! - purePassWordUpdateReg: Password has been updated \ No newline at end of file + purePassWordUpdateReg: Password has been updated +tableBar: + pureList: List + pureLarge: Large + pureDefault: Default + pureSmall: Small + pureColumnSettings: ColumnSettings + pureCollapse: Collapse + pureExpand: Expand + pureRefresh: Refresh + pureDensity: Density + pureColumnDisplay: ColumnDisplay + pureReset: Reset + pureExitFullScreen: ExitFullScreen + pureFullScreen: FullScreen \ No newline at end of file diff --git a/locales/zh-CN.yaml b/locales/zh-CN.yaml index 48fb0ec6c..bcf1eea74 100644 --- a/locales/zh-CN.yaml +++ b/locales/zh-CN.yaml @@ -238,4 +238,18 @@ login: purePassWordRuleReg: 密码格式应为8-18位数字、字母、符号的任意两种组合 purePassWordSureReg: 请输入确认密码 purePassWordDifferentReg: 两次密码不一致! - purePassWordUpdateReg: 修改密码成功 \ No newline at end of file + purePassWordUpdateReg: 修改密码成功 +tableBar: + pureList: 列表 + pureLarge: 宽松 + pureDefault: 默认 + pureSmall: 紧凑 + pureColumnSettings: 列设置 + pureCollapse: 折叠 + pureExpand: 展开 + pureRefresh: 刷新 + pureDensity: 密度 + pureColumnDisplay: 列展示 + pureReset: 重置 + pureExitFullScreen: 退出全屏 + pureFullScreen: 全屏 \ No newline at end of file diff --git a/src/components/RePureTableBar/src/bar.tsx b/src/components/RePureTableBar/src/bar.tsx index b00486e7f..924e47bde 100644 --- a/src/components/RePureTableBar/src/bar.tsx +++ b/src/components/RePureTableBar/src/bar.tsx @@ -1,5 +1,5 @@ import Sortable from "sortablejs"; -import { transformI18n } from "@/plugins/i18n"; +import { $t, transformI18n } from "@/plugins/i18n"; import { useEpThemeStoreHook } from "@/store/modules/epTheme"; import { type PropType, @@ -30,7 +30,7 @@ const props = { /** 头部最左边的标题 */ title: { type: String, - default: "列表" + default: $t("tableBar.pureList") }, /** 对于树形表格，如果想启用展开和折叠功能，传入当前表格的ref即可 */ tableRef: { @@ -169,19 +169,19 @@ export default defineComponent({ style={getDropdownItemStyle.value("large")} onClick={() => (size.value = "large")} > - 宽松 + {transformI18n($t("tableBar.pureLarge"))} (size.value = "default")} > - 默认 + {transformI18n($t("tableBar.pureDefault"))} (size.value = "small")} > - 紧凑 + {transformI18n($t("tableBar.pureSmall"))} ) @@ -245,7 +245,9 @@ export default defineComponent({ reference: () => ( ) }; @@ -268,7 +270,7 @@ export default defineComponent({ {slots?.title ? ( slots.title() ) : ( -

{props.title}

+

{transformI18n(props.title)}

)}
{slots?.buttons ? ( @@ -282,7 +284,9 @@ export default defineComponent({ transform: isExpandAll.value ? "none" : "rotate(-90deg)" }} v-tippy={rendTippyProps( - isExpandAll.value ? "折叠" : "展开" + isExpandAll.value + ? transformI18n($t("tableBar.pureCollapse")) + : transformI18n($t("tableBar.pureExpand")) )} onClick={() => onExpand()} /> @@ -295,14 +299,18 @@ export default defineComponent({ iconClass.value, loading.value ? "animate-spin" : "" ]} - v-tippy={rendTippyProps("刷新")} + v-tippy={rendTippyProps( + transformI18n($t("tableBar.pureRefresh")) + )} onClick={() => onReFresh()} /> @@ -318,13 +326,13 @@ export default defineComponent({
handleCheckAllChange(value)} /> onReset()}> - 重置 + {transformI18n($t("tableBar.pureReset"))}
@@ -382,7 +390,11 @@ export default defineComponent({ onFullscreen()} />
diff --git a/src/components/ReVxeTableBar/src/bar.tsx b/src/components/ReVxeTableBar/src/bar.tsx index aaca2c894..1aa345106 100644 --- a/src/components/ReVxeTableBar/src/bar.tsx +++ b/src/components/ReVxeTableBar/src/bar.tsx @@ -1,5 +1,5 @@ import Sortable from "sortablejs"; -import { transformI18n } from "@/plugins/i18n"; +import { $t, transformI18n } from "@/plugins/i18n"; import { useEpThemeStoreHook } from "@/store/modules/epTheme"; import { delay, cloneDeep, getKeyList } from "@pureadmin/utils"; import { @@ -24,7 +24,7 @@ const props = { /** 头部最左边的标题 */ title: { type: String, - default: "列表" + default: $t("tableBar.pureList") }, vxeTableRef: { type: Object as PropType @@ -161,19 +161,19 @@ export default defineComponent({ style={getDropdownItemStyle.value("medium")} onClick={() => changeSize("medium")} > - 宽松 + {transformI18n($t("tableBar.pureLarge"))} changeSize("small")} > - 默认 + {transformI18n($t("tableBar.pureDefault"))} changeSize("mini")} > - 紧凑 + {transformI18n($t("tableBar.pureSmall"))} ) @@ -238,7 +238,9 @@ export default defineComponent({ reference: () => ( ) }; @@ -261,7 +263,7 @@ export default defineComponent({ {slots?.title ? ( slots.title() ) : ( -

{props.title}

+

{transformI18n(props.title)}

)}
{slots?.buttons ? ( @@ -275,7 +277,9 @@ export default defineComponent({ transform: isExpandAll.value ? "none" : "rotate(-90deg)" }} v-tippy={rendTippyProps( - isExpandAll.value ? "折叠" : "展开" + isExpandAll.value + ? transformI18n($t("tableBar.pureCollapse")) + : transformI18n($t("tableBar.pureExpand")) )} onClick={() => onExpand()} /> @@ -288,14 +292,18 @@ export default defineComponent({ iconClass.value, loading.value ? "animate-spin" : "" ]} - v-tippy={rendTippyProps("刷新")} + v-tippy={rendTippyProps( + transformI18n($t("tableBar.pureRefresh")) + )} onClick={() => onReFresh()} /> @@ -311,13 +319,13 @@ export default defineComponent({
handleCheckAllChange(value)} /> onReset()}> - 重置 + {transformI18n($t("tableBar.pureReset"))}
@@ -373,7 +381,11 @@ export default defineComponent({ onFullscreen()} />
From ebc92ba61cc7fe4dcbf97db0c910e7fd673f9cc2 Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Fri, 9 Jan 2026 12:17:54 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=BC=94=E7=A4=BA=E6=8E=A5=E5=8F=A3=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mock.ts | 2 +- src/views/components/upload/index.vue | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/api/mock.ts b/src/api/mock.ts index 549e9d09b..1911dd133 100644 --- a/src/api/mock.ts +++ b/src/api/mock.ts @@ -14,7 +14,7 @@ export const mapJson = (params?: object) => { export const formUpload = data => { return http.request( "post", - "https://run.mocky.io/v3/3aa761d7-b0b3-4a03-96b3-6168d4f7467b", + "https://pureadmin.free.beeceptor.com/images", { data }, { headers: { diff --git a/src/views/components/upload/index.vue b/src/views/components/upload/index.vue index 4077da458..b3a079019 100644 --- a/src/views/components/upload/index.vue +++ b/src/views/components/upload/index.vue @@ -143,7 +143,7 @@ const onDownload = () => { class="pure-upload" list-type="picture-card" accept="image/jpeg,image/png,image/gif" - action="https://run.mocky.io/v3/3aa761d7-b0b3-4a03-96b3-6168d4f7467b" + action="https://pureadmin.free.beeceptor.com/images" :limit="3" :headers="{ Authorization: 'eyJhbGciOiJIUzUxMiJ9.admin' }" :on-exceed="onExceed" @@ -264,13 +264,13 @@ const onDownload = () => { 表格操作栏中的上传头像功能

- 免责声明：上传接口使用免费开源的 + 免责声明：上传接口使用 -  Mocky  +  Beeceptor  请不要上传重要信息 ，如果造成任何损失，我们概不负责 From f2616fdfafb50fe303fb39080e5f895c0fececd2 Mon Sep 17 00:00:00 2001 From: xiaoming <1923740402@qq.com> Date: Sat, 10 Jan 2026 08:58:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84`API`?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=93=8D=E5=BA=94=E6=A0=BC=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E5=B8=A6=E6=9D=A5=E7=AE=80=E6=B4=81=E9=AB=98=E6=95=88=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AE=BE=E8=AE=A1=20(#1256)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mock/asyncRoutes.ts | 3 +- mock/list.ts | 3 +- mock/login.ts | 6 ++- mock/map.ts | 3 +- mock/mine.ts | 6 ++- mock/refreshToken.ts | 6 ++- mock/system.ts | 48 ++++++++++++------- src/api/list.ts | 3 +- src/api/mock.ts | 3 +- src/api/routes.ts | 3 +- src/api/system.ts | 6 ++- src/api/user.ts | 12 +++-- src/components/ReMap/src/Amap.vue | 18 +++---- src/router/utils.ts | 22 ++++++--- src/store/modules/user.ts | 4 +- .../account-settings/components/Profile.vue | 13 +++-- .../components/SecurityLog.vue | 12 +++-- src/views/account-settings/index.vue | 9 ++-- src/views/components/upload/form.vue | 4 +- src/views/list/card/index.vue | 14 +++--- src/views/login/index.vue | 2 +- src/views/monitor/logs/login/hook.tsx | 12 +++-- src/views/monitor/logs/operation/hook.tsx | 12 +++-- src/views/monitor/logs/system/hook.tsx | 12 +++-- src/views/monitor/online/hook.tsx | 12 +++-- src/views/permission/page/index.vue | 2 +- src/views/system/dept/utils/hook.tsx | 23 +++++---- src/views/system/menu/utils/hook.tsx | 19 ++++---- src/views/system/role/utils/hook.tsx | 26 ++++++---- src/views/system/user/utils/hook.tsx | 23 +++++---- 30 files changed, 210 insertions(+), 131 deletions(-) diff --git a/mock/asyncRoutes.ts b/mock/asyncRoutes.ts index 7b57c702c..85ae65f6c 100644 --- a/mock/asyncRoutes.ts +++ b/mock/asyncRoutes.ts @@ -326,7 +326,8 @@ export default defineFakeRoute([ method: "get", response: () => { return { - success: true, + code: 0, + message: "操作成功", data: [ systemManagementRouter, systemMonitorRouter, diff --git a/mock/list.ts b/mock/list.ts index 2212b4ea5..12787c49c 100644 --- a/mock/list.ts +++ b/mock/list.ts @@ -6,7 +6,8 @@ export default defineFakeRoute([ method: "post", response: () => { return { - success: true, + code: 0, + message: "操作成功", data: { list: [ { diff --git a/mock/login.ts b/mock/login.ts index 55897d8f4..2306ad886 100644 --- a/mock/login.ts +++ b/mock/login.ts @@ -8,7 +8,8 @@ export default defineFakeRoute([ response: ({ body }) => { if (body.username === "admin") { return { - success: true, + code: 0, + message: "操作成功", data: { avatar: "https://avatars.githubusercontent.com/u/44761321", username: "admin", @@ -24,7 +25,8 @@ export default defineFakeRoute([ }; } else { return { - success: true, + code: 0, + message: "操作成功", data: { avatar: "https://avatars.githubusercontent.com/u/52823142", username: "common", diff --git a/mock/map.ts b/mock/map.ts index e8bf3c167..096ef890b 100644 --- a/mock/map.ts +++ b/mock/map.ts @@ -33,7 +33,8 @@ export default defineFakeRoute([ method: "get", response: () => { return { - success: true, + code: 0, + message: "操作成功", data: mapList() }; } diff --git a/mock/mine.ts b/mock/mine.ts index ed3fcb096..5716f888e 100644 --- a/mock/mine.ts +++ b/mock/mine.ts @@ -8,7 +8,8 @@ export default defineFakeRoute([ method: "get", response: () => { return { - success: true, + code: 0, + message: "操作成功", data: { avatar: "https://avatars.githubusercontent.com/u/44761321", username: "admin", @@ -46,7 +47,8 @@ export default defineFakeRoute([ } ]; return { - success: true, + code: 0, + message: "操作成功", data: { list, total: list.length, // 总条目数 diff --git a/mock/refreshToken.ts b/mock/refreshToken.ts index 34d0e8766..1757a05c4 100644 --- a/mock/refreshToken.ts +++ b/mock/refreshToken.ts @@ -8,7 +8,8 @@ export default defineFakeRoute([ response: ({ body }) => { if (body.refreshToken) { return { - success: true, + code: 0, + message: "操作成功", data: { accessToken: "eyJhbGciOiJIUzUxMiJ9.newAdmin", refreshToken: "eyJhbGciOiJIUzUxMiJ9.newAdminRefresh", @@ -18,7 +19,8 @@ export default defineFakeRoute([ }; } else { return { - success: false, + code: 10001, + message: "请求参数缺失或格式不正确", data: {} }; } diff --git a/mock/system.ts b/mock/system.ts index b715cf731..e4d6e58a2 100644 --- a/mock/system.ts +++ b/mock/system.ts @@ -50,7 +50,8 @@ export default defineFakeRoute([ if (body.phone) list = list.filter(item => item.phone === body.phone); if (body.deptId) list = list.filter(item => item.dept.id === body.deptId); return { - success: true, + code: 0, + message: "操作成功", data: { list, total: list.length, // 总条目数 @@ -66,7 +67,8 @@ export default defineFakeRoute([ method: "get", response: () => { return { - success: true, + code: 0, + message: "操作成功", data: [ { id: 1, name: "超级管理员" }, { id: 2, name: "普通角色" } @@ -82,18 +84,21 @@ export default defineFakeRoute([ if (body.userId) { if (body.userId == 1) { return { - success: true, + code: 0, + message: "操作成功", data: [1] }; } else if (body.userId == 2) { return { - success: true, + code: 0, + message: "操作成功", data: [2] }; } } else { return { - success: false, + code: 10001, + message: "请求参数缺失或格式不正确", data: [] }; } @@ -130,7 +135,8 @@ export default defineFakeRoute([ ); if (body.code) list = list.filter(item => item.code === body.code); return { - success: true, + code: 0, + message: "操作成功", data: { list, total: list.length, // 总条目数 @@ -146,7 +152,8 @@ export default defineFakeRoute([ method: "post", response: () => { return { - success: true, + code: 0, + message: "操作成功", data: [ // 外部页面 { @@ -350,7 +357,8 @@ export default defineFakeRoute([ response: ({ body }) => { if (body.id == 1) { return { - success: true, + code: 0, + message: "操作成功", data: [ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 200, 201, 202, 203, 204, 205, 300, 301, 302, 303, 304, 400, 401, 402, 403, @@ -359,7 +367,8 @@ export default defineFakeRoute([ }; } else if (body.id == 2) { return { - success: true, + code: 0, + message: "操作成功", data: [ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 404, 500, 501, 502, 503 @@ -374,7 +383,8 @@ export default defineFakeRoute([ method: "post", response: () => { return { - success: true, + code: 0, + message: "操作成功", data: [ // 外部页面 { @@ -1255,7 +1265,8 @@ export default defineFakeRoute([ method: "post", response: () => { return { - success: true, + code: 0, + message: "操作成功", data: [ { name: "杭州总公司", @@ -1418,7 +1429,8 @@ export default defineFakeRoute([ ]; list = list.filter(item => item.username.includes(body?.username)); return { - success: true, + code: 0, + message: "操作成功", data: { list, total: list.length, // 总条目数 @@ -1462,7 +1474,8 @@ export default defineFakeRoute([ String(item.status).includes(String(body?.status)) ); return { - success: true, + code: 0, + message: "操作成功", data: { list, total: list.length, // 总条目数 @@ -1508,7 +1521,8 @@ export default defineFakeRoute([ String(item.status).includes(String(body?.status)) ); return { - success: true, + code: 0, + message: "操作成功", data: { list, total: list.length, // 总条目数 @@ -1566,7 +1580,8 @@ export default defineFakeRoute([ ]; list = list.filter(item => item.module.includes(body?.module)); return { - success: true, + code: 0, + message: "操作成功", data: { list, total: list.length, // 总条目数 @@ -1601,7 +1616,8 @@ export default defineFakeRoute([ "Content-Length": 17019 }, responseBody: { - success: true, + code: 0, + message: "操作成功", data: [ { parentId: 0, diff --git a/src/api/list.ts b/src/api/list.ts index c0017843f..a3c5bfba6 100644 --- a/src/api/list.ts +++ b/src/api/list.ts @@ -1,7 +1,8 @@ import { http } from "@/utils/http"; type Result = { - success: boolean; + code: number; + message: string; data?: { /** 列表数据 */ list: Array; diff --git a/src/api/mock.ts b/src/api/mock.ts index 1911dd133..682550aca 100644 --- a/src/api/mock.ts +++ b/src/api/mock.ts @@ -1,7 +1,8 @@ import { http } from "@/utils/http"; type Result = { - success: boolean; + code: number; + message: string; data: Array; }; diff --git a/src/api/routes.ts b/src/api/routes.ts index 501ea3c7a..aa5a95021 100644 --- a/src/api/routes.ts +++ b/src/api/routes.ts @@ -1,7 +1,8 @@ import { http } from "@/utils/http"; type Result = { - success: boolean; + code: number; + message: string; data: Array; }; diff --git a/src/api/system.ts b/src/api/system.ts index e4db23811..da09f718d 100644 --- a/src/api/system.ts +++ b/src/api/system.ts @@ -1,12 +1,14 @@ import { http } from "@/utils/http"; type Result = { - success: boolean; + code: number; + message: string; data?: Array; }; type ResultTable = { - success: boolean; + code: number; + message: string; data?: { /** 列表数据 */ list: Array; diff --git a/src/api/user.ts b/src/api/user.ts index 2404c008f..d2dee14c2 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -1,7 +1,8 @@ import { http } from "@/utils/http"; export type UserResult = { - success: boolean; + code: number; + message: string; data: { /** 头像 */ avatar: string; @@ -23,7 +24,8 @@ export type UserResult = { }; export type RefreshTokenResult = { - success: boolean; + code: number; + message: string; data: { /** `token` */ accessToken: string; @@ -50,12 +52,14 @@ export type UserInfo = { }; export type UserInfoResult = { - success: boolean; + code: number; + message: string; data: UserInfo; }; type ResultTable = { - success: boolean; + code: number; + message: string; data?: { /** 列表数据 */ list: Array; diff --git a/src/components/ReMap/src/Amap.vue b/src/components/ReMap/src/Amap.vue index 8f8bd5bff..5eb8e4644 100644 --- a/src/components/ReMap/src/Amap.vue +++ b/src/components/ReMap/src/Amap.vue @@ -92,14 +92,16 @@ onBeforeMount(() => { // 获取模拟车辆信息 mapJson() - .then(({ data }) => { - const points: object = data.map(v => { - return { - lnglat: [v.lng, v.lat], - ...v - }; - }); - if (MarkerCluster) MarkerCluster.setData(points); + .then(({ code, data }) => { + if (code === 0) { + const points: object = data.map(v => { + return { + lnglat: [v.lng, v.lat], + ...v + }; + }); + if (MarkerCluster) MarkerCluster.setData(points); + } }) .catch(err => { console.log("err:", err); diff --git a/src/router/utils.ts b/src/router/utils.ts index 43d1888de..836fb2006 100644 --- a/src/router/utils.ts +++ b/src/router/utils.ts @@ -209,18 +209,26 @@ function initRouter() { }); } else { return new Promise(resolve => { - getAsyncRoutes().then(({ data }) => { - handleAsyncRoutes(cloneDeep(data)); - storageLocal().setItem(key, data); - resolve(router); + getAsyncRoutes().then(({ code, data }) => { + if (code === 0) { + handleAsyncRoutes(cloneDeep(data)); + storageLocal().setItem(key, data); + resolve(router); + } else { + resolve(router); + } }); }); } } else { return new Promise(resolve => { - getAsyncRoutes().then(({ data }) => { - handleAsyncRoutes(cloneDeep(data)); - resolve(router); + getAsyncRoutes().then(({ code, data }) => { + if (code === 0) { + handleAsyncRoutes(cloneDeep(data)); + resolve(router); + } else { + resolve(router); + } }); }); } diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 0429847f7..59f117b82 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -80,7 +80,7 @@ export const useUserStore = defineStore("pure-user", { return new Promise((resolve, reject) => { getLogin(data) .then(data => { - if (data?.success) setToken(data.data); + if (data.code === 0) setToken(data.data); resolve(data); }) .catch(error => { @@ -103,7 +103,7 @@ export const useUserStore = defineStore("pure-user", { return new Promise((resolve, reject) => { refreshTokenApi(data) .then(data => { - if (data) { + if (data.code === 0) { setToken(data.data); resolve(data); } diff --git a/src/views/account-settings/components/Profile.vue b/src/views/account-settings/components/Profile.vue index b213d6cda..9d6ff47c0 100644 --- a/src/views/account-settings/components/Profile.vue +++ b/src/views/account-settings/components/Profile.vue @@ -1,7 +1,7 @@ diff --git a/src/views/account-settings/components/SecurityLog.vue b/src/views/account-settings/components/SecurityLog.vue index bddbce472..26084ec98 100644 --- a/src/views/account-settings/components/SecurityLog.vue +++ b/src/views/account-settings/components/SecurityLog.vue @@ -55,11 +55,13 @@ const columns: TableColumnList = [ async function onSearch() { loading.value = true; - const { data } = await getMineLogs(); - dataList.value = data.list; - pagination.total = data.total; - pagination.pageSize = data.pageSize; - pagination.currentPage = data.currentPage; + const { code, data } = await getMineLogs(); + if (code === 0) { + dataList.value = data.list; + pagination.total = data.total; + pagination.pageSize = data.pageSize; + pagination.currentPage = data.currentPage; + } setTimeout(() => { loading.value = false; diff --git a/src/views/account-settings/index.vue b/src/views/account-settings/index.vue index 0e507c79d..9dd16fe4f 100644 --- a/src/views/account-settings/index.vue +++ b/src/views/account-settings/index.vue @@ -1,9 +1,9 @@ diff --git a/src/views/components/upload/form.vue b/src/views/components/upload/form.vue index 57f03430e..7cf68b9ee 100644 --- a/src/views/components/upload/form.vue +++ b/src/views/components/upload/form.vue @@ -23,8 +23,8 @@ const submitForm = formEl => { date: validateForm.date // 别的字段 }); formUpload(formData) - .then(({ success }) => { - if (success) { + .then(({ code }) => { + if (code === 0) { message("提交成功", { type: "success" }); } else { message("提交失败"); diff --git a/src/views/list/card/index.vue b/src/views/list/card/index.vue index 8cdcb99f3..720eb898c 100644 --- a/src/views/list/card/index.vue +++ b/src/views/list/card/index.vue @@ -38,12 +38,14 @@ const dataLoading = ref(true); const getCardListData = async () => { try { - const { data } = await getCardList(); - productList.value = data.list; - pagination.value = { - ...pagination.value, - total: data.list.length - }; + const { code, data } = await getCardList(); + if (code === 0) { + productList.value = data.list; + pagination.value = { + ...pagination.value, + total: data.list.length + }; + } } catch (e) { console.log(e); } finally { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index eaa0809f7..4e0522374 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -74,7 +74,7 @@ const onLogin = async (formEl: FormInstance | undefined) => { password: ruleForm.password }) .then(res => { - if (res.success) { + if (res.code === 0) { // 获取后端路由 return initRouter().then(() => { disabled.value = true; diff --git a/src/views/monitor/logs/login/hook.tsx b/src/views/monitor/logs/login/hook.tsx index 88f31bbd6..a61473531 100644 --- a/src/views/monitor/logs/login/hook.tsx +++ b/src/views/monitor/logs/login/hook.tsx @@ -129,11 +129,13 @@ export function useRole(tableRef: Ref) { async function onSearch() { loading.value = true; - const { data } = await getLoginLogsList(toRaw(form)); - dataList.value = data.list; - pagination.total = data.total; - pagination.pageSize = data.pageSize; - pagination.currentPage = data.currentPage; + const { code, data } = await getLoginLogsList(toRaw(form)); + if (code === 0) { + dataList.value = data.list; + pagination.total = data.total; + pagination.pageSize = data.pageSize; + pagination.currentPage = data.currentPage; + } setTimeout(() => { loading.value = false; diff --git a/src/views/monitor/logs/operation/hook.tsx b/src/views/monitor/logs/operation/hook.tsx index 11ffcf25c..0f21390a5 100644 --- a/src/views/monitor/logs/operation/hook.tsx +++ b/src/views/monitor/logs/operation/hook.tsx @@ -134,11 +134,13 @@ export function useRole(tableRef: Ref) { async function onSearch() { loading.value = true; - const { data } = await getOperationLogsList(toRaw(form)); - dataList.value = data.list; - pagination.total = data.total; - pagination.pageSize = data.pageSize; - pagination.currentPage = data.currentPage; + const { code, data } = await getOperationLogsList(toRaw(form)); + if (code === 0) { + dataList.value = data.list; + pagination.total = data.total; + pagination.pageSize = data.pageSize; + pagination.currentPage = data.currentPage; + } setTimeout(() => { loading.value = false; diff --git a/src/views/monitor/logs/system/hook.tsx b/src/views/monitor/logs/system/hook.tsx index cca9db445..f4dddc40c 100644 --- a/src/views/monitor/logs/system/hook.tsx +++ b/src/views/monitor/logs/system/hook.tsx @@ -204,11 +204,13 @@ export function useRole(tableRef: Ref) { async function onSearch() { loading.value = true; - const { data } = await getSystemLogsList(toRaw(form)); - dataList.value = data.list; - pagination.total = data.total; - pagination.pageSize = data.pageSize; - pagination.currentPage = data.currentPage; + const { code, data } = await getSystemLogsList(toRaw(form)); + if (code === 0) { + dataList.value = data.list; + pagination.total = data.total; + pagination.pageSize = data.pageSize; + pagination.currentPage = data.currentPage; + } setTimeout(() => { loading.value = false; diff --git a/src/views/monitor/online/hook.tsx b/src/views/monitor/online/hook.tsx index 65b5936e1..2d18bf050 100644 --- a/src/views/monitor/online/hook.tsx +++ b/src/views/monitor/online/hook.tsx @@ -80,11 +80,13 @@ export function useRole() { async function onSearch() { loading.value = true; - const { data } = await getOnlineLogsList(toRaw(form)); - dataList.value = data.list; - pagination.total = data.total; - pagination.pageSize = data.pageSize; - pagination.currentPage = data.currentPage; + const { code, data } = await getOnlineLogsList(toRaw(form)); + if (code === 0) { + dataList.value = data.list; + pagination.total = data.total; + pagination.pageSize = data.pageSize; + pagination.currentPage = data.currentPage; + } setTimeout(() => { loading.value = false; diff --git a/src/views/permission/page/index.vue b/src/views/permission/page/index.vue index e2ee26d12..21125e4fc 100644 --- a/src/views/permission/page/index.vue +++ b/src/views/permission/page/index.vue @@ -33,7 +33,7 @@ function onChange() { useUserStoreHook() .loginByUsername({ username: username.value, password: "admin123" }) .then(res => { - if (res.success) { + if (res.code === 0) { storageLocal().removeItem("async-routes"); usePermissionStoreHook().clearAllCachePage(); initRouter(); diff --git a/src/views/system/dept/utils/hook.tsx b/src/views/system/dept/utils/hook.tsx index 8cbcdb810..830b1bf38 100644 --- a/src/views/system/dept/utils/hook.tsx +++ b/src/views/system/dept/utils/hook.tsx @@ -74,17 +74,20 @@ export function useDept() { async function onSearch() { loading.value = true; - const { data } = await getDeptList(); // 这里是返回一维数组结构，前端自行处理成树结构，返回格式要求：唯一id加父节点parentId，parentId取父节点id - let newData = data; - if (!isAllEmpty(form.name)) { - // 前端搜索部门名称 - newData = newData.filter(item => item.name.includes(form.name)); + const { code, data } = await getDeptList(); // 这里是返回一维数组结构，前端自行处理成树结构，返回格式要求：唯一id加父节点parentId，parentId取父节点id + if (code === 0) { + let newData = data; + if (!isAllEmpty(form.name)) { + // 前端搜索部门名称 + newData = newData.filter(item => item.name.includes(form.name)); + } + if (!isAllEmpty(form.status)) { + // 前端搜索状态 + newData = newData.filter(item => item.status === form.status); + } + dataList.value = handleTree(newData); // 处理成树结构 } - if (!isAllEmpty(form.status)) { - // 前端搜索状态 - newData = newData.filter(item => item.status === form.status); - } - dataList.value = handleTree(newData); // 处理成树结构 + setTimeout(() => { loading.value = false; }, 500); diff --git a/src/views/system/menu/utils/hook.tsx b/src/views/system/menu/utils/hook.tsx index 822f3da8b..6c031f9f7 100644 --- a/src/views/system/menu/utils/hook.tsx +++ b/src/views/system/menu/utils/hook.tsx @@ -106,15 +106,18 @@ export function useMenu() { async function onSearch() { loading.value = true; - const { data } = await getMenuList(); // 这里是返回一维数组结构，前端自行处理成树结构，返回格式要求：唯一id加父节点parentId，parentId取父节点id - let newData = data; - if (!isAllEmpty(form.title)) { - // 前端搜索菜单名称 - newData = newData.filter(item => - transformI18n(item.title).includes(form.title) - ); + const { code, data } = await getMenuList(); // 这里是返回一维数组结构，前端自行处理成树结构，返回格式要求：唯一id加父节点parentId，parentId取父节点id + if (code === 0) { + let newData = data; + if (!isAllEmpty(form.title)) { + // 前端搜索菜单名称 + newData = newData.filter(item => + transformI18n(item.title).includes(form.title) + ); + } + dataList.value = handleTree(newData); // 处理成树结构 } - dataList.value = handleTree(newData); // 处理成树结构 + setTimeout(() => { loading.value = false; }, 500); diff --git a/src/views/system/role/utils/hook.tsx b/src/views/system/role/utils/hook.tsx index a57c4d128..282d760b5 100644 --- a/src/views/system/role/utils/hook.tsx +++ b/src/views/system/role/utils/hook.tsx @@ -163,11 +163,13 @@ export function useRole(treeRef: Ref) { async function onSearch() { loading.value = true; - const { data } = await getRoleList(toRaw(form)); - dataList.value = data.list; - pagination.total = data.total; - pagination.pageSize = data.pageSize; - pagination.currentPage = data.currentPage; + const { code, data } = await getRoleList(toRaw(form)); + if (code === 0) { + dataList.value = data.list; + pagination.total = data.total; + pagination.pageSize = data.pageSize; + pagination.currentPage = data.currentPage; + } setTimeout(() => { loading.value = false; @@ -229,8 +231,10 @@ export function useRole(treeRef: Ref) { if (id) { curRow.value = row; isShow.value = true; - const { data } = await getRoleMenuIds({ id }); - treeRef.value.setCheckedKeys(data); + const { code, data } = await getRoleMenuIds({ id }); + if (code === 0) { + treeRef.value.setCheckedKeys(data); + } } else { curRow.value = null; isShow.value = false; @@ -268,9 +272,11 @@ export function useRole(treeRef: Ref) { onMounted(async () => { onSearch(); - const { data } = await getRoleMenu(); - treeIds.value = getKeyList(data, "id"); - treeData.value = handleTree(data); + const { code, data } = await getRoleMenu(); + if (code === 0) { + treeIds.value = getKeyList(data, "id"); + treeData.value = handleTree(data); + } }); watch(isExpandAll, val => { diff --git a/src/views/system/user/utils/hook.tsx b/src/views/system/user/utils/hook.tsx index ba17db184..73b4b2aeb 100644 --- a/src/views/system/user/utils/hook.tsx +++ b/src/views/system/user/utils/hook.tsx @@ -272,11 +272,13 @@ export function useUser(tableRef: Ref, treeRef: Ref) { async function onSearch() { loading.value = true; - const { data } = await getUserList(toRaw(form)); - dataList.value = data.list; - pagination.total = data.total; - pagination.pageSize = data.pageSize; - pagination.currentPage = data.currentPage; + const { code, data } = await getUserList(toRaw(form)); + if (code === 0) { + dataList.value = data.list; + pagination.total = data.total; + pagination.pageSize = data.pageSize; + pagination.currentPage = data.currentPage; + } setTimeout(() => { loading.value = false; @@ -497,13 +499,16 @@ export function useUser(tableRef: Ref, treeRef: Ref) { onSearch(); // 归属部门 - const { data } = await getDeptList(); - higherDeptOptions.value = handleTree(data); - treeData.value = handleTree(data); + const { code, data } = await getDeptList(); + if (code === 0) { + higherDeptOptions.value = handleTree(data); + treeData.value = handleTree(data); + } + treeLoading.value = false; // 角色列表 - roleOptions.value = (await getAllRoleList()).data; + roleOptions.value = (await getAllRoleList()).data ?? []; }); return { From 42076a22470801cd400fc5e04d32711a94edd19e Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Mon, 12 Jan 2026 09:22:26 +0800 Subject: [PATCH 4/5] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/user.ts | 10 ++++++++-- src/views/login/index.vue | 30 ++++++++++++++--------------- src/views/permission/page/index.vue | 14 ++++++++------ 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 59f117b82..4791fffc1 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -80,8 +80,12 @@ export const useUserStore = defineStore("pure-user", { return new Promise((resolve, reject) => { getLogin(data) .then(data => { - if (data.code === 0) setToken(data.data); - resolve(data); + if (data.code === 0) { + setToken(data.data); + resolve(data); + } else { + reject(data.message); + } }) .catch(error => { reject(error); @@ -106,6 +110,8 @@ export const useUserStore = defineStore("pure-user", { if (data.code === 0) { setToken(data.data); resolve(data); + } else { + reject(data.message); } }) .catch(error => { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 4e0522374..b95d924ef 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -73,23 +73,21 @@ const onLogin = async (formEl: FormInstance | undefined) => { username: ruleForm.username, password: ruleForm.password }) - .then(res => { - if (res.code === 0) { - // 获取后端路由 - return initRouter().then(() => { - disabled.value = true; - router - .push(getTopMenu(true).path) - .then(() => { - message(t("login.pureLoginSuccess"), { type: "success" }); - }) - .finally(() => (disabled.value = false)); - }); - } else { - message(t("login.pureLoginFail"), { type: "error" }); - } + .then(async () => { + // 获取后端路由 + await initRouter(); + disabled.value = true; + router.push(getTopMenu(true).path).then(() => { + message(t("login.pureLoginSuccess"), { type: "success" }); + }); }) - .finally(() => (loading.value = false)); + .catch(_err => { + message(t("login.pureLoginFail"), { type: "error" }); + }) + .finally(() => { + disabled.value = false; + loading.value = false; + }); } }); }; diff --git a/src/views/permission/page/index.vue b/src/views/permission/page/index.vue index 21125e4fc..33d80516d 100644 --- a/src/views/permission/page/index.vue +++ b/src/views/permission/page/index.vue @@ -1,4 +1,5 @@ From f3756089fdbbad18ceab69248c19a2c5b5ebace7 Mon Sep 17 00:00:00 2001 From: Journey Date: Mon, 12 Jan 2026 10:46:44 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E5=88=B7=E6=96=B0`token`=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=AF=B7=E6=B1=82=E5=A4=B1=E8=B4=A5=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95=20(#1253?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/en.yaml | 1 + locales/zh-CN.yaml | 1 + src/utils/http/index.ts | 9 +++++++++ 3 files changed, 11 insertions(+) diff --git a/locales/en.yaml b/locales/en.yaml index 89008e379..64a27092a 100644 --- a/locales/en.yaml +++ b/locales/en.yaml @@ -239,6 +239,7 @@ login: purePassWordSureReg: Please enter confirm password purePassWordDifferentReg: The two passwords do not match! purePassWordUpdateReg: Password has been updated + pureLoginExpired: Login expired, please login again tableBar: pureList: List pureLarge: Large diff --git a/locales/zh-CN.yaml b/locales/zh-CN.yaml index bcf1eea74..83bb3df51 100644 --- a/locales/zh-CN.yaml +++ b/locales/zh-CN.yaml @@ -239,6 +239,7 @@ login: purePassWordSureReg: 请输入确认密码 purePassWordDifferentReg: 两次密码不一致! purePassWordUpdateReg: 修改密码成功 + pureLoginExpired: 登录已过期，请重新登录 tableBar: pureList: 列表 pureLarge: 宽松 diff --git a/src/utils/http/index.ts b/src/utils/http/index.ts index a975cc95f..053c6ff1a 100644 --- a/src/utils/http/index.ts +++ b/src/utils/http/index.ts @@ -10,6 +10,8 @@ import type { PureHttpRequestConfig } from "./types.d"; import { stringify } from "qs"; +import { message } from "@/utils/message"; +import { $t, transformI18n } from "@/plugins/i18n"; import { getToken, formatToken } from "@/utils/auth"; import { useUserStoreHook } from "@/store/modules/user"; @@ -90,6 +92,13 @@ class PureHttp { PureHttp.requests.forEach(cb => cb(token)); PureHttp.requests = []; }) + .catch(_err => { + PureHttp.requests = []; + useUserStoreHook().logOut(); + message(transformI18n($t("login.pureLoginExpired")), { + type: "warning" + }); + }) .finally(() => { PureHttp.isRefreshing = false; });