|
|
@@ -40,7 +40,7 @@ class DisplayColumnBox extends React.Component {
|
|
|
let index = this.state.targetColumns.indexOf(item.key);
|
|
|
return <span data-key={item.name}>
|
|
|
{item.label}
|
|
|
- {index !== -1 && <span>
|
|
|
+ {index !== -1 && <span style={{ float: 'right' }}>
|
|
|
<Icon type="arrow-up" onClick={() => {this.upSwap(index)}} />
|
|
|
<Icon type="arrow-down" onClick={() => {this.downSwap(index)}} />
|
|
|
</span>}
|
|
|
@@ -54,7 +54,13 @@ class DisplayColumnBox extends React.Component {
|
|
|
onOk= () => {
|
|
|
const { dispatch, chartDesigner, autoRefresh, hideBox } = this.props;
|
|
|
const { targetColumns } = this.state;
|
|
|
- let viewColumns = chartDesigner.columns.filter(column => targetColumns.indexOf(column.name) !== -1).map((c) => ({key:c.name, label:c.label}));
|
|
|
+ let viewColumns = targetColumns.map(c => {
|
|
|
+ let cl = chartDesigner.columns.find(_c => _c.name === c);
|
|
|
+ return {
|
|
|
+ key: cl.name,
|
|
|
+ label: cl.label
|
|
|
+ }
|
|
|
+ });
|
|
|
dispatch(
|
|
|
{
|
|
|
type: 'chartDesigner/changeField',
|
|
|
@@ -84,6 +90,8 @@ class DisplayColumnBox extends React.Component {
|
|
|
width={700}
|
|
|
style={{textAlign:'center'}}
|
|
|
onOk={this.onOk}
|
|
|
+ maskClosable={false}
|
|
|
+ destroyOnClose={true}
|
|
|
>
|
|
|
<Transfer
|
|
|
dataSource={this.props.chartDesigner.columns.map(c => ({ ...c, key: c.name }))}
|