summaryrefslogtreecommitdiff
path: root/src/client/scripts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-04-19 08:25:22 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-04-19 08:25:22 +0900
commit43641228044f8eafdfc7ddbe87b8c161bf27e4c1 (patch)
tree264b98d9d221165739862a3d8052bcf993a3a97a /src/client/scripts
parentMerge branch 'develop' of https://github.com/syuilo/misskey into develop (diff)
downloadsharkey-43641228044f8eafdfc7ddbe87b8c161bf27e4c1.tar.gz
sharkey-43641228044f8eafdfc7ddbe87b8c161bf27e4c1.tar.bz2
sharkey-43641228044f8eafdfc7ddbe87b8c161bf27e4c1.zip
feat(pages): Improve chart
Diffstat (limited to 'src/client/scripts')
-rw-r--r--src/client/scripts/aoiscript/evaluator.ts24
1 files changed, 20 insertions, 4 deletions
diff --git a/src/client/scripts/aoiscript/evaluator.ts b/src/client/scripts/aoiscript/evaluator.ts
index 502b852aec..5046d4a1bd 100644
--- a/src/client/scripts/aoiscript/evaluator.ts
+++ b/src/client/scripts/aoiscript/evaluator.ts
@@ -87,13 +87,13 @@ export class ASEvaluator {
data: {
labels: opts.value.get('labels').value.map(x => x.value),
datasets: opts.value.get('datasets').value.map(x => ({
- label: x.value.get('label').value,
+ label: x.value.has('label') ? x.value.get('label').value : '',
data: x.value.get('data').value.map(x => x.value),
pointRadius: 0,
lineTension: 0,
borderWidth: 2,
- borderColor: color,
- backgroundColor: tinycolor(color).setAlpha(0.1).toRgbString(),
+ borderColor: x.value.has('color') ? x.value.get('color') : color,
+ backgroundColor: tinycolor(x.value.has('color') ? x.value.get('color') : color).setAlpha(0.1).toRgbString(),
}))
},
options: {
@@ -111,6 +111,7 @@ export class ASEvaluator {
}
},
legend: {
+ display: opts.value.get('datasets').value.filter(x => x.value.has('label') && x.value.get('label').value).length === 0 ? false : true,
position: 'bottom',
labels: {
boxWidth: 16,
@@ -121,7 +122,22 @@ export class ASEvaluator {
},
chartArea: {
backgroundColor: '#fff'
- }
+ },
+ ...(opts.value.get('type').value === 'rader' ? {
+ scale: {
+ ticks: {
+ beginAtZero: opts.value.has('begin_at_zero') ? opts.value.get('begin_at_zero') : false
+ }
+ }
+ } : {
+ scales: {
+ yAxes: [{
+ ticks: {
+ beginAtZero: opts.value.has('begin_at_zero') ? opts.value.get('begin_at_zero') : false
+ }
+ }]
+ }
+ })
}
});
}),