Переглянути джерело

筛选条件变更后是否自动刷新与自动刷新开关一致

zhuth 7 роки тому
батько
коміт
311d0faa07

+ 1 - 1
src/components/chartDesigner/content.jsx

@@ -94,7 +94,7 @@ class ChartDesignerContent extends React.Component {
                 <Content style={{ overflow: 'hidden' }}>
                     <Layout>
                         <Header className='content-header'>
-                            <ToolBar className='header-toolbar'/>
+                            <ToolBar className='header-toolbar' autoRefresh={autoRefresh} />
                         </Header>
                         <Content style={{ overflow: 'auto' }}>
                             { chartView }

+ 5 - 5
src/components/chartDesigner/sections/toolbar.jsx

@@ -16,15 +16,14 @@ class Toolbar extends React.Component {
 
     filterUsingChange = (e) => {
         const key = e.target.dataset.key;
-        const props = this.props;
-        const chartDesigner = props.chartDesigner;
+        const { chartDesigner, dispatch, autoRefresh } = this.props;
         const filters = chartDesigner.filters;
-        props.dispatch({ type: 'chartDesigner/changeField', name: 'filters', value: filters.map( f => {
+        dispatch({ type: 'chartDesigner/changeField', name: 'filters', value: filters.map( f => {
             if(+f.key === +key) {
                 f = { ...f, using: !f.using }
             }
             return f;
-        }) });
+        }), autoRefresh });
     }
 
     showFilterBox = (e) => {
@@ -40,7 +39,8 @@ class Toolbar extends React.Component {
     }
 
     createFilters = (filters) => {
-        this.props.dispatch({ type: 'chartDesigner/changeField', name: 'filters', value: filters });
+        const { autoRefresh, dispatch } = this.props;
+        dispatch({ type: 'chartDesigner/changeField', name: 'filters', value: filters, autoRefresh });
         this.hideFilterBox()
     }