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

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

Browse Source
This commit is contained in:
zhangyu
2023-06-02 09:40:20 +08:00
parent b4fba42a27 034c05b7df
commit e1e812e76c
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nezha-fronted/src/components/chart/chartList.vue
View File

@@ -1,5 +1,7 @@
<template> <template>
<div id="chart-list"> <div id="chart-list" :style="{
width: isGroup ? '100%': 'calc(100% - 10px)',
}">
<div :id='`chartList${(isGroup ? "Group" : "") + timestamp}`' class="chart-list" v-my-loading="gridLayoutLoading" ref="layoutBox"> <div :id='`chartList${(isGroup ? "Group" : "") + timestamp}`' class="chart-list" v-my-loading="gridLayoutLoading" ref="layoutBox">
<grid-layout <grid-layout
ref="layout" ref="layout"
@@ -10,7 +12,7 @@
:is-draggable="!panelLock" :is-draggable="!panelLock"
:is-resizable="!panelLock" :is-resizable="!panelLock"
:layout.sync="copyDataList" :layout.sync="copyDataList"
:margin="[10, 10]" :margin="isGroup ? [10, 10] : [10, 10]"
:row-height="stepWidth" :row-height="stepWidth"
:vertical-compact="true" :vertical-compact="true"
:use-css-transforms="false" :use-css-transforms="false"

2
nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
View File

@@ -87,7 +87,7 @@
<!--图表--> <!--图表-->
<div id="tableList" class="table-list" style="padding-top: 0;overflow: hidden"> <div id="tableList" class="table-list" style="padding-top: 0;overflow: hidden">
<div id="dashboardScrollbar" class="table-list-box"> <div id="dashboardScrollbar" class="table-list-box">
<div class="box-content" ref="dashboardScrollbar" v-my-loading="chartListLoading" style="overflow-y: auto;display: flex;flex-direction: column;overflow-x: hidden"> <div class="box-content" ref="dashboardScrollbar" v-my-loading="chartListLoading" style="overflow-y: scroll;display: flex;flex-direction: column;overflow-x: hidden">
<panel-variables :labelArrs="variables" :time-range="searchTime" @getPanelData="getPanelData"></panel-variables> <panel-variables :labelArrs="variables" :time-range="searchTime" @getPanelData="getPanelData"></panel-variables>
<chart-list <chart-list
ref="chartList" ref="chartList"

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

@@ -95,7 +95,7 @@
</div> </div>
<div id="tableList" class="table-list" style='overflow-y: unset'> <div id="tableList" class="table-list" style='overflow-y: unset'>
<div class="table-list-box"> <div class="table-list-box">
<div id="dashboardScrollbar" class="box-content" v-my-loading="chartListLoading" ref="dashboardScrollbar" style='overflow-y: auto;display: flex;flex-direction: column;overflow-x: hidden'> <div id="dashboardScrollbar" class="box-content" v-my-loading="chartListLoading" ref="dashboardScrollbar" style='overflow-y: scroll;display: flex;flex-direction: column;overflow-x: hidden'>
<panel-variables :labelArrs="variables" :time-range="searchTime" @getPanelData="getPanelData"></panel-variables> <panel-variables :labelArrs="variables" :time-range="searchTime" @getPanelData="getPanelData"></panel-variables>
<chart-list <chart-list
ref="chartList" ref="chartList"