From 4fd3b76f7f5830832ffec152a8ea79e7ccd71401 Mon Sep 17 00:00:00 2001 From: likexuan Date: Tue, 7 Mar 2023 15:51:02 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-2633=20feat:=20=E8=A7=92=E8=89=B2=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/bottomBox/bottomBox.vue | 9 +- .../common/bottomBox/tabs/rolesTab.vue | 239 ++++++++++++++++++ .../common/table/settings/roleTable.vue | 3 +- .../common/table/settings/userTabTable.vue | 205 +++++++++++++++ .../src/components/page/config/roles.vue | 1 + 5 files changed, 455 insertions(+), 2 deletions(-) create mode 100644 nezha-fronted/src/components/common/bottomBox/tabs/rolesTab.vue create mode 100644 nezha-fronted/src/components/common/table/settings/userTabTable.vue diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue index 5db71b662..7cc9cbb2a 100644 --- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue +++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue @@ -76,6 +76,8 @@ + + @@ -111,6 +113,7 @@ import networkBottomTab from '@/components/common/bottomBox/tabs/networkBottomTa import scrapeEndpoint from '@/components/common/bottomBox/tabs/scrapeEndpoint' import cortexDetail from '@/components/common/bottomBox/tabs/cortexDetail' import lokiStatus from '@/components/common/bottomBox/tabs/lokiStatus' +import rolesTab from '@/components/common/bottomBox/tabs/rolesTab' import IpDetails from '@/components/common/bottomBox/tabs/IpDetails' import recordRuleEvalLog from '@/components/common/bottomBox/tabs/recordRuleEvalLog' import routerPathParams from '@/components/common/mixin/routerPathParams' @@ -146,7 +149,8 @@ export default { recordRulesQuery, issueTab, commentsBottomTab, - vsysBottomTab + vsysBottomTab, + rolesTab }, props: { isFullScreen: Boolean, // 是否全屏 @@ -284,6 +288,9 @@ export default { alertSilence: [ { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true } ], + role: [ + { prop: 'userTab', name: this.$t('config.operationlog.username'), active: true } + ], issue: [ // { prop: 'issue', name: this.$t('overall.issue'), active: true } ] diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/rolesTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/rolesTab.vue new file mode 100644 index 000000000..6f938571d --- /dev/null +++ b/nezha-fronted/src/components/common/bottomBox/tabs/rolesTab.vue @@ -0,0 +1,239 @@ + + + diff --git a/nezha-fronted/src/components/common/table/settings/roleTable.vue b/nezha-fronted/src/components/common/table/settings/roleTable.vue index 25c71c771..c6d68d596 100644 --- a/nezha-fronted/src/components/common/table/settings/roleTable.vue +++ b/nezha-fronted/src/components/common/table/settings/roleTable.vue @@ -61,12 +61,13 @@ fixed="right">
{{$t('overall.option')}}
- +
+ {{$t('overall.edit')}} {{$t('overall.duplicate')}} {{$t('overall.delete')}} diff --git a/nezha-fronted/src/components/common/table/settings/userTabTable.vue b/nezha-fronted/src/components/common/table/settings/userTabTable.vue new file mode 100644 index 000000000..8b65b7893 --- /dev/null +++ b/nezha-fronted/src/components/common/table/settings/userTabTable.vue @@ -0,0 +1,205 @@ + + + diff --git a/nezha-fronted/src/components/page/config/roles.vue b/nezha-fronted/src/components/page/config/roles.vue index d9318a325..ba4d77f41 100644 --- a/nezha-fronted/src/components/page/config/roles.vue +++ b/nezha-fronted/src/components/page/config/roles.vue @@ -76,6 +76,7 @@ export default { return { url: 'sys/role', tableId: 'rolesTable', // 需要分页的table的id,用于记录每页数量 + detailType: 'list', blankObject: { // 空白对象 name: '', remark: '',