Commit 17c0c956 authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'didam' into 'master'

ao

See merge request !298
parents 959a2892 d9b399bd
......@@ -2328,13 +2328,13 @@ export default class BalanceSheet extends Component {
</div>
<div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150), height: this.props.height - 400 }}>
<MuiThemeProvider theme={getMuiTheme()}>
{!this.state.loading && <MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable
data={dataTable2}
columns={columns}
options={options}
/>
</MuiThemeProvider>
</MuiThemeProvider>}
</div>
</div>
<div className="grid grid-2x" style={{ marginTop: 20 }}>
......@@ -2396,7 +2396,11 @@ export default class BalanceSheet extends Component {
outline: 'none'
}}
onClick={() => {
this.forceUpdate()
this.setState({loading: true}, () => {
setTimeout(() => {
this.setState({loading: false})
}, 100);
})
}}
>
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
......
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