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

[PE SSE mobile] Fix Bug 50889

Browse source
This commit is contained in:
SergeyEzhin 2021-06-17 14:53:47 +03:00
parent 6c9ad62861
commit 31705e5aea
4 changed files with 51 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx
View file

@ -16,14 +16,14 @@ const PageApplicationSettings = props => {
}; };
// set mode // set mode
// const appOptions = props.storeAppOptions; const appOptions = props.storeAppOptions;
// const _isEdit = appOptions.isEdit; const _isEdit = appOptions.isEdit;
// const _isShowMacros = (!appOptions.isDisconnected && appOptions.customization) ? appOptions.customization.macros !== false : true; // const _isShowMacros = (!appOptions.isDisconnected && appOptions.customization) ? appOptions.customization.macros !== false : true;
return ( return (
<Page> <Page>
<Navbar title={_t.textApplicationSettings} backLink={_t.textBack} /> <Navbar title={_t.textApplicationSettings} backLink={_t.textBack} />
{/* {_isEdit && */} {_isEdit &&
<Fragment> <Fragment>
<BlockTitle>{_t.textUnitOfMeasurement}</BlockTitle> <BlockTitle>{_t.textUnitOfMeasurement}</BlockTitle>
<List> <List>
@ -46,7 +46,7 @@ const PageApplicationSettings = props => {
</ListItem> </ListItem>
</List> </List>
</Fragment> </Fragment>
{/* } */} }
{/* {_isShowMacros && */} {/* {_isShowMacros && */}
<List mediaList> <List mediaList>
<ListItem title={_t.textMacrosSettings} link="/macros-settings/" routeProps={{ <ListItem title={_t.textMacrosSettings} link="/macros-settings/" routeProps={{
@ -84,7 +84,7 @@ const PageMacrosSettings = props => {
); );
}; };
const ApplicationSettings = inject("storeApplicationSettings")(observer(PageApplicationSettings)); const ApplicationSettings = inject("storeApplicationSettings", "storeAppOptions")(observer(PageApplicationSettings));
const MacrosSettings = inject("storeApplicationSettings")(observer(PageMacrosSettings)); const MacrosSettings = inject("storeApplicationSettings")(observer(PageMacrosSettings));
export {ApplicationSettings, MacrosSettings}; export {ApplicationSettings, MacrosSettings};

2
apps/presentationeditor/mobile/src/view/settings/Settings.jsx
View file

@ -130,9 +130,11 @@ const SettingsList = inject("storeAppOptions")(observer(props => {
<Icon slot="media" icon="icon-collaboration"></Icon> <Icon slot="media" icon="icon-collaboration"></Icon>
</ListItem> </ListItem>
: null} : null}
{_isEdit &&
<ListItem link="#" title={_t.textPresentationSettings} onClick={onoptionclick.bind(this, '/presentation-settings/')}> <ListItem link="#" title={_t.textPresentationSettings} onClick={onoptionclick.bind(this, '/presentation-settings/')}>
<Icon slot="media" icon="icon-setup"></Icon> <Icon slot="media" icon="icon-setup"></Icon>
</ListItem> </ListItem>
}
<ListItem title={_t.textApplicationSettings} link="#" onClick={onoptionclick.bind(this, '/application-settings/')}> <ListItem title={_t.textApplicationSettings} link="#" onClick={onoptionclick.bind(this, '/application-settings/')}>
<Icon slot="media" icon="icon-app-settings"></Icon> <Icon slot="media" icon="icon-app-settings"></Icon>
</ListItem> </ListItem>

9
apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx
View file

@ -27,14 +27,14 @@ const PageApplicationSettings = props => {
}; };
// set mode // set mode
// const appOptions = props.storeAppOptions; const appOptions = props.storeAppOptions;
// const _isEdit = appOptions.isEdit; const _isEdit = appOptions.isEdit;
// const _isShowMacros = (!appOptions.isDisconnected && appOptions.customization) ? appOptions.customization.macros !== false : true; // const _isShowMacros = (!appOptions.isDisconnected && appOptions.customization) ? appOptions.customization.macros !== false : true;
return ( return (
<Page> <Page>
<Navbar title={_t.textApplicationSettings} backLink={_t.textBack} /> <Navbar title={_t.textApplicationSettings} backLink={_t.textBack} />
{/* {_isEdit && */} {_isEdit &&
<Fragment> <Fragment>
<BlockTitle>{_t.textUnitOfMeasurement}</BlockTitle> <BlockTitle>{_t.textUnitOfMeasurement}</BlockTitle>
<List> <List>
@ -59,6 +59,8 @@ const PageApplicationSettings = props => {
onRegSettings: props.onRegSettings onRegSettings: props.onRegSettings
}}></ListItem> }}></ListItem>
</List> </List>
</Fragment>
}
<BlockTitle>{_t.textCommentingDisplay}</BlockTitle> <BlockTitle>{_t.textCommentingDisplay}</BlockTitle>
<List> <List>
<ListItem> <ListItem>
@ -91,7 +93,6 @@ const PageApplicationSettings = props => {
/> />
</ListItem> </ListItem>
</List> </List>
</Fragment>
{/* } */} {/* } */}
{/* {_isShowMacros && */} {/* {_isShowMacros && */}
<List> <List>

2
apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx
View file

@ -138,9 +138,11 @@ const SettingsList = inject("storeAppOptions")(observer(props => {
<Icon slot="media" icon="icon-collaboration"></Icon> <Icon slot="media" icon="icon-collaboration"></Icon>
</ListItem> </ListItem>
: null} : null}
{_isEdit &&
<ListItem link="#" title={_t.textSpreadsheetSettings} onClick={onoptionclick.bind(this, '/spreadsheet-settings/')}> <ListItem link="#" title={_t.textSpreadsheetSettings} onClick={onoptionclick.bind(this, '/spreadsheet-settings/')}>
<Icon slot="media" icon="icon-table-settings"></Icon> <Icon slot="media" icon="icon-table-settings"></Icon>
</ListItem> </ListItem>
}
<ListItem title={_t.textApplicationSettings} link="#" onClick={onoptionclick.bind(this, '/application-settings/')}> <ListItem title={_t.textApplicationSettings} link="#" onClick={onoptionclick.bind(this, '/application-settings/')}>
<Icon slot="media" icon="icon-app-settings"></Icon> <Icon slot="media" icon="icon-app-settings"></Icon>
</ListItem> </ListItem>