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

src/components/chartDesigner/content.jsx

@@ -89,7 +89,7 @@ class ChartDesignerContent extends React.Component {
                             <OtherConfigForm formItemLayout={formItemLayout}/>
                         </TabPane>
                     </Tabs>
-                    <Footer className='sider-footer'>
+                    <Footer className='sider-footer' style={{display: this.state.collapsed? 'none':'block'}}>
                         <div className='fresh-bar'>
                             <Switch defaultChecked checkedChildren='自动刷新' unCheckedChildren='手动刷新' onChange={(checked) => {
                                 // 自动刷新后立即请求一次数据

src/models/chart.js

@@ -175,6 +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 data = {
                         code: resData.chartId,
@@ -187,7 +188,8 @@ export default {
                         },
                         otherConfig: otherConfig,
                         description: resData.describes,
-                        group: resData.chartsGroup+''
+                        group: resData.chartsGroup+'',
+                        filters: filters,
                     }
 
                     if(viewType === 'bar') {
@@ -319,10 +321,11 @@ export default {
         *remoteModify(action, { select, call, put }) {
             try{
                 const chartDesigner = yield select(state => state.present.chartDesigner);
-                const { code, header, baseConfig, pieConfig, lineConfig, aggregateTableConfig, dataViewConfig,
+                const { filters, code, header, baseConfig, pieConfig, lineConfig, aggregateTableConfig, dataViewConfig,
                     barConfig, scatterConfig, otherConfig, description, group } = chartDesigner;
                 let body = {
                     chartId: code,
+                    filters: JSON.stringify(filters),
                     chartName: header.label,
                     dataId: baseConfig.dataSource,
                     createBy: 'zhuth',