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

Merge pull request #1212 from ONLYOFFICE/feature/fix-bug-react

Browse source 
Feature/fix bug react
This commit is contained in:
maxkadushkin 2021-10-04 23:28:35 +03:00 committed by GitHub
parent 5d604867a6 7ae7a08e7f
commit 40e68b5afb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 63 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/common/mobile/resources/less/common-material.less
View file

@ -73,13 +73,8 @@
margin-bottom: 0; margin-bottom: 0;
margin-top: 8px; margin-top: 8px;
} }
.add-image { .add-image, .inputs-list {
ul:before, :after{ ul:after, :before{
display: none;
}
}
.inputs-list {
ul:after {
display: none; display: none;
} }
} }

4
apps/common/mobile/resources/less/search.less
View file

@ -43,6 +43,10 @@
height: auto; height: auto;
display: block; display: block;
line-height: normal; line-height: normal;
&:before{
display: none;
}
} }
} }

2
apps/documenteditor/mobile/src/view/add/AddImage.jsx
View file

@ -11,7 +11,7 @@ const PageLinkSettings = props => {
<Page> <Page>
<Navbar title={_t.textLinkSettings} backLink={_t.textBack}></Navbar> <Navbar title={_t.textLinkSettings} backLink={_t.textBack}></Navbar>
<BlockTitle>{_t.textAddress}</BlockTitle> <BlockTitle>{_t.textAddress}</BlockTitle>
<List className='inputs-list'> <List className='add-image'>
<ListInput <ListInput
type='text' type='text'
placeholder={_t.textImageURL} placeholder={_t.textImageURL}

16
apps/documenteditor/mobile/src/view/edit/EditShape.jsx
View file

@ -508,7 +508,13 @@ const EditShape = props => {
const canFill = props.storeFocusObjects.shapeObject.get_ShapeProperties().get_CanFill(); const canFill = props.storeFocusObjects.shapeObject.get_ShapeProperties().get_CanFill();
const shapeObject = props.storeFocusObjects.shapeObject; const shapeObject = props.storeFocusObjects.shapeObject;
const wrapType = props.storeShapeSettings.getWrapType(shapeObject); const wrapType = props.storeShapeSettings.getWrapType(shapeObject);
const shapeType = shapeObject.get_ShapeProperties().asc_getType();
const hideChangeType = shapeObject.get_ShapeProperties().get_FromChart() || shapeType=='line' || shapeType=='bentConnector2' || shapeType=='bentConnector3'
|| shapeType=='bentConnector4' || shapeType=='bentConnector5' || shapeType=='curvedConnector2'
|| shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5'
|| shapeType=='straightConnector1';
let disableRemove = !!props.storeFocusObjects.paragraphObject; let disableRemove = !!props.storeFocusObjects.paragraphObject;
return ( return (
@ -533,9 +539,11 @@ const EditShape = props => {
onOverlap: props.onOverlap, onOverlap: props.onOverlap,
onWrapDistance: props.onWrapDistance onWrapDistance: props.onWrapDistance
}}></ListItem> }}></ListItem>
<ListItem title={_t.textReplace} link='/edit-shape-replace/' routeProps={{ { !hideChangeType &&
onReplace: props.onReplace <ListItem title={_t.textReplace} link='/edit-shape-replace/' routeProps={{
}}></ListItem> onReplace: props.onReplace
}}></ListItem>
}
{ wrapType !== 'inline' && <ListItem title={_t.textReorder} link='/edit-shape-reorder/' routeProps={{ { wrapType !== 'inline' && <ListItem title={_t.textReorder} link='/edit-shape-reorder/' routeProps={{
onReorder: props.onReorder onReorder: props.onReorder
}}></ListItem> } }}></ListItem> }

6
apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx
View file

@ -174,10 +174,8 @@ const PageDocumentColorSchemes = props => {
return ( return (
<ListItem radio={true} className="color-schemes-menu no-fastclick" key={index} title={(index < 22) ? (SchemeNames[index] || name) : name} checked={stateScheme === index} <ListItem radio={true} className="color-schemes-menu no-fastclick" key={index} title={(index < 22) ? (SchemeNames[index] || name) : name} checked={stateScheme === index}
onChange={() => { onChange={() => {
if(index !== curScheme) { setScheme(index);
setScheme(index); setTimeout(() => props.onColorSchemeChange(index), 10);
props.onColorSchemeChange(index);
};
}}> }}>
<div slot="before-title"> <div slot="before-title">
<span className="color-schema-block"> <span className="color-schema-block">

15
apps/presentationeditor/mobile/src/view/edit/EditShape.jsx
View file

@ -12,6 +12,12 @@ const EditShape = props => {
const shapeObject = storeFocusObjects.shapeObject; const shapeObject = storeFocusObjects.shapeObject;
const canFill = shapeObject && shapeObject.get_CanFill(); const canFill = shapeObject && shapeObject.get_CanFill();
const shapeType = shapeObject.asc_getType();
const hideChangeType = shapeObject.get_FromChart() || shapeType=='line' || shapeType=='bentConnector2' || shapeType=='bentConnector3'
|| shapeType=='bentConnector4' || shapeType=='bentConnector5' || shapeType=='curvedConnector2'
|| shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5'
|| shapeType=='straightConnector1';
let disableRemove = !!props.storeFocusObjects.paragraphObject; let disableRemove = !!props.storeFocusObjects.paragraphObject;
return ( return (
@ -30,9 +36,12 @@ const EditShape = props => {
onBorderColor: props.onBorderColor onBorderColor: props.onBorderColor
}}></ListItem> }}></ListItem>
} }
<ListItem title={_t.textReplace} link="/edit-replace-shape/" routeProps={{ { !hideChangeType &&
onReplace: props.onReplace <ListItem title={_t.textReplace} link="/edit-replace-shape/" routeProps={{
}}></ListItem> onReplace: props.onReplace
}}></ListItem>
}
<ListItem title={_t.textReorder} link="/edit-reorder-shape/" routeProps={{ <ListItem title={_t.textReorder} link="/edit-reorder-shape/" routeProps={{
onReorder: props.onReorder onReorder: props.onReorder
}}></ListItem> }}></ListItem>

6
apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx
View file

@ -56,10 +56,8 @@ const PagePresentationColorSchemes = props => {
return ( return (
<ListItem radio={true} className="color-schemes-menu no-fastclick" key={index} title={(index < 22) ? (SchemeNames[index] || name) : name} checked={stateScheme === index} <ListItem radio={true} className="color-schemes-menu no-fastclick" key={index} title={(index < 22) ? (SchemeNames[index] || name) : name} checked={stateScheme === index}
onChange={() => { onChange={() => {
if(index !== curScheme) { setScheme(index);
setScheme(index); setTimeout(() => props.onColorSchemeChange(index), 10);
props.onColorSchemeChange(index);
};
}}> }}>
<div slot="before-title"> <div slot="before-title">
<span className="color-schema-block"> <span className="color-schema-block">

19
apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx
View file

@ -114,13 +114,24 @@ class ContextMenu extends ContextMenuController {
onMergeCells() { onMergeCells() {
const { t } = this.props; const { t } = this.props;
const _t = t("ContextMenu", { returnObjects: true });
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
if (api.asc_mergeCellsDataLost(Asc.c_oAscMergeOptions.Merge)) { if (api.asc_mergeCellsDataLost(Asc.c_oAscMergeOptions.Merge)) {
setTimeout(() => { setTimeout(() => {
f7.dialog.confirm(_t.warnMergeLostData, _t.notcriticalErrorTitle, () => { f7.dialog.create({
api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge); title: t('ContextMenu.notcriticalErrorTitle'),
}); text: t('ContextMenu.warnMergeLostData'),
buttons: [
{
text: t('ContextMenu.menuCancel')
},
{
text: 'OK',
onClick: () => {
api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge);
}
}
]
}).open();
}, 0); }, 0);
} else { } else {
api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge); api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge);

14
apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx
View file

@ -12,6 +12,12 @@ const EditShape = props => {
const shapeObject = storeFocusObjects.shapeObject; const shapeObject = storeFocusObjects.shapeObject;
const canFill = shapeObject && shapeObject.get_ShapeProperties().asc_getCanFill(); const canFill = shapeObject && shapeObject.get_ShapeProperties().asc_getCanFill();
const shapeType = shapeObject.get_ShapeProperties().asc_getType();
const hideChangeType = shapeObject.get_ShapeProperties().get_FromChart() || shapeType=='line' || shapeType=='bentConnector2' || shapeType=='bentConnector3'
|| shapeType=='bentConnector4' || shapeType=='bentConnector5' || shapeType=='curvedConnector2'
|| shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5'
|| shapeType=='straightConnector1';
let disableRemove = storeFocusObjects.selections.indexOf('text') > -1; let disableRemove = storeFocusObjects.selections.indexOf('text') > -1;
return ( return (
@ -30,9 +36,11 @@ const EditShape = props => {
onBorderColor: props.onBorderColor onBorderColor: props.onBorderColor
}}></ListItem> }}></ListItem>
} }
<ListItem title={_t.textReplace} link="/edit-replace-shape/" routeProps={{ { !hideChangeType &&
onReplace: props.onReplace <ListItem title={_t.textReplace} link="/edit-replace-shape/" routeProps={{
}}></ListItem> onReplace: props.onReplace
}}></ListItem>
}
<ListItem title={_t.textReorder} link="/edit-reorder-shape/" routeProps={{ <ListItem title={_t.textReorder} link="/edit-reorder-shape/" routeProps={{
onReorder: props.onReorder onReorder: props.onReorder
}}></ListItem> }}></ListItem>

6
apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx
View file

@ -29,10 +29,8 @@ const PageSpreadsheetColorSchemes = props => {
return ( return (
<ListItem radio={true} className="color-schemes-menu no-fastclick" key={index} title={(index < 22) ? (SchemeNames[index] || name) : name} checked={stateScheme === index} <ListItem radio={true} className="color-schemes-menu no-fastclick" key={index} title={(index < 22) ? (SchemeNames[index] || name) : name} checked={stateScheme === index}
onChange={() => { onChange={() => {
if(index !== curScheme) { setScheme(index);
setScheme(index); setTimeout(() => props.onColorSchemeChange(index), 15);
props.onColorSchemeChange(index);
};
}}> }}>
<div slot="before-title"> <div slot="before-title">
<span className="color-schema-block"> <span className="color-schema-block">