From 001ff011025987233e71a3b69ceefbc1e6ffe120 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 18 May 2021 20:59:22 +0300 Subject: [PATCH 1/8] [SSE mobile] Bug 50398 --- .../mobile/src/view/edit/EditChart.jsx | 79 +++++++++++++++---- 1 file changed, 62 insertions(+), 17 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx index 4beba878c..539fdc2e8 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx @@ -360,7 +360,9 @@ const PageLayout = props => { chartType == Asc.c_oAscChartTypeSettings.lineStacked || chartType == Asc.c_oAscChartTypeSettings.lineStackedPer || 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( { value: Asc.c_oAscChartDataLabelsPos.l, displayValue: _t.textLeft }, { 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 = { 0: `${_t.textNone}`, @@ -461,7 +463,7 @@ const PageLayout = props => { {_t.textAxisTitle} { }}> { {_t.textGridlines} { }}> { ) : null} - + {!props.disableAxisPos ? + + : null}
{ const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties(); const chartType = chartProperties && chartProperties.getType(); - const disableSetting = ( + const disableEditAxis = ( chartType == Asc.c_oAscChartTypeSettings.pie || chartType == Asc.c_oAscChartTypeSettings.doughnut || 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 ( @@ -1393,11 +1416,21 @@ const EditChart = props => { onBorderSize: props.onBorderSize }}> - { onVerAxisTickMinor: props.onVerAxisTickMinor, onVerAxisLabelPos: props.onVerAxisLabelPos }}> - Date: Thu, 20 May 2021 13:37:23 +0300 Subject: [PATCH 2/8] [SSE mobile] Bug 48754 --- .../spreadsheeteditor/mobile/src/controller/Statusbar.jsx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx b/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx index 3531b7d36..778eaeb84 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx @@ -22,6 +22,7 @@ const Statusbar = inject('sheets', 'storeAppOptions', 'users')(props => { api.asc_registerCallback('asc_onWorksheetLocked', onWorksheetLocked); api.asc_registerCallback('asc_onSheetsChanged', onApiSheetsChanged); api.asc_registerCallback('asc_onHidePopMenu', onApiHideTabContextMenu); + api.asc_registerCallback('asc_onActiveSheetChanged', onApiActiveSheetChanged); }; if ( !Common.EditorApi ) { Common.Notifications.on('document:ready', onDocumentReady); @@ -48,11 +49,18 @@ const Statusbar = inject('sheets', 'storeAppOptions', 'users')(props => { api.asc_unregisterCallback('asc_onWorksheetLocked', onWorksheetLocked); api.asc_unregisterCallback('asc_onSheetsChanged', onApiSheetsChanged); api.asc_unregisterCallback('asc_onHidePopMenu', onApiHideTabContextMenu); + api.asc_unregisterCallback('asc_onActiveSheetChanged', onApiActiveSheetChanged); $$('.view-main').off('click', on_main_view_click); }; }, []); + const onApiActiveSheetChanged = (index) => { + // console.log(index); + sheets.setActiveWorksheet(index); + Common.Notifications.trigger('sheet:active', index); + } + const onApiHideTabContextMenu = () => { f7.popover.close('.document-menu.modal-in', false); } From b8004facaee183f91674e8bdc35bfd69c1fb5695 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Thu, 20 May 2021 23:05:58 +0300 Subject: [PATCH 3/8] [SSE mobile] Correct edit link --- .../mobile/src/controller/edit/EditLink.jsx | 22 +++++++------ .../mobile/src/view/edit/EditLink.jsx | 32 ++++++++++++------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx b/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx index 92e221136..e9f8327ff 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx @@ -18,12 +18,12 @@ class EditLinkController extends Component { this.linkInfo = cellInfo.asc_getHyperlink(); this.isLock = cellInfo.asc_getLockText(); this.currentSheet = api.asc_getWorksheetName(api.asc_getActiveWorksheetIndex()); - + // Sheets let items = []; let wsc = api.asc_getWorksheetsCount(); - const aws = api.asc_getActiveWorksheetIndex(); + // const aws = api.asc_getActiveWorksheetIndex(); if (wsc > 0) { items = []; @@ -33,12 +33,14 @@ class EditLinkController extends Component { value: wsc, caption: api.asc_getWorksheetName(wsc) }); - if (wsc === aws) { - this.activeSheet = { - value: wsc, - caption: api.asc_getWorksheetName(wsc) - } - } + + console.log(api.asc_getWorksheetName(wsc)) + // if (wsc === aws) { + // this.activeSheet = { + // value: wsc, + // caption: api.asc_getWorksheetName(wsc) + // } + // } } } this.sheets = items; @@ -103,7 +105,7 @@ class EditLinkController extends Component { defaultDisplay = url; } - if (this.isLock) { + if (args.isLock) { linkProps.asc_setText(null); } else { if (!displayText) { @@ -131,7 +133,7 @@ class EditLinkController extends Component { linkInfo={this.linkInfo} isLock={this.isLock} sheets={this.sheets} - activeSheet={this.activeSheet} + // activeSheet={this.activeSheet} currentSheet={this.currentSheet} onEditLink={this.onEditLink} onRemoveLink={this.onRemoveLink} diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx index 8b9f6d554..5dc420253 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx @@ -35,7 +35,7 @@ const PageTypeLink = ({curType, changeType, storeFocusObjects}) => { const PageSheet = ({curSheet, sheets, changeSheet, storeFocusObjects}) => { const { t } = useTranslation(); const _t = t('View.Edit', {returnObjects: true}); - const [stateSheet, setSheet] = useState(curSheet.value); + const [stateSheet, setSheet] = useState(curSheet); const settings = !storeFocusObjects.focusOn ? [] : (storeFocusObjects.focusOn === 'obj' ? storeFocusObjects.objects : storeFocusObjects.selections); if (storeFocusObjects.focusOn === 'obj' || settings.indexOf('hyperlink') === -1) { @@ -59,10 +59,10 @@ const PageSheet = ({curSheet, sheets, changeSheet, storeFocusObjects}) => { key={`sheet-${sheet.value}`} title={sheet.caption} radio - checked={stateSheet === sheet.value} - onClick={() => { - setSheet(sheet.value); - changeSheet(sheet); + checked={stateSheet === sheet.caption} + onChange={() => { + setSheet(sheet.caption); + changeSheet(sheet.caption); }} /> ) @@ -80,13 +80,20 @@ const EditLink = props => { const linkInfo = props.linkInfo; const isLock = props.isLock; const sheets = props.sheets; - const activeSheet = props.activeSheet; const currentSheet = props.currentSheet; + + console.log(linkInfo); + const valueLinkInfo = linkInfo.asc_getType(); const linkSheet = (valueLinkInfo == Asc.c_oAscHyperlinkType.RangeLink) ? linkInfo.asc_getSheet() : currentSheet; - + + console.log(valueLinkInfo); + console.log(currentSheet); + console.log(linkSheet); + const [typeLink, setTypeLink] = useState(valueLinkInfo); const textType = typeLink != Asc.c_oAscHyperlinkType.RangeLink ? _t.textExternalLink : _t.textInternalDataRange; + const changeType = (newType) => { setTypeLink(newType); }; @@ -98,7 +105,8 @@ const EditLink = props => { const [screenTip, setScreenTip] = useState(linkInfo.asc_getTooltip()); - const [curSheet, setSheet] = useState(activeSheet); + const [curSheet, setSheet] = useState(linkSheet); + const changeSheet = (sheet) => { setSheet(sheet); }; @@ -123,8 +131,8 @@ const EditLink = props => { /> } {typeLink == Asc.c_oAscHyperlinkType.RangeLink && - @@ -158,8 +166,8 @@ const EditLink = props => { {props.onEditLink(typeLink === 1 ? - {type: 1, url: link, text: stateDisplayText, tooltip: screenTip} : - {type: 2, url: range, sheet: curSheet.caption, text: stateDisplayText, tooltip: screenTip})}} + {type: 1, url: link, text: stateDisplayText, tooltip: screenTip, isLock} : + {type: 2, url: range, sheet: curSheet, text: stateDisplayText, tooltip: screenTip, isLock})}} /> Date: Fri, 21 May 2021 16:02:28 +0300 Subject: [PATCH 4/8] [SSE mobile] Bug 49779 --- .../mobile/src/controller/edit/EditLink.jsx | 16 +++----------- .../mobile/src/view/edit/EditLink.jsx | 21 +++++++------------ 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx b/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx index e9f8327ff..0f3d1c44a 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx @@ -23,24 +23,15 @@ class EditLinkController extends Component { let items = []; let wsc = api.asc_getWorksheetsCount(); - // const aws = api.asc_getActiveWorksheetIndex(); if (wsc > 0) { items = []; - while ( !(--wsc < 0) ) { - if ( !api.asc_isWorksheetHidden(wsc) ) { + while (!(--wsc < 0)) { + if (!api.asc_isWorksheetHidden(wsc)) { items.unshift({ value: wsc, caption: api.asc_getWorksheetName(wsc) }); - - console.log(api.asc_getWorksheetName(wsc)) - // if (wsc === aws) { - // this.activeSheet = { - // value: wsc, - // caption: api.asc_getWorksheetName(wsc) - // } - // } } } this.sheets = items; @@ -105,7 +96,7 @@ class EditLinkController extends Component { defaultDisplay = url; } - if (args.isLock) { + if (this.isLock) { linkProps.asc_setText(null); } else { if (!displayText) { @@ -133,7 +124,6 @@ class EditLinkController extends Component { linkInfo={this.linkInfo} isLock={this.isLock} sheets={this.sheets} - // activeSheet={this.activeSheet} currentSheet={this.currentSheet} onEditLink={this.onEditLink} onRemoveLink={this.onRemoveLink} diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx index 5dc420253..24db43a7c 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditLink.jsx @@ -81,17 +81,12 @@ const EditLink = props => { const isLock = props.isLock; const sheets = props.sheets; const currentSheet = props.currentSheet; + const valueTypeLink = linkInfo.asc_getType(); + const valueLinkSheet = linkInfo.asc_getSheet(); + const getLinkSheet = () => sheets.find(sheet => sheet.caption === valueLinkSheet); + const linkSheet = (valueTypeLink == Asc.c_oAscHyperlinkType.RangeLink) ? getLinkSheet() ? getLinkSheet().caption : '' : currentSheet; - console.log(linkInfo); - - const valueLinkInfo = linkInfo.asc_getType(); - const linkSheet = (valueLinkInfo == Asc.c_oAscHyperlinkType.RangeLink) ? linkInfo.asc_getSheet() : currentSheet; - - console.log(valueLinkInfo); - console.log(currentSheet); - console.log(linkSheet); - - const [typeLink, setTypeLink] = useState(valueLinkInfo); + const [typeLink, setTypeLink] = useState(valueTypeLink); const textType = typeLink != Asc.c_oAscHyperlinkType.RangeLink ? _t.textExternalLink : _t.textInternalDataRange; const changeType = (newType) => { @@ -164,10 +159,10 @@ const EditLink = props => { {props.onEditLink(typeLink === 1 ? - {type: 1, url: link, text: stateDisplayText, tooltip: screenTip, isLock} : - {type: 2, url: range, sheet: curSheet, text: stateDisplayText, tooltip: screenTip, isLock})}} + {type: 1, url: link, text: stateDisplayText, tooltip: screenTip} : + {type: 2, url: range, sheet: curSheet, text: stateDisplayText, tooltip: screenTip})}} /> Date: Fri, 21 May 2021 16:37:50 +0300 Subject: [PATCH 5/8] [DE PE SSE mobile] Bug 50406 --- .../mobile/src/store/chartSettings.js | 14 +++++++------- .../mobile/src/store/chartSettings.js | 14 +++++++------- .../mobile/src/store/chartSettings.js | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/apps/documenteditor/mobile/src/store/chartSettings.js b/apps/documenteditor/mobile/src/store/chartSettings.js index 8ae720d45..019aee3c4 100644 --- a/apps/documenteditor/mobile/src/store/chartSettings.js +++ b/apps/documenteditor/mobile/src/store/chartSettings.js @@ -104,12 +104,19 @@ export class storeChartSettings { { type: Asc.c_oAscChartTypeSettings.barNormal, thumb: 'chart-03.png'}, { type: Asc.c_oAscChartTypeSettings.barStacked, thumb: 'chart-02.png'}, { type: Asc.c_oAscChartTypeSettings.barStackedPer, thumb: 'chart-01.png'}, + { type: Asc.c_oAscChartTypeSettings.barNormal3d, thumb: 'chart-17.png'}, + { type: Asc.c_oAscChartTypeSettings.barStacked3d, thumb: 'chart-18.png'}, + { type: Asc.c_oAscChartTypeSettings.barStackedPer3d, thumb: 'chart-19.png'}, + { type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, thumb: 'chart-20.png'}, { type: Asc.c_oAscChartTypeSettings.lineNormal, thumb: 'chart-06.png'}, { type: Asc.c_oAscChartTypeSettings.lineStacked, thumb: 'chart-05.png'}, { type: Asc.c_oAscChartTypeSettings.lineStackedPer, thumb: 'chart-04.png'}, { type: Asc.c_oAscChartTypeSettings.hBarNormal, thumb: 'chart-09.png'}, { type: Asc.c_oAscChartTypeSettings.hBarStacked, thumb: 'chart-08.png'}, { type: Asc.c_oAscChartTypeSettings.hBarStackedPer, thumb: 'chart-07.png'}, + { type: Asc.c_oAscChartTypeSettings.hBarNormal3d, thumb: 'chart-25.png'}, + { type: Asc.c_oAscChartTypeSettings.hBarStacked3d, thumb: 'chart-24.png'}, + { type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, thumb: 'chart-23.png'}, { type: Asc.c_oAscChartTypeSettings.areaNormal, thumb: 'chart-12.png'}, { type: Asc.c_oAscChartTypeSettings.areaStacked, thumb: 'chart-11.png'}, { type: Asc.c_oAscChartTypeSettings.areaStackedPer, thumb: 'chart-10.png'}, @@ -119,13 +126,6 @@ export class storeChartSettings { { type: Asc.c_oAscChartTypeSettings.scatter, thumb: 'chart-15.png'}, { type: Asc.c_oAscChartTypeSettings.stock, thumb: 'chart-16.png'}, { type: Asc.c_oAscChartTypeSettings.line3d, thumb: 'chart-21.png'}, - { type: Asc.c_oAscChartTypeSettings.barNormal3d, thumb: 'chart-17.png'}, - { type: Asc.c_oAscChartTypeSettings.barStacked3d, thumb: 'chart-18.png'}, - { type: Asc.c_oAscChartTypeSettings.barStackedPer3d, thumb: 'chart-19.png'}, - { type: Asc.c_oAscChartTypeSettings.hBarNormal3d, thumb: 'chart-25.png'}, - { type: Asc.c_oAscChartTypeSettings.hBarStacked3d, thumb: 'chart-24.png'}, - { type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, thumb: 'chart-23.png'}, - { type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, thumb: 'chart-20.png'} ]; const columns = 3; const arr = []; diff --git a/apps/presentationeditor/mobile/src/store/chartSettings.js b/apps/presentationeditor/mobile/src/store/chartSettings.js index 935fc7203..f30ac8a2e 100644 --- a/apps/presentationeditor/mobile/src/store/chartSettings.js +++ b/apps/presentationeditor/mobile/src/store/chartSettings.js @@ -52,12 +52,19 @@ export class storeChartSettings { { type: Asc.c_oAscChartTypeSettings.barNormal, thumb: 'chart-03.png'}, { type: Asc.c_oAscChartTypeSettings.barStacked, thumb: 'chart-02.png'}, { type: Asc.c_oAscChartTypeSettings.barStackedPer, thumb: 'chart-01.png'}, + { type: Asc.c_oAscChartTypeSettings.barNormal3d, thumb: 'chart-17.png'}, + { type: Asc.c_oAscChartTypeSettings.barStacked3d, thumb: 'chart-18.png'}, + { type: Asc.c_oAscChartTypeSettings.barStackedPer3d, thumb: 'chart-19.png'}, + { type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, thumb: 'chart-20.png'}, { type: Asc.c_oAscChartTypeSettings.lineNormal, thumb: 'chart-06.png'}, { type: Asc.c_oAscChartTypeSettings.lineStacked, thumb: 'chart-05.png'}, { type: Asc.c_oAscChartTypeSettings.lineStackedPer, thumb: 'chart-04.png'}, { type: Asc.c_oAscChartTypeSettings.hBarNormal, thumb: 'chart-09.png'}, { type: Asc.c_oAscChartTypeSettings.hBarStacked, thumb: 'chart-08.png'}, { type: Asc.c_oAscChartTypeSettings.hBarStackedPer, thumb: 'chart-07.png'}, + { type: Asc.c_oAscChartTypeSettings.hBarNormal3d, thumb: 'chart-25.png'}, + { type: Asc.c_oAscChartTypeSettings.hBarStacked3d, thumb: 'chart-24.png'}, + { type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, thumb: 'chart-23.png'}, { type: Asc.c_oAscChartTypeSettings.areaNormal, thumb: 'chart-12.png'}, { type: Asc.c_oAscChartTypeSettings.areaStacked, thumb: 'chart-11.png'}, { type: Asc.c_oAscChartTypeSettings.areaStackedPer, thumb: 'chart-10.png'}, @@ -67,13 +74,6 @@ export class storeChartSettings { { type: Asc.c_oAscChartTypeSettings.scatter, thumb: 'chart-15.png'}, { type: Asc.c_oAscChartTypeSettings.stock, thumb: 'chart-16.png'}, { type: Asc.c_oAscChartTypeSettings.line3d, thumb: 'chart-21.png'}, - { type: Asc.c_oAscChartTypeSettings.barNormal3d, thumb: 'chart-17.png'}, - { type: Asc.c_oAscChartTypeSettings.barStacked3d, thumb: 'chart-18.png'}, - { type: Asc.c_oAscChartTypeSettings.barStackedPer3d, thumb: 'chart-19.png'}, - { type: Asc.c_oAscChartTypeSettings.hBarNormal3d, thumb: 'chart-25.png'}, - { type: Asc.c_oAscChartTypeSettings.hBarStacked3d, thumb: 'chart-24.png'}, - { type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, thumb: 'chart-23.png'}, - { type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, thumb: 'chart-20.png'} ]; const columns = 3; const arr = []; diff --git a/apps/spreadsheeteditor/mobile/src/store/chartSettings.js b/apps/spreadsheeteditor/mobile/src/store/chartSettings.js index 3d1ea1dbb..dacd9310c 100644 --- a/apps/spreadsheeteditor/mobile/src/store/chartSettings.js +++ b/apps/spreadsheeteditor/mobile/src/store/chartSettings.js @@ -78,12 +78,19 @@ export class storeChartSettings { { type: Asc.c_oAscChartTypeSettings.barNormal, thumb: 'bar-normal'}, { type: Asc.c_oAscChartTypeSettings.barStacked, thumb: 'bar-stacked'}, { type: Asc.c_oAscChartTypeSettings.barStackedPer, thumb: 'bar-pstacked'}, + { type: Asc.c_oAscChartTypeSettings.barNormal3d, thumb: 'bar3dnormal'}, + { type: Asc.c_oAscChartTypeSettings.barStacked3d, thumb: 'bar3dstack'}, + { type: Asc.c_oAscChartTypeSettings.barStackedPer3d, thumb: 'bar3dpstack'}, + { type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, thumb: 'bar3dpsnormal'}, { type: Asc.c_oAscChartTypeSettings.lineNormal, thumb: 'line-normal'}, { type: Asc.c_oAscChartTypeSettings.lineStacked, thumb: 'line-stacked'}, { type: Asc.c_oAscChartTypeSettings.lineStackedPer, thumb: 'line-pstacked'}, { type: Asc.c_oAscChartTypeSettings.hBarNormal, thumb: 'hbar-normal'}, { type: Asc.c_oAscChartTypeSettings.hBarStacked, thumb: 'hbar-stacked'}, { type: Asc.c_oAscChartTypeSettings.hBarStackedPer, thumb: 'hbar-pstacked'}, + { type: Asc.c_oAscChartTypeSettings.hBarNormal3d, thumb: 'hbar3dnormal'}, + { type: Asc.c_oAscChartTypeSettings.hBarStacked3d, thumb: 'hbar3dstack'}, + { type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, thumb: 'hbar3dpstack'}, { type: Asc.c_oAscChartTypeSettings.areaNormal, thumb: 'area-normal'}, { type: Asc.c_oAscChartTypeSettings.areaStacked, thumb: 'area-stacked'}, { type: Asc.c_oAscChartTypeSettings.areaStackedPer, thumb: 'area-pstacked'}, @@ -93,13 +100,6 @@ export class storeChartSettings { { type: Asc.c_oAscChartTypeSettings.scatter, thumb: 'scatter'}, { type: Asc.c_oAscChartTypeSettings.stock, thumb: 'stock'}, { type: Asc.c_oAscChartTypeSettings.line3d, thumb: 'line3d'}, - { type: Asc.c_oAscChartTypeSettings.barNormal3d, thumb: 'bar3dnormal'}, - { type: Asc.c_oAscChartTypeSettings.barStacked3d, thumb: 'bar3dstack'}, - { type: Asc.c_oAscChartTypeSettings.barStackedPer3d, thumb: 'bar3dpstack'}, - { type: Asc.c_oAscChartTypeSettings.hBarNormal3d, thumb: 'hbar3dnormal'}, - { type: Asc.c_oAscChartTypeSettings.hBarStacked3d, thumb: 'hbar3dstack'}, - { type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, thumb: 'hbar3dpstack'}, - { type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, thumb: 'bar3dpsnormal'} ]; const columns = 3; let row = -1; From 1ffa6d8c9d7f209903dd103999cacfa94ce18311 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 21 May 2021 19:45:02 +0300 Subject: [PATCH 6/8] [SSE mobile] Bug 47073 --- .../mobile/src/controller/settings/Download.jsx | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx b/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx index 2ee98c31d..91d4b6be4 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx @@ -10,21 +10,11 @@ class DownloadController extends Component { this.onSaveFormat = this.onSaveFormat.bind(this); } - closeModal() { - if (Device.phone) { - f7.sheet.close('.settings-popup', true); - } else { - f7.popover.close('#settings-popover'); - } - } - onSaveFormat(format) { const api = Common.EditorApi.get(); const { t } = this.props; const _t = t("View.Settings", {returnObjects: true}); - this.closeModal(); - if (format) { if (format == Asc.c_oAscFileType.CSV) { f7.dialog.confirm( From b5906be1289a0b8cbd2afdfb63d6e01fd7fdb225 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 25 May 2021 17:11:24 +0300 Subject: [PATCH 7/8] [PE mobile] Bug 43838 --- apps/common/mobile/resources/less/common.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 0b2f9ae4b..77219dcec 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -485,6 +485,9 @@ &, li { margin-bottom: 12px; } + li, div { + box-shadow: 0 0 0 1px @gray; + } } li, From d871811be426bad63bfcadfc0171856f9a33d595 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 25 May 2021 18:45:39 +0300 Subject: [PATCH 8/8] Correct translation --- apps/spreadsheeteditor/mobile/locale/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 55d00ec13..49889fc50 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -90,7 +90,7 @@ "loadingDocumentTitleText": "Loading document", "loadingDocumentTextText": "Loading document...", "textLoadingDocument": "Loading document", - + "textYes": "Yes", "notcriticalErrorTitle": "Warning", "textOk": "Ok", "textNo": "No",