mirror of
https://github.com/KevinMidboe/vue-chartjs.git
synced 2025-10-29 18:00:20 +00:00
Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
188ab83989 | ||
|
|
d9f53e6ef4 | ||
|
|
7d1dacf77c | ||
|
|
67c01133d0 | ||
|
|
ab9721b577 | ||
|
|
71bcafa804 | ||
|
|
882bdd86b8 | ||
|
|
4f7dda3c3b | ||
|
|
f04441ab36 | ||
|
|
acb3d5c823 | ||
|
|
92bac84dae | ||
|
|
85e946dbe1 |
29
CHANGELOG.md
29
CHANGELOG.md
@@ -1,5 +1,34 @@
|
|||||||
# Change Log
|
# Change Log
|
||||||
|
|
||||||
|
## [v2.7.0](https://github.com/apertureless/vue-chartjs/tree/v2.7.0) (2017-07-04)
|
||||||
|
[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.6.5...v2.7.0)
|
||||||
|
|
||||||
|
**Closed issues:**
|
||||||
|
|
||||||
|
- Reactive Data Tutorial [\#132](https://github.com/apertureless/vue-chartjs/issues/132)
|
||||||
|
- Using inline plugins [\#130](https://github.com/apertureless/vue-chartjs/issues/130)
|
||||||
|
- Scatter Chart [\#129](https://github.com/apertureless/vue-chartjs/issues/129)
|
||||||
|
- Generating Chart after clicking submit button [\#128](https://github.com/apertureless/vue-chartjs/issues/128)
|
||||||
|
- Ticks not working with reactive props [\#127](https://github.com/apertureless/vue-chartjs/issues/127)
|
||||||
|
- Error in callback for watcher "chartData": "TypeError: Cannot read property 'data' of undefined" [\#126](https://github.com/apertureless/vue-chartjs/issues/126)
|
||||||
|
- Passing the data from vue to chartjs [\#125](https://github.com/apertureless/vue-chartjs/issues/125)
|
||||||
|
- Combination of Bar and Line Chart [\#123](https://github.com/apertureless/vue-chartjs/issues/123)
|
||||||
|
- Reactive data example not working [\#122](https://github.com/apertureless/vue-chartjs/issues/122)
|
||||||
|
- vue-chartjs height was 0 when i set v-show [\#120](https://github.com/apertureless/vue-chartjs/issues/120)
|
||||||
|
- Bar chart, barPercentage in X axis [\#119](https://github.com/apertureless/vue-chartjs/issues/119)
|
||||||
|
- update event not firing on data change [\#118](https://github.com/apertureless/vue-chartjs/issues/118)
|
||||||
|
|
||||||
|
**Merged pull requests:**
|
||||||
|
|
||||||
|
- ✅ Update tests for addPlugin method [\#140](https://github.com/apertureless/vue-chartjs/pull/140) ([apertureless](https://github.com/apertureless))
|
||||||
|
- Fix beforeDestory when renderChart was not called [\#139](https://github.com/apertureless/vue-chartjs/pull/139) ([ZhangYiJiang](https://github.com/ZhangYiJiang))
|
||||||
|
- Add support for inline plugins [\#137](https://github.com/apertureless/vue-chartjs/pull/137) ([kurbar](https://github.com/kurbar))
|
||||||
|
- Feature/scatter chart [\#136](https://github.com/apertureless/vue-chartjs/pull/136) ([apertureless](https://github.com/apertureless))
|
||||||
|
- 🐛 Fix \#122 reactive mixin [\#135](https://github.com/apertureless/vue-chartjs/pull/135) ([apertureless](https://github.com/apertureless))
|
||||||
|
- 📝 Add resources & tutorials to docs [\#133](https://github.com/apertureless/vue-chartjs/pull/133) ([apertureless](https://github.com/apertureless))
|
||||||
|
- fix a typo in an example [\#131](https://github.com/apertureless/vue-chartjs/pull/131) ([JobV](https://github.com/JobV))
|
||||||
|
- Update README [\#121](https://github.com/apertureless/vue-chartjs/pull/121) ([stoykostanchev](https://github.com/stoykostanchev))
|
||||||
|
|
||||||
## [v2.6.5](https://github.com/apertureless/vue-chartjs/tree/v2.6.5) (2017-06-10)
|
## [v2.6.5](https://github.com/apertureless/vue-chartjs/tree/v2.6.5) (2017-06-10)
|
||||||
[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.6.4...v2.6.5)
|
[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v2.6.4...v2.6.5)
|
||||||
|
|
||||||
|
|||||||
@@ -262,30 +262,30 @@ Sometimes you need more control over chart.js. Thats why you can access the char
|
|||||||
There are two versions of the Bar chart. `{Bar}` and `{HorizontalBar}`
|
There are two versions of the Bar chart. `{Bar}` and `{HorizontalBar}`
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||

|

|
||||||
### Line Chart
|
### Line Chart
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### Doughnut
|
### Doughnut
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### Pie
|
### Pie
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### Radar
|
### Radar
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### Polar Area
|
### Polar Area
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### Bubble
|
### Bubble
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
## Webpack, Browserify and dist files.
|
## Webpack, Browserify and dist files.
|
||||||
|
|
||||||
|
|||||||
@@ -264,30 +264,30 @@ export default Line.extend({
|
|||||||
棒グラフには `{Bar}` と `{HorizontalBar}` の2つのバージョンがあります。
|
棒グラフには `{Bar}` と `{HorizontalBar}` の2つのバージョンがあります。
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||

|

|
||||||
### 折れ線グラフ
|
### 折れ線グラフ
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### ドーナツチャート
|
### ドーナツチャート
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### パイチャート
|
### パイチャート
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### レーダーチャート
|
### レーダーチャート
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### 鶏頭図
|
### 鶏頭図
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### バブルチャート
|
### バブルチャート
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
|
||||||
## ビルド方法の違い
|
## ビルド方法の違い
|
||||||
|
|||||||
@@ -221,31 +221,31 @@ export default Line.extend({
|
|||||||
|
|
||||||
### Gráfico de Barra
|
### Gráfico de Barra
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### Gráfico de Linha
|
### Gráfico de Linha
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### Donut
|
### Donut
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### Pizza
|
### Pizza
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### Radar
|
### Radar
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### Área Polar
|
### Área Polar
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### Bolha
|
### Bolha
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
## Configurações de Build
|
## Configurações de Build
|
||||||
|
|
||||||
|
|||||||
10
package.json
10
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "vue-chartjs",
|
"name": "vue-chartjs",
|
||||||
"version": "2.7.0",
|
"version": "2.7.2",
|
||||||
"description": "vue.js wrapper for chart.js",
|
"description": "vue.js wrapper for chart.js",
|
||||||
"author": "Jakub Juszczak <jakub@posteo.de>",
|
"author": "Jakub Juszczak <jakub@posteo.de>",
|
||||||
"homepage": "http://vue-chartjs.org",
|
"homepage": "http://vue-chartjs.org",
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"chart.js": "^2.6.0",
|
"chart.js": "^2.6.0",
|
||||||
"vue": "^2.3.4"
|
"vue": "^2.4.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"babel-cli": "^6.24.1",
|
"babel-cli": "^6.24.1",
|
||||||
@@ -117,12 +117,12 @@
|
|||||||
"sinon": "^2.1.0",
|
"sinon": "^2.1.0",
|
||||||
"sinon-chai": "^2.9.0",
|
"sinon-chai": "^2.9.0",
|
||||||
"url-loader": "^0.5.8",
|
"url-loader": "^0.5.8",
|
||||||
"vue": "^2.3.4",
|
"vue": "^2.4.2",
|
||||||
"vue-hot-reload-api": "^2.1.0",
|
"vue-hot-reload-api": "^2.1.0",
|
||||||
"vue-html-loader": "^1.2.4",
|
"vue-html-loader": "^1.2.4",
|
||||||
"vue-loader": "^12.2.1",
|
"vue-loader": "^12.2.2",
|
||||||
"vue-style-loader": "^3.0.1",
|
"vue-style-loader": "^3.0.1",
|
||||||
"vue-template-compiler": "^2.3.4",
|
"vue-template-compiler": "^2.4.2",
|
||||||
"webpack": "^1.13.2",
|
"webpack": "^1.13.2",
|
||||||
"webpack-dev-middleware": "^1.10.1",
|
"webpack-dev-middleware": "^1.10.1",
|
||||||
"webpack-hot-middleware": "^2.17.1",
|
"webpack-hot-middleware": "^2.17.1",
|
||||||
|
|||||||
@@ -75,7 +75,6 @@ export default Vue.extend({
|
|||||||
plugins: this.plugins
|
plugins: this.plugins
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
this._chart.generateLegend()
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeDestroy () {
|
beforeDestroy () {
|
||||||
|
|||||||
@@ -76,7 +76,6 @@ export default Vue.extend({
|
|||||||
plugins: this.plugins
|
plugins: this.plugins
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
this._chart.generateLegend()
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeDestroy () {
|
beforeDestroy () {
|
||||||
|
|||||||
@@ -59,7 +59,6 @@ export default Vue.extend({
|
|||||||
plugins: this.plugins
|
plugins: this.plugins
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
this._chart.generateLegend()
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeDestroy () {
|
beforeDestroy () {
|
||||||
|
|||||||
@@ -75,7 +75,6 @@ export default Vue.extend({
|
|||||||
plugins: this.plugins
|
plugins: this.plugins
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
this._chart.generateLegend()
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeDestroy () {
|
beforeDestroy () {
|
||||||
|
|||||||
@@ -74,7 +74,6 @@ export default Vue.extend({
|
|||||||
plugins: this.plugins
|
plugins: this.plugins
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
this._chart.generateLegend()
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeDestroy () {
|
beforeDestroy () {
|
||||||
|
|||||||
@@ -59,7 +59,6 @@ export default Vue.extend({
|
|||||||
plugins: this.plugins
|
plugins: this.plugins
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
this._chart.generateLegend()
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeDestroy () {
|
beforeDestroy () {
|
||||||
|
|||||||
@@ -59,7 +59,6 @@ export default Vue.extend({
|
|||||||
plugins: this.plugins
|
plugins: this.plugins
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
this._chart.generateLegend()
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeDestroy () {
|
beforeDestroy () {
|
||||||
|
|||||||
@@ -59,7 +59,6 @@ export default Vue.extend({
|
|||||||
plugins: this.plugins
|
plugins: this.plugins
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
this._chart.generateLegend()
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeDestroy () {
|
beforeDestroy () {
|
||||||
|
|||||||
@@ -65,7 +65,6 @@ export default Vue.extend({
|
|||||||
plugins: this.plugins
|
plugins: this.plugins
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
this._chart.generateLegend()
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeDestroy () {
|
beforeDestroy () {
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import Scatter from '../BaseCharts/Scatter'
|
|||||||
export default Scatter.extend({
|
export default Scatter.extend({
|
||||||
mounted () {
|
mounted () {
|
||||||
this.renderChart({
|
this.renderChart({
|
||||||
labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
|
|
||||||
datasets: [{
|
datasets: [{
|
||||||
label: 'Scatter Dataset 1',
|
label: 'Scatter Dataset 1',
|
||||||
fill: false,
|
fill: false,
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import Pie from './BaseCharts/Pie'
|
|||||||
import PolarArea from './BaseCharts/PolarArea'
|
import PolarArea from './BaseCharts/PolarArea'
|
||||||
import Radar from './BaseCharts/Radar'
|
import Radar from './BaseCharts/Radar'
|
||||||
import Bubble from './BaseCharts/Bubble'
|
import Bubble from './BaseCharts/Bubble'
|
||||||
|
import Scatter from './BaseCharts/Scatter'
|
||||||
import mixins from './mixins/index.js'
|
import mixins from './mixins/index.js'
|
||||||
import npmCfg from '../package.json'
|
import npmCfg from '../package.json'
|
||||||
|
|
||||||
@@ -19,6 +20,7 @@ const VueCharts = {
|
|||||||
PolarArea,
|
PolarArea,
|
||||||
Radar,
|
Radar,
|
||||||
Bubble,
|
Bubble,
|
||||||
|
Scatter,
|
||||||
mixins
|
mixins
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -34,5 +36,6 @@ export {
|
|||||||
PolarArea,
|
PolarArea,
|
||||||
Radar,
|
Radar,
|
||||||
Bubble,
|
Bubble,
|
||||||
|
Scatter,
|
||||||
mixins
|
mixins
|
||||||
}
|
}
|
||||||
|
|||||||
18
yarn.lock
18
yarn.lock
@@ -5707,9 +5707,9 @@ vue-html-loader@^1.2.4:
|
|||||||
loader-utils "^1.0.2"
|
loader-utils "^1.0.2"
|
||||||
object-assign "^4.1.0"
|
object-assign "^4.1.0"
|
||||||
|
|
||||||
vue-loader@^12.2.1:
|
vue-loader@^12.2.2:
|
||||||
version "12.2.1"
|
version "12.2.2"
|
||||||
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-12.2.1.tgz#53f27c0973d386768f5a75156f4129b5efc6ba55"
|
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-12.2.2.tgz#2b3a764f27018f975bc78cb8b1f55137548ee2d7"
|
||||||
dependencies:
|
dependencies:
|
||||||
consolidate "^0.14.0"
|
consolidate "^0.14.0"
|
||||||
hash-sum "^1.0.2"
|
hash-sum "^1.0.2"
|
||||||
@@ -5732,9 +5732,9 @@ vue-style-loader@^3.0.0, vue-style-loader@^3.0.1:
|
|||||||
hash-sum "^1.0.2"
|
hash-sum "^1.0.2"
|
||||||
loader-utils "^1.0.2"
|
loader-utils "^1.0.2"
|
||||||
|
|
||||||
vue-template-compiler@^2.3.4:
|
vue-template-compiler@^2.4.2:
|
||||||
version "2.3.4"
|
version "2.4.2"
|
||||||
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.3.4.tgz#5a88ac2c5e4d5d6218e6aa80e7e221fb7e67894c"
|
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.2.tgz#5a45d843f148b098f6c1d1e35ac20c4956d30ad1"
|
||||||
dependencies:
|
dependencies:
|
||||||
de-indent "^1.0.2"
|
de-indent "^1.0.2"
|
||||||
he "^1.1.0"
|
he "^1.1.0"
|
||||||
@@ -5743,9 +5743,9 @@ vue-template-es2015-compiler@^1.2.2:
|
|||||||
version "1.4.0"
|
version "1.4.0"
|
||||||
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.4.0.tgz#7b88853ca4bf8d84ae54ab9e56771de271e60198"
|
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.4.0.tgz#7b88853ca4bf8d84ae54ab9e56771de271e60198"
|
||||||
|
|
||||||
vue@^2.3.4:
|
vue@^2.4.2:
|
||||||
version "2.3.4"
|
version "2.4.2"
|
||||||
resolved "https://registry.yarnpkg.com/vue/-/vue-2.3.4.tgz#5ec3b87a191da8090bbef56b7cfabd4158038171"
|
resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.2.tgz#a9855261f191c978cc0dc1150531b8d08149b58c"
|
||||||
|
|
||||||
watchpack@^0.2.1:
|
watchpack@^0.2.1:
|
||||||
version "0.2.9"
|
version "0.2.9"
|
||||||
|
|||||||
Reference in New Issue
Block a user