diff --git a/nezha-fronted/src/components/common/copy.vue b/nezha-fronted/src/components/common/copy.vue index abc4de9ad..dab1fb1a7 100644 --- a/nezha-fronted/src/components/common/copy.vue +++ b/nezha-fronted/src/components/common/copy.vue @@ -3,7 +3,7 @@ - + @@ -11,7 +11,8 @@ export default { name: 'copy', props: { - copyData: String + copyData: String, + showInfo: String }, data () { return { diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue index 11b5d6ac6..f6c9ed838 100644 --- a/nezha-fronted/src/components/common/table/asset/assetTable.vue +++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue @@ -44,14 +44,14 @@ {{scope.row.name ? scope.row.name : '-'}} --> - + {{scope.row.name ? scope.row.name : '-'}} - + {{scope.row.manageIp ? scope.row.manageIp : '-'}} diff --git a/nezha-fronted/src/components/common/table/settings/issueTable.vue b/nezha-fronted/src/components/common/table/settings/issueTable.vue index ae461e215..0f12a3dbf 100644 --- a/nezha-fronted/src/components/common/table/settings/issueTable.vue +++ b/nezha-fronted/src/components/common/table/settings/issueTable.vue @@ -37,14 +37,14 @@ - + {{scope.row.name ? scope.row.name : '-'}} - + {{scope.row.type ? scope.row.type : '-'}} diff --git a/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue b/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue index 3c3a4e3b2..6d1d8e6a5 100644 --- a/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue +++ b/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue @@ -37,7 +37,7 @@ - + {{scope.row.name ? scope.row.name : '-'}} @@ -51,7 +51,7 @@ {{"-"}} - + {{scope.row[item.prop] ? scope.row[item.prop] : '-'}} diff --git a/nezha-fronted/src/components/page/config/mibBrowser.vue b/nezha-fronted/src/components/page/config/mibBrowser.vue index 4758b3241..4639fda2a 100644 --- a/nezha-fronted/src/components/page/config/mibBrowser.vue +++ b/nezha-fronted/src/components/page/config/mibBrowser.vue @@ -86,24 +86,27 @@ Name - - {{currentWalk.name}} - - + + + {{currentWalk.name}} + + OID - - {{currentWalk.objectID}} - - + + + {{currentWalk.objectID}} + + MIB - - {{mibName(currentWalk.objectID)}} - - + + + {{mibName(currentWalk.objectID)}} + + Syntax @@ -141,20 +144,18 @@ - - - {{row.name ? row.name : row.oid}} - - - + + + {{row.name ? row.name : row.oid}} + + - - - {{row.value}} - - - + + + {{row.value}} + + {{row.type}} @@ -174,6 +175,7 @@ import fileSaver from 'file-saver' import nzDataList from '@/components/common/table/nzDataList' import xlsx from 'xlsx' +import copy from '@/components/common/copy' export default { name: 'mibBrowser', @@ -181,7 +183,8 @@ export default { switchTab: String }, components: { - nzDataList + nzDataList, + copy }, data () { return { diff --git a/nezha-fronted/src/components/page/config/system/apiKeyTable.vue b/nezha-fronted/src/components/page/config/system/apiKeyTable.vue index 8ab496e0c..09f29bad3 100644 --- a/nezha-fronted/src/components/page/config/system/apiKeyTable.vue +++ b/nezha-fronted/src/components/page/config/system/apiKeyTable.vue @@ -78,16 +78,18 @@ {{scope.row[item.prop]?utcTimeToTimezoneStr(scope.row[item.prop]):$t('config.system.apiKey.noExpire')}} - - {{scope.row[item.prop].replace(reg, '*')}} - - + + + {{scope.row[item.prop].replace(reg, '*')}} + + - - {{scope.row.name ? scope.row.name : '-'}} - - + + + {{scope.row[item.prop]?scope.row[item.prop]:'-'}} + + {{scope.row[item.prop]}} - @@ -138,12 +140,13 @@ import { tableCommon } from './systemCommon' import table from '@/components/common/mixin/table' import deleteButton from '@/components/common/deleteButton' +import copy from '@/components/common/copy' export default { name: 'apiKeyTable', props: { loading: Boolean }, - components: { deleteButton }, + components: { deleteButton, copy }, mixins: [table, tableCommon], data () { return { diff --git a/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue b/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue index 0cc691dee..7127d9824 100644 --- a/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue +++ b/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue @@ -40,10 +40,11 @@ {{scope.row[item.prop]?scope.row[item.prop]:'-'}} - - {{scope.row[item.prop]?scope.row[item.prop].replace(reg, '*'):'-'}} - - + + + {{scope.row[item.prop]?scope.row[item.prop].replace(reg, '*'):'-'}} + + {{scope.row[item.prop]?utcTimeToTimezoneStr(scope.row[item.prop]):'-'}} @@ -100,12 +101,13 @@ import { tableCommon } from './systemCommon' import table from '@/components/common/mixin/table' import deleteButton from '@/components/common/deleteButton' +import copy from '@/components/common/copy' export default { name: 'selfApiKeyTable', props: { loading: Boolean }, - components: { deleteButton }, + components: { deleteButton, copy }, mixins: [table, tableCommon], data () { return {