Merge pull request #1304 from ONLYOFFICE/feature/fix-bug-reactjs
Feature/fix bug reactjs
This commit is contained in:
commit
45538869ea
|
@ -26,11 +26,7 @@ const PageReview = props => {
|
||||||
<List>
|
<List>
|
||||||
{canReview &&
|
{canReview &&
|
||||||
<ListItem title={_t.textTrackChanges} className={isDisableAllSettings ? 'disabled' : ''}>
|
<ListItem title={_t.textTrackChanges} className={isDisableAllSettings ? 'disabled' : ''}>
|
||||||
<Toggle checked={props.trackChanges} onToggleChange={
|
<Toggle checked={props.trackChanges} onToggleChange={() => props.onTrackChanges(!props.trackChanges)}/>
|
||||||
(prev) => {
|
|
||||||
props.onTrackChanges(!prev);
|
|
||||||
}
|
|
||||||
}/>
|
|
||||||
</ListItem>
|
</ListItem>
|
||||||
}
|
}
|
||||||
{!props.isRestrictedEdit &&
|
{!props.isRestrictedEdit &&
|
||||||
|
|
|
@ -113,6 +113,14 @@
|
||||||
.swiper-pagination-bullet-active{
|
.swiper-pagination-bullet-active{
|
||||||
background: @black;
|
background: @black;
|
||||||
}
|
}
|
||||||
|
.multilevels {
|
||||||
|
li:not(:first-child){
|
||||||
|
border:none;
|
||||||
|
.item-content {
|
||||||
|
min-height: 70px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -25,11 +25,13 @@ const StatusbarView = inject('storeAppOptions', 'sheets', 'users')(observer(prop
|
||||||
return (
|
return (
|
||||||
<Fragment>
|
<Fragment>
|
||||||
<View id="idx-statusbar" className="statusbar" style={viewStyle}>
|
<View id="idx-statusbar" className="statusbar" style={viewStyle}>
|
||||||
|
{isEdit &&
|
||||||
<div id="idx-box-add-tab" className={`${isDisconnected || isWorkbookLocked || isProtectedWorkbook ? 'disabled' : ''}`}>
|
<div id="idx-box-add-tab" className={`${isDisconnected || isWorkbookLocked || isProtectedWorkbook ? 'disabled' : ''}`}>
|
||||||
<Link href={false} id="idx-btn-addtab" className={`tab${isDisabledEditSheet || isDisconnected || isWorkbookLocked || isProtectedWorkbook ? ' disabled' : ''}`} onClick={props.onAddTabClicked}>
|
<Link href={false} id="idx-btn-addtab" className={`tab${isDisabledEditSheet || isDisconnected || isWorkbookLocked || isProtectedWorkbook ? ' disabled' : ''}`} onClick={props.onAddTabClicked}>
|
||||||
<Icon className="icon icon-plus" />
|
<Icon className="icon icon-plus" />
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
|
}
|
||||||
<div className="statusbar--box-tabs">
|
<div className="statusbar--box-tabs">
|
||||||
<ul className="sheet-tabs bottom">
|
<ul className="sheet-tabs bottom">
|
||||||
{allSheets.map((model,i) =>
|
{allSheets.map((model,i) =>
|
||||||
|
|
|
@ -27,9 +27,7 @@ const AddSortAndFilter = props => {
|
||||||
<List>
|
<List>
|
||||||
<ListItem title={_t.textFilter}>
|
<ListItem title={_t.textFilter}>
|
||||||
<Toggle checked={isFilter}
|
<Toggle checked={isFilter}
|
||||||
onToggleChange={(prev) => {
|
onToggleChange={() => props.onInsertFilter(!isFilter)}/>
|
||||||
props.onInsertFilter(!prev);
|
|
||||||
}}/>
|
|
||||||
</ListItem>
|
</ListItem>
|
||||||
</List>
|
</List>
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue