by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

Browse Source
This commit is contained in:
dap
2024-08-08 08:03:04 +08:00
parent 8bb203dc0d 8ffc853b86
commit f2f7225c1f
71 changed files with 1219 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web-antd/package.json
View File

@@ -48,8 +48,8 @@
"jsencrypt": "^3.3.2",
"lodash-es": "^4.17.21",
"pinia": "2.2.0",
"vue": "^3.4.35",
"vue-router": "^4.4.2"
"vue": "^3.4.36",
"vue-router": "^4.4.3"
},
"devDependencies": {
"@types/crypto-js": "^4.2.2",

6
apps/web-antd/src/api/core/auth.ts
View File

@@ -26,7 +26,7 @@ export namespace AuthApi {
/**
* 登录
*/
export async function login(data: AuthApi.LoginParams) {
export async function loginApi(data: AuthApi.LoginParams) {
return requestClient.post<AuthApi.LoginResult>(
'/auth/login',
{ ...data, clientId },
@@ -70,3 +70,7 @@ export interface TenantResp {
export function tenantList() {
return requestClient.get<TenantResp>('/auth/tenant/list');
}
export async function getAccessCodesApi() {
return requestClient.get<string[]>('/auth/codes');
}

2
apps/web-antd/src/api/core/menu.ts
View File

@@ -40,6 +40,6 @@ export interface Menu {
/**
* 获取用户所有菜单
*/
export async function getAllMenus() {
export async function getAllMenusApi() {
return requestClient.get<Menu[]>('/system/menu/getRouters');
}

2
apps/web-antd/src/api/core/user.ts
View File

@@ -40,6 +40,6 @@ export interface UserInfoResp {
/**
* 获取用户信息
*/
export async function getUserInfo() {
export async function getUserInfoApi() {
return requestClient.get<UserInfoResp>('/system/user/getInfo');
}

4
apps/web-antd/src/api/demos/status.ts
View File

@@ -3,8 +3,8 @@ import { requestClient } from '#/api/request';
/**
* 模拟任意状态码
*/
async function getMockStatus(status: string) {
async function getMockStatusApi(status: string) {
return requestClient.get('/status', { params: { status } });
}
export { getMockStatus };
export { getMockStatusApi };

7
apps/web-antd/src/router/access.ts
View File

@@ -10,7 +10,7 @@ import { preferences } from '@vben/preferences';
import { message } from 'ant-design-vue';
import { cloneDeep } from 'lodash-es';
import { getAllMenus, type Menu } from '#/api';
import { getAllMenusApi, type Menu } from '#/api';
import { BasicLayout, IFrameView } from '#/layouts';
import { $t } from '#/locales';
@@ -110,7 +110,8 @@ async function generateAccess(options: GenerateMenuAndRoutesOptions) {
// 根目录为菜单形式
// 固定有一个children children为当前菜单
if (menu.path === '/' && menu.children && menu.children.length === 1) {
menu.meta = menu.children[0].meta;
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
menu.meta = menu.children[0]!.meta;
/**
* todo 先写死 后续再优化
*/
@@ -241,7 +242,7 @@ async function generateAccess(options: GenerateMenuAndRoutesOptions) {
duration: 1,
});
// 后台返回路由/菜单
const backMenuList = await getAllMenus();
const backMenuList = await getAllMenusApi();
// 转换为vben能用的路由
const vbenMenuList = backMenuToVbenMenu(backMenuList);
// 特别注意 这里要深拷贝

6
apps/web-antd/src/store/auth.ts
View File

@@ -10,7 +10,7 @@ import { resetAllStores, useAccessStore, useUserStore } from '@vben/stores';
import { notification } from 'ant-design-vue';
import { defineStore } from 'pinia';
import { doLogout, getUserInfo, login } from '#/api';
import { doLogout, getUserInfoApi, loginApi } from '#/api';
import { $t } from '#/locales';
export const useAuthStore = defineStore('auth', () => {
@@ -33,7 +33,7 @@ export const useAuthStore = defineStore('auth', () => {
let userInfo: null | UserInfo = null;
try {
loginLoading.value = true;
const { access_token } = await login(params);
const { access_token } = await loginApi(params);
// 将 accessToken 存储到 accessStore 中
accessStore.setAccessToken(access_token);
@@ -92,7 +92,7 @@ export const useAuthStore = defineStore('auth', () => {
}
async function fetchUserInfo() {
const { permissions = [], roles = [], user } = await getUserInfo();
const { permissions = [], roles = [], user } = await getUserInfoApi();
/**
* 从后台user -> vben user转换

4
apps/web-antd/src/views/demos/features/login-expired/index.vue
View File

@@ -5,13 +5,13 @@ import { preferences, updatePreferences } from '@vben/preferences';
import { Button } from 'ant-design-vue';
import { getMockStatus } from '#/api';
import { getMockStatusApi } from '#/api';
async function handleClick(type: LoginExpiredModeType) {
const loginExpiredMode = preferences.app.loginExpiredMode;
updatePreferences({ app: { loginExpiredMode: type } });
await getMockStatus('401');
await getMockStatusApi('401');
updatePreferences({ app: { loginExpiredMode } });
}
</script>

4
apps/web-ele/package.json
View File

@@ -44,8 +44,8 @@
"dayjs": "^1.11.12",
"element-plus": "^2.7.8",
"pinia": "2.2.0",
"vue": "^3.4.35",
"vue-router": "^4.4.2"
"vue": "^3.4.36",
"vue-router": "^4.4.3"
},
"devDependencies": {
"unplugin-element-plus": "^0.8.0"

4
apps/web-ele/src/api/core/auth.ts
View File

@@ -21,13 +21,13 @@ export namespace AuthApi {
/**
* 登录
*/
export async function login(data: AuthApi.LoginParams) {
export async function loginApi(data: AuthApi.LoginParams) {
return requestClient.post<AuthApi.LoginResult>('/auth/login', data);
}
/**
* 获取用户权限码
*/
export async function getAccessCodes() {
export async function getAccessCodesApi() {
return requestClient.get<string[]>('/auth/codes');
}

2
apps/web-ele/src/api/core/menu.ts
View File

@@ -5,6 +5,6 @@ import { requestClient } from '#/api/request';
/**
* 获取用户所有菜单
*/
export async function getAllMenus() {
export async function getAllMenusApi() {
return requestClient.get<RouteRecordStringComponent[]>('/menu/all');
}

2
apps/web-ele/src/api/core/user.ts
View File

@@ -5,6 +5,6 @@ import { requestClient } from '#/api/request';
/**
* 获取用户信息
*/
export async function getUserInfo() {
export async function getUserInfoApi() {
return requestClient.get<UserInfo>('/user/info');
}

4
apps/web-ele/src/router/access.ts
View File

@@ -8,7 +8,7 @@ import { preferences } from '@vben/preferences';
import { ElMessage } from 'element-plus';
import { getAllMenus } from '#/api';
import { getAllMenusApi } from '#/api';
import { BasicLayout, IFrameView } from '#/layouts';
import { $t } from '#/locales';
@@ -29,7 +29,7 @@ async function generateAccess(options: GenerateMenuAndRoutesOptions) {
duration: 1500,
message: `${$t('common.loadingMenu')}...`,
});
return await getAllMenus();
return await getAllMenusApi();
},
// 可以指定没有权限跳转403页面
forbiddenComponent,

8
apps/web-ele/src/store/auth.ts
View File

@@ -10,7 +10,7 @@ import { resetAllStores, useAccessStore, useUserStore } from '@vben/stores';
import { ElNotification } from 'element-plus';
import { defineStore } from 'pinia';
import { getAccessCodes, getUserInfo, login } from '#/api';
import { getAccessCodesApi, getUserInfoApi, loginApi } from '#/api';
import { $t } from '#/locales';
export const useAuthStore = defineStore('auth', () => {
@@ -33,7 +33,7 @@ export const useAuthStore = defineStore('auth', () => {
let userInfo: null | UserInfo = null;
try {
loginLoading.value = true;
const { accessToken, refreshToken } = await login(params);
const { accessToken, refreshToken } = await loginApi(params);
// 如果成功获取到 accessToken
if (accessToken) {
@@ -44,7 +44,7 @@ export const useAuthStore = defineStore('auth', () => {
// 获取用户信息并存储到 accessStore 中
const [fetchUserInfoResult, accessCodes] = await Promise.all([
fetchUserInfo(),
getAccessCodes(),
getAccessCodesApi(),
]);
userInfo = fetchUserInfoResult;
@@ -92,7 +92,7 @@ export const useAuthStore = defineStore('auth', () => {
async function fetchUserInfo() {
let userInfo: null | UserInfo = null;
userInfo = await getUserInfo();
userInfo = await getUserInfoApi();
userStore.setUserInfo(userInfo);
return userInfo;
}

4
apps/web-naive/package.json
View File

@@ -43,7 +43,7 @@
"@vueuse/core": "^10.11.0",
"naive-ui": "^2.39.0",
"pinia": "2.2.0",
"vue": "^3.4.35",
"vue-router": "^4.4.2"
"vue": "^3.4.36",
"vue-router": "^4.4.3"
}
}

4
apps/web-naive/src/api/core/auth.ts
View File

@@ -21,13 +21,13 @@ export namespace AuthApi {
/**
* 登录
*/
export async function login(data: AuthApi.LoginParams) {
export async function loginApi(data: AuthApi.LoginParams) {
return requestClient.post<AuthApi.LoginResult>('/auth/login', data);
}
/**
* 获取用户权限码
*/
export async function getAccessCodes() {
export async function getAccessCodesApi() {
return requestClient.get<string[]>('/auth/codes');
}

2
apps/web-naive/src/api/core/menu.ts
View File

@@ -5,6 +5,6 @@ import { requestClient } from '#/api/request';
/**
* 获取用户所有菜单
*/
export async function getAllMenus() {
export async function getAllMenusApi() {
return requestClient.get<RouteRecordStringComponent[]>('/menu/all');
}

2
apps/web-naive/src/api/core/user.ts
View File

@@ -5,6 +5,6 @@ import { requestClient } from '#/api/request';
/**
* 获取用户信息
*/
export async function getUserInfo() {
export async function getUserInfoApi() {
return requestClient.get<UserInfo>('/user/info');
}

4
apps/web-naive/src/router/access.ts
View File

@@ -6,7 +6,7 @@ import type {
import { generateAccessible } from '@vben/access';
import { preferences } from '@vben/preferences';
import { getAllMenus } from '#/api';
import { getAllMenusApi } from '#/api';
import { BasicLayout, IFrameView } from '#/layouts';
import { $t } from '#/locales';
import { message } from '#/naive';
@@ -27,7 +27,7 @@ async function generateAccess(options: GenerateMenuAndRoutesOptions) {
message.loading(`${$t('common.loadingMenu')}...`, {
duration: 1.5,
});
return await getAllMenus();
return await getAllMenusApi();
},
// 可以指定没有权限跳转403页面
forbiddenComponent,

8
apps/web-naive/src/store/auth.ts
View File

@@ -9,7 +9,7 @@ import { resetAllStores, useAccessStore, useUserStore } from '@vben/stores';
import { defineStore } from 'pinia';
import { getAccessCodes, getUserInfo, login } from '#/api';
import { getAccessCodesApi, getUserInfoApi, loginApi } from '#/api';
import { $t } from '#/locales';
import { notification } from '#/naive';
@@ -33,7 +33,7 @@ export const useAuthStore = defineStore('auth', () => {
let userInfo: null | UserInfo = null;
try {
loginLoading.value = true;
const { accessToken, refreshToken } = await login(params);
const { accessToken, refreshToken } = await loginApi(params);
// 如果成功获取到 accessToken
if (accessToken) {
@@ -44,7 +44,7 @@ export const useAuthStore = defineStore('auth', () => {
// 获取用户信息并存储到 accessStore 中
const [fetchUserInfoResult, accessCodes] = await Promise.all([
fetchUserInfo(),
getAccessCodes(),
getAccessCodesApi(),
]);
userInfo = fetchUserInfoResult;
@@ -92,7 +92,7 @@ export const useAuthStore = defineStore('auth', () => {
async function fetchUserInfo() {
let userInfo: null | UserInfo = null;
userInfo = await getUserInfo();
userInfo = await getUserInfoApi();
userStore.setUserInfo(userInfo);
return userInfo;
}