gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-3280 fix：Role Permission，Permission中未勾选View权限，但仍可进行View操作

Browse Source
This commit is contained in:
zyh
2023-10-27 10:29:04 +08:00
parent 9d18918bfc
commit 9fced424de
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nezha-fronted/src/components/common/bottomBox/tabs/notebookTab.vue
View File

@@ -12,13 +12,15 @@
> >
<template v-slot:title><span :title="obj.name">{{obj.name}}</span></template> <template v-slot:title><span :title="obj.name">{{obj.name}}</span></template>
<template v-slot:top-tool-right> <template v-slot:top-tool-right>
<button class="nz-btn nz-btn-size-normal nz-btn-style-normal" v-if="!notebookEdit" @click="edit"> <div v-has="'notebook_edit'">
<i class="nz-icon nz-icon-edit"></i> <button class="nz-btn nz-btn-size-normal nz-btn-style-normal" v-if="!notebookEdit" @click="edit">
<span>{{$t('overall.edit')}}</span> <i class="nz-icon nz-icon-edit"></i>
</button> <span>{{$t('overall.edit')}}</span>
<button class="nz-btn nz-btn-size-normal nz-btn-style-normal" v-else @click="done"> </button>
<span>{{$t('notebook.done')}}</span> <button class="nz-btn nz-btn-size-normal nz-btn-style-normal" v-else @click="done">
</button> <span>{{$t('notebook.done')}}</span>
</button>
</div>
<pick-time ref="pickTime" v-model="searchTime" :refresh-data-func="dateChange" :show-locked="true" :use-chart-unit="false" :sign="'notebook' + obj.id"></pick-time> <pick-time ref="pickTime" v-model="searchTime" :refresh-data-func="dateChange" :show-locked="true" :use-chart-unit="false" :sign="'notebook' + obj.id"></pick-time>
<el-dropdown v-has="['notebook_view']" trigger="click" size="medium" class="nz-el-dropdown"> <el-dropdown v-has="['notebook_view']" trigger="click" size="medium" class="nz-el-dropdown">
<button class="top-tool-btn" :title="$t('overall.download')"> <button class="top-tool-btn" :title="$t('overall.download')">

5
nezha-fronted/src/components/common/table/settings/notebookTable.vue
View File

@@ -55,7 +55,7 @@
fixed="right"> fixed="right">
<div slot="header" class="table-operation-title">{{$t('overall.option')}}</div> <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
<div slot-scope="scope" class="table-operation-items"> <div slot-scope="scope" class="table-operation-items">
<button class="table-operation-item" @click="showBottomBox('notebookTab', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button> <button class="table-operation-item" v-has="'notebook_view'" @click="showBottomBox('notebookTab', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button>
<el-dropdown size="medium" v-has="['notebook_add','notebook_edit','notebook_delete']" trigger="click" @command="tableOperation"> <el-dropdown size="medium" v-has="['notebook_add','notebook_edit','notebook_delete']" trigger="click" @command="tableOperation">
<div class="table-operation-item table-operation-item--more" :title="$t('overall.moreOperations')"> <div class="table-operation-item table-operation-item--more" :title="$t('overall.moreOperations')">
<i class="nz-icon nz-icon-more3"></i> <i class="nz-icon nz-icon-more3"></i>
@@ -121,6 +121,9 @@ export default {
}, },
methods: { methods: {
showBottomBox (targetTab, row) { showBottomBox (targetTab, row) {
if (!this.hasButton('notebook_view')) {
return
}
this.$store.commit('setNotebookEdit', false) this.$store.commit('setNotebookEdit', false)
this.$emit('showBottomBox', targetTab, JSON.parse(JSON.stringify(row))) this.$emit('showBottomBox', targetTab, JSON.parse(JSON.stringify(row)))
} }

2
nezha-fronted/src/components/page/config/system/license.vue
View File

@@ -80,7 +80,7 @@
<span>{{scope.row.hostname}}</span> <span>{{scope.row.hostname}}</span>
</template> </template>
<!-- ip --> <!-- ip -->
<template v-if="item.prop === 'ip'"> <template v-else-if="item.prop === 'ip'">
<span>{{getLicense(scope.row)}}</span> <span>{{getLicense(scope.row)}}</span>
</template> </template>
<!-- state --> <!-- state -->