diff --git a/package.json b/package.json index 99a672e63..d3bfc27cf 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "misskey", "author": "syuilo ", - "version": "8.3.0", - "clientVersion": "1.0.8825", + "version": "8.3.1", + "clientVersion": "1.0.8828", "codename": "nighthike", "main": "./built/index.js", "private": true, @@ -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", diff --git a/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts b/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts index d79b0ba19..c09dc6dd8 100644 --- a/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts +++ b/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts @@ -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: [{ diff --git a/src/client/app/desktop/views/pages/admin/admin.chart.vue b/src/client/app/desktop/views/pages/admin/admin.chart.vue index 4e0050e8b..8db54174f 100644 --- a/src/client/app/desktop/views/pages/admin/admin.chart.vue +++ b/src/client/app/desktop/views/pages/admin/admin.chart.vue @@ -173,7 +173,7 @@ export default Vue.extend({ driveChart(local: boolean, total: boolean): any { const data = this.stats.slice().reverse().map(x => ({ date: new Date(x.date), - count: local ? + size: local ? total ? x.drive.local.totalSize : x.drive.local.diffSize : total ? x.drive.remote.totalSize : x.drive.remote.diffSize })); @@ -186,7 +186,7 @@ export default Vue.extend({ borderWidth: 2, pointBackgroundColor: '#fff', lineTension: 0, - data: data.map(x => ({ t: x.date, y: x.count })) + data: data.map(x => ({ t: x.date, y: x.size })) }] }, { scales: {