Merge branch 'master' of ssh://10.10.100.21/source/platform-bi-web

src/components/chartDesigner/content.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Layout, Tabs, Switch, Button, Icon } from 'antd'
+import { Layout, Tabs, Switch, Button } from 'antd'
 import BaseConfigForm from './sections/baseConfigForm'
 import AggregateTableConfigForm from './sections/aggregateTableConfigForm'
 import DataViewConfigForm from './sections/dataViewConfigForm'

src/models/chart.js

@@ -175,7 +175,7 @@ export default {
                     let chartConfig = JSON.parse(resData.chartConfig || '{ "xAxis": { "column": {}, "granularity": {} }, "yAxis": { "column": {}, "gauge": {} } }');
                     let otherConfig = JSON.parse(resData.otherConfig || '{}');
                     let viewType = getViewType(resData.chartType);
-                    let filters = JSON.parse(resData.filters || '{}');
+                    let filters = JSON.parse(resData.filters || '[]');
 
                     let data = {
                         code: resData.chartId,
@@ -371,6 +371,7 @@ export default {
                     body.chartType = 'individual';
                     body.chartConfig = JSON.stringify(dataViewConfig);
                 }
+                console.log('body', body)
                 const res = yield call(service.fetch, {
                     url: URLS.CHART_UPDATE,
                     body: body