moris/misskey
1
0
Fork 0
forked from mirror/misskey
Code Pull Requests Activity

Fix bug

Browse Source
This commit is contained in:
syuilo 2018-08-24 07:02:52 +09:00
parent fa3299840f
commit 92cf205c66
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -150,6 +150,7 @@
"loader-utils": "1.1.0",
"lodash.assign": "4.2.0",
"mecab-async": "0.1.2",
"merge-options": "1.0.1",
"minio": "7.0.0",
"mkdirp": "0.5.1",
"mocha": "5.2.0",

3
src/client/app/desktop/views/pages/admin/admin.chart.chart.ts
View File

@ -1,5 +1,6 @@
import Vue from 'vue';
import { Line } from 'vue-chartjs';
import * as mergeOptions from 'merge-options';
export default Vue.extend({
extends: Line,
@ -21,7 +22,7 @@ export default Vue.extend({
},
methods: {
render() {
this.renderChart(this.data, Object.assign({
this.renderChart(this.data, mergeOptions({
responsive: false,
scales: {
xAxes: [{