Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
c7959ff0
Commit
c7959ff0
authored
Aug 10, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: Using table cell links and ad hoc filters together now works & looks correct, fixes #8052
parent
d2437d3c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
public/app/plugins/panel/table/renderer.ts
+6
-6
public/sass/components/_panel_table.scss
+1
-1
No files found.
public/app/plugins/panel/table/renderer.ts
View file @
c7959ff0
...
...
@@ -157,9 +157,9 @@ export class TableRenderer {
// because of the fixed table headers css only solution
// there is an issue if header cell is wider the cell
// this hack adds header content to cell (not visible)
var
widthHack
=
''
;
var
columnHtml
=
''
;
if
(
addWidthHack
)
{
widthHack
=
'<div class="table-panel-width-hack">'
+
this
.
table
.
columns
[
columnIndex
].
title
+
'</div>'
;
columnHtml
=
'<div class="table-panel-width-hack">'
+
this
.
table
.
columns
[
columnIndex
].
title
+
'</div>'
;
}
if
(
value
===
undefined
)
{
...
...
@@ -173,8 +173,6 @@ export class TableRenderer {
cellClasses
.
push
(
"table-panel-cell-pre"
);
}
var
columnHtml
=
widthHack
+
value
;
if
(
column
.
style
&&
column
.
style
.
link
)
{
// Render cell as link
var
scopedVars
=
this
.
renderRowVariables
(
rowIndex
);
...
...
@@ -185,11 +183,13 @@ export class TableRenderer {
var
cellTarget
=
column
.
style
.
linkTargetBlank
?
'_blank'
:
''
;
cellClasses
.
push
(
"table-panel-cell-link"
);
columnHtml
=
`
columnHtml
+
=
`
<a href="
${
cellLink
}
" target="
${
cellTarget
}
" data-link-tooltip data-original-title="
${
cellLinkTooltip
}
" data-placement="right">
${
columnHtml
}
${
value
}
</a>
`
;
}
else
{
columnHtml
+=
value
;
}
if
(
column
.
filterable
)
{
...
...
public/sass/components/_panel_table.scss
View file @
c7959ff0
...
...
@@ -84,7 +84,7 @@
a
{
padding
:
0
.45em
0
0
.45em
1
.1em
;
height
:
100%
;
width
:
100%
;
display
:
inline-block
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment