Skip to content

Commit 21fa27e

Browse files
committed
date style
1 parent 85d0071 commit 21fa27e

5 files changed

Lines changed: 37 additions & 14 deletions

File tree

dist/assets/css/widgets.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/widgets.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "widgets",
3-
"version": "1.3.1",
3+
"version": "1.3.2",
44
"description": "",
55
"main": "dist/widgets.js",
66
"directories": {

src/components/chart_by_time.vue

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div>
33
<GChart :type="chartType" :data="chartData" :options="chartOptions" :events="chartEvents" @ready="onReady" />
4-
{{setZoom()}}
4+
{{setUnits()}}
55
{{setRevert()}}
66
</div>
77
</template>
@@ -79,7 +79,7 @@
7979
}
8080
},
8181
mounted: function(){
82-
this.setZoom();
82+
this.setUnits();
8383
this.setRevert();
8484
},
8585
methods: {
@@ -121,23 +121,19 @@
121121
}
122122
}
123123
},
124-
setZoom: function(){
124+
setUnits: function(){
125125
let it = this;
126126
if(it.$el && it.context.query.refresh){
127127
if(!it.dFormat){
128128
it.dFormat = document.createElement('div');
129-
it.dFormat.innerHTML = "Time units <select>" +
129+
// opacity: 0
130+
it.dFormat.innerHTML = "<span></span><select>" +
130131
// "<option value='%Y-%m-%dT%H'>Hours</option>" +
131132
"<option value='%Y-%m-%d'>Days</option>" +
132-
"<option value='%Y-%m'>Month</option>" +
133+
"<option value='%Y-%m'>Months</option>" +
133134
"<option value='%Y'>Years</option>" +
134135
"</select>";
135-
it.dFormat.style.position = "absolute";
136-
it.dFormat.style.zIndex = 1000;
137-
it.dFormat.style.bottom = '15px';
138-
it.dFormat.style.left = '0';
139-
it.dFormat.style.width = '100%';
140-
it.dFormat.style.textAlign = 'center';
136+
it.dFormat.classList.add('widgets-set-units');
141137
it.$el.appendChild(it.dFormat);
142138
it.dFormat.querySelector('select').addEventListener('change', function(e){
143139
// if (Array.isArray(it.historyRequests)){
@@ -152,6 +148,7 @@
152148
});
153149
}
154150
it.dFormat.querySelector('select').value = it.context.query.variables.dateFormat;
151+
it.dFormat.querySelector('span').innerText = it.dFormat.querySelector('select>option:checked').text;
155152
}
156153
},
157154
prepareChartData: function(result, options){

src/scss/widgets.scss

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,3 +287,29 @@
287287
.widgets-errors{
288288
color: red;
289289
}
290+
291+
.widgets-set-units{
292+
position: absolute;
293+
z-index: 1000;
294+
bottom: 15px;
295+
left: 0;
296+
width: 100%;
297+
text-align: center;
298+
299+
span{
300+
text-decoration-line: underline;
301+
text-decoration-style: dashed;
302+
text-underline-position: under;
303+
cursor: pointer;
304+
}
305+
306+
select{
307+
top: 0;
308+
bottom: 0;
309+
margin: auto;
310+
position: absolute;
311+
left: 0;
312+
right: 0;
313+
opacity: 0;
314+
}
315+
}

0 commit comments

Comments
 (0)