Merge pull request #1304 from ONLYOFFICE/feature/fix-bug-reactjs

Feature/fix bug reactjs
This commit is contained in:
maxkadushkin 2021-11-15 12:24:47 +03:00 committed by GitHub
commit 45538869ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 13 deletions

View file

@ -26,11 +26,7 @@ const PageReview = props => {
<List>
{canReview &&
<ListItem title={_t.textTrackChanges} className={isDisableAllSettings ? 'disabled' : ''}>
<Toggle checked={props.trackChanges} onToggleChange={
(prev) => {
props.onTrackChanges(!prev);
}
}/>
<Toggle checked={props.trackChanges} onToggleChange={() => props.onTrackChanges(!props.trackChanges)}/>
</ListItem>
}
{!props.isRestrictedEdit &&

View file

@ -113,6 +113,14 @@
.swiper-pagination-bullet-active{
background: @black;
}
.multilevels {
li:not(:first-child){
border:none;
.item-content {
min-height: 70px;
}
}
}
}

View file

@ -25,11 +25,13 @@ const StatusbarView = inject('storeAppOptions', 'sheets', 'users')(observer(prop
return (
<Fragment>
<View id="idx-statusbar" className="statusbar" style={viewStyle}>
<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}>
<Icon className="icon icon-plus" />
</Link>
</div>
{isEdit &&
<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}>
<Icon className="icon icon-plus" />
</Link>
</div>
}
<div className="statusbar--box-tabs">
<ul className="sheet-tabs bottom">
{allSheets.map((model,i) =>

View file

@ -27,9 +27,7 @@ const AddSortAndFilter = props => {
<List>
<ListItem title={_t.textFilter}>
<Toggle checked={isFilter}
onToggleChange={(prev) => {
props.onInsertFilter(!prev);
}}/>
onToggleChange={() => props.onInsertFilter(!isFilter)}/>
</ListItem>
</List>
}