Skip to content

Commit 2b5a1a1

Browse files
committed
add map
update doc
1 parent ac22df2 commit 2b5a1a1

File tree

47 files changed

+3690
-1091
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+3690
-1091
lines changed

data-vis.xmind

13.1 KB
Binary file not shown.

docs/website-data-api/chartCardApi.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@
3030
"value": "8888888",
3131
"unit": "",
3232
"showChange": false
33-
},
34-
{
35-
"label": "日环比",
36-
"value": "3.95%",
37-
"unit": "%",
38-
"showChange": true
3933
}
4034
]
4135
}

src/charts/chartDataset.vue

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@
2222
2323
import echarts from 'echarts';
2424
import chartTheme from './theme.json';
25+
import chinaJson from 'echarts/map/json/china.json';
2526
import { on, off } from '../utils/utils';
2627
import dataGetter from '../mixins/dataGetter';
2728
import {classPrifix} from '../utils/const';
2829
echarts.registerTheme('chartTheme', chartTheme);
30+
echarts.registerMap('china', chinaJson);
2931
3032
export default {
3133
name: 'ChartDataset',
@@ -91,7 +93,7 @@ export default {
9193
saveAsImage: {}
9294
}
9395
},
94-
legend: {},
96+
legend: chart.legend !== undefined ? chart.legend : {},
9597
tooltip : {
9698
trigger: 'axis',
9799
},
@@ -125,6 +127,11 @@ export default {
125127
option.yAxis = chart.yAxis || {};
126128
}
127129
130+
// visualMap
131+
if (chart.visualMap) {
132+
option.visualMap = chart.visualMap || {};
133+
}
134+
128135
this.dom && this.dom.setOption(option);
129136
on(window, 'resize', this.resize);
130137
}

