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

Merge branch 'codeCheck' of https://git.mesalab.cn/nezha/nezha-fronted into codeCheck

Browse Source
This commit is contained in:
zhangyu
2020-11-04 17:55:12 +08:00
parent 2b8d4d1c7c 7ab9ed81f7
commit 81b0a3ab98
20 changed files with 46 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/assets/stylus/main.scss
View File

@@ -823,6 +823,7 @@ li{
.nz-table .el-table {
border: none;
font-size: 12px;
display: table-cell!important;
}
.nz-table::before {
height: 0;

2
nezha-fronted/src/components/charts/chart-detail.vue
View File

@@ -93,7 +93,7 @@
v-scrollBar:el-table="'small'"
>
<el-table-column
:resizable="false"
:resizable="true"
v-for="(_item, _index) in setLabels(value)"
v-if="_item.show"
:key="`col-${_index}`"

6
nezha-fronted/src/components/common/alert/alertMessageTable.vue
View File

@@ -39,11 +39,9 @@
>
</el-table-column>
<el-table-column
:resizable="false"
:resizable="true"
v-for="(item, index) in tools.customTableTitle"
v-if="item.show"
:width="item.width"
:minWidth="item.minWidth"
:key="`col-${index}`"
:label="item.label"
:show-overflow-tooltip="item.prop != 'labels' && item.prop != 'alertRule'"
@@ -156,7 +154,7 @@
</template>
</el-table-column>
<el-table-column width="28" :resizable="false">
<el-table-column width="28" :resizable="true">
<template slot="header" slot-scope="scope">
<span @mousedown.stop="!tools.showCustomTableTitle && (tools.showCustomTableTitle = true)" class="nz-table-gear">
<i class="nz-icon nz-icon-gear"></i>

3
nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
View File

@@ -35,10 +35,9 @@
align="center">
</el-table-column>
<el-table-column
:resizable="false"
:resizable="true"
v-for="(item, index) in tableTitle"
v-if="item.show"
:width="item.width"
:key="`col-${index}`"
:label="item.label"
>

4
nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
View File

@@ -59,13 +59,11 @@
align="center">
</el-table-column>
<el-table-column
:resizable="false"
:resizable="true"
v-for="(item, index) in tools.customTableTitle"
v-if="item.show"
:width="item.width"
:key="`col-${index}`"
:label="item.label"
:min-width="(item.minWidth?item.minWidth+'px':'110px')"
:sortable="$tableSet.sortableShow(item.prop,'endpointTab')"
:prop="$tableSet.propTitle(item.prop,'endpointTab')"
:sort-orders="['ascending', 'descending']"

23
nezha-fronted/src/components/common/exportXLSX.vue
View File

@@ -72,9 +72,17 @@
<div class="result-title">{{$t('overall.result.failedDetail')}}:</div>
<div class="result-detail" v-if="importResult&&importResult.failDetail">
<el-scrollbar style="height: 100%">
<ul>
<!-- <ul>
<li v-for="(item,index) in importResult.failDetail"><span>{{item.lineNo}}</span>:<span>{{item.errorMsg}}</span> </li>
</ul>
</ul>-->
<template v-for="(item,index) in importResult.failDetail">
<div class="import-result-block">
<div class="import-result-item">
<div class="line-num">{{$t('overall.result.line',[item.lineNo])}}</div>
<div>{{item.errorMsg}}</div>
</div>
</div>
</template>
</el-scrollbar>
</div>
</div>
@@ -324,3 +332,14 @@
}
/*去除上传文件动画end*/
</style>
<style>
.result-detail .import-result-block{
}
.result-detail .import-result-block .import-result-item{
display: flex;
}
.import-result-item .line-num{
width: 55px;
}
</style>

3
nezha-fronted/src/components/common/language/cn.js
View File

@@ -71,7 +71,8 @@ const cn = {
total: "总计",
failed: "失败",
success: "成功",
failedDetail: "失败详情"
failedDetail: "失败详情",
line:"第{0}行:"
},
reset: "重置",
submit: "保存",

3
nezha-fronted/src/components/common/language/en.js
View File

@@ -75,7 +75,8 @@ const en = {
total:'Total',
failed:'Failed',
success:'Success',
failedDetail:'Failed Detail'
failedDetail:'Failed Detail',
line:'Line {0}:'
},
reset:'Reset',
submit:'Save',

2
nezha-fronted/src/components/common/project/popData/alertTable.vue
View File

@@ -55,7 +55,7 @@
<!--&gt;-->
<!--</el-table-column>-->
<el-table-column
:resizable="false"
:resizable="true"
v-for="(item, index) in tableTitle"
v-if="item.show"
:width="item.width"

2
nezha-fronted/src/components/common/project/popData/assetTable.vue
View File

@@ -45,7 +45,7 @@
@sort-change="tableDataSort"
>
<el-table-column
:resizable="false"
:resizable="true"
v-for="(item, index) in tableTitle"
v-if="item.show"
:width="item.width"

4
nezha-fronted/src/components/page/alert/config.vue
View File

@@ -85,14 +85,12 @@
align="center">
</el-table-column>
<el-table-column
:resizable="false"
:resizable="true"
v-for="(item, index) in tools.customTableTitle"
v-if="item.show"
:width="item.width"
:key="`col-${index}`"
:label="item.label"
show-overflow-tooltip
min-width="110px"
:sort-orders="['ascending', 'descending']"
:sortable="$tableSet.sortableShow(item.prop,'alertRules')"
:prop="$tableSet.propTitle(item.prop,'alertRules')"

4
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -57,15 +57,13 @@
align="center">
</el-table-column>
<el-table-column
:resizable="false"
:resizable="true"
v-for="(item, index) in tools.customTableTitle"
v-if="item.show"
:width="item.width"
:key="`col_${index}`"
:label="item.label"
:fixed="item.fixed"
:show-overflow-tooltip="item.prop != 'Alert' || item.prop != 'Module'"
min-width="110px"
:class-name="item.prop == 'option' ? 'content-right-options' : ''"
:sortable="$tableSet.sortableShow(item.prop,'asset')"
:prop="$tableSet.propTitle(item.prop,'asset')"

3
nezha-fronted/src/components/page/config/account.vue
View File

@@ -53,10 +53,9 @@
align="center">
</el-table-column>
<el-table-column
:resizable="false"
:resizable="true"
v-for="(item, index) in tools.customTableTitle"
v-if="item.show"
:width="item.width"
:key="`col-${index}`"
:label="item.label"
:prop="item.prop"

3
nezha-fronted/src/components/page/config/dc.vue
View File

@@ -53,11 +53,10 @@
align="center">
</el-table-column>
<el-table-column
:resizable="false"
:resizable="true"
show-overflow-tooltip
v-for="(item, index) in tools.customTableTitle"
v-if="item.show"
:width="item.width"
:key="`col-${index}`"
:label="item.label"
:sortable="$tableSet.sortableShow(item.prop,'dc')"

2
nezha-fronted/src/components/page/config/mib.vue
View File

@@ -45,7 +45,7 @@
width="40"
align="center">
</el-table-column>
<el-table-column :resizable="false" v-for="(item, index) in tools.customTableTitle" v-if="item.show" :width="item.width" :class-name="item.prop == 'modelsDetail'?'detail-column':''"
<el-table-column :resizable="true" v-for="(item, index) in tools.customTableTitle" v-if="item.show" :class-name="item.prop == 'modelsDetail'?'detail-column':''"
:key="`col-${index}`" :label="item.label" :sortable="$tableSet.sortableShow(item.prop,'mib')"
:prop="$tableSet.propTitle(item.prop,'mib')"
:sort-orders="['ascending', 'descending']">

3
nezha-fronted/src/components/page/config/model.vue
View File

@@ -49,10 +49,9 @@
width="40"
align="center">
</el-table-column>
<el-table-column :resizable="false"
<el-table-column :resizable="true"
v-for="(item, index) in tools.customTableTitle"
v-if="item.show"
:width="item.width"
:key="`col-${index}`"
:label="item.label"
:sortable="$tableSet.sortableShow(item.prop,'model')"

3
nezha-fronted/src/components/page/config/operationlog.vue
View File

@@ -36,10 +36,9 @@
@sort-change="tableDataSort"
>
<el-table-column
:resizable="false"
:resizable="true"
v-for="(item, index) in tools.customTableTitle"
v-if="item.show"
:width="item.width"
:key="`col-${index}`"
:label="item.label"
:sortable="$tableSet.sortableShow(item.prop,'operationlog')"

3
nezha-fronted/src/components/page/config/promServer.vue
View File

@@ -41,9 +41,8 @@
width="40"
align="center">
</el-table-column>
<el-table-column :resizable="false" v-for="(item, index) in tools.customTableTitle"
<el-table-column :resizable="true" v-for="(item, index) in tools.customTableTitle"
v-if="item.show"
:width="item.width"
:key="`col-${index}`"
:label="item.label"
:sortable="$tableSet.sortableShow(item.prop,'promServer')"

3
nezha-fronted/src/components/page/config/terminallog.vue
View File

@@ -35,10 +35,9 @@
style="width: 100%;"
@sort-change="tableDataSort">
<el-table-column
:resizable="false"
:resizable="true"
v-for="(item, index) in tools.customTableTitle"
v-if="item.show"
:width="item.width"
:key="`col-${index}`"
:label="item.label"
:sortable="$tableSet.sortableShow(item.prop,'temrminallog')"

8
nezha-fronted/src/components/page/project/project.vue
View File

@@ -68,6 +68,7 @@
@sort-change="tableDataSort"
@row-dblclick="detailEndpoint"
@selection-change="(selection)=>{this.batchDeleteObjs=selection}"
@header-dragend="()=>{this.$refs.endpointTable.doLayout();}"
>
<el-table-column
:resizable="false"
@@ -76,13 +77,12 @@
align="center">
</el-table-column>
<el-table-column
:resizable="false"
:resizable="true"
v-for="(item, index) in tools.customTableTitle"
v-if="item.show"
:width="item.width"
:key="`col-${index}`"
:label="item.label"
min-width="110px"
:min-width="item.width"
:sortable="$tableSet.sortableShow(item.prop,'project')"
:prop="$tableSet.propTitle(item.prop,'project')"
:sort-orders="['ascending', 'descending']"
@@ -132,7 +132,7 @@
<template v-else>-</template>
</template>
</el-table-column>
<el-table-column width="28" :resizable="false">
<el-table-column width="28" :resizable="true">
<template slot="header" slot-scope="scope">
<span @mousedown.stop="!tools.showCustomTableTitle && (tools.showCustomTableTitle = true)" class="nz-table-gear">
<i class="nz-icon nz-icon-gear"></i>