1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-05 10:18:38 +09:00

Merge branch 'develop'

This commit is contained in:
syuilo 2019-07-05 22:36:13 +09:00
commit c201326906
9 changed files with 29 additions and 4 deletions

View File

@ -17,6 +17,14 @@ npm i -g ts-node
npm run migrate
```
11.24.2 (2019/07/05)
--------------------
### 🐛Fixes
* チャートAPIの返り値が文字列になっていることがある問題を修正
* チャートに数字が表示される問題を修正
* ペタバイト単位が表示できない問題を修正
* SingleLineなMFMが折り返されてしまう問題を修正
11.24.1 (2019/07/05)
--------------------
### 🐛Fixes

View File

@ -1,7 +1,7 @@
{
"name": "misskey",
"author": "syuilo <i@syuilo.com>",
"version": "11.24.1",
"version": "11.24.2",
"codename": "daybreak",
"repository": {
"type": "git",

View File

@ -72,6 +72,9 @@ export default Vue.extend({
columnWidth: '80%'
}
},
dataLabels: {
enabled: false
},
grid: {
clipMarkers: false,
padding: {

View File

@ -1,5 +1,5 @@
<template>
<mfm-core v-bind="$attrs" class="havbbuyv" v-once/>
<mfm-core v-bind="$attrs" class="havbbuyv" :class="{ plain: $attrs['plain-text'] }" v-once/>
</template>
<script lang="ts">
@ -17,6 +17,9 @@ export default Vue.extend({
.havbbuyv
white-space pre-wrap
&.plain
white-space pre
>>> .title
display block
margin-bottom 4px

View File

@ -73,6 +73,9 @@ export default Vue.extend({
enabled: true
},
},
dataLabels: {
enabled: false
},
grid: {
clipMarkers: false,
padding: {

View File

@ -163,6 +163,9 @@ export default Vue.extend({
columnWidth: '80%'
}
},
dataLabels: {
enabled: false
},
grid: {
clipMarkers: false,
padding: {

View File

@ -2,7 +2,7 @@ import Vue from 'vue';
Vue.filter('bytes', (v, digits = 0) => {
if (v == null) return '?';
const sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
if (v == 0) return '0';
const isMinus = v < 0;
if (isMinus) v = -v;

View File

@ -90,6 +90,9 @@ export default define({
enabled: true,
}
},
dataLabels: {
enabled: false
},
tooltip: {
enabled: false
},

View File

@ -446,7 +446,9 @@ export default abstract class Chart<T extends Record<string, any>> {
if (typeof v == 'object') {
dive(v, p);
} else {
nestedProperty.set(res, p, chart.map(s => nestedProperty.get(s, p)));
const values = chart.map(s => nestedProperty.get(s, p))
.map(v => parseInt(v, 10)); // TypeORMのバグ()で何故か数値カラムの値が文字列型になっているので数値に戻す
nestedProperty.set(res, p, values);
}
}
};