mirrors2/naive-ui-admin
1
0
Fork 0
mirror of https://github.com/jekip/naive-ui-admin.git synced 2026-03-01 00:23:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
xiaoma
2021-09-10 18:36:43 +08:00
parent 82dc7d2589
commit 70c2b75f17
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Table/src/Table.vue
View File

@@ -171,7 +171,7 @@
useColumns(getProps); useColumns(getProps);
const state = reactive({ const state = reactive({
tableSize: 'medium', tableSize: unref(getProps as any).size || 'medium',
isColumnSetting: false, isColumnSetting: false,
}); });

8
src/store/mutation-types.ts
View File

@@ -1,4 +1,4 @@
export const ACCESS_TOKEN = 'Access-Token'; // 用户token export const ACCESS_TOKEN = 'ACCESS-TOKEN'; // 用户token
export const CURRENT_USER = 'Current-User'; // 当前用户信息 export const CURRENT_USER = 'CURRENT-USER'; // 当前用户信息
export const IS_LOCKSCREEN = 'Is-Lockscreen'; // 是否锁屏 export const IS_LOCKSCREEN = 'IS-LOCKSCREEN'; // 是否锁屏
export const TABS_ROUTES = 'Tabs-Routes'; // 标签页 export const TABS_ROUTES = 'TABS-ROUTES'; // 标签页

21
src/utils/http/axios/index.ts
View File

@@ -5,6 +5,7 @@ import axios, { AxiosResponse } from 'axios';
import { checkStatus } from './checkStatus'; import { checkStatus } from './checkStatus';
import { joinTimestamp, formatRequestDate } from './helper'; import { joinTimestamp, formatRequestDate } from './helper';
import { RequestEnum, ResultEnum, ContentTypeEnum } from '@/enums/httpEnum'; import { RequestEnum, ResultEnum, ContentTypeEnum } from '@/enums/httpEnum';
import { PageEnum } from '@/enums/pageEnum';
import { useGlobSetting } from '@/hooks/setting'; import { useGlobSetting } from '@/hooks/setting';
@@ -101,7 +102,8 @@ const transform: AxiosTransform = {
// 登录超时 // 登录超时
if (code === ResultEnum.TIMEOUT) { if (code === ResultEnum.TIMEOUT) {
if (router.currentRoute.value.name == 'login') return; const LoginName = PageEnum.BASE_LOGIN_NAME;
if (router.currentRoute.value.name == LoginName) return;
// 到登录页 // 到登录页
const timeoutMsg = '登录超时,请重新登录!'; const timeoutMsg = '登录超时,请重新登录!';
Modal.warning({ Modal.warning({
@@ -112,7 +114,7 @@ const transform: AxiosTransform = {
onPositiveClick: () => { onPositiveClick: () => {
storage.clear(); storage.clear();
router.replace({ router.replace({
name: 'login', name: LoginName,
query: { query: {
redirect: router.currentRoute.value.fullPath, redirect: router.currentRoute.value.fullPath,
}, },
@@ -143,6 +145,7 @@ const transform: AxiosTransform = {
config.url = `${apiUrl}${config.url}`; config.url = `${apiUrl}${config.url}`;
} }
const params = config.params || {}; const params = config.params || {};
const data = config.data || false;
if (config.method?.toUpperCase() === RequestEnum.GET) { if (config.method?.toUpperCase() === RequestEnum.GET) {
if (!isString(params)) { if (!isString(params)) {
// 给 get 请求加上时间戳参数，避免从缓存中拿数据。 // 给 get 请求加上时间戳参数，避免从缓存中拿数据。
@@ -155,10 +158,18 @@ const transform: AxiosTransform = {
} else { } else {
if (!isString(params)) { if (!isString(params)) {
formatDate && formatRequestDate(params); formatDate && formatRequestDate(params);
config.data = params; if (Reflect.has(config, 'data') && config.data && Object.keys(config.data).length) {
config.params = undefined; config.data = data;
config.params = params;
} else {
config.data = params;
config.params = undefined;
}
if (joinParamsToUrl) { if (joinParamsToUrl) {
config.url = setObjToUrlParams(config.url as string, config.data); config.url = setObjToUrlParams(
config.url as string,
Object.assign({}, config.params, config.data)
);
} }
} else { } else {
// 兼容restful风格 // 兼容restful风格