natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2440 from syuilo/develop 

8.3.1
This commit is contained in:
syuilo 2018-08-24 07:03:49 +09:00 committed by GitHub
parent 2d4b183c14 027140eccc
commit 87f248b8ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@ -1,8 +1,8 @@
{
"name": "misskey",
"author": "syuilo <i@syuilo.com>",
"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",

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: [{

4
src/client/app/desktop/views/pages/admin/admin.chart.vue
View File

@ -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: {