dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7129 from kalutkaz/pieFlotDateFix

Browse Source 
[3.4.2] UI: Remove selection (mode:x) for Pie-flot widget
This commit is contained in:
Igor Kulikov 2022-09-07 18:23:31 +03:00 committed by GitHub
commit 490b78567b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts
View File

@ -153,13 +153,13 @@ export class TbFlot {
autoHighlight: this.tooltipIndividual === true, autoHighlight: this.tooltipIndividual === true,
markings: [] markings: []
}, },
selection : { mode : 'x' },
legend : { legend : {
show: false show: false
} }
}; };
if (this.chartType === 'line' || this.chartType === 'bar' || this.chartType === 'state') { if (this.chartType === 'line' || this.chartType === 'bar' || this.chartType === 'state') {
this.options.selection = { mode : 'x' };
this.options.xaxes = []; this.options.xaxes = [];
this.xaxis = { this.xaxis = {
mode: 'time', mode: 'time',
@ -1206,10 +1206,12 @@ export class TbFlot {
private enableMouseEvents() { private enableMouseEvents() {
this.$element.css('pointer-events', ''); this.$element.css('pointer-events', '');
this.$element.addClass('mouse-events'); this.$element.addClass('mouse-events');
this.options.selection = { mode : 'x' }; if (this.chartType !== 'pie') {
this.$element.bind('plothover', this.flotHoverHandler); this.options.selection = {mode: 'x'};
this.$element.bind('plotselected', this.flotSelectHandler); this.$element.bind('plotselected', this.flotSelectHandler);
this.$element.bind('dblclick', this.dblclickHandler); this.$element.bind('dblclick', this.dblclickHandler);
}
this.$element.bind('plothover', this.flotHoverHandler);
this.$element.bind('mousedown', this.mousedownHandler); this.$element.bind('mousedown', this.mousedownHandler);
this.$element.bind('mouseup', this.mouseupHandler); this.$element.bind('mouseup', this.mouseupHandler);
this.$element.bind('mouseleave', this.mouseleaveHandler); this.$element.bind('mouseleave', this.mouseleaveHandler);
@ -1219,10 +1221,12 @@ export class TbFlot {
private disableMouseEvents() { private disableMouseEvents() {
this.$element.css('pointer-events', 'none'); this.$element.css('pointer-events', 'none');
this.$element.removeClass('mouse-events'); this.$element.removeClass('mouse-events');
this.options.selection = { mode : null }; if (this.chartType !== 'pie') {
this.$element.unbind('plothover', this.flotHoverHandler); this.options.selection = {mode: null};
this.$element.unbind('plotselected', this.flotSelectHandler); this.$element.unbind('plotselected', this.flotSelectHandler);
this.$element.unbind('dblclick', this.dblclickHandler); this.$element.unbind('dblclick', this.dblclickHandler);
}
this.$element.unbind('plothover', this.flotHoverHandler);
this.$element.unbind('mousedown', this.mousedownHandler); this.$element.unbind('mousedown', this.mousedownHandler);
this.$element.unbind('mouseup', this.mouseupHandler); this.$element.unbind('mouseup', this.mouseupHandler);
this.$element.unbind('mouseleave', this.mouseleaveHandler); this.$element.unbind('mouseleave', this.mouseleaveHandler);