Unverified Commit 4338bcb7 authored by Lijiaoa's avatar Lijiaoa Committed by GitHub
Browse files

fix bug of `Add/Remove` modal (#3491)

parent 45236e18
...@@ -12,6 +12,7 @@ interface ChangeColumnProps { ...@@ -12,6 +12,7 @@ interface ChangeColumnProps {
onSelectedChange: (val: string[]) => void; onSelectedChange: (val: string[]) => void;
onHideDialog: () => void; onHideDialog: () => void;
minSelected?: number; minSelected?: number;
whichComponent: string; // which component use this component
} }
interface SimpleColumn { interface SimpleColumn {
...@@ -57,10 +58,14 @@ class ChangeColumnComponent extends React.Component<ChangeColumnProps, ChangeCol ...@@ -57,10 +58,14 @@ class ChangeColumnComponent extends React.Component<ChangeColumnProps, ChangeCol
saveUserSelectColumn = (): void => { saveUserSelectColumn = (): void => {
const { currentSelected } = this.state; const { currentSelected } = this.state;
const { allColumns, onSelectedChange } = this.props; const { allColumns, onSelectedChange, whichComponent } = this.props;
const selectedColumns = allColumns.map(column => column.key).filter(key => currentSelected.includes(key)); const selectedColumns = allColumns.map(column => column.key).filter(key => currentSelected.includes(key));
localStorage.setItem('columns', JSON.stringify(selectedColumns));
onSelectedChange(selectedColumns); onSelectedChange(selectedColumns);
if (whichComponent === 'table') {
localStorage.setItem('columns', JSON.stringify(selectedColumns));
} else {
localStorage.setItem('paraColumns', JSON.stringify(selectedColumns));
}
this.hideDialog(); this.hideDialog();
}; };
......
...@@ -51,7 +51,11 @@ class Para extends React.Component<ParaProps, ParaState> { ...@@ -51,7 +51,11 @@ class Para extends React.Component<ParaProps, ParaState> {
noChart: true, noChart: true,
customizeColumnsDialogVisible: false, customizeColumnsDialogVisible: false,
availableDimensions: [], availableDimensions: [],
chosenDimensions: [] chosenDimensions:
localStorage.getItem('paraColumns') !== null
? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
JSON.parse(localStorage.getItem('paraColumns')!)
: []
}; };
} }
...@@ -130,6 +134,7 @@ class Para extends React.Component<ParaProps, ParaState> { ...@@ -130,6 +134,7 @@ class Para extends React.Component<ParaProps, ParaState> {
this.setState({ customizeColumnsDialogVisible: false }); this.setState({ customizeColumnsDialogVisible: false });
}} }}
minSelected={2} minSelected={2}
whichComponent='para'
/> />
)} )}
<div className='parcoords' style={this.chartMulineStyle} ref={this.paraRef} /> <div className='parcoords' style={this.chartMulineStyle} ref={this.paraRef} />
......
...@@ -571,6 +571,7 @@ class TableList extends React.Component<TableListProps, TableListState> { ...@@ -571,6 +571,7 @@ class TableList extends React.Component<TableListProps, TableListState> {
onHideDialog={(): void => { onHideDialog={(): void => {
this.setState({ customizeColumnsDialogVisible: false }); this.setState({ customizeColumnsDialogVisible: false });
}} }}
whichComponent='table'
/> />
)} )}
{/* Clone a trial and customize a set of new parameters */} {/* Clone a trial and customize a set of new parameters */}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment