|
@@ -1,6 +1,7 @@
|
|
|
import React from 'react'
|
|
import React from 'react'
|
|
|
-import { Form, Select, InputNumber } from 'antd'
|
|
|
|
|
|
|
+import { Form, Select, InputNumber, Button } from 'antd'
|
|
|
import { connect } from 'dva'
|
|
import { connect } from 'dva'
|
|
|
|
|
+import DisplayColumnBox from './displayColumnBox'
|
|
|
const FormItem = Form.Item
|
|
const FormItem = Form.Item
|
|
|
const { Option } = Select
|
|
const { Option } = Select
|
|
|
|
|
|
|
@@ -8,9 +9,11 @@ class DataViewConfigForm extends React.Component {
|
|
|
constructor(props) {
|
|
constructor(props) {
|
|
|
super(props);
|
|
super(props);
|
|
|
this.state = {
|
|
this.state = {
|
|
|
- showBox: false
|
|
|
|
|
|
|
+ showBox: false,
|
|
|
|
|
+ visibleDisplayColumnBox: false
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
render() {
|
|
render() {
|
|
|
const { autoRefresh, dispatch, chartDesigner, formItemLayout } = this.props;
|
|
const { autoRefresh, dispatch, chartDesigner, formItemLayout } = this.props;
|
|
|
const columns = chartDesigner.columns;
|
|
const columns = chartDesigner.columns;
|
|
@@ -18,9 +21,9 @@ class DataViewConfigForm extends React.Component {
|
|
|
return (
|
|
return (
|
|
|
<Form layout='horizontal'>
|
|
<Form layout='horizontal'>
|
|
|
<FormItem label="展示列" {...formItemLayout}>
|
|
<FormItem label="展示列" {...formItemLayout}>
|
|
|
- <Select
|
|
|
|
|
|
|
+ {/* <Select
|
|
|
mode='multiple'
|
|
mode='multiple'
|
|
|
- allowClear
|
|
|
|
|
|
|
+ allowClear
|
|
|
showArrow={true}
|
|
showArrow={true}
|
|
|
value={chartDesigner.dataViewConfig.viewColumns}
|
|
value={chartDesigner.dataViewConfig.viewColumns}
|
|
|
showSearch
|
|
showSearch
|
|
@@ -32,7 +35,8 @@ class DataViewConfigForm extends React.Component {
|
|
|
{columns.map((c, i)=>{
|
|
{columns.map((c, i)=>{
|
|
|
return <Option key={i} value={c.name}>{c.label}</Option>
|
|
return <Option key={i} value={c.name}>{c.label}</Option>
|
|
|
})}
|
|
})}
|
|
|
- </Select>
|
|
|
|
|
|
|
+ </Select> */}
|
|
|
|
|
+ <Button onClick={() => {this.setState({visibleDisplayColumnBox:true})}}>设置展示列</Button>
|
|
|
</FormItem>
|
|
</FormItem>
|
|
|
<FormItem label='排序列' {...formItemLayout}>
|
|
<FormItem label='排序列' {...formItemLayout}>
|
|
|
<Select
|
|
<Select
|
|
@@ -45,7 +49,7 @@ class DataViewConfigForm extends React.Component {
|
|
|
dispatch({ type: 'chartDesigner/changeField', name: 'dataViewConfig', value: { ...chartDesigner.dataViewConfig, sortColumn: value }, autoRefresh });
|
|
dispatch({ type: 'chartDesigner/changeField', name: 'dataViewConfig', value: { ...chartDesigner.dataViewConfig, sortColumn: value }, autoRefresh });
|
|
|
}}
|
|
}}
|
|
|
>
|
|
>
|
|
|
- {columns.filter(c => chartDesigner.dataViewConfig.viewColumns.map(c => c.key).indexOf(c.name) !== -1 ).map((c, i)=>{
|
|
|
|
|
|
|
+ {chartDesigner.dataViewConfig.viewColumns.map((c, i)=>{
|
|
|
return <Option key={i} value={c.name}>{c.label}</Option>
|
|
return <Option key={i} value={c.name}>{c.label}</Option>
|
|
|
})}
|
|
})}
|
|
|
</Select>
|
|
</Select>
|
|
@@ -72,6 +76,11 @@ class DataViewConfigForm extends React.Component {
|
|
|
>
|
|
>
|
|
|
</InputNumber>
|
|
</InputNumber>
|
|
|
</FormItem>
|
|
</FormItem>
|
|
|
|
|
+ <DisplayColumnBox
|
|
|
|
|
+ autoRefresh={autoRefresh}
|
|
|
|
|
+ visibleDisplayColumnBox={this.state.visibleDisplayColumnBox}
|
|
|
|
|
+ hideBox={() => this.setState({visibleDisplayColumnBox:false})}
|
|
|
|
|
+ />
|
|
|
</Form>
|
|
</Form>
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|