mirror of
https://github.com/vale981/Vulcan
synced 2025-03-05 09:31:43 -05:00
Update Datatable, import SearchInput
This commit is contained in:
parent
bf9b4fda14
commit
91275b2f3d
2 changed files with 270 additions and 265 deletions
|
@ -39,14 +39,14 @@ const baseStyles = theme => ({
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
},
|
},
|
||||||
addButton: {
|
addButton: {
|
||||||
position: 'absolute',
|
top: '9.5rem',
|
||||||
top: '-8px',
|
right: '2rem',
|
||||||
right: 0,
|
position: 'fixed',
|
||||||
|
bottom: 'auto',
|
||||||
},
|
},
|
||||||
search: {
|
table: {
|
||||||
marginBottom: theme.spacing.unit * 8,
|
marginTop:0
|
||||||
},
|
},
|
||||||
table: {},
|
|
||||||
denseTable: {},
|
denseTable: {},
|
||||||
denserTable: {},
|
denserTable: {},
|
||||||
flatTable: {},
|
flatTable: {},
|
||||||
|
@ -155,6 +155,7 @@ class Datatable extends PureComponent {
|
||||||
<Components.SearchInput value={this.state.query}
|
<Components.SearchInput value={this.state.query}
|
||||||
updateQuery={this.updateQuery}
|
updateQuery={this.updateQuery}
|
||||||
className={classes.search}
|
className={classes.search}
|
||||||
|
labelId={'datatable.search'}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
@ -298,14 +299,17 @@ const DatatableContents = ({
|
||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
{
|
{
|
||||||
title &&
|
(title)?
|
||||||
<Toolbar>
|
<Toolbar>
|
||||||
<Typography variant="h6" id="tableTitle">
|
<Typography variant="h6" id="tableTitle">
|
||||||
title
|
title
|
||||||
</Typography>
|
</Typography>
|
||||||
</Toolbar>
|
</Toolbar>
|
||||||
|
:null
|
||||||
}
|
}
|
||||||
<Table className={classNames(classes.table, denseClass)}>
|
<Table className={classNames(classes.table, denseClass)}>
|
||||||
|
{
|
||||||
|
columns &&
|
||||||
<TableHead className={classes.tableHead}>
|
<TableHead className={classes.tableHead}>
|
||||||
<TableRow className={classes.tableRow}>
|
<TableRow className={classes.tableRow}>
|
||||||
{
|
{
|
||||||
|
@ -328,6 +332,7 @@ const DatatableContents = ({
|
||||||
}
|
}
|
||||||
</TableRow>
|
</TableRow>
|
||||||
</TableHead>
|
</TableHead>
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
results &&
|
results &&
|
||||||
|
|
|
@ -7,7 +7,7 @@ import './accounts/AccountsPasswordOrService';
|
||||||
import './accounts/AccountsSocialButtons';
|
import './accounts/AccountsSocialButtons';
|
||||||
|
|
||||||
import './bonus/LoadMore';
|
import './bonus/LoadMore';
|
||||||
// import './bonus/SearchInput';
|
import './bonus/SearchInput';
|
||||||
import './bonus/TooltipIntl';
|
import './bonus/TooltipIntl';
|
||||||
import './bonus/TooltipIconButton';
|
import './bonus/TooltipIconButton';
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue