报表中的图表图例显示逻辑/报表过滤器下拉取数逻辑

src/components/chart/resolveChartOption.js

@@ -30,7 +30,7 @@ export default (option, silent, thumbnail) => {
     // 图例
     _option.legend = _option.legend ? {
         ..._option.legend,
-        show: !thumbnail,
+        show: !thumbnail && _option.legend.show,
         selectedMode: !silent
     } : {
         show: !thumbnail,

src/components/common/filterBox/filter2.jsx

@@ -118,9 +118,9 @@ class Filter extends React.Component {
                     onDropdownVisibleChange={this.onDropdownVisibleChange}
                     dropdownMatchSelectWidth={false}
                     notFoundContent={fetching ? <Spin size="small" /> : '无'}
-                    onSearch={(value) => {console.log(value);this.fetchColumnData(filter, { keyword: value, mandatory: true })}}
+                    onSearch={(value) => {this.fetchColumnData(filter, { keyword: value, mandatory: true })}}
                     onFocus={() => {this.fetchColumnData(filter)}}
-                    onChange={(value) => {console.log(value);this.changeFilterValue(filter, value, index)}}
+                    onChange={(value) => {this.changeFilterValue(filter, value, index)}}
                     dropdownRender={menu => (
                         <div>
                             {menu}
@@ -190,7 +190,6 @@ class Filter extends React.Component {
         const { changeFilterValue: propsChangeFilterValue } = this.props;
         filter['value' + index] = value;
         if(propsChangeFilterValue && typeof propsChangeFilterValue === 'function') {
-            console.log('ok');
             propsChangeFilterValue({ ...filter });
         }
     }
@@ -210,7 +209,7 @@ class Filter extends React.Component {
         if(!columnData || columnData.length === 0 || mandatory) {
             this.setState({ columnData: [], fetching: true }, () => {
                 const body = isCusMode ? columns : {
-                    id: dataSource.name,
+                    id: dataSource.code,
                     columnName: filter.name,
                     keyword, 
                 };

src/components/common/filterBox/filterBox2.jsx

@@ -198,7 +198,7 @@ class FilterBox extends React.Component {
                     columnName: r.column.name,
                     keyword,
                 })) : {
-                    id: dataSource.name,
+                    id: dataSource.code,
                     columnName: filter.name,
                     keyword, 
                 };
@@ -216,7 +216,7 @@ class FilterBox extends React.Component {
                 }).then(r => {
                     const resData = r.data.data || [];
                     let obj = {fetching: false};
-                    obj['columnData-' + filter.name] = resData.filter(d => d.isFilter === '1').map(d => d || 'null')
+                    obj['columnData-' + filter.name] = resData.map(d => d || 'null')
                     this.setState(obj);
                 }).catch(ex => {
                     let obj = {fetching: false};