[SSE] Fix Bug 55629

This commit is contained in:
ShimaginAndrey 2022-02-24 17:10:26 +03:00
parent 876ac7670d
commit e3459aa8f0

View file

@ -14,23 +14,25 @@ const PageListMove = props => {
const allSheets = sheets.sheets; const allSheets = sheets.sheets;
return ( return (
<Page> <View style={!Device.phone ? {height: '420px'} : null}>
<Navbar title={t('Statusbar.textMoveBefore')}/> <Page>
<List> <Navbar title={t('Statusbar.textMoveBefore')}/>
<ListGroup> <List>
{ allSheets.map((model, index) => <ListGroup>
model.hidden ? null : { allSheets.map((model, index) =>
model.hidden ? null :
<ListItem
key={model.name}
title={model.name}
onClick={() => onMenuMoveClick(index)} />)
}
<ListItem <ListItem
key={model.name} title={t('Statusbar.textMoveToEnd')}
title={model.name} onClick={() => onMenuMoveClick(-255)}/>
onClick={() => onMenuMoveClick(index)} />) </ListGroup>
} </List>
<ListItem </Page>
title={t('Statusbar.textMoveToEnd')} </View>
onClick={() => onMenuMoveClick(-255)}/>
</ListGroup>
</List>
</Page>
) )
}; };
@ -40,19 +42,21 @@ const PageAllList = (props) => {
const allSheets = sheets.sheets; const allSheets = sheets.sheets;
return ( return (
<Page> <View style={{height: '240px'}}>
<List> <Page>
{ allSheets.map( (model,sheetIndex) => <List>
<ListItem className='item-list' key={model.name} title={model.name} checkbox checked={model.active} onClick={() => onTabListClick(sheetIndex)}> { allSheets.map( (model,sheetIndex) =>
{model.hidden ? <ListItem className='item-list' key={model.name} title={model.name} checkbox checked={model.active} onClick={() => onTabListClick(sheetIndex)}>
<div slot='after'> {model.hidden ?
{t('Statusbar.textHidden')} <div slot='after'>
</div> {t('Statusbar.textHidden')}
: null} </div>
</ListItem>) : null}
} </ListItem>)
</List> }
</Page> </List>
</Page>
</View>
) )
}; };
@ -138,7 +142,7 @@ const StatusbarView = inject('storeAppOptions', 'sheets', 'users')(observer(prop
</Actions> </Actions>
) : null} ) : null}
{ {
<Popover style={{height: '240px'}} id="idx-all-list" className="all-list"> <Popover id="idx-all-list" className="all-list">
<PageAllList sheets={sheets} onTabListClick={props.onTabListClick}/> <PageAllList sheets={sheets} onTabListClick={props.onTabListClick}/>
</Popover> </Popover>
} }
@ -150,7 +154,7 @@ const StatusbarView = inject('storeAppOptions', 'sheets', 'users')(observer(prop
<PageListMove sheets={sheets} onMenuMoveClick={props.onMenuMoveClick}/> <PageListMove sheets={sheets} onMenuMoveClick={props.onMenuMoveClick}/>
</Sheet> </Sheet>
: :
<Popover style={{height: '420px'}} id="idx-move-sheet-popover" closeByOutsideClick={false}> <Popover id="idx-move-sheet-popover" closeByOutsideClick={false}>
<PageListMove sheets={sheets} onMenuMoveClick={props.onMenuMoveClick}/> <PageListMove sheets={sheets} onMenuMoveClick={props.onMenuMoveClick}/>
</Popover> </Popover>
} }