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

[DE PE SSE mobile] Fix Bug 50897

Browse source
This commit is contained in:
SergeyEzhin 2021-06-18 16:06:53 +03:00
parent c85901a908
commit 10e10ca77b
11 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -202,7 +202,7 @@ const EditLayoutNavbar = ({ editors, inPopover }) => {
editors.length > 1 ? editors.length > 1 ?
<div className='tab-buttons tabbar'> <div className='tab-buttons tabbar'>
{editors.map((item, index) => <Link key={"de-link-" + item.id} tabLink={"#" + item.id} tabLinkActive={index === 0}>{item.caption}</Link>)} {editors.map((item, index) => <Link key={"de-link-" + item.id} tabLink={"#" + item.id} tabLinkActive={index === 0}>{item.caption}</Link>)}
{isAndroid && <span className='tab-link-highlight' style={{width: 100 / editors.lenght + '%'}}></span>} {isAndroid && <span className='tab-link-highlight' style={{width: 100 / editors.length + '%'}}></span>}
</div> : </div> :
<NavTitle>{ editors[0].caption }</NavTitle> <NavTitle>{ editors[0].caption }</NavTitle>
} }

2
apps/documenteditor/mobile/src/view/edit/EditChart.jsx
View file

@ -147,6 +147,7 @@ const PageStyle = props => {
const types = storeChartSettings.types; const types = storeChartSettings.types;
const curType = chartProperties ? chartProperties.getType() : null; const curType = chartProperties ? chartProperties.getType() : null;
const chartStyles = storeChartSettings.chartStyles; const chartStyles = storeChartSettings.chartStyles;
const isAndroid = Device.android;
// console.log(chartStyles, curType); // console.log(chartStyles, curType);
// console.log(Asc.c_oAscChartTypeSettings.comboBarLine, Asc.c_oAscChartTypeSettings.comboBarLineSecondary, Asc.c_oAscChartTypeSettings.comboAreaBar, Asc.c_oAscChartTypeSettings.comboCustom); // console.log(Asc.c_oAscChartTypeSettings.comboBarLine, Asc.c_oAscChartTypeSettings.comboBarLineSecondary, Asc.c_oAscChartTypeSettings.comboAreaBar, Asc.c_oAscChartTypeSettings.comboCustom);
@ -184,6 +185,7 @@ const PageStyle = props => {
{chartStyles ? <Link key={"de-link-chart-style"} tabLink={"#edit-chart-style"}>{_t.textStyle}</Link> : null} {chartStyles ? <Link key={"de-link-chart-style"} tabLink={"#edit-chart-style"}>{_t.textStyle}</Link> : null}
<Link key={"de-link-chart-fill"} tabLink={"#edit-chart-fill"}>{_t.textFill}</Link> <Link key={"de-link-chart-fill"} tabLink={"#edit-chart-fill"}>{_t.textFill}</Link>
<Link key={"de-link-chart-border"} tabLink={"#edit-chart-border"}>{_t.textBorder}</Link> <Link key={"de-link-chart-border"} tabLink={"#edit-chart-border"}>{_t.textBorder}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>

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

@ -144,6 +144,7 @@ const PageStyle = props => {
const _t = t('Edit', {returnObjects: true}); const _t = t('Edit', {returnObjects: true});
const storeShapeSettings = props.storeShapeSettings; const storeShapeSettings = props.storeShapeSettings;
const shapeObject = props.storeFocusObjects.shapeObject; const shapeObject = props.storeFocusObjects.shapeObject;
const isAndroid = Device.android;
let borderSize, borderType, transparent; let borderSize, borderType, transparent;
if (shapeObject) { if (shapeObject) {
@ -177,9 +178,10 @@ const PageStyle = props => {
<Page> <Page>
<Navbar backLink={_t.textBack}> <Navbar backLink={_t.textBack}>
<div className='tab-buttons tabbar'> <div className='tab-buttons tabbar'>
<Link key={"de-link-shape-fill"} tabLink={"#edit-shape-fill"} tabLinkActive={true}>{_t.textFill}</Link> <Link key={"de-link-shape-fill"} tabLink={"#edit-shape-fill"} tabLinkActive={true}>{_t.textFill}</Link>
<Link key={"de-link-shape-border"} tabLink={"#edit-shape-border"}>{_t.textBorder}</Link> <Link key={"de-link-shape-border"} tabLink={"#edit-shape-border"}>{_t.textBorder}</Link>
<Link key={"de-link-shape-effects"} tabLink={"#edit-shape-effects"}>{_t.textEffects}</Link> <Link key={"de-link-shape-effects"} tabLink={"#edit-shape-effects"}>{_t.textEffects}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>

8
apps/documenteditor/mobile/src/view/edit/EditTable.jsx
View file

@ -466,6 +466,7 @@ const PageStyle = props => {
const _t = t('Edit', {returnObjects: true}); const _t = t('Edit', {returnObjects: true});
const storeTableSettings = props.storeTableSettings; const storeTableSettings = props.storeTableSettings;
const templates = storeTableSettings.styles; const templates = storeTableSettings.styles;
const isAndroid = Device.android;
const tableObject = props.storeFocusObjects.tableObject; const tableObject = props.storeFocusObjects.tableObject;
if (!tableObject && Device.phone) { if (!tableObject && Device.phone) {
@ -477,9 +478,10 @@ const PageStyle = props => {
<Page> <Page>
<Navbar backLink={_t.textBack}> <Navbar backLink={_t.textBack}>
<div className="tab-buttons tabbar"> <div className="tab-buttons tabbar">
<Link key={"de-link-table-style"} tabLink={"#edit-table-style"} tabLinkActive={true}>{_t.textStyle}</Link> <Link key={"de-link-table-style"} tabLink={"#edit-table-style"} tabLinkActive={true}>{_t.textStyle}</Link>
<Link key={"de-link-table-fill"} tabLink={"#edit-table-fill"}>{_t.textFill}</Link> <Link key={"de-link-table-fill"} tabLink={"#edit-table-fill"}>{_t.textFill}</Link>
<Link key={"de-link-table-border"} tabLink={"#edit-table-border"}>{_t.textBorder}</Link> <Link key={"de-link-table-border"} tabLink={"#edit-table-border"}>{_t.textBorder}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>

2
apps/presentationeditor/mobile/src/view/edit/Edit.jsx
View file

@ -231,7 +231,7 @@ const EditLayoutNavbar = ({ editors, inPopover }) => {
editors.length > 1 ? editors.length > 1 ?
<div className='tab-buttons tabbar'> <div className='tab-buttons tabbar'>
{editors.map((item, index) => <Link key={"pe-link-" + item.id} tabLink={"#" + item.id} tabLinkActive={index === 0}>{item.caption}</Link>)} {editors.map((item, index) => <Link key={"pe-link-" + item.id} tabLink={"#" + item.id} tabLinkActive={index === 0}>{item.caption}</Link>)}
{isAndroid && <span className='tab-link-highlight' style={{width: 100 / editors.lenght + '%'}}></span>} {isAndroid && <span className='tab-link-highlight' style={{width: 100 / editors.length + '%'}}></span>}
</div> : </div> :
<NavTitle>{ editors[0].caption }</NavTitle> <NavTitle>{ editors[0].caption }</NavTitle>
} }

2
apps/presentationeditor/mobile/src/view/edit/EditChart.jsx
View file

@ -159,6 +159,7 @@ const PageStyle = props => {
const styles = storeChartSettings.styles; const styles = storeChartSettings.styles;
const shapeObject = props.storeFocusObjects.shapeObject; const shapeObject = props.storeFocusObjects.shapeObject;
const chartStyles = storeChartSettings.chartStyles; const chartStyles = storeChartSettings.chartStyles;
const isAndroid = Device.android;
let borderSize, borderType, borderColor; let borderSize, borderType, borderColor;
@ -194,6 +195,7 @@ const PageStyle = props => {
{chartStyles ? <Link key={"pe-link-chart-style"} tabLink={"#edit-chart-style"}>{_t.textStyle}</Link> : null} {chartStyles ? <Link key={"pe-link-chart-style"} tabLink={"#edit-chart-style"}>{_t.textStyle}</Link> : null}
<Link key={"pe-link-chart-fill"} tabLink={"#edit-chart-fill"}>{_t.textFill}</Link> <Link key={"pe-link-chart-fill"} tabLink={"#edit-chart-fill"}>{_t.textFill}</Link>
<Link key={"pe-link-chart-border"} tabLink={"#edit-chart-border"}>{_t.textBorder}</Link> <Link key={"pe-link-chart-border"} tabLink={"#edit-chart-border"}>{_t.textBorder}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>

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

@ -89,6 +89,7 @@ const PageStyle = props => {
const storeFocusObjects = props.storeFocusObjects; const storeFocusObjects = props.storeFocusObjects;
const storeShapeSettings = props.storeShapeSettings; const storeShapeSettings = props.storeShapeSettings;
const shapeObject = storeFocusObjects.shapeObject; const shapeObject = storeFocusObjects.shapeObject;
const isAndroid = Device.android;
let borderSize, borderType, transparent; let borderSize, borderType, transparent;
if (shapeObject) { if (shapeObject) {
@ -125,6 +126,7 @@ const PageStyle = props => {
<Link key={"pe-link-shape-fill"} tabLink={"#edit-shape-fill"} tabLinkActive={true}>{_t.textFill}</Link> <Link key={"pe-link-shape-fill"} tabLink={"#edit-shape-fill"} tabLinkActive={true}>{_t.textFill}</Link>
<Link key={"pe-link-shape-border"} tabLink={"#edit-shape-border"}>{_t.textBorder}</Link> <Link key={"pe-link-shape-border"} tabLink={"#edit-shape-border"}>{_t.textBorder}</Link>
<Link key={"pe-link-shape-effects"} tabLink={"#edit-shape-effects"}>{_t.textEffects}</Link> <Link key={"pe-link-shape-effects"} tabLink={"#edit-shape-effects"}>{_t.textEffects}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>

8
apps/presentationeditor/mobile/src/view/edit/EditTable.jsx
View file

@ -313,14 +313,16 @@ const PageStyle = props => {
const _t = t('View.Edit', {returnObjects: true}); const _t = t('View.Edit', {returnObjects: true});
const storeTableSettings = props.storeTableSettings; const storeTableSettings = props.storeTableSettings;
const templates = storeTableSettings.styles; const templates = storeTableSettings.styles;
const isAndroid = Device.android;
return ( return (
<Page> <Page>
<Navbar backLink={_t.textBack}> <Navbar backLink={_t.textBack}>
<div className="tab-buttons tabbar"> <div className="tab-buttons tabbar">
<Link key={"pe-link-table-style"} tabLink={"#edit-table-style"} tabLinkActive={true}>{_t.textStyle}</Link> <Link key={"pe-link-table-style"} tabLink={"#edit-table-style"} tabLinkActive={true}>{_t.textStyle}</Link>
<Link key={"pe-link-table-fill"} tabLink={"#edit-table-fill"}>{_t.textFill}</Link> <Link key={"pe-link-table-fill"} tabLink={"#edit-table-fill"}>{_t.textFill}</Link>
<Link key={"pe-link-table-border"} tabLink={"#edit-table-border"}>{_t.textBorder}</Link> <Link key={"pe-link-table-border"} tabLink={"#edit-table-border"}>{_t.textBorder}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>

2
apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx
View file

@ -296,7 +296,7 @@ const EditLayoutNavbar = ({ editors, inPopover }) => {
editors.length > 1 ? editors.length > 1 ?
<div className='tab-buttons tabbar'> <div className='tab-buttons tabbar'>
{editors.map((item, index) => <Link key={"sse-link-" + item.id} tabLink={"#" + item.id} tabLinkActive={index === 0}>{item.caption}</Link>)} {editors.map((item, index) => <Link key={"sse-link-" + item.id} tabLink={"#" + item.id} tabLinkActive={index === 0}>{item.caption}</Link>)}
{isAndroid && <span className='tab-link-highlight' style={{width: 100 / editors.lenght + '%'}}></span>} {isAndroid && <span className='tab-link-highlight' style={{width: 100 / editors.length + '%'}}></span>}
</div> : </div> :
<NavTitle>{ editors[0].caption }</NavTitle> <NavTitle>{ editors[0].caption }</NavTitle>
} }

2
apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx
View file

@ -147,6 +147,7 @@ const PageBorderColor = props => {
const PageStyle = props => { const PageStyle = props => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('View.Edit', {returnObjects: true}); const _t = t('View.Edit', {returnObjects: true});
const isAndroid = Device.android;
const storeChartSettings = props.storeChartSettings; const storeChartSettings = props.storeChartSettings;
const storeFocusObjects = props.storeFocusObjects; const storeFocusObjects = props.storeFocusObjects;
const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties(); const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties();
@ -195,6 +196,7 @@ const PageStyle = props => {
{chartStyles ? <Link key={"sse-link-chart-style"} tabLink={"#edit-chart-style"}>{_t.textStyle}</Link> : null} {chartStyles ? <Link key={"sse-link-chart-style"} tabLink={"#edit-chart-style"}>{_t.textStyle}</Link> : null}
<Link key={"sse-link-chart-fill"} tabLink={"#edit-chart-fill"}>{_t.textFill}</Link> <Link key={"sse-link-chart-fill"} tabLink={"#edit-chart-fill"}>{_t.textFill}</Link>
<Link key={"sse-link-chart-border"} tabLink={"#edit-chart-border"}>{_t.textBorder}</Link> <Link key={"sse-link-chart-border"} tabLink={"#edit-chart-border"}>{_t.textBorder}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>

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

@ -83,6 +83,7 @@ const PaletteFill = inject("storeFocusObjects", "storeShapeSettings", "storePale
const PageStyle = props => { const PageStyle = props => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('View.Edit', {returnObjects: true}); const _t = t('View.Edit', {returnObjects: true});
const isAndroid = Device.android;
const storeShapeSettings = props.storeShapeSettings; const storeShapeSettings = props.storeShapeSettings;
const storeFocusObjects = props.storeFocusObjects; const storeFocusObjects = props.storeFocusObjects;
const shapeObject = storeFocusObjects.shapeObject.get_ShapeProperties(); const shapeObject = storeFocusObjects.shapeObject.get_ShapeProperties();
@ -121,6 +122,7 @@ const PageStyle = props => {
<Link key={"se-link-shape-fill"} tabLink={"#edit-shape-fill"} tabLinkActive={true}>{_t.textFill}</Link> <Link key={"se-link-shape-fill"} tabLink={"#edit-shape-fill"} tabLinkActive={true}>{_t.textFill}</Link>
<Link key={"se-link-shape-border"} tabLink={"#edit-shape-border"}>{_t.textBorder}</Link> <Link key={"se-link-shape-border"} tabLink={"#edit-shape-border"}>{_t.textBorder}</Link>
<Link key={"se-link-shape-effects"} tabLink={"#edit-shape-effects"}>{_t.textEffects}</Link> <Link key={"se-link-shape-effects"} tabLink={"#edit-shape-effects"}>{_t.textEffects}</Link>
{isAndroid && <span className='tab-link-highlight'></span>}
</div> </div>
{Device.phone && {Device.phone &&
<NavRight> <NavRight>