|
|
@@ -3,7 +3,7 @@ import Echarts from 'echarts-for-react'
|
|
|
import { Table, Spin, Icon } from 'antd'
|
|
|
import RichTextEditor from './richTextEditor'
|
|
|
import { connect } from 'dva'
|
|
|
-import resolveChartOption from '../chart/resolveChartOption'
|
|
|
+// import resolveChartOption from '../chart/resolveChartOption'
|
|
|
import { isEqual, hashcode } from '../../utils/baseUtils'
|
|
|
import EmptyContent from '../common/emptyContent/index'
|
|
|
|
|
|
@@ -63,7 +63,8 @@ class ChartView extends React.Component {
|
|
|
|
|
|
if(viewType === 'chart') { // 图表类型
|
|
|
if(chartOption) {
|
|
|
- let newOption = resolveChartOption(chartOption, editMode, false);
|
|
|
+ // let newOption = resolveChartOption(chartOption, editMode, false);
|
|
|
+ let newOption = chartOption;
|
|
|
let type = ['bar', 'line', 'pie', 'scatter'].indexOf(chartType) !== -1 ? 'echarts' :
|
|
|
(['aggregateTable', 'dataView'].indexOf(chartType) !== -1 ? 'table' : 'default');
|
|
|
if(type === 'echarts') {
|