mirror of
https://github.com/grafana/grafana.git
synced 2025-01-26 08:16:59 -06:00
fix(graph): minor fix for hover tooltip when combined with a single series using stepped lines, fixes #2754
This commit is contained in:
parent
b4093ccf59
commit
b5f237a69b
@ -56,7 +56,7 @@
|
|||||||
</ul>
|
</ul>
|
||||||
<div class="clearfix"></div>
|
<div class="clearfix"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="tight-form">
|
<div class="tight-form last">
|
||||||
<ul class="tight-form-list">
|
<ul class="tight-form-list">
|
||||||
<li class="tight-form-item" style="width: 20px">
|
<li class="tight-form-item" style="width: 20px">
|
||||||
<i class="fa fa-fw fa-unlink invisible"></i>
|
<i class="fa fa-fw fa-unlink invisible"></i>
|
||||||
|
@ -246,7 +246,7 @@
|
|||||||
<div class="editor-row" ng-if="current.type === 'query'">
|
<div class="editor-row" ng-if="current.type === 'query'">
|
||||||
<div class="tight-form-section">
|
<div class="tight-form-section">
|
||||||
<h5>Value groups/tags (Experimental feature)</h5>
|
<h5>Value groups/tags (Experimental feature)</h5>
|
||||||
<div class="tight-form" ng-if="current.useTags">
|
<div class="tight-form last" ng-if="current.useTags">
|
||||||
<ul class="tight-form-list">
|
<ul class="tight-form-list">
|
||||||
<li class="tight-form-item" style="width: 135px">
|
<li class="tight-form-item" style="width: 135px">
|
||||||
Tags query
|
Tags query
|
||||||
|
@ -69,7 +69,7 @@ function ($) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Highlighting multiple Points depending on the plot type
|
// Highlighting multiple Points depending on the plot type
|
||||||
if (scope.panel.steppedLine || scope.panel.stack) {
|
if (series.lines.steps || series.stack) {
|
||||||
// stacked and steppedLine plots can have series with different length.
|
// stacked and steppedLine plots can have series with different length.
|
||||||
// Stacked series can increase its length on each new stacked serie if null points found,
|
// Stacked series can increase its length on each new stacked serie if null points found,
|
||||||
// to speed the index search we begin always on the last found hoverIndex.
|
// to speed the index search we begin always on the last found hoverIndex.
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<div class="editor-row">
|
<div class="editor-row">
|
||||||
<div class="section">
|
<div class="section">
|
||||||
<h5>General options</h5>
|
<h5>General options</h5>
|
||||||
<div class="tight-form">
|
<div class="tight-form last">
|
||||||
<ul class="tight-form-list">
|
<ul class="tight-form-list">
|
||||||
<li class="tight-form-item">
|
<li class="tight-form-item">
|
||||||
Title
|
Title
|
||||||
@ -32,7 +32,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="section">
|
<div class="section">
|
||||||
<h5>Templating options</h5>
|
<h5>Templating options</h5>
|
||||||
<div class="tight-form">
|
<div class="tight-form last">
|
||||||
<ul class="tight-form-list">
|
<ul class="tight-form-list">
|
||||||
<li class="tight-form-item">
|
<li class="tight-form-item">
|
||||||
Repeat Panel
|
Repeat Panel
|
||||||
|
@ -41,8 +41,8 @@ define([
|
|||||||
describeSharedTooltip("steppedLine false, stack false", function(ctx) {
|
describeSharedTooltip("steppedLine false, stack false", function(ctx) {
|
||||||
ctx.setup(function() {
|
ctx.setup(function() {
|
||||||
ctx.data = [
|
ctx.data = [
|
||||||
{ data: [[10, 15], [12, 20]], },
|
{ data: [[10, 15], [12, 20]], lines: {} },
|
||||||
{ data: [[10, 2], [12, 3]], }
|
{ data: [[10, 2], [12, 3]], lines: {} }
|
||||||
];
|
];
|
||||||
ctx.pos = { x: 11 };
|
ctx.pos = { x: 11 };
|
||||||
});
|
});
|
||||||
@ -75,6 +75,7 @@ define([
|
|||||||
ctx.data = [
|
ctx.data = [
|
||||||
{
|
{
|
||||||
data: [[10, 15], [12, 20]],
|
data: [[10, 15], [12, 20]],
|
||||||
|
lines: {},
|
||||||
datapoints: {
|
datapoints: {
|
||||||
pointsize: 2,
|
pointsize: 2,
|
||||||
points: [[10,15], [12,20]],
|
points: [[10,15], [12,20]],
|
||||||
@ -83,6 +84,7 @@ define([
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
data: [[10, 2], [12, 3]],
|
data: [[10, 2], [12, 3]],
|
||||||
|
lines: {},
|
||||||
datapoints: {
|
datapoints: {
|
||||||
pointsize: 2,
|
pointsize: 2,
|
||||||
points: [[10, 2], [12, 3]],
|
points: [[10, 2], [12, 3]],
|
||||||
@ -104,6 +106,7 @@ define([
|
|||||||
ctx.data = [
|
ctx.data = [
|
||||||
{
|
{
|
||||||
data: [[10, 15], [12, 20]],
|
data: [[10, 15], [12, 20]],
|
||||||
|
lines: {},
|
||||||
datapoints: {
|
datapoints: {
|
||||||
pointsize: 2,
|
pointsize: 2,
|
||||||
points: [[10, 15], [12, 20]],
|
points: [[10, 15], [12, 20]],
|
||||||
@ -112,6 +115,7 @@ define([
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
data: [[10, 2], [12, 3]],
|
data: [[10, 2], [12, 3]],
|
||||||
|
lines: {},
|
||||||
datapoints: {
|
datapoints: {
|
||||||
pointsize: 2,
|
pointsize: 2,
|
||||||
points: [[10, 2], [12, 3]],
|
points: [[10, 2], [12, 3]],
|
||||||
@ -134,6 +138,7 @@ define([
|
|||||||
ctx.data = [
|
ctx.data = [
|
||||||
{
|
{
|
||||||
data: [[10, 15], [12, 20]],
|
data: [[10, 15], [12, 20]],
|
||||||
|
lines: {},
|
||||||
datapoints: {
|
datapoints: {
|
||||||
pointsize: 2,
|
pointsize: 2,
|
||||||
points: [[10, 15], [12, 20]],
|
points: [[10, 15], [12, 20]],
|
||||||
@ -142,6 +147,7 @@ define([
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
data: [[10, 2], [12, 3]],
|
data: [[10, 2], [12, 3]],
|
||||||
|
lines: {},
|
||||||
datapoints: {
|
datapoints: {
|
||||||
pointsize: 2,
|
pointsize: 2,
|
||||||
points: [[10, 2], [12, 3]],
|
points: [[10, 2], [12, 3]],
|
||||||
|
Loading…
Reference in New Issue
Block a user