Compare commits
1 Commits
master
...
dependabot
| Author | SHA1 | Date |
|---|---|---|
dependabot[bot]
|
808d4125ef |
|
|
@ -1,5 +1,3 @@
|
|||
|
||||
|
||||
简体中文 | [English](./README.en-US.md)
|
||||
<h1 align="center">Vue Antd Admin</h1>
|
||||
|
||||
|
|
@ -8,12 +6,6 @@
|
|||
[Ant Design Pro](https://github.com/ant-design/ant-design-pro) 的 Vue 实现版本
|
||||
开箱即用的中后台前端/设计解决方案
|
||||
|
||||
:star::star::star:
|
||||
vue3 版本现已推出，更名为
|
||||
[stepin-template](https://github.com/stepui/stepin-template)，欢迎体验，
|
||||
[立即前往](https://github.com/stepui/stepin-template)
|
||||
--
|
||||
|
||||
[](https://github.com/iczer/vue-antd-admin/blob/master/LICENSE)
|
||||
[](https://david-dm.org/iczer/vue-antd-admin)
|
||||
[](https://david-dm.org/iczer/vue-antd-admin?type=dev)
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ const tokenCheck = {
|
|||
* `options: Object`: 应用配置，包含: {router, i18n, store, message}，可根据需要扩展。
|
||||
|
||||
### onRejected
|
||||
我们会为 onRejected 钩子函数注入 error 和 options 两个参数：
|
||||
我们会为 onFulfilled 钩子函数注入 error 和 options 两个参数：
|
||||
* `error: Error`: axios 请求错误对象
|
||||
* `options: Object`: 应用配置，包含: {router, i18n, store, message}，可根据需要扩展。
|
||||
|
||||
|
|
@ -128,4 +128,4 @@ export default {
|
|||
response: [resp401, resp403] // 响应拦截
|
||||
}
|
||||
```
|
||||
:::
|
||||
:::
|
||||
|
|
@ -22,11 +22,10 @@ const ANTD = {
|
|||
'component-background': '#fff',
|
||||
'heading-color': 'rgba(0, 0, 0, 0.85)',
|
||||
'text-color': 'rgba(0, 0, 0, 0.65)',
|
||||
'text-color-inverse': '#fefefe',
|
||||
'text-color-inverse': '#fff',
|
||||
'text-color-secondary': 'rgba(0, 0, 0, 0.45)',
|
||||
'shadow-color': 'rgba(0, 0, 0, 0.15)',
|
||||
'border-color-split': '#f0f0f0',
|
||||
'border-color-base': '#d9d9d9',
|
||||
'background-color-light': '#fafafa',
|
||||
'background-color-base': '#f5f5f5',
|
||||
'table-selected-row-bg': '#fafafa',
|
||||
|
|
@ -35,9 +34,8 @@ const ANTD = {
|
|||
'disabled-color': 'rgba(0, 0, 0, 0.25)',
|
||||
'menu-dark-color': 'rgba(254, 254, 254, 0.65)',
|
||||
'menu-dark-highlight-color': '#fefefe',
|
||||
'menu-dark-selected-item-icon-color': '#fefefe',
|
||||
'menu-dark-arrow-color': '#fefefe',
|
||||
'btn-primary-color': '#fefefe',
|
||||
'btn-primary-color': '#fff',
|
||||
},
|
||||
light: {
|
||||
'layout-body-background': '#f0f2f5',
|
||||
|
|
@ -45,11 +43,10 @@ const ANTD = {
|
|||
'component-background': '#fff',
|
||||
'heading-color': 'rgba(0, 0, 0, 0.85)',
|
||||
'text-color': 'rgba(0, 0, 0, 0.65)',
|
||||
'text-color-inverse': '#fefefe',
|
||||
'text-color-inverse': '#fff',
|
||||
'text-color-secondary': 'rgba(0, 0, 0, 0.45)',
|
||||
'shadow-color': 'rgba(0, 0, 0, 0.15)',
|
||||
'border-color-split': '#f0f0f0',
|
||||
'border-color-base': '#d9d9d9',
|
||||
'background-color-light': '#fafafa',
|
||||
'background-color-base': '#f5f5f5',
|
||||
'table-selected-row-bg': '#fafafa',
|
||||
|
|
@ -58,9 +55,8 @@ const ANTD = {
|
|||
'disabled-color': 'rgba(0, 0, 0, 0.25)',
|
||||
'menu-dark-color': 'rgba(1, 1, 1, 0.65)',
|
||||
'menu-dark-highlight-color': '#fefefe',
|
||||
'menu-dark-selected-item-icon-color': '#fefefe',
|
||||
'menu-dark-arrow-color': '#fefefe',
|
||||
'btn-primary-color': '#fefefe',
|
||||
'btn-primary-color': '#fff',
|
||||
},
|
||||
night: {
|
||||
'layout-body-background': '#000',
|
||||
|
|
@ -68,11 +64,10 @@ const ANTD = {
|
|||
'component-background': '#141414',
|
||||
'heading-color': 'rgba(255, 255, 255, 0.85)',
|
||||
'text-color': 'rgba(255, 255, 255, 0.85)',
|
||||
'text-color-inverse': '#fefefe',
|
||||
'text-color-inverse': '#141414',
|
||||
'text-color-secondary': 'rgba(255, 255, 255, 0.45)',
|
||||
'shadow-color': 'rgba(255, 255, 255, 0.15)',
|
||||
'border-color-split': '#303030',
|
||||
'border-color-base': '#282828',
|
||||
'background-color-light': '#ffffff0a',
|
||||
'background-color-base': '#2a2a2a',
|
||||
'table-selected-row-bg': '#ffffff0a',
|
||||
|
|
@ -81,9 +76,8 @@ const ANTD = {
|
|||
'disabled-color': 'rgba(255, 255, 255, 0.25)',
|
||||
'menu-dark-color': 'rgba(254, 254, 254, 0.65)',
|
||||
'menu-dark-highlight-color': '#fefefe',
|
||||
'menu-dark-selected-item-icon-color': '#fefefe',
|
||||
'menu-dark-arrow-color': '#fefefe',
|
||||
'btn-primary-color': '#fefefe',
|
||||
'btn-primary-color': '#141414',
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ export default {
|
|||
let routes = this.$route.matched
|
||||
const path = this.$route.path
|
||||
let breadcrumb = []
|
||||
routes.filter(item => path.includes(item.path) || item.regex.test(path))
|
||||
routes.filter(item => path.includes(item.path))
|
||||
.forEach(route => {
|
||||
const path = route.path.length === 0 ? '/home' : route.path
|
||||
breadcrumb.push(this.$t(getI18nKey(path)))
|
||||
|
|
|
|||
|
|
@ -95,7 +95,8 @@
|
|||
this.$emit('contextmenu', pageKey, e)
|
||||
},
|
||||
pageName(page) {
|
||||
const custom = this.customTitles.find(item => item.path === page.path)
|
||||
const pagePath = page.fullPath.split('?')[0]
|
||||
const custom = this.customTitles.find(item => item.path === pagePath)
|
||||
return (custom && custom.title) || page.title || this.$t(getI18nKey(page.keyPath))
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<div :class="['tabs-view-content', layout, pageWidth]" :style="`margin-top: ${multiPage ? -24 : 0}px`">
|
||||
<page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
|
||||
<a-keep-alive :exclude-keys="excludeKeys" v-if="multiPage && cachePage" v-model="clearCaches">
|
||||
<router-view v-if="!refreshing" ref="tabContent" :key="$route.fullPath" />
|
||||
<router-view v-if="!refreshing" ref="tabContent" :key="$route.path" />
|
||||
</a-keep-alive>
|
||||
<router-view ref="tabContent" v-else-if="!refreshing" />
|
||||
</page-toggle-transition>
|
||||
|
|
@ -62,10 +62,10 @@ export default {
|
|||
this.loadCacheConfig(this.$router?.options?.routes)
|
||||
this.loadCachedTabs()
|
||||
const route = this.$route
|
||||
if (this.pageList.findIndex(item => item.path === route.fullPath) === -1) {
|
||||
if (this.pageList.findIndex(item => item.path === route.path) === -1) {
|
||||
this.pageList.push(this.createPage(route))
|
||||
}
|
||||
this.activePage = route.fullPath
|
||||
this.activePage = route.path
|
||||
if (this.multiPage) {
|
||||
this.$nextTick(() => {
|
||||
this.setCachedKey(route)
|
||||
|
|
@ -86,8 +86,8 @@ export default {
|
|||
this.loadCacheConfig(val)
|
||||
},
|
||||
'$route': function (newRoute) {
|
||||
this.activePage = newRoute.fullPath
|
||||
const page = this.pageList.find(item => item.path === newRoute.fullPath)
|
||||
this.activePage = newRoute.path
|
||||
const page = this.pageList.find(item => item.path === newRoute.path)
|
||||
if (!this.multiPage) {
|
||||
this.pageList = [this.createPage(newRoute)]
|
||||
} else if (page) {
|
||||
|
|
@ -261,7 +261,7 @@ export default {
|
|||
return {
|
||||
keyPath: route.matched[route.matched.length - 1].path,
|
||||
fullPath: route.fullPath, loading: false,
|
||||
path: route.fullPath,
|
||||
path: route.path,
|
||||
title: route.meta && route.meta.page && route.meta.page.title,
|
||||
unclose: route.meta && route.meta.page && (route.meta.page.closable === false),
|
||||
}
|
||||
|
|
@ -271,7 +271,7 @@ export default {
|
|||
* @param route 页面对应的路由
|
||||
*/
|
||||
setCachedKey(route) {
|
||||
const page = this.pageList.find(item => item.path === route.fullPath)
|
||||
const page = this.pageList.find(item => item.path === route.path)
|
||||
page.unclose = route.meta && route.meta.page && (route.meta.page.closable === false)
|
||||
if (!page._init_) {
|
||||
const vnode = this.$refs.tabContent.$vnode
|
||||
|
|
@ -301,7 +301,7 @@ export default {
|
|||
routes.forEach(item => {
|
||||
const cacheAble = item.meta?.page?.cacheAble ?? pCache ?? true
|
||||
if (!cacheAble) {
|
||||
this.excludeKeys.push(new RegExp(`${item.path.replace(/:[^/]*/g, '[^/]*')}(\\?.*)?\\d*$`))
|
||||
this.excludeKeys.push(new RegExp(`${item.path.replace(/:[^/]*/g, '[^/]*')}\\d*$`))
|
||||
}
|
||||
if (item.children) {
|
||||
this.loadCacheConfig(item.children, cacheAble)
|
||||
|
|
|
|||
|
|
@ -17,9 +17,8 @@ const TabsPagePlugin = {
|
|||
},
|
||||
$setPageTitle(route, title) {
|
||||
if (title) {
|
||||
// let path = typeof route === 'object' ? route.path : route
|
||||
// path = path && path.split('?')[0]
|
||||
let path = typeof route === 'object' ? this.$router.resolve(route).route.fullPath : route
|
||||
let path = typeof route === 'object' ? route.path : route
|
||||
path = path && path.split('?')[0]
|
||||
this.$store.commit('setting/setCustomTitle', {path, title})
|
||||
}
|
||||
}
|
||||
|
|
@ -27,8 +26,8 @@ const TabsPagePlugin = {
|
|||
computed: {
|
||||
customTitle() {
|
||||
const customTitles = this.$store.state.setting.customTitles
|
||||
// const path = this.$route.path.split('?')[0]
|
||||
const custom = customTitles.find(item => item.path === this.$route.fullPath)
|
||||
const path = this.$route.path.split('?')[0]
|
||||
const custom = customTitles.find(item => item.path === path)
|
||||
return custom && custom.title
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,12 +8,10 @@ function hasPermission(authority, permissions) {
|
|||
let required = '*'
|
||||
if (typeof authority === 'string') {
|
||||
required = authority
|
||||
} else if (Array.isArray(authority)) {
|
||||
required = authority
|
||||
} else if (typeof authority === 'object') {
|
||||
required = authority.permission
|
||||
}
|
||||
return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
|
||||
return required === '*' || (permissions && permissions.findIndex(item => item === required || item.id === required) !== -1)
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -26,23 +24,25 @@ function hasRole(authority, roles) {
|
|||
if (typeof authority === 'object') {
|
||||
required = authority.role
|
||||
}
|
||||
return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
|
||||
return authority === '*' || hasAnyRole(required, roles)
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断目标数组是否有所需元素
|
||||
* @param {String | String[]}required 所需元素，数组或单个元素
|
||||
* @param {String[]|Object[]} source 目标数组
|
||||
* @param {Function} filter 匹配条件
|
||||
* (r: String, s: String|Object) => boolean
|
||||
* 判断是否有需要的任意一个角色
|
||||
* @param required {String | Array[String]} 需要的角色，可以是单个角色或者一个角色数组
|
||||
* @param roles 拥有的角色
|
||||
* @returns {boolean}
|
||||
*/
|
||||
function hasAnyItem(required, source, filter) {
|
||||
function hasAnyRole(required, roles) {
|
||||
if (!required) {
|
||||
return false
|
||||
} else if(Array.isArray(required)) {
|
||||
return roles.findIndex(role => {
|
||||
return required.findIndex(item => item === role || item === role.id) !== -1
|
||||
}) !== -1
|
||||
} else {
|
||||
return roles.findIndex(role => role === required || role.id === required) !== -1
|
||||
}
|
||||
let checkedList = Array.isArray(required) ? required : [required]
|
||||
return !!source.find(s => checkedList.find(r => filter(r, s)))
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -75,9 +75,6 @@ function parseRoutes(routesConfig, routerMap) {
|
|||
redirect: routeCfg.redirect || router.redirect,
|
||||
meta: {...meta, authority: meta.authority || '*'}
|
||||
}
|
||||
if (router.beforeEnter) {
|
||||
route.beforeEnter = router.beforeEnter
|
||||
}
|
||||
if (routeCfg.invisible || router.invisible) {
|
||||
route.meta.invisible = true
|
||||
}
|
||||
|
|
@ -215,7 +212,7 @@ function formatAuthority(routes, pAuthorities = []) {
|
|||
let authority = {}
|
||||
if (!meta.authority) {
|
||||
authority = defaultAuthority
|
||||
}else if (typeof meta.authority === 'string' || Array.isArray(meta.authority)) {
|
||||
}else if (typeof meta.authority === 'string') {
|
||||
authority.permission = meta.authority
|
||||
} else if (typeof meta.authority === 'object') {
|
||||
authority = meta.authority
|
||||
|
|
|
|||
|
|
@ -6795,9 +6795,9 @@ minimatch@^3.0.4:
|
|||
brace-expansion "^1.1.7"
|
||||
|
||||
minimist@^1.2.0, minimist@^1.2.5, minimist@~1.2.5:
|
||||
version "1.2.5"
|
||||
resolved "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
|
||||
integrity sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=
|
||||
version "1.2.8"
|
||||
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
|
||||
integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
|
||||
|
||||
minipass-collect@^1.0.2:
|
||||
version "1.0.2"
|
||||
|
|
|
|||
Loading…
Reference in New Issue