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

[DE mobile] Fix Bug 57755

Browse source
This commit is contained in:
SergeyEzhin 2022-06-24 20:39:29 +04:00
parent ff5b1cf090
commit 2c433a9621
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/documenteditor/mobile/src/view/edit/Edit.jsx
View file

@ -284,6 +284,13 @@ const EditTabs = props => {
component: <EmptyEditLayout /> component: <EmptyEditLayout />
}); });
} else { } else {
if(inToc) {
editors.push({
caption: _t.textTableOfCont,
id: 'edit-table-contents',
component: <EditTableContentsController />
})
}
if (settings.indexOf('text') > -1) { if (settings.indexOf('text') > -1) {
editors.push({ editors.push({
caption: _t.textText, caption: _t.textText,
@ -333,13 +340,6 @@ const EditTabs = props => {
component: <EditChartController /> component: <EditChartController />
}) })
} }
if(inToc) {
editors.push({
caption: _t.textTableOfCont,
id: 'edit-table-contents',
component: <EditTableContentsController />
})
}
if (settings.indexOf('hyperlink') > -1) { if (settings.indexOf('hyperlink') > -1) {
editors.push({ editors.push({
caption: _t.textHyperlink, caption: _t.textHyperlink,

9
apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx
View file

@ -193,7 +193,6 @@ const EditParagraph = props => {
const curStyleName = storeParagraphSettings.styleName; const curStyleName = storeParagraphSettings.styleName;
const curStyle = paragraphStyles.find(style => style.name === curStyleName); const curStyle = paragraphStyles.find(style => style.name === curStyleName);
const thumbSize = storeParagraphSettings.styleThumbSize; const thumbSize = storeParagraphSettings.styleThumbSize;
const paragraph = props.storeFocusObjects.paragraphObject; const paragraph = props.storeFocusObjects.paragraphObject;
const curBackColor = storeParagraphSettings.backColor ? storeParagraphSettings.backColor : storeParagraphSettings.getBackgroundColor(paragraph); const curBackColor = storeParagraphSettings.backColor ? storeParagraphSettings.backColor : storeParagraphSettings.getBackgroundColor(paragraph);
const background = curBackColor !== 'transparent' ? `#${(typeof curBackColor === "object" ? curBackColor.color : curBackColor)}` : curBackColor; const background = curBackColor !== 'transparent' ? `#${(typeof curBackColor === "object" ? curBackColor.color : curBackColor)}` : curBackColor;
@ -203,14 +202,14 @@ const EditParagraph = props => {
<Fragment> <Fragment>
<BlockTitle>{t('Edit.textParagraphStyle')}</BlockTitle> <BlockTitle>{t('Edit.textParagraphStyle')}</BlockTitle>
<List className={activeStyle} style={{marginBottom: 0}}> <List className={activeStyle} style={{marginBottom: 0}}>
<ListItem link="/edit-paragraph-style/" routeProps={{ <ListItem link="/edit-paragraph-style/" title={!curStyle && curStyleName} routeProps={{
onStyleClick: props.onStyleClick, onStyleClick: props.onStyleClick,
onSaveStyle: props.onSaveStyle, onSaveStyle: props.onSaveStyle,
onStyleMenuDelete: props.onStyleMenuDelete onStyleMenuDelete: props.onStyleMenuDelete
}}> }}>
<div slot="inner" {curStyle &&
style={{backgroundImage: 'url(' + curStyle.image + ')', width: thumbSize.width + 'px', height: thumbSize.height + 'px', backgroundSize: thumbSize.width + 'px ' + thumbSize.height + 'px', backgroundRepeat: 'no-repeat'}} <div slot="inner" style={{backgroundImage: 'url(' + curStyle.image + ')', width: thumbSize.width + 'px', height: thumbSize.height + 'px', backgroundSize: thumbSize.width + 'px ' + thumbSize.height + 'px', backgroundRepeat: 'no-repeat'}}></div>
></div> }
</ListItem> </ListItem>
</List> </List>
<List> <List>