图表修改数据源action完善

src/components/chartDesigner/sections/baseConfigForm.jsx

@@ -7,11 +7,12 @@ const FormItem = Form.Item
 const { Option } = Select
 
 class baseConfigForm extends React.Component {
+	componentDidMount() {
+		this.props.dispatch({ type: 'dataSource/fetchList' });
+	}
 	render() {
 		const props = this.props;
-		const { formItemLayout } = props
-
-		const { chartDesigner } = this.props;
+		const { formItemLayout, dataSource, chartDesigner } = props
 		const { baseConfig } = chartDesigner;
 
 		return (
@@ -28,7 +29,7 @@ class baseConfigForm extends React.Component {
 							});
 						}}
 					>
-						<Option value={baseConfig.dataSource.code}>{baseConfig.dataSource.name}</Option>
+						{dataSource.list.map(l => <Option key={l.code} value={l.code}>{l.name}</Option>)}
 					</Select>
 				</FormItem>
 				<FormItem label='可视化模式' {...formItemLayout}>
@@ -63,8 +64,8 @@ class baseConfigForm extends React.Component {
 	}
 }
 
-function mapStateToProps({ present: { chartDesigner } }) {
-    return { chartDesigner }
+function mapStateToProps({ present: { dataSource, chartDesigner } }) {
+    return { dataSource, chartDesigner }
 }
 
 export default Form.create()(connect(mapStateToProps)(baseConfigForm));

src/models/chart.js

@@ -337,12 +337,10 @@ 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
                 })
-                console.log('修改图表', body, res);
                 if(!res.err && res.data.code > 0) {
                     message.success('修改成功');
                     yield put({ type: 'fetchList', mandatory: true });

src/models/chartDesigner.js

@@ -163,6 +163,9 @@ export default {
         },
         *changeDataSource(action, { select, call, put }) {
             const { dataSource } = action;
+            const chartDesigner = yield select(state => state.present.chartDesigner);
+            const { baseConfig } = chartDesigner;
+            yield put({ type: 'changeField', name: 'baseConfig', value: { ...baseConfig, dataSource } });
             yield put({ type: 'remoteDataColumn', code: dataSource.code });
         },
         *remoteQucikAdd(action, { select, call, put }) {