menu和authority修改父级变为选择模式

This commit is contained in:
pixel
2020-04-15 16:37:53 +08:00
parent ea3f49d68a
commit cd0b1e0336
8 changed files with 206 additions and 33 deletions
+15
View File
@@ -59,4 +59,19 @@ export const setDataAuthority = (data) => {
method: 'post',
data
})
}
// @Summary 修改角色
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body model.SysAuthority true "修改角色"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"设置成功"}"
// @Router /authority/setDataAuthority [post]
export const updateAuthority = (data) => {
return service({
url: "/authority/updateAuthority",
method: 'put',
data
})
}
-4
View File
@@ -24,9 +24,5 @@ export default {
this.page = table.data.page
this.pageSize = table.data.pageSize
}
},
mounted() {
this.getTableData()
}
}
@@ -157,6 +157,9 @@ export default {
this.type = "create"
this.dialogFormVisible = true
}
},
created(){
this.getTableData()
}
}
</script>
+3
View File
@@ -145,6 +145,9 @@ export default {
downloadFile(row) {
downloadImage(row.url, row.name)
}
},
created(){
this.getTableData()
}
}
</script>
+108 -14
View File
@@ -16,19 +16,34 @@
<el-table-column fixed="right" label="操作" min-width="300">
<template slot-scope="scope">
<el-button @click="opdendrawer(scope.row)" size="small" type="text">设置权限</el-button>
<el-button @click="deleteAuth(scope.row)" size="small" type="text">删除角色</el-button>
<el-button @click="addAuthority(scope.row.authorityId)" size="small" type="text">新增子角色</el-button>
<el-button @click="editAuthority(scope.row)" size="small" type="text">编辑角色</el-button>
<el-button @click="deleteAuth(scope.row)" size="small" type="text">删除角色</el-button>
</template>
</el-table-column>
</el-table>
<!-- 新增角色弹窗 -->
<el-dialog :visible.sync="dialogFormVisible" :title="dialogTitle">
<el-form :model="form" :rules="rules" ref="authorityForm">
<el-form-item label="父级角色ID" prop="parentId">
<el-input autocomplete="off" disabled v-model="form.parentId"></el-input>
<el-form-item label="父级角色" prop="parentId">
<el-select
:disabled="dialogType=='add'"
placeholder="请选择"
v-model="form.parentId"
filterable
>
<el-option
:disabled="canSelect(item)"
:key="item.authorityId"
:label="item.authorityName"
:value="item.authorityId"
v-for="item in AuthorityOption"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="角色ID" prop="authorityId">
<el-input autocomplete="off" v-model="form.authorityId"></el-input>
<el-input autocomplete="off" :disabled="dialogType=='edit'" v-model="form.authorityId"></el-input>
</el-form-item>
<el-form-item label="角色姓名" prop="authorityName">
<el-input autocomplete="off" v-model="form.authorityName"></el-input>
@@ -62,7 +77,8 @@
import {
getAuthorityList,
deleteAuthority,
createAuthority
createAuthority,
updateAuthority
} from '@/api/authority'
import Menus from '@/view/superAdmin/authority/components/menus'
@@ -75,8 +91,13 @@ export default {
mixins: [infoList],
data() {
return {
AuthorityOption:[{
authorityId:"0",
authorityName:"根角色"
}],
listApi: getAuthorityList,
drawer: false,
dialogType:"add",
activeRow: {},
activeUserId: 0,
dialogTitle:"新增角色",
@@ -137,6 +158,11 @@ export default {
// 初始化表单
initForm() {
this.$refs.authorityForm.resetFields()
this.form = {
authorityId: '',
authorityName: '',
parentId: '0'
}
},
// 关闭窗口
closeDialog() {
@@ -156,28 +182,96 @@ export default {
}
this.$refs.authorityForm.validate(async valid => {
if (valid) {
const res = await createAuthority(this.form)
if (res.code == 0) {
this.$message({
type: 'success',
message: '添加成功!'
})
this.getTableData()
this.closeDialog()
switch (this.dialogType) {
case 'add':
{
const res = await createAuthority(this.form)
if (res.code == 0) {
this.$message({
type: 'success',
message: '添加成功!'
})
this.getTableData()
this.closeDialog()
}
}
break;
case 'edit':
{
const res = await updateAuthority(this.form)
if (res.code == 0) {
this.$message({
type: 'success',
message: '添加成功!'
})
this.getTableData()
this.closeDialog()
}
}
break;
default:
break;
}
this.initForm()
this.dialogFormVisible = false
}
})
},
getAuthorityList(AuthorityData){
AuthorityData.map(item=>{
this.AuthorityOption.push({
authorityId:item.authorityId,
authorityName:item.authorityName
})
if(item.children){
this.getAuthorityList(item.children)
}
})
},
findAuthoritySelf(authority,authData,outData){
authData.some(item=>{
if(item.authorityId == authority.authorityId){
outData.push(item)
return true
}
this.findAuthoritySelf(authority,item.children,outData)
})
},
findAllChild(authority,array){
authority&&authority.map(item=>{
array.push(item.authorityId)
this.findAllChild(item.children,array)
})
},
canSelect(authority){
const array = []
const arrayIds = []
this.findAuthoritySelf({authorityId:this.form.authorityId},this.tableData,array)
this.findAllChild(array,arrayIds)
return arrayIds.indexOf(authority.authorityId)>-1
},
// 增加角色
addAuthority(parentId) {
this. dialogTitle = "新增角色"
this.dialogType = "add"
this.form.parentId = parentId
this.dialogFormVisible = true
},
// 增加角色
editAuthority(row) {
this. dialogTitle = "编辑角色"
this.dialogType = "edit"
for(let key in this.form){
this.form[key] = row[key]
}
this.dialogFormVisible = true
}
},
created() {
async created() {
this.pageSize = 999
await this.getTableData()
this.getAuthorityList(this.tableData)
}
}
</script>
+58 -3
View File
@@ -47,7 +47,21 @@
</el-select>
</el-form-item>
<el-form-item label="父节点Id">
<el-input autocomplete="off" disabled v-model="form.parentId"></el-input>
<el-select
placeholder="请选择"
v-model="form.parentId"
:disabled="!this.isEdit"
filterable
>
<el-option
:disabled="canSelect(item)"
:key="item.ID"
:label="item.title"
:value="item.ID"
v-for="item in menuOption"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="文件路径" prop="component">
<el-input autocomplete="off" v-model="form.component"></el-input>
@@ -90,6 +104,12 @@ export default {
listApi: getMenuList,
dialogFormVisible: false,
dialogTitle:"新增菜单",
menuOption:[
{
ID:"0",
title:"根菜单"
}
],
form: {
ID: 0,
path: '',
@@ -211,10 +231,45 @@ export default {
this.form = res.data.menu
this.dialogFormVisible = true
this.isEdit = true
}
},
getMenuList(MenuData){
MenuData.map(item=>{
this.menuOption.push({
ID:String(item.ID),
title:item.meta.title
})
if(item.children){
this.getMenuList(item.children)
}
})
},
findAuthoritySelf(mune,muneData,outData){
muneData&&muneData.some(item=>{
if(item.ID == mune.ID){
outData.push(item)
return true
}
this.findAuthoritySelf(mune,item.children,outData)
})
},
findAllChild(menu,array){
menu&&menu.map(item=>{
array.push(String(item.ID))
this.findAllChild(item.children,array)
})
},
canSelect(authority){
const array = []
const arrayIds = []
this.findAuthoritySelf({ID:this.form.ID},this.tableData,array)
this.findAllChild(array,arrayIds)
return arrayIds.indexOf(authority.ID)>-1
},
},
created() {
async created() {
this.pageSize = 999
await this.getTableData()
await this.getMenuList(this.tableData)
}
}
</script>
+13
View File
@@ -127,6 +127,17 @@ export default {
...mapGetters('user', ['token'])
},
methods: {
getAuthorityList(AuthorityData){
AuthorityData.map(item=>{
this.authOptions.push({
authorityId:item.authorityId,
authorityName:item.authorityName
})
if(item.children){
this.getAuthorityList(item.children)
}
})
},
async enterAddUserDialog() {
this.$refs.userForm.validate(async valid => {
if (valid) {
@@ -160,8 +171,10 @@ export default {
}
},
async created() {
this.getTableData()
const res = await getAuthorityList({ page: 1, pageSize: 999 })
this.authOptions = res.data.list
}