From 4940291ce6975a5a0ebc2e7d2ca6965d65563ed4 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Thu, 1 Jul 2021 22:11:42 +0300 Subject: [PATCH] [SSE mobile] Fix Bug 43270 --- apps/spreadsheeteditor/mobile/locale/en.json | 1 + .../mobile/src/controller/edit/EditCell.jsx | 27 ++++++++++-- .../mobile/src/view/edit/EditCell.jsx | 42 ++++++++++--------- 3 files changed, 47 insertions(+), 23 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 02681d4f8..730a81fc1 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -318,6 +318,7 @@ "textThin": "Thin", "textMedium": "Medium", "textThick": "Thick", + "textFraction": "Fraction", "textGeneral": "General", "textNumber": "Number", "textInteger": "Integer", diff --git a/apps/spreadsheeteditor/mobile/src/controller/edit/EditCell.jsx b/apps/spreadsheeteditor/mobile/src/controller/edit/EditCell.jsx index b0d7bd9b7..a54d9ec07 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/edit/EditCell.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/edit/EditCell.jsx @@ -116,10 +116,29 @@ class EditCellController extends Component { api.asc_setCellAngle(angle); } - onCellFormat(value) { + onCellFormat(format) { const api = Common.EditorApi.get(); - let type = decodeURIComponent(atob(value)); - api.asc_setCellFormat(type); + // let type = decodeURIComponent(atob(value)); + api.asc_setCellFormat(format); + } + + onCurrencyCellFormat(format) { + const api = Common.EditorApi.get(); + api.asc_setCellFormat(format); + } + + onAccountingCellFormat(value) { + const api = Common.EditorApi.get(); + let info = new Asc.asc_CFormatCellsInfo(); + + info.asc_setType(Asc.c_oAscNumFormatType.Accounting); + info.asc_setSeparator(false); + info.asc_setSymbol(value); + + let format = api.asc_getFormatCells(info); + + if (format && format.length > 0) + api.asc_setCellFormat(format[0]); } onBorderStyle(type, borderInfo) { @@ -168,6 +187,8 @@ class EditCellController extends Component { onCellFormat={this.onCellFormat} onTextOrientationChange={this.onTextOrientationChange} onBorderStyle={this.onBorderStyle} + onCurrencyCellFormat={this.onCurrencyCellFormat} + onAccountingCellFormat={this.onAccountingCellFormat} /> ) } diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx index e66e49045..3a48110e8 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx @@ -88,7 +88,9 @@ const EditCell = props => { {!isAndroid ? : null @@ -757,25 +759,25 @@ const PageFormatCell = props => { } - props.onCellFormat('R2VuZXJhbA==')}> + props.onCellFormat('General')}> - props.onCellFormat('MC4wMA==')}> + props.onCellFormat('0.00')}> - props.onCellFormat('JTIzMA==')}> + props.onCellFormat('# ?/?')}> - props.onCellFormat('MC4wMEUlMkIwMA==')}> + props.onCellFormat('0.00E+00')}> @@ -789,10 +791,10 @@ const PageFormatCell = props => { }}> - props.onCellFormat('MC4wMCUyNQ==')}> + props.onCellFormat('0.00%')}> - props.onCellFormat('JTQw')}> + props.onCellFormat('@')}> @@ -815,19 +817,19 @@ const PageAccountingFormatCell = props => { props.onCellFormat('XyglMjQqJTIwJTIzJTJDJTIzJTIzMC4wMF8pJTNCXyglMjQqJTIwKCUyMyUyQyUyMyUyMzAuMDApJTNCXyglMjQqJTIwJTIyLSUyMiUzRiUzRl8pJTNCXyglNDBfKQ==')}> + onClick={() => props.onAccountingCellFormat(1033)}> props.onCellFormat('XyglRTIlODIlQUMqJTIwJTIzJTJDJTIzJTIzMC4wMF8pJTNCXyglRTIlODIlQUMqJTIwKCUyMyUyQyUyMyUyMzAuMDApJTNCXyglRTIlODIlQUMqJTIwJTIyLSUyMiUzRiUzRl8pJTNCXyglNDBfKQ==')}> + onClick={() => props.onAccountingCellFormat(1031)}> props.onCellFormat('XyglQzIlQTMqJTIwJTIzJTJDJTIzJTIzMC4wMF8pJTNCXyglQzIlQTMqJTIwKCUyMyUyQyUyMyUyMzAuMDApJTNCXyglQzIlQTMqJTIwJTIyLSUyMiUzRiUzRl8pJTNCXyglNDBfKQ==')}> + onClick={() => props.onAccountingCellFormat(2057)}> props.onCellFormat('Xy0qJTIwJTIzJTJDJTIzJTIzMC4wMCU1QiUyNCVEMSU4MC4tNDE5JTVEXy0lM0ItKiUyMCUyMyUyQyUyMyUyMzAuMDAlNUIlMjQlRDElODAuLTQxOSU1RF8tJTNCXy0qJTIwJTIyLSUyMiUzRiUzRiU1QiUyNCVEMSU4MC4tNDE5JTVEXy0lM0JfLSU0MF8t')}> + onClick={() => props.onAccountingCellFormat(1049)}> props.onCellFormat('XyglQzIlQTUqJTIwJTIzJTJDJTIzJTIzMC4wMF8pJTNCXyglQzIlQTUqJTIwKCUyMyUyQyUyMyUyMzAuMDApJTNCXyglQzIlQTUqJTIwJTIyLSUyMiUzRiUzRl8pJTNCXyglNDBfKQ==')}> + onClick={() => props.onAccountingCellFormat(1041)}> @@ -840,7 +842,7 @@ const PageCurrencyFormatCell = props => { return ( - + {Device.phone && @@ -849,19 +851,19 @@ const PageCurrencyFormatCell = props => { props.onCellFormat('JTI0JTIzJTJDJTIzJTIzMC4wMA==')}> + onClick={() => props.onCurrencyCellFormat('[$$-409]#,##0.00')}> props.onCellFormat('JUUyJTgyJUFDJTIzJTJDJTIzJTIzMC4wMA==')}> + onClick={() => props.onCurrencyCellFormat('#,##0.00\ [$€-407]')}> props.onCellFormat('JUMyJUEzJTIzJTJDJTIzJTIzMC4wMA==')}> + onClick={() => props.onCurrencyCellFormat('[$£-809]#,##0.00')}> props.onCellFormat('JTIzJTJDJTIzJTIzMC4wMCUyMiVEMSU4MC4lMjI=')}> + onClick={() => props.onCurrencyCellFormat('#,##0.00\ [$₽-419]')}> props.onCellFormat('JUMyJUE1JTIzJTJDJTIzJTIzMC4wMA==')}> + onClick={() => props.onCurrencyCellFormat('[$¥-411]#,##0.00')}>