opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 20:59:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix group by ui

Browse Source
This commit is contained in:
Sven Klemm
2018-07-05 10:19:22 +02:00
parent aacf555985
commit c604651092
3 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
public/app/plugins/datasource/postgres/query_ctrl.ts
View File

@ -33,7 +33,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
timeColumnSegment: any;
metricColumnSegment: any;
selectMenu: any;
groupBySegment: any;
groupByAdd: any;
/** @ngInject **/
constructor($scope, $injector, private templateSrv, private $q, private uiSegmentSrv) {
@ -68,7 +68,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
this.buildSelectMenu();
this.buildWhereSegments();
this.whereAdd = this.uiSegmentSrv.newPlusButton();
this.groupBySegment = this.uiSegmentSrv.newPlusButton();
this.groupByAdd = this.uiSegmentSrv.newPlusButton();
this.panelCtrl.events.on('data-received', this.onDataReceived.bind(this), $scope);
this.panelCtrl.events.on('data-error', this.onDataError.bind(this), $scope);
@ -273,7 +273,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
break;
}
case 'action': {
this.queryModel.removeWherePart(part, index);
whereParts.splice(index, 1);
this.panelCtrl.refresh();
break;
}
@ -302,7 +302,11 @@ export class PostgresQueryCtrl extends QueryCtrl {
this.queryModel.whereParts.push(sqlPart.create({ type: 'expression', params: ['value', '=', 'value'] }));
}
}
this.whereAdd = this.uiSegmentSrv.newPlusButton();
var plusButton = this.uiSegmentSrv.newPlusButton();
this.whereAdd.html = plusButton.html;
this.whereAdd.value = plusButton.value;
this.queryModel.updatePersistedParts();
this.panelCtrl.refresh();
}
@ -324,15 +328,15 @@ export class PostgresQueryCtrl extends QueryCtrl {
}
groupByAction() {
switch (this.groupBySegment.value) {
switch (this.groupByAdd.value) {
default: {
this.queryModel.addGroupBy(this.groupBySegment.value);
this.queryModel.addGroupBy(this.groupByAdd.type, this.groupByAdd.value);
}
}
var plusButton = this.uiSegmentSrv.newPlusButton();
this.groupBySegment.value = plusButton.value;
this.groupBySegment.html = plusButton.html;
this.groupByAdd.html = plusButton.html;
this.groupByAdd.value = plusButton.value;
this.panelCtrl.refresh();
}