From a4710501853deadaab61d2a2fd236b88e424c804 Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Wed, 19 May 2021 14:04:16 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-628=20fix:=20=E4=BD=BF=E7=94=A8=E5=90=91?= =?UTF-8?q?=E5=AF=BC=E9=A1=B5=E9=9D=A2=20=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/language/cn.js | 2 +- .../src/components/common/popBox/guide.vue | 75 +++++++++++++++---- .../common/table/alert/alertMessageTable.vue | 2 +- .../common/table/alert/alertRuleTable.vue | 4 +- .../common/table/alert/alertSilenceTable.vue | 4 +- .../common/table/asset/assetTable.vue | 8 +- .../common/table/settings/agentTable.vue | 4 +- .../common/table/settings/assetTypeTable.vue | 10 +-- .../common/table/settings/chartTmplTable.vue | 4 +- .../table/settings/credentialsTable.vue | 4 +- .../common/table/settings/dcTable.vue | 4 +- .../common/table/settings/endpointTable.vue | 4 +- .../common/table/settings/exprTmplTable.vue | 6 +- .../common/table/settings/menuTable.vue | 4 +- .../common/table/settings/mibTable.vue | 2 +- .../common/table/settings/modelTable.vue | 4 +- .../common/table/settings/moduleTable.vue | 6 +- .../common/table/settings/roleTable.vue | 4 +- 18 files changed, 100 insertions(+), 51 deletions(-) diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index ffe93dc45..490b24853 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -1563,7 +1563,7 @@ const cn = { add: '新增', edit: '修改', delete: '删除', - expired: '过期', + expired: '已过期', panel: { addChart: '新增图标', editChart: '修改图表', diff --git a/nezha-fronted/src/components/common/popBox/guide.vue b/nezha-fronted/src/components/common/popBox/guide.vue index d67b17a72..eee034791 100644 --- a/nezha-fronted/src/components/common/popBox/guide.vue +++ b/nezha-fronted/src/components/common/popBox/guide.vue @@ -12,7 +12,7 @@ @mouseenter="enter(index)" @mouseleave="leave(index)" >
{{guide.title}}
-
+
@@ -137,6 +137,9 @@ export default { this.interval && clearInterval(this.interval) }, downloadAgent () { + if (!this.hasButton('agent_add')) { + return + } this.$emit('close') this.$router.push({ path: '/agent', @@ -147,6 +150,9 @@ export default { }) }, openTerminal () { + if (!this.hasButton('asset_connect')) { + return + } this.$emit('close') this.$router.push({ path: '/asset', @@ -156,28 +162,25 @@ export default { }) this.$store.commit('openConsole') }, - jump (route) { - let allowed = false - this.guideList.forEach(ele => { - if (this.hasButton(ele.permissionCode)) { - allowed = true - } - }) - if (!allowed) { + jump (guide) { + if (!this.hasButton(guide.permissionCode)) { return } this.$emit('close') this.$router.push({ - path: route, + path: guide.route, query: { t: +new Date() } }) }, jumpAndOpen (cmd, open) { - this.$emit('close') switch (cmd) { case 'dc': { + if (!this.hasButton('dc_add')) { + return + } + this.$emit('close') this.$router.push({ path: '/dc', query: { @@ -188,6 +191,10 @@ export default { break } case 'agent': { + if (!this.hasButton('agent_add')) { + return + } + this.$emit('close') this.$router.push({ path: '/agent', query: { @@ -198,6 +205,10 @@ export default { break } case 'asset': { + if (!this.hasButton('asset_add')) { + return + } + this.$emit('close') this.$router.push({ path: '/asset', query: { @@ -208,6 +219,10 @@ export default { break } case 'importAsset': { + if (!this.hasButton('asset_add')) { + return + } + this.$emit('close') this.$router.push({ path: '/asset', query: { @@ -218,6 +233,10 @@ export default { break } case 'project': { + if (!this.hasButton('project_add')) { + return + } + this.$emit('close') this.$router.push({ path: '/monitor/project', query: { @@ -228,6 +247,10 @@ export default { break } case 'module': { + if (!this.hasButton('monitor_module_add')) { + return + } + this.$emit('close') this.$router.push({ path: '/monitor/module', query: { @@ -238,6 +261,10 @@ export default { break } case 'endpoint': { + if (!this.hasButton('monitor_endpoint_add')) { + return + } + this.$emit('close') this.$router.push({ path: '/monitor/endpoint', query: { @@ -248,6 +275,10 @@ export default { break } case 'importEndpoint': { + if (!this.hasButton('monitor_endpoint_add')) { + return + } + this.$emit('close') this.$router.push({ path: '/monitor/endpoint', query: { @@ -258,6 +289,10 @@ export default { break } case 'panel': { + if (!this.hasButton('panel_add')) { + return + } + this.$emit('close') this.$router.push({ path: '/panel', query: { @@ -268,6 +303,10 @@ export default { break } case 'chart': { + if (!this.hasButton('panel_chart_add')) { + return + } + this.$emit('close') this.$router.push({ path: '/panel', query: { @@ -278,6 +317,10 @@ export default { break } case 'alertRule': { + if (!this.hasButton('alertRule_add')) { + return + } + this.$emit('close') this.$router.push({ path: '/alertRule', query: { @@ -288,6 +331,10 @@ export default { break } case 'cabinet': { + if (!this.hasButton('dc_add')) { + return + } + this.$emit('close') this.$router.push({ path: '/dc', query: { @@ -394,7 +441,7 @@ export default { content: ""; } - &.guide-item--active { + &.guide-item--active{ .item__title { color: #101B27; font-weight: bold; @@ -408,9 +455,11 @@ export default { } } .item__icon.item__icon--disabled { - cursor: not-allowed; + cursor: not-allowed; + opacity: 0.4; } } + .item__title { padding-top: 20px; color: #666; diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue index eaa5873e5..907f8986a 100644 --- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue @@ -112,7 +112,7 @@ …
- {{$t('overall.delete')}} + {{$t('overall.delete')}} diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue index c3bee4787..b8b36ccb3 100644 --- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue @@ -67,8 +67,8 @@ … - {{$t('overall.edit')}} - {{$t('overall.delete')}} + {{$t('overall.edit')}} + {{$t('overall.delete')}} diff --git a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue index 81ac6f08f..ad960b8a6 100644 --- a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue @@ -89,14 +89,14 @@ fixed="right">
{{$t('overall.option')}}
- +
…
- {{$t('buttons.expire')}} + {{$t('buttons.expired')}}
diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue index 6bb2d5d1c..07d06ad30 100644 --- a/nezha-fronted/src/components/common/table/asset/assetTable.vue +++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue @@ -74,10 +74,10 @@ … - {{$t('overall.edit')}} - {{$t('dashboard.Connect')}} - {{$t('dashboard.duplicate')}} - {{$t('overall.delete')}} + {{$t('overall.edit')}} + {{$t('dashboard.Connect')}} + {{$t('dashboard.duplicate')}} + {{$t('overall.delete')}} diff --git a/nezha-fronted/src/components/common/table/settings/agentTable.vue b/nezha-fronted/src/components/common/table/settings/agentTable.vue index b4fd1e77f..3e023cc40 100644 --- a/nezha-fronted/src/components/common/table/settings/agentTable.vue +++ b/nezha-fronted/src/components/common/table/settings/agentTable.vue @@ -57,13 +57,13 @@ fixed="right">
{{$t('overall.option')}}
- +
…
- {{$t('overall.delete')}} + {{$t('overall.delete')}}
diff --git a/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue b/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue index c4f7294cc..48ef6734b 100644 --- a/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue +++ b/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue @@ -77,8 +77,8 @@ … - {{$t('overall.edit')}} - {{$t('overall.delete')}} + {{$t('overall.edit')}} + {{$t('overall.delete')}} @@ -141,11 +141,11 @@ export default { } }, methods: { - - + + }, computed: { - + } } diff --git a/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue b/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue index e70f4bd37..9a59b22e0 100644 --- a/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue +++ b/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue @@ -55,8 +55,8 @@ … - {{$t('overall.edit')}} - {{$t('overall.delete')}} + {{$t('overall.edit')}} + {{$t('overall.delete')}} diff --git a/nezha-fronted/src/components/common/table/settings/credentialsTable.vue b/nezha-fronted/src/components/common/table/settings/credentialsTable.vue index d6cee5317..7bdc12d59 100644 --- a/nezha-fronted/src/components/common/table/settings/credentialsTable.vue +++ b/nezha-fronted/src/components/common/table/settings/credentialsTable.vue @@ -72,13 +72,13 @@ fixed="right">
{{$t('overall.option')}}
- +
…
- {{$t('overall.delete')}} + {{$t('overall.delete')}}
diff --git a/nezha-fronted/src/components/common/table/settings/dcTable.vue b/nezha-fronted/src/components/common/table/settings/dcTable.vue index 11363823b..bfa13633c 100644 --- a/nezha-fronted/src/components/common/table/settings/dcTable.vue +++ b/nezha-fronted/src/components/common/table/settings/dcTable.vue @@ -89,13 +89,13 @@ fixed="right">
{{$t('overall.option')}}
- +
…
- {{$t('overall.delete')}} + {{$t('overall.delete')}}
diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue index e6aba9f9a..36e29001a 100644 --- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue +++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue @@ -100,8 +100,8 @@ … - {{$t('overall.edit')}} - {{$t('overall.delete')}} + {{$t('overall.edit')}} + {{$t('overall.delete')}} diff --git a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue index 1c6d85091..4e57266d6 100644 --- a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue +++ b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue @@ -44,14 +44,14 @@ fixed="right">
{{$t('overall.option')}}
- +
…
- {{$t('overall.copy')}} - {{$t('overall.delete')}} + {{$t('overall.copy')}} + {{$t('overall.delete')}}
diff --git a/nezha-fronted/src/components/common/table/settings/menuTable.vue b/nezha-fronted/src/components/common/table/settings/menuTable.vue index 70d9c17a5..5c399628e 100644 --- a/nezha-fronted/src/components/common/table/settings/menuTable.vue +++ b/nezha-fronted/src/components/common/table/settings/menuTable.vue @@ -61,13 +61,13 @@ fixed="right">
{{$t('overall.option')}}
- +
…
- {{$t('overall.delete')}} + {{$t('overall.delete')}}
diff --git a/nezha-fronted/src/components/common/table/settings/mibTable.vue b/nezha-fronted/src/components/common/table/settings/mibTable.vue index 729f01cec..193826d28 100644 --- a/nezha-fronted/src/components/common/table/settings/mibTable.vue +++ b/nezha-fronted/src/components/common/table/settings/mibTable.vue @@ -84,7 +84,7 @@ {{$t('overall.edit')}} - {{$t('overall.delete')}} + {{$t('overall.delete')}} diff --git a/nezha-fronted/src/components/common/table/settings/modelTable.vue b/nezha-fronted/src/components/common/table/settings/modelTable.vue index 70537fff6..d179c0c8a 100644 --- a/nezha-fronted/src/components/common/table/settings/modelTable.vue +++ b/nezha-fronted/src/components/common/table/settings/modelTable.vue @@ -60,7 +60,7 @@ fixed="right">
{{$t('overall.option')}}
- +
@@ -68,7 +68,7 @@
- {{$t('overall.delete')}} + {{$t('overall.delete')}}
diff --git a/nezha-fronted/src/components/common/table/settings/moduleTable.vue b/nezha-fronted/src/components/common/table/settings/moduleTable.vue index 9d9da3faa..49bf1c865 100644 --- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue +++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue @@ -64,14 +64,14 @@ fixed="right">
{{$t('overall.option')}}
- +
…
- {{$t('overall.edit')}} - {{$t('overall.delete')}} + {{$t('overall.edit')}} + {{$t('overall.delete')}}
diff --git a/nezha-fronted/src/components/common/table/settings/roleTable.vue b/nezha-fronted/src/components/common/table/settings/roleTable.vue index 13c9603c7..945e7b135 100644 --- a/nezha-fronted/src/components/common/table/settings/roleTable.vue +++ b/nezha-fronted/src/components/common/table/settings/roleTable.vue @@ -54,13 +54,13 @@ fixed="right">
{{$t('overall.option')}}
- +
…
- {{$t('overall.delete')}} + {{$t('overall.delete')}}