yvan/Study
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增按钮权限，增加redis可独立配置 (#923)

Browse Source 
* fix jwt to golang-jwt, gin to 1.7.0

* 增加按钮权限功能

* 增加redis可独立配置

Co-authored-by: helight <helight@helight.info>
This commit is contained in:
奇淼（piexlmax
2022-02-22 00:26:21 +08:00
committed by GitHub
co-authored by helight
parent f389ff701a
commit 6a97f39f66
33 changed files with 5024 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/api/authorityBtn.js
+27
View File
@@ -0,0 +1,27 @@
import service from '@/utils/request'
export const getAuthorityBtnApi = (data) => {
return service({
url: '/authorityBtn/getAuthorityBtn',
method: 'post',
data
})
}
export const setAuthorityBtnApi = (data) => {
return service({
url: '/authorityBtn/setAuthorityBtn',
method: 'post',
data
})
}
export const canRemoveAuthorityBtnApi = (params) => {
return service({
url: '/authorityBtn/canRemoveAuthorityBtn',
method: 'post',
params
})
}
web/src/directive/auth.js
+2 -4
View File
@@ -23,9 +23,7 @@ export default {
break
}
if (type === '') {
/* eslint-disable */
console.error("v-auth必须是Array,Number,String属性,暂不支持其他属性")
/* eslint-enable */
el.parentNode.removeChild(el)
return
}
const waitUse = binding.value.toString().split(',')
@@ -34,7 +32,7 @@ export default {
flag = !flag
}
if (!flag) {
el.style.display = 'none'
el.parentNode.removeChild(el)
}
}
})
web/src/pinia/modules/router.js
+1
View File
@@ -12,6 +12,7 @@ const formatRouter = (routes, routeMap) => {
if ((!item.children || item.children.every(ch => ch.hidden)) && item.name !== '404' && !item.hidden) {
routerListArr.push({ label: item.meta.title, value: item.name })
}
item.meta.btns = item.btns
item.meta.hidden = item.hidden
routeMap[item.name] = item
if (item.children && item.children.length > 0) {
web/src/utils/btnAuth.js
+5
View File
@@ -0,0 +1,5 @@
import { useRoute } from 'vue-router'
export const useBtnAuth = () => {
const route = useRoute()
return route.meta.btns
}
web/src/view/dashboard/index.vue
+1 -1
View File
@@ -6,7 +6,7 @@
<div class="gva-top-card-left-title">早安，管理员，请开始一天的工作吧</div>
<div class="gva-top-card-left-dot">今日晴，0℃ - 10℃，天气寒冷，注意添加衣物。</div>
<div class="gva-top-card-left-rows">
<el-row>
<el-row v-auth="888">
<el-col :span="8" :xs="24" :sm="8">
<div class="flex-center">
<el-icon class="dasboard-icon">
web/src/view/superAdmin/authority/components/menus.vue
+87 -2
View File
@@ -28,9 +28,37 @@
{{ row.defaultRouter === data.name?"首页":"设为首页" }}
</el-button>
</span>
<span v-if="data.menuBtn.length">
<el-button
type="text"
size="small"
@click="() => OpenBtn(data)"
>
分配按钮
</el-button>
</span>
</span>
</template>
</el-tree>
<el-dialog v-model="btnVisible" title="分配按钮" destroy-on-close>
<el-table
ref="btnTableRef"
:data="btnData"
row-key="ID"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" />
<el-table-column label="按钮名称" prop="name" />
<el-table-column label="按钮备注" prop="desc" />
</el-table>
<template #footer>
<div class="dialog-footer">
<el-button size="small" @click="closeDialog">取 消</el-button>
<el-button size="small" type="primary" @click="enterDialog">确 定</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
@@ -39,7 +67,8 @@ import { getBaseMenuTree, getMenuAuthority, addMenuAuthority } from '@/api/menu'
import {
updateAuthority
} from '@/api/authority'
import { ref } from 'vue'
import { getAuthorityBtnApi, setAuthorityBtnApi } from '@/api/authorityBtn'
import { nextTick, ref } from 'vue'
import { ElMessage } from 'element-plus'
const props = defineProps({
row: {
@@ -66,7 +95,6 @@ const init = async() => {
// 获取所有菜单树
const res = await getBaseMenuTree()
menuTreeData.value = res.data.menus
const res1 = await getMenuAuthority({ authorityId: props.row.authorityId })
const menus = res1.data.menus
const arr = []
@@ -113,6 +141,55 @@ const relation = async() => {
defineExpose({ enterAndNext, needConfirm })
const btnVisible = ref(false)
const btnData = ref([])
const multipleSelection = ref([])
const btnTableRef = ref()
let menuID = ''
const OpenBtn = async(data) => {
menuID = data.ID
const res = await getAuthorityBtnApi({ menuID: menuID, authorityId: props.row.authorityId })
if (res.code === 0) {
openDialog(data)
await nextTick()
if (res.data.selected) {
res.data.selected.forEach(id => {
btnData.value.some(item => {
if (item.ID === id) {
btnTableRef.value.toggleRowSelection(item, true)
}
})
})
}
}
}
const handleSelectionChange = (val) => {
multipleSelection.value = val
}
const openDialog = (data) => {
btnVisible.value = true
btnData.value = data.menuBtn
}
const closeDialog = () => {
btnVisible.value = false
}
const enterDialog = async() => {
const selected = multipleSelection.value.map(item => item.ID)
const res = await setAuthorityBtnApi({
menuID,
selected,
authorityId: props.row.authorityId
})
if (res.code === 0) {
ElMessage({ type: 'success', message: '设置成功' })
btnVisible.value = false
}
}
</script>
<script>
@@ -121,3 +198,11 @@ export default {
name: 'Menus'
}
</script>
<style lang="scss" scope>
.custom-tree-node{
span+span{
margin-left: 12px;
}
}
</style>
web/src/view/superAdmin/menu/menu.vue
+65 -2
View File
@@ -177,6 +177,42 @@
</template>
</el-table-column>
</el-table>
<el-button
style="margin-top:12px"
size="small"
type="primary"
icon="edit"
@click="addBtn(form)"
>新增可控按钮</el-button>
<el-table :data="form.menuBtn" style="width: 100%">
<el-table-column align="left" prop="name" label="按钮名称" width="180">
<template #default="scope">
<div>
<el-input v-model="scope.row.name" />
</div>
</template>
</el-table-column>
<el-table-column align="left" prop="name" label="备注" width="180">
<template #default="scope">
<div>
<el-input v-model="scope.row.desc" />
</div>
</template>
</el-table-column>
<el-table-column align="left">
<template #default="scope">
<div>
<el-button
type="danger"
size="small"
icon="delete"
@click="deleteBtn(form.menuBtn,scope.$index)"
>删除</el-button>
</div>
</template>
</el-table-column>
</el-table>
</div>
<template #footer>
<div class="dialog-footer">
@@ -198,6 +234,7 @@ import {
} from '@/api/menu'
import icon from '@/view/superAdmin/menu/icon.vue'
import warningBar from '@/components/warningBar/warningBar.vue'
import { canRemoveAuthorityBtnApi } from '@/api/authorityBtn'
import { reactive, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
@@ -232,7 +269,7 @@ getTableData()
// 新增参数
const addParameter = (form) => {
if (!form.parameters) {
form.value.parameters = []
form.parameters = []
}
form.parameters.push({
type: 'query',
@@ -245,6 +282,31 @@ const deleteParameter = (parameters, index) => {
parameters.splice(index, 1)
}
// 新增可控按钮
const addBtn = (form) => {
console.log(form)
if (!form.menuBtn) {
form.menuBtn = []
}
form.menuBtn.push({
name: '',
desc: '',
})
}
// 删除可控按钮
const deleteBtn = async(btns, index) => {
const btn = btns[index]
if (btn.ID === 0) {
btns.splice(index, 1)
return
}
const res = await canRemoveAuthorityBtnApi({ id: btn.ID })
if (res.code === 0) {
btns.splice(index, 1)
return
}
}
const form = ref({
ID: 0,
path: '',
@@ -259,7 +321,8 @@ const form = ref({
closeTab: false,
keepAlive: false
},
parameters: []
parameters: [],
menuBtn: []
})
const changeName = () => {
form.value.path = form.value.name