IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

TablePanel: Remove scroll option on TablePanel (#18318)

Browse Source
This commit is contained in:
Tobias Skarhed 2019-07-31 18:56:06 +02:00 committed by Torkel Ödegaard
parent 12f5d16c76
commit 21f702f7c9
2 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
public/app/plugins/panel/table/editor.html
View File

@ -1,54 +1,68 @@
<div class="editor-row">
<div class="section gf-form-group">
<h5 class="section-heading">Data</h5>
<div class="section gf-form-group">
<h5 class="section-heading">Data</h5>
<div class="gf-form">
<label class="gf-form-label width-10">Table Transform</label>
<div class="gf-form-select-wrapper max-width-15">
<select class="gf-form-input" ng-model="editor.panel.transform" ng-options="k as v.description for (k, v) in editor.transformers" ng-change="editor.transformChanged()"></select>
<select
class="gf-form-input"
ng-model="editor.panel.transform"
ng-options="k as v.description for (k, v) in editor.transformers"
ng-change="editor.transformChanged()"
></select>
</div>
</div>
<div class="gf-form-inline">
<div class="gf-form">
<label class="gf-form-label width-10">Columns</label>
</div>
<div class="gf-form" ng-repeat="column in editor.panel.columns">
<label class="gf-form-label">
<i class="pointer fa fa-remove" ng-click="editor.removeColumn(column)"></i>
<span>{{column.text}}</span>
</label>
</div>
<div class="gf-form" ng-show="editor.canSetColumns">
<metric-segment segment="editor.addColumnSegment" get-options="editor.getColumnOptions()" on-change="editor.addColumn()"></metric-segment>
</div>
<div class="gf-form" ng-hide="editor.canSetColumns">
<label class="gf-form-label">
Auto
<info-popover mode="right-normal" ng-if="editor.columnsHelpMessage">
{{editor.columnsHelpMessage}}
</info-popover>
</label>
</div>
</div>
</div>
<div class="gf-form" ng-repeat="column in editor.panel.columns">
<label class="gf-form-label">
<i class="pointer fa fa-remove" ng-click="editor.removeColumn(column)"></i>
<span>{{ column.text }}</span>
</label>
</div>
<div class="gf-form" ng-show="editor.canSetColumns">
<metric-segment
segment="editor.addColumnSegment"
get-options="editor.getColumnOptions()"
on-change="editor.addColumn()"
></metric-segment>
</div>
<div class="gf-form" ng-hide="editor.canSetColumns">
<label class="gf-form-label">
Auto
<info-popover mode="right-normal" ng-if="editor.columnsHelpMessage">
{{ editor.columnsHelpMessage }}
</info-popover>
</label>
</div>
</div>
</div>
<div class="section gf-form-group">
<h5 class="section-heading">Paging</h5>
<div class="section gf-form-group">
<h5 class="section-heading">Paging</h5>
<div class="gf-form">
<label class="gf-form-label width-8">Rows per page</label>
<input type="number" class="gf-form-input width-7"
placeholder="100" data-placement="right"
ng-model="editor.panel.pageSize"
ng-change="editor.render()"
ng-model-onblur>
<input
type="number"
class="gf-form-input width-7"
placeholder="100"
data-placement="right"
ng-model="editor.panel.pageSize"
ng-change="editor.render()"
ng-model-onblur
/>
</div>
<gf-form-switch class="gf-form" label-class="width-8" switch-class="max-width-7" label="Scroll" checked="editor.panel.scroll" on-change="editor.render()"></gf-form-switch>
<div class="gf-form max-width-17">
<label class="gf-form-label width-8">Font size</label>
<div class="gf-form-select-wrapper width-7">
<select class="gf-form-input"
ng-model="editor.panel.fontSize"
ng-options="f for f in editor.fontSizes"
ng-change="editor.render()"></select>
<select
class="gf-form-input"
ng-model="editor.panel.fontSize"
ng-options="f for f in editor.fontSizes"
ng-change="editor.render()"
></select>
</div>
</div>
</div>

4
public/app/plugins/panel/table/module.ts
View File

@ -41,7 +41,7 @@ class TablePanelCtrl extends MetricsPanelCtrl {
},
],
columns: [],
scroll: true,
fontSize: '100%',
sort: { col: 0, desc: true },
};
@ -243,7 +243,7 @@ class TablePanelCtrl extends MetricsPanelCtrl {
appendTableRows(tbodyElem);
appendPaginationControls(footerElem);
rootElem.css({ 'max-height': panel.scroll ? getTableHeight() : '' });
rootElem.css({ 'max-height': getTableHeight() });
}
// hook up link tooltips