-
+ 
+
+
diff --git a/yudao-ui-admin-vue3/src/components/Table/src/Table.vue b/yudao-ui-admin-vue3/src/components/Table/src/Table.vue
index c8cbddea6..ade25b604 100644
--- a/yudao-ui-admin-vue3/src/components/Table/src/Table.vue
+++ b/yudao-ui-admin-vue3/src/components/Table/src/Table.vue
@@ -13,7 +13,7 @@ export default defineComponent({
pageSize: propTypes.number.def(10),
currentPage: propTypes.number.def(1),
// 是否多选
- selection: propTypes.bool.def(true),
+ selection: propTypes.bool.def(false),
// 是否所有的超出隐藏，优先级低于schema中的showOverflowTooltip,
showOverflowTooltip: propTypes.bool.def(true),
// 表头
diff --git a/yudao-ui-admin-vue3/src/components/TagsView/src/TagsView.vue b/yudao-ui-admin-vue3/src/components/TagsView/src/TagsView.vue
index c366f5a10..fc2a75225 100644
--- a/yudao-ui-admin-vue3/src/components/TagsView/src/TagsView.vue
+++ b/yudao-ui-admin-vue3/src/components/TagsView/src/TagsView.vue
@@ -84,7 +84,7 @@ const refreshSelectedTag = async (view?: RouteLocationNormalizedLoaded) => {
tagsViewStore.delCachedView()
const { path, query } = view
await nextTick()
- await replace({
+ replace({
path: '/redirect' + path,
query: query
})
@@ -107,7 +107,15 @@ const toLastView = () => {
if (latestView) {
push(latestView)
} else {
- push('/')
+ if (
+ unref(currentRoute).path === permissionStore.getAddRouters[0].path ||
+ unref(currentRoute).path === permissionStore.getAddRouters[0].redirect
+ ) {
+ addTags()
+ return
+ }
+ // You can set another route
+ push(permissionStore.getAddRouters[0].path)
}
}
diff --git a/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue b/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue
index 5ee94b006..30e151dd3 100644
--- a/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue
+++ b/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue
@@ -22,9 +22,9 @@ const { push, replace } = useRouter()
const user = wsCache.get('user')
-const avatar = user ? user.user.avatar : '@/assets/imgs/avatar.gif'
+const avatar = user?.user?.avatar ? user.user.avatar : '@/assets/imgs/avatar.gif'
-const userName = user ? user.user.nickname : 'Admin'
+const userName = user?.user?.nickname ? user.user.nickname : 'Admin'
const loginOut = () => {
ElMessageBox.confirm(t('common.loginOutMessage'), t('common.reminder'), {
@@ -38,7 +38,6 @@ const loginOut = () => {
removeToken()
tagsViewStore.delAllViews()
replace('/login')
- // }
})
.catch(() => {})
}
diff --git a/yudao-ui-admin-vue3/src/config/axios/Axios.ts b/yudao-ui-admin-vue3/src/config/axios/Axios.ts
deleted file mode 100644
index 6637e9966..000000000
--- a/yudao-ui-admin-vue3/src/config/axios/Axios.ts
+++ /dev/null
@@ -1,287 +0,0 @@
-import type { AxiosRequestConfig, AxiosInstance, AxiosResponse, AxiosError } from 'axios'
-import type { RequestOptions, RequestResult, UploadFileParams } from 'types/axios'
-import type { CreateAxiosOptions } from './axiosTransform'
-import axios from 'axios'
-import qs from 'qs'
-import { AxiosCanceler } from './axiosCancel'
-import { isFunction } from '@/utils/is'
-import { cloneDeep } from 'lodash-es'
-import { ContentTypeEnum } from '@/enums/http.enum'
-import { RequestEnum } from '@/enums/http.enum'
-import { downloadByData } from '@/utils/filt'
-
-export * from './axiosTransform'
-
-/**
- * @description: axios module
- */
-export class VAxios {
- private axiosInstance: AxiosInstance
- private readonly options: CreateAxiosOptions
-
- constructor(options: CreateAxiosOptions) {
- this.options = options
- this.axiosInstance = axios.create(options)
- this.setupInterceptors()
- }
-
- /**
- * @description: Create axios instance
- */
- private createAxios(config: CreateAxiosOptions): void {
- this.axiosInstance = axios.create(config)
- }
-
- private getTransform() {
- const { transform } = this.options
- return transform
- }
-
- getAxios(): AxiosInstance {
- return this.axiosInstance
- }
-
- /**
- * @description: Reconfigure axios
- */
- configAxios(config: CreateAxiosOptions) {
- if (!this.axiosInstance) {
- return
- }
- this.createAxios(config)
- }
-
- /**
- * @description: Set general header
- */
- setHeader(headers: any): void {
- if (!this.axiosInstance) {
- return
- }
- Object.assign(this.axiosInstance.defaults.headers, headers)
- }
-
- /**
- * @description: Interceptor configuration
- */
- private setupInterceptors() {
- const transform = this.getTransform()
- if (!transform) {
- return
- }
- const {
- requestInterceptors,
- requestInterceptorsCatch,
- responseInterceptors,
- responseInterceptorsCatch
- } = transform
-
- const axiosCanceler = new AxiosCanceler()
-
- // Request interceptor configuration processing
- this.axiosInstance.interceptors.request.use((config: AxiosRequestConfig) => {
- // If cancel repeat request is turned on, then cancel repeat request is prohibited
- const {
- // @ts-ignore
- headers: { ignoreCancelToken }
- } = config
-
- const ignoreCancel =
- ignoreCancelToken !== undefined
- ? ignoreCancelToken
- : this.options.requestOptions?.ignoreCancelToken
-
- !ignoreCancel && axiosCanceler.addPending(config)
- if (requestInterceptors && isFunction(requestInterceptors)) {
- config = requestInterceptors(config, this.options)
- }
- return config
- }, undefined)
-
- // Request interceptor error capture
- requestInterceptorsCatch &&
- isFunction(requestInterceptorsCatch) &&
- this.axiosInstance.interceptors.request.use(undefined, requestInterceptorsCatch)
-
- // Response result interceptor processing
- this.axiosInstance.interceptors.response.use((res: AxiosResponse
+
-
-
+ {{ title }}
+
-
- {{ title }}
-
-
- 演示模式，无法进行写操作
' +
+ '参考 https://doc.iocoder.cn/ 教程
' +
+ '5 分钟搭建本地环境
'
+ )
+ return Promise.reject(new Error(msg))
+ } else if (code !== 200) {
+ if (msg === '无效的刷新令牌') {
+ // hard coding：忽略这个提示，直接登出
+ console.log(msg)
+ } else {
+ ElNotification.error({
+ title: msg
+ })
+ }
+ return Promise.reject('error')
+ } else {
+ return data
+ }
+ },
+ (error: AxiosError) => {
+ console.log('err' + error) // for debug
+ ElMessage.error(error.message)
return Promise.reject(error)
}
+)
+function handleAuthorized() {
+ if (!isRelogin.show) {
+ isRelogin.show = true
+ ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
+ confirmButtonText: '重新登录',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(() => {
+ isRelogin.show = false
+ })
+ .catch(() => {
+ isRelogin.show = false
+ })
+ }
+ return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
}
-
-function createAxios(opt?: Partial