From b946c1a5f8bc04ae844337302b1880e783bb7f29 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 04 八月 2023 15:08:25 +0800
Subject: [PATCH] 1.角色权限优化85%
---
src/views/basicSettings/roleList.vue | 100 +++++++++++++++++++++++++++++++------------------
1 files changed, 63 insertions(+), 37 deletions(-)
diff --git a/src/views/basicSettings/roleList.vue b/src/views/basicSettings/roleList.vue
index 5d48668..816eb2b 100644
--- a/src/views/basicSettings/roleList.vue
+++ b/src/views/basicSettings/roleList.vue
@@ -141,7 +141,7 @@
:key="it.menucode"
v-model="it.buttonChecked"
style="margin-left: 40px;height:26px;display: flex;"
- @change="val=>handleCheckedButtonChange(val,it.menucode)"
+ @change="val=>handleCheckedButtonChange(val,it.menucode,it.buttonChecked)"
>
<el-checkbox
@@ -332,29 +332,28 @@
childrenProperty: 'children'
})
- this.menuCheckedCodeArr = this.allButtonData.map(i => i.menucode)
- this.$nextTick(() => {
- this.$refs.treeCenterRef.setCheckedKeys(this.menuCheckedCodeArr)
- })
+ this.treeCenter = [
+ { menucode: '-1', menuname: '鍏ㄩ儴', children: result }
+ ]
- result.forEach(item => {
+ this.treeCenter[0].children.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach(it => {
- it.buttoncodelist = it.buttoncodelist ? it.buttoncodelist.split(',') : []
+ it.buttoncodelist = it.buttoncodelist !== null ? it.buttoncodelist.split(',') : []
if (it.buttoncodelist && it.buttoncodelist.length > 0) {
it.buttoncodelist = this.$ButtonData.filter(j =>
it.buttoncodelist.includes(j.buttoncode)
)
- let temp = this.allButtonData.filter(j => j.menucode === it.menucode).length > 0 ? this.allButtonData.filter(j => j.menucode === it.menucode)[0].buttoncode : []
- temp = temp.length > 0 ? temp.split(',') : []
+ // let temp = this.allButtonData.filter(j => j.menucode === it.menucode).length > 0 ? this.allButtonData.filter(j => j.menucode === it.menucode)[0].buttoncode : []
+ // temp = temp.length > 0 ? temp.split(',') : []
- it.buttonChecked = [] // 鏁版嵁鍥炴樉
- it.buttoncodelist.forEach(j => {
- if (temp.includes(j.buttoncode)) {
- it.buttonChecked.push(j.buttonname)
- }
- })
+ // it.buttonChecked = [] // 鏁版嵁鍥炴樉
+ // it.buttoncodelist.forEach(j => {
+ // if (temp.includes(j.buttoncode)) {
+ // it.buttonChecked.push(j.buttonname)
+ // }
+ // })
it.buttoncodelist = it.buttoncodelist.map(j => j.buttonname)
}
@@ -365,22 +364,44 @@
it.datacodelist.includes(j.datacode)
).map(j => j.dataname)
}
- const datacode = this.allButtonData.filter(j => j.menucode === it.menucode).length > 0 ? this.allButtonData.filter(j => j.menucode === it.menucode)[0].datacode : ''
- it.dataChecked = datacode ? this.dataKeyValue.find(j => j.datacode === datacode).dataname : '' // 鏁版嵁鍥炴樉
+ // const datacode = this.allButtonData.filter(j => j.menucode === it.menucode).length > 0 ? this.allButtonData.filter(j => j.menucode === it.menucode)[0].datacode : ''
+ // it.dataChecked = datacode ? this.dataKeyValue.find(j => j.datacode === datacode).dataname : '' // 鏁版嵁鍥炴樉
})
item.expanded = true
}
})
- this.treeCenter = [
- { menucode: '-1', menuname: '鍏ㄩ儴', children: result }
- ]
+ this.handleData()// 澶勭悊鏁版嵁鍥炴樉
+ },
+ // 澶勭悊缁勫悎鏁版嵁
+ handleData() {
+ this.menuCheckedCodeArr = this.allButtonData.map(i => i.menucode)
+ this.$nextTick(() => {
+ this.$refs.treeCenterRef.setCheckedKeys(this.menuCheckedCodeArr)
+ })
- this.handleCheckedButtonChange('', '', true)
+ this.treeCenter[0].children.forEach(item => {
+ if (item.children && item.children.length) {
+ item.children.forEach(it => {
+ let temp = this.allButtonData.filter(j => j.menucode === it.menucode).length > 0 ? this.allButtonData.filter(j => j.menucode === it.menucode)[0].buttoncode : []
+ temp = temp.length > 0 ? temp.split(',') : []
+ it.buttonChecked = [] // 鏁版嵁鍥炴樉
+ this.$ButtonData.forEach(j => {
+ if (temp.includes(j.buttoncode)) {
+ it.buttonChecked.push(j.buttonname)
+ }
+ })
+
+ const datacode = this.allButtonData.filter(j => j.menucode === it.menucode).length > 0 ? this.allButtonData.filter(j => j.menucode === it.menucode)[0].datacode : ''
+ it.dataChecked = datacode ? this.dataKeyValue.find(j => j.datacode === datacode).dataname : '' // 鏁版嵁鍥炴樉
+ })
+ }
+ })
+
+ this.handleCheckedButtonChange('', '', '', true)
this.handleCheckedDataChange('', '', true)
// this.$forceUpdate()
- console.log(JSON.parse(JSON.stringify(result)), 6)
},
// 宸﹁竟婊氬姩鏉℃粦鍔ㄦ椂
@@ -441,12 +462,13 @@
}
},
// 鍗曚釜鎸夐挳鏀瑰彉
- handleCheckedButtonChange(value, code, flag) {
+ handleCheckedButtonChange(oldValue, code, newValue, flag) {
+ // console.log(oldValue, code, newValue, 2)
// 鍒ゆ柇鏄惁鍖呭惈鍦ㄥ唴
if (!flag) {
- if (!this.menuCheckedCodeArr.includes(code) && value.length === 1) { // 鍚�
+ if (!this.menuCheckedCodeArr.includes(code) && oldValue.length === 0 && newValue.length === 1) { // 鍚�
this.menuCheckedCodeArr.push(code)
- } else if (this.menuCheckedCodeArr.includes(code) && value.length === 0) { // 鏄�
+ } else if (this.menuCheckedCodeArr.includes(code) && oldValue.length === 1 && newValue.length === 0) { // 鏄�
this.menuCheckedCodeArr = this.menuCheckedCodeArr.filter(i => i !== code)
}
this.$refs.treeCenterRef.setCheckedKeys(this.menuCheckedCodeArr)
@@ -504,19 +526,23 @@
handleTreeCenterCheckChange(obj, selfChecked, selfChildrenTreeCheck) {
// console.log(obj, selfChecked, selfChildrenTreeCheck, '鐜嬭�佸悏')
if (!selfChildrenTreeCheck) {
- if (!selfChecked) {
+ if (!selfChecked) { // 浠庨�変腑鍒颁笉閫変腑
+ obj.buttonChecked = []
+ obj.dataChecked = ''
+ this.menuCheckedCodeArr = this.menuCheckedCodeArr.filter(i => i !== obj.menucode)
+ }
+ if (selfChecked) { // 浠庝笉閫変腑鍒伴�変腑
this.treeCenter[0].children.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach(it => {
if (it.menucode === obj.menucode) {
- it.buttonChecked = []
- it.DataChecked = ''
+ this.menuCheckedCodeArr.push(obj.menucode)
}
})
}
})
- this.$forceUpdate()
}
+ this.$forceUpdate()
}
},
// 鍗曢�夋鎸夐挳鏀瑰彉
@@ -551,7 +577,8 @@
async treeLeftNodeClick(obj, Node, VueComponent) {
if (obj.code !== '000') {
await this.getRolePermissionSearchRoleMenuButton(obj.code)
- await this.getRolePermissionSearchRoleMenu(obj.code)
+ // await this.getRolePermissionSearchRoleMenu(obj.code)
+ this.handleData()
}
},
// 瑙掕壊鍚嶇О鏂板
@@ -589,26 +616,25 @@
if (item.children && item.children.length) {
item.children.forEach(it => {
if (menuKeyArr.includes(it.menucode)) {
- if (it.dataChecked && it.dataChecked.toString().length > 0) { // 鏁版嵁鏉冮檺宸插嬀閫�
- it.dataChecked = this.dataKeyValue.find(i => i.dataname === it.dataChecked).datacode
+ if (it.buttoncodelist.length > 0 && it.buttoncodelist && it.dataChecked && it.dataChecked.toString().length > 0) { // 鏁版嵁鏉冮檺宸插嬀閫�
+ it.dataCheckedCode = this.dataKeyValue.find(i => i.dataname === it.dataChecked).datacode
}
if (it.buttonChecked && it.buttonChecked.length > 0) { // 宸查�夎彍鍗�
- it.buttonChecked = this.$ButtonData.filter(i =>
+ it.buttonCheckedCode = this.$ButtonData.filter(i =>
it.buttonChecked.includes(i.buttonname)
).map(i => i.buttoncode)
}
arr.push({
menucode: it.menucode,
- datacode: it.dataChecked,
- buttoncode: it.buttonChecked ? it.buttonChecked.join(',') : ''
+ datacode: it.dataCheckedCode !== undefined ? it.dataCheckedCode : '',
+ buttoncode: it.buttonCheckedCode ? it.buttonCheckedCode.join(',') : ''
})
}
})
}
})
- // console.log(this.$refs.treeCenterRef.getCheckedKeys(), 7)
console.log(arr, 'arr')
const rolecode = this.$refs.treeLeftRef.getCurrentKey()
const res = await RolePermissionSava(JSON.stringify(arr), rolecode, this.activeName)
@@ -616,7 +642,7 @@
const rolename = this.treeLeft[0].roles.find(i => i.code === rolecode).name
this.$notify.success(rolename + '鐨勮鑹叉潈闄愭彁浜ゆ垚鍔燂紒')
await this.getRolePermissionSearchRoleMenuButton(rolecode)
- await this.getRolePermissionSearchRoleMenu(rolecode)
+ // await this.getRolePermissionSearchRoleMenu(rolecode)
}
// this.$forceUpdate()
},
--
Gitblit v1.9.3