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

Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme

Browse Source 
# Conflicts:
#	nezha-fronted/src/assets/css/common.scss
#	nezha-fronted/src/assets/css/common/tableCommon.scss
#	nezha-fronted/src/assets/stylus/main.scss
#	nezha-fronted/src/components/charts/chart-list.vue
#	nezha-fronted/src/components/charts/logs.vue
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/alert/alertRuleInfo.vue
#	nezha-fronted/src/components/common/bottomBox/bottomBox.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
#	nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue
#	nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue
#	nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue
#	nezha-fronted/src/components/common/detailView/nzDetailView.vue
#	nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
#	nezha-fronted/src/components/common/multipleTime.vue
#	nezha-fronted/src/components/common/pickTime.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/project/L5/topoTooltip.vue
#	nezha-fronted/src/components/common/project/popData/Info.vue
#	nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
#	nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
#	nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
#	nezha-fronted/src/components/common/table/settings/userTable.vue
#	nezha-fronted/src/components/layout/header.vue
#	nezha-fronted/src/components/page/alert/alertMessage.vue
#	nezha-fronted/src/components/page/alert/nzAlertTag.vue
#	nezha-fronted/src/components/page/asset/components/operation.vue
#	nezha-fronted/src/components/page/config/mibBrowser.vue
#	nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
#	nezha-fronted/src/components/page/dashboard/explore/logTab.vue
#	nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
#	nezha-fronted/src/components/page/dashboard/panel.vue
This commit is contained in:
chenjinsong
2021-11-01 18:24:01 +08:00
parent 914c096463 1decda6833
commit ef664be5ef
151 changed files with 5009 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
nezha-fronted/src/components/page/dashboard/panel.vue
View File

@@ -79,9 +79,9 @@
</template>
</div>
<div id="tableList" class="table-list">
<div ref="dashboardScrollbar" :class="overScroll10?'border-t-1-de':'border-t-1-tr'" id="dashboardScrollbar" style="height: calc(100% - 20px); overflow: auto;">
<div class="box-content">
<chart-list ref="chartList" :class="{'show-top':showTopBtn}" :from="fromRoute.panel" :panel-lock="panelLock" @on-edit-chart="editChart" @on-refresh-time="refreshTime" @on-remove-chart="delChart" @on-add-group-item-chart="addGroupItem"></chart-list>
<div ref="dashboardScrollbar" id="dashboardScrollbar" class="border-t-1-de" style="height: calc(100% - 20px); overflow: auto;">
<div class="box-content" v-loading="chartListLoading">
<chart-list ref="chartList" :class="{'show-top':showTopBtn}" :from="fromRoute.panel" :panel-lock="panelLock" @on-edit-chart="editChart" @on-refresh-time="refreshTime" @on-remove-chart="delChart" @panel-list-loading="load" @on-add-group-item-chart="addGroupItem"></chart-list>
</div>
</div>
</div>
@@ -124,6 +124,7 @@ export default {
panelLock: true,
showTopBtn: false, // top按钮
visible: false,
chartListLoading: true,
rightBox: { // 面板弹出框相关
chart: { show: false },
chartTemp: { show: false },
@@ -566,6 +567,7 @@ export default {
this.$store.state.showPanel.id = 0
this.$store.state.showPanel.name = ''
this.$store.state.showPanel.type = 'dashboard'
} else {
if (response.msg) {
this.$message.error(response.msg)
@@ -680,6 +682,13 @@ export default {
wrap.scrollTop = currentTop
}
}, 20)
},
load (dataList) {
if (dataList.length > 0) {
this.chartListLoading = false
} else {
this.chartListLoading = !dataList.length === 0
}
}
},
created () {
@@ -735,3 +744,79 @@ export default {
}
}
</script>
<style lang="scss">
.border-t-1-de{
border-top: 1px solid #dedede;
padding-top: 10px;
}
.border-t-1-tr{
border-top: 1px solid transparent;
}
.panel {
height: 100%;
display: flex;
flex-direction:column;
}
.panel .el-table {
border-radius: 5px;
}
/* begin-chart list*/
.table-list {
margin-top: 0px;
overflow-y: auto;
height: calc(100% - 50px);
flex: 1;
}
.box-content {
position: relative;
height: 100%;
}
.panel-select-header {
display: flex;
justify-content: space-evenly;
margin-bottom: 15px;
}
.panel-select-tail {
border-top: 1px solid #DEDEDE;
.panel-select-add {
line-height: 32px;
height: 32px;
display: inline-block;
cursor: pointer;
i {
color: #FA901C;
font-size: 12px;
font-weight: bold;
padding-left: 20px;
}
}
}
/* end-chart list*/
</style>
<style lang="scss">
@import '@/assets/css/common/tableCommon.scss';
</style>
<style scoped>
.loading {
position: fixed;
left: 250px;
top: 59px;
height: 100%;
width: 100%;
background: center center no-repeat #fff;
z-index: 10;
}
.show-panel-name{
display: inline-block;
padding: 0 7px;
font-weight: bold;
max-width: 310px;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
vertical-align: bottom;
}
</style>