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
87c718f5
Commit
87c718f5
authored
Nov 12, 2015
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(tablepanel): worked on issues and improving defaults
parent
e04678f3
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
53 additions
and
17 deletions
+53
-17
public/app/panels/table/controller.ts
+17
-2
public/app/panels/table/editor.html
+1
-4
public/app/panels/table/editor.ts
+4
-0
public/app/panels/table/module.ts
+4
-4
public/app/panels/table/renderer.ts
+20
-5
public/app/panels/table/table_model.ts
+1
-1
public/less/panel_table.less
+6
-1
No files found.
public/app/panels/table/controller.ts
View file @
87c718f5
...
@@ -28,11 +28,26 @@ export class TablePanelCtrl {
...
@@ -28,11 +28,26 @@ export class TablePanelCtrl {
transform
:
'timeseries_to_rows'
,
transform
:
'timeseries_to_rows'
,
pageSize
:
50
,
pageSize
:
50
,
showHeader
:
true
,
showHeader
:
true
,
columns
:
[],
columns
:
[
{
type
:
'date'
,
pattern
:
'Time'
,
dateFormat
:
'YYYY-MM-DD HH:mm:ss'
,
},
{
unit
:
'short'
,
type
:
'number'
,
decimals
:
2
,
colors
:
[
"rgba(245, 54, 54, 0.9)"
,
"rgba(237, 129, 40, 0.89)"
,
"rgba(50, 172, 45, 0.97)"
],
colorMode
:
null
,
pattern
:
'/.*/'
,
thresholds
:
[],
}
],
fields
:
[],
fields
:
[],
scroll
:
true
,
scroll
:
true
,
fontSize
:
'100%'
,
fontSize
:
'100%'
,
sort
:
{
col
:
null
,
desc
:
true
},
sort
:
{
col
:
0
,
desc
:
true
},
};
};
$scope
.
init
=
function
()
{
$scope
.
init
=
function
()
{
...
...
public/app/panels/table/editor.html
View file @
87c718f5
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<select
class=
"input-large tight-form-input"
<select
class=
"input-large tight-form-input"
ng-model=
"panel.transform"
ng-model=
"panel.transform"
ng-options=
"k as v.description for (k, v) in transformers"
ng-options=
"k as v.description for (k, v) in transformers"
ng-change=
"
render
()"
></select>
ng-change=
"
transformChanged
()"
></select>
</li>
</li>
</ul>
</ul>
<div
class=
"clearfix"
></div>
<div
class=
"clearfix"
></div>
...
@@ -131,9 +131,6 @@
...
@@ -131,9 +131,6 @@
<spectrum-picker
ng-model=
"column.colors[1]"
ng-change=
"render()"
></spectrum-picker>
<spectrum-picker
ng-model=
"column.colors[1]"
ng-change=
"render()"
></spectrum-picker>
<spectrum-picker
ng-model=
"column.colors[2]"
ng-change=
"render()"
></spectrum-picker>
<spectrum-picker
ng-model=
"column.colors[2]"
ng-change=
"render()"
></spectrum-picker>
</li>
</li>
<li
class=
"tight-form-item last"
>
<a
class=
"pointer"
ng-click=
"invertColorOrder()"
>
invert order
</a>
</li>
</ul>
</ul>
<div
class=
"clearfix"
></div>
<div
class=
"clearfix"
></div>
</div>
</div>
...
...
public/app/panels/table/editor.ts
View file @
87c718f5
...
@@ -73,6 +73,10 @@ export function tablePanelEditor() {
...
@@ -73,6 +73,10 @@ export function tablePanelEditor() {
scope
.
render
();
scope
.
render
();
};
};
scope
.
transformChanged
=
function
()
{
scope
.
render
();
};
scope
.
removeJsonField
=
function
(
field
)
{
scope
.
removeJsonField
=
function
(
field
)
{
scope
.
panel
.
fields
=
_
.
without
(
scope
.
panel
.
fields
,
field
);
scope
.
panel
.
fields
=
_
.
without
(
scope
.
panel
.
fields
,
field
);
scope
.
render
();
scope
.
render
();
...
...
public/app/panels/table/module.ts
View file @
87c718f5
...
@@ -55,8 +55,8 @@ export function tablePanel() {
...
@@ -55,8 +55,8 @@ export function tablePanel() {
var
paginationList
=
$
(
'<ul></ul>'
);
var
paginationList
=
$
(
'<ul></ul>'
);
var
prevLink
=
$
(
'<li><a class="table-panel-page-link pointer">«</a></li>'
);
//
var prevLink = $('<li><a class="table-panel-page-link pointer">«</a></li>');
paginationList
.
append
(
prevLink
);
//
paginationList.append(prevLink);
for
(
var
i
=
startPage
;
i
<
endPage
;
i
++
)
{
for
(
var
i
=
startPage
;
i
<
endPage
;
i
++
)
{
var
activeClass
=
i
===
scope
.
pageIndex
?
'active'
:
''
;
var
activeClass
=
i
===
scope
.
pageIndex
?
'active'
:
''
;
...
@@ -64,8 +64,8 @@ export function tablePanel() {
...
@@ -64,8 +64,8 @@ export function tablePanel() {
paginationList
.
append
(
pageLinkElem
);
paginationList
.
append
(
pageLinkElem
);
}
}
var
nextLink
=
$
(
'<li><a href="#">»</a></li>'
);
//
var nextLink = $('<li><a href="#">»</a></li>');
paginationList
.
append
(
nextLink
);
//
paginationList.append(nextLink);
footerElem
.
append
(
paginationList
);
footerElem
.
append
(
paginationList
);
}
}
...
...
public/app/panels/table/renderer.ts
View file @
87c718f5
...
@@ -95,7 +95,7 @@ export class TableRenderer {
...
@@ -95,7 +95,7 @@ export class TableRenderer {
return
this
.
formaters
[
colIndex
](
value
);
return
this
.
formaters
[
colIndex
](
value
);
}
}
renderCell
(
columnIndex
,
value
)
{
renderCell
(
columnIndex
,
value
,
addWidthHack
=
false
)
{
var
value
=
this
.
formatColumnValue
(
columnIndex
,
value
);
var
value
=
this
.
formatColumnValue
(
columnIndex
,
value
);
var
style
=
''
;
var
style
=
''
;
if
(
this
.
colorState
.
cell
)
{
if
(
this
.
colorState
.
cell
)
{
...
@@ -107,7 +107,15 @@ export class TableRenderer {
...
@@ -107,7 +107,15 @@ export class TableRenderer {
this
.
colorState
.
value
=
null
;
this
.
colorState
.
value
=
null
;
}
}
return
'<td'
+
style
+
'>'
+
value
+
'</td>'
;
// 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
=
''
;
if
(
addWidthHack
)
{
widthHack
=
'<div class="table-panel-width-hack">'
+
this
.
table
.
columns
[
columnIndex
].
text
+
'<div>'
;
}
return
'<td'
+
style
+
'>'
+
value
+
widthHack
+
'</td>'
;
}
}
render
(
page
)
{
render
(
page
)
{
...
@@ -117,11 +125,18 @@ export class TableRenderer {
...
@@ -117,11 +125,18 @@ export class TableRenderer {
for
(
var
y
=
startPos
;
y
<
endPos
;
y
++
)
{
for
(
var
y
=
startPos
;
y
<
endPos
;
y
++
)
{
let
row
=
this
.
table
.
rows
[
y
];
let
row
=
this
.
table
.
rows
[
y
];
html
+=
'<tr>'
;
let
cellHtml
=
''
;
let
rowStyle
=
''
;
for
(
var
i
=
0
;
i
<
this
.
table
.
columns
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
this
.
table
.
columns
.
length
;
i
++
)
{
html
+=
this
.
renderCell
(
i
,
row
[
i
]
);
cellHtml
+=
this
.
renderCell
(
i
,
row
[
i
],
y
===
0
);
}
}
html
+=
'</tr>'
;
if
(
this
.
colorState
.
row
)
{
rowStyle
=
' style="background-color:'
+
this
.
colorState
.
row
+
';color: white"'
;
this
.
colorState
.
row
=
null
;
}
html
+=
'<tr '
+
rowStyle
+
'>'
+
cellHtml
+
'</tr>'
;
}
}
return
html
;
return
html
;
...
...
public/app/panels/table/table_model.ts
View file @
87c718f5
...
@@ -10,7 +10,7 @@ export class TableModel {
...
@@ -10,7 +10,7 @@ export class TableModel {
}
}
sort
(
options
)
{
sort
(
options
)
{
if
(
options
.
col
===
null
||
this
.
columns
.
length
<
options
.
col
)
{
if
(
options
.
col
===
null
||
this
.
columns
.
length
<
=
options
.
col
)
{
return
;
return
;
}
}
...
...
public/less/panel_table.less
View file @
87c718f5
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
}
}
.table-panel-container {
.table-panel-container {
padding-top: 2em;
padding-top: 2
.2
em;
position: relative;
position: relative;
}
}
...
@@ -94,3 +94,8 @@
...
@@ -94,3 +94,8 @@
top: 0;
top: 0;
}
}
.table-panel-width-hack {
visibility: hidden;
height: 0px;
line-height: 0px;
}
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