From 92cf205c6669abde283ae13491cd1a07da32a98a Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 24 Aug 2018 07:02:52 +0900 Subject: [PATCH] Fix bug --- package.json | 1 + src/client/app/desktop/views/pages/admin/admin.chart.chart.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 99a672e636..e362adbfe3 100644 --- a/package.json +++ b/package.json @@ -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 d79b0ba192..c09dc6dd8c 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: [{