jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Browse Source 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/components/Breadcrumb/index.vue
	ruoyi-ui/src/layout/components/AppMain.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/store/getters.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
This commit is contained in:
疯狂的狮子li
2020-12-18 09:45:54 +08:00
parent b029a7265a c86dc20743
commit 6c8497f632
10 changed files with 56 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-ui/src/components/Breadcrumb/index.vue
View File

@ -10,8 +10,6 @@
</template>
<script>
import pathToRegexp from 'path-to-regexp'
export default {
data() {
return {
@ -49,18 +47,13 @@ export default {
}
return name.trim() === '首页'
},
pathCompile(path) {
const { params } = this.$route
var toPath = pathToRegexp.compile(path)
return toPath(params)
},
handleLink(item) {
const { redirect, path } = item
if (redirect) {
this.$router.push(redirect)
return
}
this.$router.push(this.pathCompile(path))
this.$router.push(path)
}
}
}