-
+
{code}
diff --git a/src/pages/chart/ECharts/EchartsComponent.js b/src/pages/chart/ECharts/EchartsComponent.js
index b2fa38e..58d6bed 100644
--- a/src/pages/chart/ECharts/EchartsComponent.js
+++ b/src/pages/chart/ECharts/EchartsComponent.js
@@ -7,10 +7,8 @@ import ThemeChartComponent from './ThemeChartComponent'
import ChartShowLoadingComponent from './ChartShowLoadingComponent'
import ChartAPIComponent from './ChartAPIComponent'
import DynamicChartComponent from './DynamicChartComponent'
-import MapChartComponent from './MapChartComponent'
-// v1.2.0 add 7 demo.
-import AirportCoordComponent from './AirportCoordComponent'
+// removed MapChartComponent and AirportCoordComponent
import CalendarComponent from './CalendarComponent'
import GaugeComponent from './GaugeComponent'
import GCalendarComponent from './GCalendarComponent'
@@ -28,8 +26,7 @@ const EchartsComponent = ({ type }) => {
if (type === 'events') return
if (type === 'theme') return
if (type === 'dynamic') return
- if (type === 'map') return
- if (type === 'airport') return
+ // map and airport chart types removed
if (type === 'graph') return
if (type === 'calendar') return
if (type === 'treemap') return
diff --git a/src/pages/chart/ECharts/GaugeComponent.js b/src/pages/chart/ECharts/GaugeComponent.js
index 665908b..99f37e6 100644
--- a/src/pages/chart/ECharts/GaugeComponent.js
+++ b/src/pages/chart/ECharts/GaugeComponent.js
@@ -37,13 +37,10 @@ class GaugeComponent extends React.Component {
},
axisLabel: {
// 坐标轴小标记
- textStyle: {
- // 属性lineStyle控制线条样式
- fontWeight: 'bolder',
- color: '#fff',
- shadowColor: '#fff', // 默认透明
- shadowBlur: 10,
- },
+ fontWeight: 'bolder',
+ color: '#fff',
+ shadowColor: '#fff', // 默认透明
+ shadowBlur: 10,
},
axisTick: {
// 坐标轴小标记
@@ -89,11 +86,9 @@ class GaugeComponent extends React.Component {
shadowColor: '#fff', // 默认透明
shadowBlur: 5,
offsetCenter: [0, '50%'], // x, y，单位px
- textStyle: {
- // 其余属性默认使用全局文本样式，详见TEXTSTYLE
- fontWeight: 'bolder',
- color: '#fff',
- },
+ // 其余属性默认使用全局文本样式，详见TEXTSTYLE
+ fontWeight: 'bolder',
+ color: '#fff',
},
data: [{ value: 40, name: 'km/h' }],
},
@@ -118,13 +113,10 @@ class GaugeComponent extends React.Component {
},
axisLabel: {
// 坐标轴小标记
- textStyle: {
- // 属性lineStyle控制线条样式
- fontWeight: 'bolder',
- color: '#fff',
- shadowColor: '#fff', // 默认透明
- shadowBlur: 10,
- },
+ fontWeight: 'bolder',
+ color: '#fff',
+ shadowColor: '#fff', // 默认透明
+ shadowBlur: 10,
},
axisTick: {
// 坐标轴小标记
@@ -172,11 +164,9 @@ class GaugeComponent extends React.Component {
width: 80,
height: 30,
offsetCenter: [25, '20%'], // x, y，单位px
- textStyle: {
- // 其余属性默认使用全局文本样式，详见TEXTSTYLE
- fontWeight: 'bolder',
- color: '#fff',
- },
+ // 其余属性默认使用全局文本样式，详见TEXTSTYLE
+ fontWeight: 'bolder',
+ color: '#fff',
},
data: [{ value: 1.5, name: 'x1000 r/min' }],
},
@@ -211,13 +201,10 @@ class GaugeComponent extends React.Component {
},
},
axisLabel: {
- textStyle: {
- // 属性lineStyle控制线条样式
- fontWeight: 'bolder',
- color: '#fff',
- shadowColor: '#fff', // 默认透明
- shadowBlur: 10,
- },
+ fontWeight: 'bolder',
+ color: '#fff',
+ shadowColor: '#fff', // 默认透明
+ shadowBlur: 10,
formatter(v) {
switch (`${v}`) {
case '0':
@@ -280,13 +267,10 @@ class GaugeComponent extends React.Component {
show: false,
},
axisLabel: {
- textStyle: {
- // 属性lineStyle控制线条样式
- fontWeight: 'bolder',
- color: '#fff',
- shadowColor: '#fff', // 默认透明
- shadowBlur: 10,
- },
+ fontWeight: 'bolder',
+ color: '#fff',
+ shadowColor: '#fff', // 默认透明
+ shadowBlur: 10,
formatter(v) {
switch (`${v}`) {
case '0':
diff --git a/src/pages/chart/ECharts/GraphComponent.js b/src/pages/chart/ECharts/GraphComponent.js
index 1621cd8..b9d2498 100644
--- a/src/pages/chart/ECharts/GraphComponent.js
+++ b/src/pages/chart/ECharts/GraphComponent.js
@@ -1325,10 +1325,8 @@ const GraphComponent = () => {
layout: 'force',
animation: false,
label: {
- normal: {
- position: 'right',
- formatter: '{b}',
- },
+ position: 'right',
+ formatter: '{b}',
},
draggable: true,
data: webkitDep.nodes.map((node, idx) => {
diff --git a/src/pages/chart/ECharts/LiquidfillComponent.js b/src/pages/chart/ECharts/LiquidfillComponent.js
index b119217..1fddb3b 100644
--- a/src/pages/chart/ECharts/LiquidfillComponent.js
+++ b/src/pages/chart/ECharts/LiquidfillComponent.js
@@ -1,7 +1,7 @@
import React from 'react'
import ReactEcharts from 'echarts-for-react'
-
-require('echarts-liquidfill')
+import * as echarts from 'echarts'
+import 'echarts-liquidfill'
const LiquidfillComponent = () => {
const option = {
@@ -17,6 +17,7 @@ const LiquidfillComponent = () => {
{
coordinateSystem: 'calendar',
symbolSize: 1,
label: {
- normal: {
- show: true,
- formatter(params) {
- let d = echarts.number.parseDate(params.value[0])
- return `${d.getDate()}\n\n${params.value[2]}\n\n`
- },
- textStyle: {
- color: '#000',
- },
+ show: true,
+ formatter(params) {
+ let d = echarts.number.parseDate(params.value[0])
+ return `${d.getDate()}\n\n${params.value[2]}\n\n`
},
+ color: '#000',
},
data: lunarData,
},
@@ -448,17 +444,13 @@ const LunarCalendarComponent = () => {
coordinateSystem: 'calendar',
symbolSize: 1,
label: {
- normal: {
- show: true,
- formatter(params) {
- return `\n\n\n${params.value[3] || ''}`
- },
- textStyle: {
- fontSize: 14,
- fontWeight: 700,
- color: '#a00',
- },
+ show: true,
+ formatter(params) {
+ return `\n\n\n${params.value[3] || ''}`
},
+ fontSize: 14,
+ fontWeight: 700,
+ color: '#a00',
},
data: lunarData,
},
diff --git a/src/pages/chart/ECharts/MapChartComponent.js b/src/pages/chart/ECharts/MapChartComponent.js
deleted file mode 100644
index d272e90..0000000
--- a/src/pages/chart/ECharts/MapChartComponent.js
+++ /dev/null
@@ -1,209 +0,0 @@
-import React from 'react'
-import ReactEcharts from 'echarts-for-react'
-
-require('./map/js/china.js')
-
-class MapChartComponent extends React.Component {
- constructor() {
- super()
- this.timeTicket = null
- const randomData = () => {
- return Math.round(Math.random() * 1000)
- }
- const option = {
- title: {
- text: 'iphone销量',
- subtext: '纯属虚构',
- left: 'center',
- },
- tooltip: {
- trigger: 'item',
- },
- legend: {
- orient: 'vertical',
- left: 'left',
- data: ['iphone3', 'iphone4', 'iphone5'],
- },
- visualMap: {
- min: 0,
- max: 2500,
- left: 'left',
- top: 'bottom',
- text: ['高', '低'], // 文本，默认为数值文本
- calculable: true,
- },
- toolbox: {
- show: true,
- orient: 'vertical',
- left: 'right',
- top: 'center',
- feature: {
- dataView: { readOnly: false },
- restore: {},
- saveAsImage: {},
- },
- },
- series: [
- {
- name: 'iphone3',
- type: 'map',
- mapType: 'china',
- roam: false,
- label: {
- normal: {
- show: true,
- },
- emphasis: {
- show: true,
- },
- },
- data: [
- { name: '北京', value: randomData() },
- { name: '天津', value: randomData() },
- { name: '上海', value: randomData() },
- { name: '重庆', value: randomData() },
- { name: '河北', value: randomData() },
- { name: '河南', value: randomData() },
- { name: '云南', value: randomData() },
- { name: '辽宁', value: randomData() },
- { name: '黑龙江', value: randomData() },
- { name: '湖南', value: randomData() },
- { name: '安徽', value: randomData() },
- { name: '山东', value: randomData() },
- { name: '新疆', value: randomData() },
- { name: '江苏', value: randomData() },
- { name: '浙江', value: randomData() },
- { name: '江西', value: randomData() },
- { name: '湖北', value: randomData() },
- { name: '广西', value: randomData() },
- { name: '甘肃', value: randomData() },
- { name: '山西', value: randomData() },
- { name: '内蒙古', value: randomData() },
- { name: '陕西', value: randomData() },
- { name: '吉林', value: randomData() },
- { name: '福建', value: randomData() },
- { name: '贵州', value: randomData() },
- { name: '广东', value: randomData() },
- { name: '青海', value: randomData() },
- { name: '西藏', value: randomData() },
- { name: '四川', value: randomData() },
- { name: '宁夏', value: randomData() },
- { name: '海南', value: randomData() },
- { name: '台湾', value: randomData() },
- { name: '香港', value: randomData() },
- { name: '澳门', value: randomData() },
- ],
- },
- {
- name: 'iphone4',
- type: 'map',
- mapType: 'china',
- label: {
- normal: {
- show: true,
- },
- emphasis: {
- show: true,
- },
- },
- data: [
- { name: '北京', value: randomData() },
- { name: '天津', value: randomData() },
- { name: '上海', value: randomData() },
- { name: '重庆', value: randomData() },
- { name: '河北', value: randomData() },
- { name: '安徽', value: randomData() },
- { name: '新疆', value: randomData() },
- { name: '浙江', value: randomData() },
- { name: '江西', value: randomData() },
- { name: '山西', value: randomData() },
- { name: '内蒙古', value: randomData() },
- { name: '吉林', value: randomData() },
- { name: '福建', value: randomData() },
- { name: '广东', value: randomData() },
- { name: '西藏', value: randomData() },
- { name: '四川', value: randomData() },
- { name: '宁夏', value: randomData() },
- { name: '香港', value: randomData() },
- { name: '澳门', value: randomData() },
- ],
- },
- {
- name: 'iphone5',
- type: 'map',
- mapType: 'china',
- label: {
- normal: {
- show: true,
- },
- emphasis: {
- show: true,
- },
- },
- data: [
- { name: '北京', value: randomData() },
- { name: '天津', value: randomData() },
- { name: '上海', value: randomData() },
- { name: '广东', value: randomData() },
- { name: '台湾', value: randomData() },
- { name: '香港', value: randomData() },
- { name: '澳门', value: randomData() },
- ],
- },
- ],
- }
- this.state = {
- option,
- }
- }
-
- componentDidMount() {
- if (this.timeTicket) {
- clearInterval(this.timeTicket)
- }
- this.timeTicket = setInterval(() => {
- const { option } = this.state
- const r = new Date().getSeconds()
- option.title.text = `iphone销量${r}`
- option.series[0].name = `iphone销量${r}`
- option.legend.data[0] = `iphone销量${r}`
- this.setState({ option })
- }, 1000)
- }
-
- componentWillUnmount() {
- if (this.timeTicket) {
- clearInterval(this.timeTicket)
- }
- }
-
- render() {
- let code =
- "require('echarts/map/js/china.js'); \n" +
- '"
- return (
-
-
-
-
-
-
- {code}
-
-
-
diff --git a/src/pages/user/components/Filter.js b/src/pages/user/components/Filter.js
index 6374581..c1e90b7 100644
--- a/src/pages/user/components/Filter.js
+++ b/src/pages/user/components/Filter.js
@@ -136,7 +136,7 @@ class Filter extends Component {
{i18n._('Reset')}