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

[SSE mobile] Bug 50398

Browse source
This commit is contained in:
SergeyEzhin 2021-05-18 20:59:22 +03:00
parent 1f0b09c539
commit 001ff01102
1 changed files with 62 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -360,7 +360,9 @@ const PageLayout = props => {
chartType == Asc.c_oAscChartTypeSettings.lineStacked || chartType == Asc.c_oAscChartTypeSettings.lineStacked ||
chartType == Asc.c_oAscChartTypeSettings.lineStackedPer || chartType == Asc.c_oAscChartTypeSettings.lineStackedPer ||
chartType == Asc.c_oAscChartTypeSettings.stock || chartType == Asc.c_oAscChartTypeSettings.stock ||
chartType == Asc.c_oAscChartTypeSettings.scatter) { chartType == Asc.c_oAscChartTypeSettings.scatter ||
chartType == Asc.c_oAscChartTypeSettings.scatterSmoothMarker || chartType == Asc.c_oAscChartTypeSettings.scatterSmooth ||
chartType == Asc.c_oAscChartTypeSettings.scatterLineMarker || chartType == Asc.c_oAscChartTypeSettings.scatterLine) {
dataLabelPos.push( dataLabelPos.push(
{ value: Asc.c_oAscChartDataLabelsPos.l, displayValue: _t.textLeft }, { value: Asc.c_oAscChartDataLabelsPos.l, displayValue: _t.textLeft },
{ value: Asc.c_oAscChartDataLabelsPos.r, displayValue: _t.textRight }, { value: Asc.c_oAscChartDataLabelsPos.r, displayValue: _t.textRight },
@ -375,7 +377,7 @@ const PageLayout = props => {
); );
} }
const disableSetting = props.disableSetting; const disableEditAxis = props.disableEditAxis;
const chartLayoutTitles = { const chartLayoutTitles = {
0: `${_t.textNone}`, 0: `${_t.textNone}`,
@ -461,7 +463,7 @@ const PageLayout = props => {
<BlockTitle>{_t.textAxisTitle}</BlockTitle> <BlockTitle>{_t.textAxisTitle}</BlockTitle>
<List> <List>
<ListItem title={_t.textHorizontal} link="/edit-horizontal-axis-title/" <ListItem title={_t.textHorizontal} link="/edit-horizontal-axis-title/"
after={chartLayoutAxisTitleHorizontal[chartAxisHorTitle]} disabled={disableSetting} routeProps={{ after={chartLayoutAxisTitleHorizontal[chartAxisHorTitle]} disabled={disableEditAxis} routeProps={{
chartLayoutAxisTitleHorizontal, chartLayoutAxisTitleHorizontal,
setLayoutProperty: props.setLayoutProperty, setLayoutProperty: props.setLayoutProperty,
chartAxisHorTitle, chartAxisHorTitle,
@ -469,7 +471,7 @@ const PageLayout = props => {
}}> }}>
</ListItem> </ListItem>
<ListItem title={_t.textVertical} link="/edit-vertical-axis-title/" <ListItem title={_t.textVertical} link="/edit-vertical-axis-title/"
after={chartLayoutAxisTitleVertical[chartAxisVertTitle]} disabled={disableSetting} routeProps={{ after={chartLayoutAxisTitleVertical[chartAxisVertTitle]} disabled={disableEditAxis} routeProps={{
chartLayoutAxisTitleVertical, chartLayoutAxisTitleVertical,
setLayoutProperty: props.setLayoutProperty, setLayoutProperty: props.setLayoutProperty,
chartAxisVertTitle, chartAxisVertTitle,
@ -480,7 +482,7 @@ const PageLayout = props => {
<BlockTitle>{_t.textGridlines}</BlockTitle> <BlockTitle>{_t.textGridlines}</BlockTitle>
<List> <List>
<ListItem title={_t.textHorizontal} link="/edit-horizontal-gridlines/" <ListItem title={_t.textHorizontal} link="/edit-horizontal-gridlines/"
after={chartLayoutGridlinesHorizontal[chartHorGridlines]} disabled={disableSetting} routeProps={{ after={chartLayoutGridlinesHorizontal[chartHorGridlines]} disabled={disableEditAxis} routeProps={{
chartLayoutGridlinesHorizontal, chartLayoutGridlinesHorizontal,
setLayoutProperty: props.setLayoutProperty, setLayoutProperty: props.setLayoutProperty,
chartHorGridlines, chartHorGridlines,
@ -488,7 +490,7 @@ const PageLayout = props => {
}}> }}>
</ListItem> </ListItem>
<ListItem title={_t.textVertical} link="/edit-vertical-gridlines/" <ListItem title={_t.textVertical} link="/edit-vertical-gridlines/"
after={chartLayoutGridlinesVertical[chartVertGridlines]} disabled={disableSetting} routeProps={{ after={chartLayoutGridlinesVertical[chartVertGridlines]} disabled={disableEditAxis} routeProps={{
chartLayoutGridlinesVertical, chartLayoutGridlinesVertical,
setLayoutProperty: props.setLayoutProperty, setLayoutProperty: props.setLayoutProperty,
chartVertGridlines, chartVertGridlines,
@ -1155,12 +1157,14 @@ const PageHorizontalAxis = props => {
) : null} ) : null}
</List> </List>
<List> <List>
<ListItem title={_t.textAxisPosition} link="/edit-hor-axis-position/" after={axisPosition.display} routeProps={{ {!props.disableAxisPos ?
horAxisPosition, <ListItem title={_t.textAxisPosition} link="/edit-hor-axis-position/" after={axisPosition.display} routeProps={{
onHorAxisPos: props.onHorAxisPos, horAxisPosition,
axisPosition, onHorAxisPos: props.onHorAxisPos,
setAxisPosition axisPosition,
}}></ListItem> setAxisPosition
}}></ListItem>
: null}
<ListItem title={_t.textValuesInReverseOrder}> <ListItem title={_t.textValuesInReverseOrder}>
<div slot="after"> <div slot="after">
<Toggle checked={valuesReverseOrder} <Toggle checked={valuesReverseOrder}
@ -1376,12 +1380,31 @@ const EditChart = props => {
const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties(); const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties();
const chartType = chartProperties && chartProperties.getType(); const chartType = chartProperties && chartProperties.getType();
const disableSetting = ( const disableEditAxis = (
chartType == Asc.c_oAscChartTypeSettings.pie || chartType == Asc.c_oAscChartTypeSettings.pie ||
chartType == Asc.c_oAscChartTypeSettings.doughnut || chartType == Asc.c_oAscChartTypeSettings.doughnut ||
chartType == Asc.c_oAscChartTypeSettings.pie3d chartType == Asc.c_oAscChartTypeSettings.pie3d
); );
const disableAxisPos = (
chartType == Asc.c_oAscChartTypeSettings.barNormal3d ||
chartType == Asc.c_oAscChartTypeSettings.barStacked3d ||
chartType == Asc.c_oAscChartTypeSettings.barStackedPer3d ||
chartType == Asc.c_oAscChartTypeSettings.hBarNormal3d ||
chartType == Asc.c_oAscChartTypeSettings.hBarStacked3d ||
chartType == Asc.c_oAscChartTypeSettings.hBarStackedPer3d ||
chartType == Asc.c_oAscChartTypeSettings.barNormal3dPerspective
);
const needReverse = (
chartType == Asc.c_oAscChartTypeSettings.hBarNormal ||
chartType == Asc.c_oAscChartTypeSettings.hBarStacked ||
chartType == Asc.c_oAscChartTypeSettings.hBarStackedPer ||
chartType == Asc.c_oAscChartTypeSettings.hBarNormal3d ||
chartType == Asc.c_oAscChartTypeSettings.hBarStacked3d ||
chartType == Asc.c_oAscChartTypeSettings.hBarStackedPer3d
);
return ( return (
<Fragment> <Fragment>
<List> <List>
@ -1393,11 +1416,21 @@ const EditChart = props => {
onBorderSize: props.onBorderSize onBorderSize: props.onBorderSize
}}></ListItem> }}></ListItem>
<ListItem title={_t.textLayout} link='/edit-chart-layout/' routeProps={{ <ListItem title={_t.textLayout} link='/edit-chart-layout/' routeProps={{
disableSetting, disableEditAxis,
setLayoutProperty: props.setLayoutProperty, setLayoutProperty: props.setLayoutProperty,
initChartLayout: props.initChartLayout initChartLayout: props.initChartLayout
}}></ListItem> }}></ListItem>
<ListItem title={_t.textVerticalAxis} link='/edit-chart-vertical-axis/' disabled={disableSetting} routeProps={{ <ListItem title={_t.textVerticalAxis} link={needReverse ? '/edit-chart-horizontal-axis/' : '/edit-chart-vertical-axis/'} disabled={disableEditAxis} routeProps={needReverse ? {
onHorAxisCrossType: props.onHorAxisCrossType,
onHorAxisCrossValue: props.onHorAxisCrossValue,
onHorAxisPos: props.onHorAxisPos,
onHorAxisReverse: props.onHorAxisReverse,
onHorAxisTickMajor: props.onHorAxisTickMajor,
onHorAxisTickMinor: props.onHorAxisTickMinor,
onHorAxisLabelPos: props.onHorAxisLabelPos,
disableAxisPos,
needReverse
} : {
onVerAxisMinValue: props.onVerAxisMinValue, onVerAxisMinValue: props.onVerAxisMinValue,
onVerAxisMaxValue: props.onVerAxisMaxValue, onVerAxisMaxValue: props.onVerAxisMaxValue,
onVerAxisCrossType: props.onVerAxisCrossType, onVerAxisCrossType: props.onVerAxisCrossType,
@ -1408,14 +1441,26 @@ const EditChart = props => {
onVerAxisTickMinor: props.onVerAxisTickMinor, onVerAxisTickMinor: props.onVerAxisTickMinor,
onVerAxisLabelPos: props.onVerAxisLabelPos onVerAxisLabelPos: props.onVerAxisLabelPos
}}></ListItem> }}></ListItem>
<ListItem title={_t.textHorizontalAxis} link='/edit-chart-horizontal-axis/' disabled={disableSetting} routeProps={{ <ListItem title={_t.textHorizontalAxis} link={needReverse || chartType == Asc.c_oAscChartTypeSettings.scatter ? '/edit-chart-vertical-axis/' : '/edit-chart-horizontal-axis/'} disabled={disableEditAxis} routeProps={needReverse || chartType == Asc.c_oAscChartTypeSettings.scatter ? {
onVerAxisMinValue: props.onVerAxisMinValue,
onVerAxisMaxValue: props.onVerAxisMaxValue,
onVerAxisCrossType: props.onVerAxisCrossType,
onVerAxisCrossValue: props.onVerAxisCrossValue,
onVerAxisDisplayUnits: props.onVerAxisDisplayUnits,
onVerAxisReverse: props.onVerAxisReverse,
onVerAxisTickMajor: props.onVerAxisTickMajor,
onVerAxisTickMinor: props.onVerAxisTickMinor,
onVerAxisLabelPos: props.onVerAxisLabelPos
} : {
onHorAxisCrossType: props.onHorAxisCrossType, onHorAxisCrossType: props.onHorAxisCrossType,
onHorAxisCrossValue: props.onHorAxisCrossValue, onHorAxisCrossValue: props.onHorAxisCrossValue,
onHorAxisPos: props.onHorAxisPos, onHorAxisPos: props.onHorAxisPos,
onHorAxisReverse: props.onHorAxisReverse, onHorAxisReverse: props.onHorAxisReverse,
onHorAxisTickMajor: props.onHorAxisTickMajor, onHorAxisTickMajor: props.onHorAxisTickMajor,
onHorAxisTickMinor: props.onHorAxisTickMinor, onHorAxisTickMinor: props.onHorAxisTickMinor,
onHorAxisLabelPos: props.onHorAxisLabelPos onHorAxisLabelPos: props.onHorAxisLabelPos,
disableAxisPos,
needReverse
}}></ListItem> }}></ListItem>
<ListItem title={_t.textReorder} link='/edit-chart-reorder/' routeProps={{ <ListItem title={_t.textReorder} link='/edit-chart-reorder/' routeProps={{
onReorder: props.onReorder onReorder: props.onReorder