提交 ed6285ff 编写于 作者: C chomik

charts fixes

上级 9137ccaf
...@@ -93,7 +93,7 @@ if (window.Apex) { ...@@ -93,7 +93,7 @@ if (window.Apex) {
}, },
legend: { legend: {
show: false show: true
}, },
title: { title: {
......
...@@ -49,6 +49,35 @@ employment: ...@@ -49,6 +49,35 @@ employment:
color: green color: green
data: [17, 18, 21, 20, 30, 29] data: [17, 18, 21, 20, 30, 29]
line-chart-stroke:
name: Line chart
display: true
type: line
stroke-curve: straight
hide-legend: true
categories: ['2013', '2014', '2015', '2016', '2017', '2018', '2019']
series:
- name: Development
color: orange
data: [8, 10, 11, 12, 20, 27, 30]
- name: Marketing
color: blue
data: [3, 16, 17, 19, 20, 30, 30]
- name: Sales
color: green
data: [7, 10, 11, 18, 18, 18, 24]
stepline-chart:
name: Stepline
display: true
type: line
hide-legend: true
stroke-curve: stepline
series:
- name: Development
color: orange
data: [34, 44, 54, 21, 12, 43, 33, 23, 66, 66, 58]
temperature: temperature:
name: Monthly Average Temperature name: Monthly Average Temperature
display: true display: true
...@@ -199,7 +228,6 @@ pie: ...@@ -199,7 +228,6 @@ pie:
name: Lorem ipsum name: Lorem ipsum
display: true display: true
type: pie type: pie
hide-legend: true
series: series:
- name: A - name: A
color: blue-darker color: blue-darker
...@@ -218,7 +246,6 @@ donut: ...@@ -218,7 +246,6 @@ donut:
name: Lorem ipsum name: Lorem ipsum
display: true display: true
type: donut type: donut
hide-legend: true
series: series:
- name: Maximum - name: Maximum
color: green color: green
...@@ -280,6 +307,7 @@ new-clients: ...@@ -280,6 +307,7 @@ new-clients:
days-labels-count: 30 days-labels-count: 30
sparkline: true sparkline: true
dashed-history: true dashed-history: true
hide-legend: true
series: series:
- name: May - name: May
color: blue color: blue
...@@ -326,7 +354,7 @@ usd-eur: ...@@ -326,7 +354,7 @@ usd-eur:
type: line type: line
days-labels-count: 30 days-labels-count: 30
auto-min: true auto-min: true
stroke-straight: true stroke-curve: straight
series: series:
- name: USD/EUR - name: USD/EUR
color: black color: black
......
...@@ -26,14 +26,14 @@ $(document).ready(function(){ ...@@ -26,14 +26,14 @@ $(document).ready(function(){
}, },
{% endif %} {% endif %}
{% if data.dashed-history or data.stroke-straight %} {% if data.dashed-history or data.stroke-curve %}
stroke: { stroke: {
{% if data.dashed-history %} {% if data.dashed-history %}
width: [2, 1], width: [2, 1],
dashArray: [0, 3], dashArray: [0, 3],
{% endif %} {% endif %}
{% if data.stroke-straight %} {% if data.stroke-curve %}
curve: 'straight', curve: '{{ data.stroke-curve }}',
{% endif %} {% endif %}
}, },
{% endif %} {% endif %}
......
...@@ -11,7 +11,7 @@ menu: charts ...@@ -11,7 +11,7 @@ menu: charts
<div class="col-lg-6 col-xl-4"> <div class="col-lg-6 col-xl-4">
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<h3 class="card-title">{{ chart[1].name }} {{ chart[0] }}</h3> <h3 class="card-title">{{ chart[1].name }}</h3>
</div> </div>
<div class="card-body"> <div class="card-body">
<div id="{{ key }}" style="height: 16rem"></div> <div id="{{ key }}" style="height: 16rem"></div>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册