Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2139 from ONLYOFFICE/feature/fix-bugs

Browse source 
Feature/fix bugs
This commit is contained in:
maxkadushkin 2022-12-15 19:29:24 +03:00 committed by GitHub
parent f5a1a75377 451798e680
commit 2f18c95b5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/mobile/lib/controller/SharingSettings.jsx
View file

@ -28,7 +28,7 @@ const SharingSettingsController = props => {
if (msgData?.needUpdate) { if (msgData?.needUpdate) {
setSharingSettings(msgData.sharingSettings); setSharingSettings(msgData.sharingSettings);
} }
f7.views.current.router.back(); props.f7router.back();
} }
} }
}; };

15
apps/common/mobile/lib/view/collaboration/Collaboration.jsx
View file

@ -92,6 +92,9 @@ const PageCollaboration = inject('storeAppOptions', 'users')(observer(props => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('Common.Collaboration', {returnObjects: true}); const _t = t('Common.Collaboration', {returnObjects: true});
const appOptions = props.storeAppOptions; const appOptions = props.storeAppOptions;
const documentInfo = props.documentInfo;
const dataDoc = documentInfo && documentInfo.dataDoc;
const fileType = dataDoc && dataDoc.fileType;
const sharingSettingsUrl = appOptions.sharingSettingsUrl; const sharingSettingsUrl = appOptions.sharingSettingsUrl;
const isViewer = appOptions.isViewer; const isViewer = appOptions.isViewer;
@ -108,7 +111,7 @@ const PageCollaboration = inject('storeAppOptions', 'users')(observer(props => {
} }
</Navbar> </Navbar>
<List> <List>
{sharingSettingsUrl && {(sharingSettingsUrl && fileType !== 'oform') &&
<ListItem title={t('Common.Collaboration.textSharingSettings')} link="/sharing-settings/"> <ListItem title={t('Common.Collaboration.textSharingSettings')} link="/sharing-settings/">
<Icon slot="media" icon="icon-sharing-settings"></Icon> <Icon slot="media" icon="icon-sharing-settings"></Icon>
</ListItem> </ListItem>
@ -148,10 +151,10 @@ class CollaborationView extends Component {
return ( return (
show_popover ? show_popover ?
<Popover id="coauth-popover" className="popover__titled" onPopoverClosed={() => this.props.onclosed()} closeByOutsideClick={false}> <Popover id="coauth-popover" className="popover__titled" onPopoverClosed={() => this.props.onclosed()} closeByOutsideClick={false}>
<PageCollaboration style={{height: '410px'}} page={this.props.page}/> <PageCollaboration documentInfo={this.props.documentInfo} style={{height: '410px'}} page={this.props.page}/>
</Popover> : </Popover> :
<Sheet className="coauth__sheet" push onSheetClosed={() => this.props.onclosed()}> <Sheet className="coauth__sheet" push onSheetClosed={() => this.props.onclosed()}>
<PageCollaboration page={this.props.page}/> <PageCollaboration documentInfo={this.props.documentInfo} page={this.props.page}/>
</Sheet> </Sheet>
) )
} }
@ -177,9 +180,9 @@ const Collaboration = props => {
}; };
return ( return (
<CollaborationView usePopover={!Device.phone} onclosed={onviewclosed} page={props.page}/> <CollaborationView usePopover={!Device.phone} documentInfo={props.storeDocumentInfo} onclosed={onviewclosed} page={props.page}/>
) )
}; };
export {PageCollaboration} const CollaborationDocument = inject('storeDocumentInfo')(observer(Collaboration));
export default Collaboration; export {Collaboration, CollaborationDocument};

5
apps/documenteditor/mobile/src/page/main.jsx
View file

@ -7,7 +7,7 @@ import { withTranslation } from 'react-i18next';
import EditOptions from '../view/edit/Edit'; import EditOptions from '../view/edit/Edit';
import AddOptions from '../view/add/Add'; import AddOptions from '../view/add/Add';
import Settings from '../controller/settings/Settings'; import Settings from '../controller/settings/Settings';
import Collaboration from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx' import { CollaborationDocument } from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx'
import { Device } from '../../../../common/mobile/utils/device' import { Device } from '../../../../common/mobile/utils/device'
import { Search, SearchSettings } from '../controller/Search'; import { Search, SearchSettings } from '../controller/Search';
import ContextMenu from '../controller/ContextMenu'; import ContextMenu from '../controller/ContextMenu';
@ -229,8 +229,7 @@ class MainPage extends Component {
} }
{ {
!this.state.collaborationVisible ? null : !this.state.collaborationVisible ? null :
<Collaboration onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} <CollaborationDocument onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} page={this.state.collaborationPage} />
page={this.state.collaborationPage}/>
} }
{ {
!this.state.navigationVisible ? null : !this.state.navigationVisible ? null :

2
apps/documenteditor/mobile/src/view/Toolbar.jsx
View file

@ -62,7 +62,7 @@ const ToolbarView = props => {
onRedoClick: props.onRedo onRedoClick: props.onRedo
})} })}
{/*isAvailableExt && !props.disabledControls &&*/} {/*isAvailableExt && !props.disabledControls &&*/}
{(isViewer || !Device.phone) && <Link className={(!isAvailableExt || props.disabledControls) && 'disabled'} icon={isMobileView ? 'icon-standard-view' : 'icon-mobile-view'} href={false} onClick={async e => { {((isViewer || !Device.phone) && isAvailableExt) && <Link className={(!isAvailableExt || props.disabledControls) && 'disabled'} icon={isMobileView ? 'icon-standard-view' : 'icon-mobile-view'} href={false} onClick={async e => {
await props.changeMobileView(); await props.changeMobileView();
await props.openOptions('snackbar'); await props.openOptions('snackbar');
setTimeout(() => { setTimeout(() => {

4
apps/presentationeditor/mobile/src/page/main.jsx
View file

@ -6,7 +6,7 @@ import { Device } from '../../../../common/mobile/utils/device';
import EditOptions from '../view/edit/Edit'; import EditOptions from '../view/edit/Edit';
import AddOptions from '../view/add/Add'; import AddOptions from '../view/add/Add';
import Settings from '../view/settings/Settings'; import Settings from '../view/settings/Settings';
import CollaborationView from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx'; import { Collaboration } from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx';
import { Preview } from "../controller/Preview"; import { Preview } from "../controller/Preview";
import { Search, SearchSettings } from '../controller/Search'; import { Search, SearchSettings } from '../controller/Search';
import ContextMenu from '../controller/ContextMenu'; import ContextMenu from '../controller/ContextMenu';
@ -179,7 +179,7 @@ class MainPage extends Component {
} }
{ {
!this.state.collaborationVisible ? null : !this.state.collaborationVisible ? null :
<CollaborationView onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} /> <Collaboration onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} />
} }
{appOptions.isDocReady && <ContextMenu openOptions={this.handleClickToOpenOptions.bind(this)} />} {appOptions.isDocReady && <ContextMenu openOptions={this.handleClickToOpenOptions.bind(this)} />}
</Page> </Page>

3
apps/spreadsheeteditor/mobile/src/controller/Main.jsx
View file

@ -516,9 +516,6 @@ class MainController extends Component {
storeSpreadsheetInfo.changeTitle(meta.title); storeSpreadsheetInfo.changeTitle(meta.title);
} }
}); });
const storeAppOptions = this.props.storeAppOptions;
this.api.asc_setFilteringMode && this.api.asc_setFilteringMode(storeAppOptions.canModifyFilter);
} }
onEntriesListMenu(validation, textArr, addArr) { onEntriesListMenu(validation, textArr, addArr) {

8
apps/spreadsheeteditor/mobile/src/controller/add/AddFilter.jsx
View file

@ -24,6 +24,9 @@ class AddFilterController extends Component {
componentDidMount () { componentDidMount () {
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
const appOptions = this.props.storeAppOptions;
api.asc_setFilteringMode && api.asc_setFilteringMode(appOptions.canModifyFilter);
api.asc_registerCallback('asc_onError', this.uncheckedFilter); api.asc_registerCallback('asc_onError', this.uncheckedFilter);
} }
@ -108,7 +111,8 @@ class AddFilterController extends Component {
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
const formatTableInfo = api.asc_getCellInfo().asc_getFormatTableInfo(); const formatTableInfo = api.asc_getCellInfo().asc_getFormatTableInfo();
const tablename = (formatTableInfo) ? formatTableInfo.asc_getTableName() : undefined; const tablename = (formatTableInfo) ? formatTableInfo.asc_getTableName() : undefined;
if (checked) {
if (checked || tablename) {
api.asc_addAutoFilter(); api.asc_addAutoFilter();
} else { } else {
api.asc_changeAutoFilter(tablename, Asc.c_oAscChangeFilterOptions.filter, checked); api.asc_changeAutoFilter(tablename, Asc.c_oAscChangeFilterOptions.filter, checked);
@ -127,4 +131,4 @@ class AddFilterController extends Component {
} }
} }
export default inject("storeWorksheets")(observer(withTranslation()(AddFilterController))); export default inject("storeWorksheets", "storeAppOptions")(observer(withTranslation()(AddFilterController)));

4
apps/spreadsheeteditor/mobile/src/page/main.jsx
View file

@ -4,7 +4,7 @@ import { observer, inject } from "mobx-react";
import { Device } from '../../../../common/mobile/utils/device'; import { Device } from '../../../../common/mobile/utils/device';
import Settings from '../view/settings/Settings'; import Settings from '../view/settings/Settings';
import CollaborationView from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx' import { Collaboration } from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx'
import CellEditor from '../controller/CellEditor'; import CellEditor from '../controller/CellEditor';
import { Statusbar } from '../controller/Statusbar'; import { Statusbar } from '../controller/Statusbar';
import FilterOptionsController from '../controller/FilterOptions.jsx' import FilterOptionsController from '../controller/FilterOptions.jsx'
@ -167,7 +167,7 @@ class MainPage extends Component {
} }
{ {
!this.state.collaborationVisible ? null : !this.state.collaborationVisible ? null :
<CollaborationView onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} /> <Collaboration onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} />
} }
{appOptions.isDocReady && {appOptions.isDocReady &&

8
apps/spreadsheeteditor/mobile/src/view/add/AddFilter.jsx
View file

@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
const AddSortAndFilter = props => { const AddSortAndFilter = props => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('View.Add', {returnObjects: true}); const _t = t('View.Add', {returnObjects: true});
const isFilter = props.isFilter; const [isFilter, setIsFilter] = useState(props.isFilter);
const wsLock = props.wsLock; const wsLock = props.wsLock;
return ( return (
@ -27,7 +27,11 @@ const AddSortAndFilter = props => {
<List> <List>
<ListItem title={_t.textFilter}> <ListItem title={_t.textFilter}>
<Toggle checked={isFilter} <Toggle checked={isFilter}
onToggleChange={() => props.onInsertFilter(!isFilter)}/> onToggleChange={() => {
setIsFilter(!isFilter);
props.onInsertFilter(!isFilter)}
}
/>
</ListItem> </ListItem>
</List> </List>
} }