update for 1.2.0

README.md

@@ -3,17 +3,20 @@ Base on **Vue2**, wrapper for **ChartJs**.
 -[Vue js](https://vuejs.org/)  
 -[Chart js](http://www.chartjs.org/)  
 -Work well with [Laravel](https://laravel.com/)  
--Degree of completion 90%  
+
 
 # Render a Chart Easily  
 -Single Line
 ![](https://raw.githubusercontent.com/hchstera/vue-charts/master/pictures/easy_use.png)  
 -Multiple Bar
 ![](https://raw.githubusercontent.com/hchstera/vue-charts/master/pictures/multiple.png)  
+-Multiple Mix Chart
+![](https://raw.githubusercontent.com/hchstera/vue-charts/master/pictures/mix.png)  
 
 # Features  
 -Single Chart   
 -Multiple Chart   
+-Multiple Mix Chart   
 -[Override Datasets](http://vue-charts.hchspersonal.tk/line#datasets)    
 -[Override Option](http://vue-charts.hchspersonal.tk/line#option)    
 -[Pass Json data](http://vue-charts.hchspersonal.tk/passjson)    

components/chartjs-bar.vue

@@ -14,6 +14,7 @@ export default {
             chart_data: {
                 labels: this.labels,
                 datasets: [{
+                    type: 'bar',
                     label: this.datalabel,
                     backgroundColor: this.backgroundcolor,
                     borderColor: this.bordercolor,

components/chartjs-line.vue

@@ -36,6 +36,7 @@ export default {
             chart_data: {
                 labels: this.labels,
                 datasets: [{
+                    type: 'line',
                     label: this.datalabel,
                     fill: this.fill,
                     lineTension:  this.linetension,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hchs-vue-charts",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "description": "Base on Vue2.0 wrapper for ChartJs.",
   "main": "vue-charts.js",
   "scripts": {
@@ -15,6 +15,7 @@
   },
   "keywords": [
     "vue",
+    "vuejs",
     "chart",
     "chart.js",
     "chartjs",