filterBox2关联列请求数据bug

src/components/common/filterBox/filterBox2.jsx

@@ -182,20 +182,15 @@ class FilterBox extends React.Component {
 
     fetchColumnData = (filter, options) => {
         const { keyword, mandatory } = options || {};
-        const { dataSource } = filter;
-        const isCusMode = dataSource.name === 'cus';
-        let column;
-        if(isCusMode) {
-            column = dataSource.columns.find(c => c.name === filter.name)
-        }
+        const { combined, dataSource } = filter;
         let columnData = this.state['columnData-' + filter.name]
         if(!columnData || columnData.length === 0 || mandatory) {
             let obj = {fetching: true};
             obj['columnData-' + filter.name] = []
             this.setState(obj, () => {
-                const body = isCusMode ? column.relations.map(r => ({
-                    id: r.dataSource.code,
-                    columnName: r.column.name,
+                const body = combined ? dataSource.map(d => ({
+                    id: d.dataSource.code,
+                    columnName: d.column.name,
                     keyword,
                 })) : {
                     id: dataSource.code,
@@ -203,7 +198,7 @@ class FilterBox extends React.Component {
                     keyword, 
                 };
                 service.fetch({
-                    url: isCusMode ? URLS.DATASOURCE_QUERY_COLUMNDATA_MUL : URLS.DATASOURCE_QUERY_COLUMNDATA,
+                    url: combined ? URLS.DATASOURCE_QUERY_COLUMNDATA_MUL : URLS.DATASOURCE_QUERY_COLUMNDATA,
                     allow: true,
                     body: body,
                 }).then(r => {

src/models/dashboardDesigner.js

@@ -492,7 +492,6 @@ export default {
                 });
                 if(!res.err && res.data.code > 0) {
                     let resData = res.data.data;
-                    let styleConfig = resData.styleConfig ? JSON.parse(resData.styleConfig) || {} : {};
                     if(!resData) {
                         yield put({ type: 'setItemFields', code: chartCode, fields: [
                             { name: 'chartType', value: '' },
@@ -500,6 +499,7 @@ export default {
                         ] });
                         return false;
                     }
+                    let styleConfig = resData.styleConfig ? JSON.parse(resData.styleConfig) || {} : {};
                     const { chartType : ctype, chartConfig: cfg } = resData.chartsColumnConfig;
                     const chartType = CHART_TYPE[ctype];
                     const chartConfig = JSON.parse(cfg);