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

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

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/common/language/cn.js
#	nezha-fronted/src/components/common/language/en.js
This commit is contained in:
zhangyu
2021-10-22 18:08:37 +08:00
parent 9974d42038 015edf87af
commit fa2da5a3c1
63 changed files with 436 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/components/page/config/terminalLog.vue
View File

@@ -67,6 +67,7 @@
<terminal-log-table
ref="dataTable"
v-loading="tools.loading"
:loading="tools.loading"
:api="url"
:custom-table-title="tools.customTableTitle"
:height="mainTableHeight"