* Set flex-basis for tableWidth.

This commit is contained in:
songchenxuan
2023-11-24 15:25:00 +08:00
parent 7f6313f8d3
commit 4b5800d300
2 changed files with 12 additions and 7 deletions
+7 -2
View File
@@ -271,11 +271,16 @@ class metric extends control
$resultHeader = $this->metricZen->getViewTableHeader($metric);
$resultData = $this->metricZen->getViewTableData($metric, $result);
list($groupHeader, $groupData) = $this->metricZen->getGroupTable($resultHeader, $resultData);
$this->view->groupHeader = $groupHeader;
$this->view->groupData = $groupData;
$this->view->tableWidth = $this->metricZen->getViewTableWidth($groupHeader);
$this->view->headerGroup = $this->metric->isHeaderGroup($groupHeader);
$this->view->metric = $metric;
$this->view->resultHeader = $resultHeader;
$this->view->resultData = $resultData;
$this->view->chartTypeList = $this->metric->getChartTypeList($resultHeader);
$this->view->echartOptions = $this->metric->getEchartsOptions($resultHeader, $resultData);
$this->view->metricRecordType = $this->metric->getMetricRecordType($resultHeader);
$this->display();
}
@@ -12,8 +12,6 @@ namespace zin;
$metricID = $metric->id;
$metricRecordType = $this->metric->getMetricRecordType($resultHeader);
$fnGenerateQueryForm = function() use($metricRecordType, $metric, $metricID)
{
if(!$metricRecordType) return null;
@@ -137,15 +135,17 @@ div
div
(
setClass('table-side'),
setStyle(array('flex-basis' => $tableWidth . 'px')),
div
(
$resultData ? dtable
$groupData ? dtable
(
set::height(310),
set::bordered(true),
set::cols($resultHeader),
set::data(array_values($resultData)),
set::cols($groupHeader),
set::data(array_values($groupData)),
($metricRecordType == 'scope' || $metricRecordType == 'scope-date') ? set::footPager(usePager('dtablePager')) : null,
$headerGroup ? set::plugins(array('header-group')) : null,
set::onRenderCell(jsRaw('window.renderDTableCell'))
) : null
)