From 1dd7fb36a0a0668e0fa9df8c0aba5d6076e0fd2f Mon Sep 17 00:00:00 2001 From: songchenxuan Date: Fri, 8 Dec 2023 13:35:43 +0800 Subject: [PATCH] * Modify metric preview dtable css. --- module/metric/css/preview.ui.css | 8 ++++---- module/metric/ui/ajaxgetmultiplemetricbox.html.php | 2 +- module/metric/ui/ajaxgettableandcharts.html.php | 2 +- module/metric/ui/previewmultiple.html.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/module/metric/css/preview.ui.css b/module/metric/css/preview.ui.css index c250a2a177..9010c4368b 100644 --- a/module/metric/css/preview.ui.css +++ b/module/metric/css/preview.ui.css @@ -38,19 +38,19 @@ .main .chart-line-margin {margin-right: 16px;} .main .table-and-chart {display: flex;} .main .table-and-chart-single {height: calc(100vh - 180px - 48px); max-height: 864px; padding: 8px 16px 16px 16px;} -.main .table-and-chart-multiple {max-height: 352px; padding: 8px 16px 16px 16px;} +.main .table-and-chart-multiple {height: 352px; padding: 8px 16px 16px 16px;} .main .canvas {height: calc(100vh - 172px + 48px); max-height: 920px; overflow-y: hidden;} .main .table-and-charts {height: calc(100vh - 172px); max-height: calc(100% - 48px); overflow-y: scroll;} .main .metricBox {max-height: 408px;} .chart-single {height: calc(100% - 32px); width: 100%;} .chart-multiple {height: 285px; width: 100%;} -.chart-type {width: 30%; padding-left: 50px;} +.chart-type {width: 20%;} i.star-empty {color: var(--color-gray-400);} i.star {color: var(--color-warning-300);} -.table-and-chart .table-side {flex-shrink: 1; max-width: 50%;} -.table-and-chart .chart-side {flex-grow: 1;} +.table-and-chart .table-side {flex-shrink: 1; max-width: 50%; border-style: solid; border-width: 1px 0px 1px 1px; border-color: var(--color-gray-300);} +.table-and-chart .chart-side {flex-grow: 1; border: 1px solid var(--color-gray-300); padding: 20px;} .table-and-chart .chart-center {display:flex; justify-content: center; align-items: center;} .icon-18 {font-size: 18px;} diff --git a/module/metric/ui/ajaxgetmultiplemetricbox.html.php b/module/metric/ui/ajaxgetmultiplemetricbox.html.php index 90867c0a5a..7c7285daf9 100644 --- a/module/metric/ui/ajaxgetmultiplemetricbox.html.php +++ b/module/metric/ui/ajaxgetmultiplemetricbox.html.php @@ -198,7 +198,7 @@ div ( $groupData ? dtable ( - set::height(310), + set::height(328), set::rowHeight(32), set::bordered(true), set::cols($groupHeader), diff --git a/module/metric/ui/ajaxgettableandcharts.html.php b/module/metric/ui/ajaxgettableandcharts.html.php index ac7054a889..5d5ca0b4d3 100644 --- a/module/metric/ui/ajaxgettableandcharts.html.php +++ b/module/metric/ui/ajaxgettableandcharts.html.php @@ -22,7 +22,7 @@ div ( $groupData ? dtable ( - $viewType == 'multiple' ? set::height(310) : set::height(jsRaw('window.getTableHeight')), + $viewType == 'multiple' ? set::height(328) : set::height(jsRaw('window.getTableHeight')), set::rowHeight(32), set::bordered(true), set::cols($groupHeader), diff --git a/module/metric/ui/previewmultiple.html.php b/module/metric/ui/previewmultiple.html.php index 8e3d3dae05..4c87207243 100644 --- a/module/metric/ui/previewmultiple.html.php +++ b/module/metric/ui/previewmultiple.html.php @@ -395,7 +395,7 @@ $metricBoxs = div ( $groupData ? dtable ( - set::height(310), + set::height(328), set::rowHeight(32), set::bordered(true), set::cols($groupHeader),