src/dataVisGroup.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
import {classPrifix} from './utils/const';
8484
import DataVisItem from './dataVisItem.vue';
8585
export default {
86-
name: 'ChartItem',
86+
name: 'DataVisGroup',
8787
components: {
8888
DataVisItem
8989
},

src/dataVisItem.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import chartComponents from './utils/fieldsLoader.js';
1515
import {classPrifix} from './utils/const';
1616
export default {
17-
name: 'ChartItem',
17+
name: 'DataVisItem',
1818
components: {
1919
...chartComponents
2020
},

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import DataVis from './dataVis';
22
import DataVisGroup from './dataVisGroup';
3-
import DataVisItem from './DataVisItem';
3+
import DataVisItem from './dataVisItem';
44

55
const install = function(Vue, installOptions = null) {
66
if (install.installed) return;
Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
// simple
2+
const simple = {};
3+
const simpleCharts = [
4+
{
5+
'type':'card',
6+
'label': '年活跃',
7+
'data': [
8+
{
9+
'label': '活跃用户数',
10+
'value': 22246150,
11+
'unit': '人',
12+
'showChange': false
13+
},
14+
{
15+
'label': '日环比',
16+
'value': -4.88,
17+
'unit': '%',
18+
'showChange': true
19+
},
20+
{
21+
'label': '周同比',
22+
'value': -1.36,
23+
'unit': '%',
24+
'showChange': true
25+
}
26+
],
27+
},
28+
{
29+
'type': 'card',
30+
'label': '年活跃',
31+
'data': [
32+
{
33+
'label': '活跃用户数',
34+
'value': 22246150,
35+
'unit': '人',
36+
'showChange': false
37+
},
38+
{
39+
'label': '日环比',
40+
'value': -4.88,
41+
'unit': '%',
42+
'showChange': true
43+
},
44+
{
45+
'label': '周同比',
46+
'value': -1.36,
47+
'unit': '%',
48+
'showChange': true
49+
}
50+
],
51+
},
52+
{
53+
'type': 'card',
54+
'label': '年活跃',
55+
'data': [
56+
{
57+
'label': '活跃用户数',
58+
'value': 22246150,
59+
'unit': '人',
60+
'showChange': false
61+
},
62+
{
63+
'label': '日环比',
64+
'value': -4.88,
65+
'unit': '%',
66+
'showChange': true
67+
},
68+
{
69+
'label': '周同比',
70+
'value': -1.36,
71+
'unit': '%',
72+
'showChange': true
73+
}
74+
],
75+
},
76+
];
77+
78+
79+
simple.data = {
80+
charts: simpleCharts
81+
};
82+
83+
84+
simple.code = `
85+
const charts = ${JSON.stringify(simpleCharts, null, 4)};
86+
87+
<template>
88+
<DataVisGroup
89+
:charts='charts'
90+
/>
91+
</template>
92+
<script>
93+
export default {
94+
data() {
95+
return {
96+
charts
97+
};
98+
}
99+
};
100+
</script>
101+
`;
102+
103+
104+
export default {
105+
simple,
106+
};

website/code/config-guide/chart/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const simple = {};
33

44
const chart = {
55
type: 'dataset',
6-
label:'dataset实现同一组数据多图绘制',
6+
label:'折线图',
77
xAxis: {type: 'category'},
88
yAxis: {},
99
dataset: {
Lines changed: 206 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,206 @@
1+
// simple echart
2+
const simple = {};
3+
4+
const chart = {
5+
type: 'dataset',
6+
label:'地图',
7+
dataset: {
8+
source: [
9+
{
10+
name: '江苏省',
11+
value: 5003
12+
},
13+
{
14+
name: '北京市',
15+
value: 3008
16+
},
17+
{
18+
name: '上海',
19+
value: 4006
20+
},
21+
{
22+
name: '重庆',
23+
value: 3006
24+
},
25+
{
26+
name: '河北',
27+
value: 3004
28+
},
29+
{
30+
name: '河南',
31+
value: 3002
32+
},
33+
{
34+
name: '云南',
35+
value: 1006
36+
},
37+
{
38+
name: '辽宁',
39+
value: 4003
40+
},
41+
{
42+
name: '黑龙江',
43+
value: 4001
44+
},
45+
{
46+
name: '湖南',
47+
value: 2004
48+
},
49+
{
50+
name: '安徽',
51+
value: 3003
52+
},
53+
{
54+
name: '山东',
55+
value: 31000
56+
},
57+
{
58+
name: '新疆',
59+
value: 11000
60+
},
61+
{
62+
name: '江苏',
63+
value: 3009
64+
},
65+
{
66+
name: '浙江',
67+
value: 3005
68+
},
69+
{
70+
name: '江西',
71+
value: 21000
72+
},
73+
{
74+
name: '湖北',
75+
value: 2001
76+
},
77+
{
78+
name: '广西',
79+
value: 31000
80+
},
81+
{
82+
name: '甘肃',
83+
value: 1002
84+
},
85+
{
86+
name: '山西',
87+
value: 3002
88+
},
89+
{
90+
name: '内蒙古',
91+
value: 3005
92+
},
93+
{
94+
name: '陕西',
95+
value: 2005
96+
},
97+
{
98+
name: '吉林',
99+
value: 4005
100+
},
101+
{
102+
name: '福建',
103+
value: 2008
104+
},
105+
{
106+
name: '贵州',
107+
value: 1008
108+
},
109+
{
110+
name: '广东',
111+
value: 3007
112+
},
113+
{
114+
name: '青海',
115+
value: 10006
116+
},
117+
{
118+
name: '西藏',
119+
value: 10004
120+
},
121+
{
122+
name: '四川',
123+
value: 3003
124+
},
125+
{
126+
name: '宁夏',
127+
value: 10008
128+
},
129+
{
130+
name: '海南',
131+
value: 1009
132+
},
133+
{
134+
name: '台湾',
135+
value: 10001
136+
},
137+
{
138+
name: '香港',
139+
value: 10001
140+
},
141+
{
142+
name: '澳门',
143+
value: 10001
144+
}
145+
]
146+
},
147+
series: [
148+
{
149+
type: 'map',
150+
map: 'china',
151+
symbolSize: function (val) {
152+
return val[2] / 10;
153+
},
154+
label: {
155+
formatter: '{b}',
156+
position: 'right'
157+
},
158+
itemStyle: {
159+
color: '#ddb926'
160+
},
161+
emphasis: {
162+
label: {
163+
show: true
164+
}
165+
}
166+
}
167+
],
168+
visualMap: {
169+
seriesIndex: 0,
170+
min: 0,
171+
max: 10000,
172+
left: 'left',
173+
top: 'bottom',
174+
text: ['高','低'], // 文本,默认为数值文本
175+
calculable: true
176+
},
177+
legend: null
178+
};
179+
180+
simple.data = {
181+
chart
182+
};
183+
184+
simple.code = `
185+
const chart = ${JSON.stringify(chart, null, 4)};
186+
187+
<template>
188+
<DataVisItem
189+
:chart='chart'
190+
/>
191+
</template>
192+
<script>
193+
export default {
194+
data() {
195+
return {
196+
chart
197+
};
198+
}
199+
};
200+
</script>
201+
`;
202+
203+
204+
export default {
205+
simple
206+
};

0 commit comments

Comments
 (0)