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

Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4

Browse Source
This commit is contained in:
zhangyu
2022-07-06 17:52:01 +08:00
parent 28da836317 44ce3beabd
commit 2de5d3db0f
16 changed files with 81 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nezha-fronted/src/components/common/table/settings/endpointTable.vue
View File

@@ -146,7 +146,7 @@
<span class="active-icon gray-bg inline-block"></span>
</span>
</span>
<nz-tooltip :that="scope.row.configs[1]" v-if="scope.row.configs[1] && scope.row.configs[1].loading && scope.row.configs[1].state > 1" :type="'configs[1]'">
<nz-tooltip :that="scope.row.configs[1]" v-if="scope.row.configs[1] && scope.row.configs[1].loading && scope.row.configs[1].state > 1" :type="'configs[1]'" :isTopoInfo="isTopoInfo">
<div name="default">
<div v-html="suspendedStr(scope.row.configs[1].state)"></div>
</div>
@@ -220,6 +220,10 @@ export default {
type: Boolean,
default: true
},
isTopoInfo: {
type: Boolean,
default: false
},
endpointTab: Boolean,
loading: Boolean
},