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

Merge pull request #1428 from ONLYOFFICE/feature/bug-45763

Browse source 
Feature/bug 45763
This commit is contained in:
Julia Radzhabova 2021-12-20 17:05:47 +03:00 committed by GitHub
parent e79216b581 b062b933d8
commit 40bf6ae262
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
View file

@ -222,7 +222,8 @@ define([
editable: false,
data: [],
scrollAlwaysVisible: true,
takeFocusOnClose: true
takeFocusOnClose: true,
search: true
});
this.cmbSymbols.on('selected', _.bind(this.onSymbolsSelect, this));
@ -321,7 +322,7 @@ define([
if (this._state.hasSeparator)
this.chSeparator.setValue(props.formatInfo.asc_getSeparator());
if (this._state.hasSymbols)
this.cmbSymbols.setValue(props.formatInfo.asc_getSymbol());
this.cmbSymbols.setValue(props.formatInfo.asc_getSymbol() || props.formatInfo.asc_getCurrencySymbol());
if (props.format) {
if (this._state.hasNegative) {
@ -384,7 +385,7 @@ define([
info.asc_setType(this.FormatType);
info.asc_setDecimalPlaces(this.spnDecimal.getNumberValue());
info.asc_setSeparator(false);
info.asc_setSymbol(record.value);
(typeof record.value === 'string') ? info.asc_setCurrencySymbol(record.value) : info.asc_setSymbol(record.value);
var format = this.api.asc_getFormatCells(info),
data = [];
@ -406,7 +407,11 @@ define([
info.asc_setType(this.FormatType);
info.asc_setDecimalPlaces(field.getNumberValue());
info.asc_setSeparator((this.FormatType == Asc.c_oAscNumFormatType.Number) ? this.chSeparator.getValue()=='checked' : false);
info.asc_setSymbol((this.FormatType == Asc.c_oAscNumFormatType.Currency || this.FormatType == Asc.c_oAscNumFormatType.Accounting) ? this.cmbSymbols.getValue() : false);
if (this.FormatType == Asc.c_oAscNumFormatType.Currency || this.FormatType == Asc.c_oAscNumFormatType.Accounting) {
var value = this.cmbSymbols.getValue();
(typeof value === 'string') ? info.asc_setCurrencySymbol(value) : info.asc_setSymbol(value);
} else
info.asc_setSymbol(false);
var format = this.api.asc_getFormatCells(info);
if (this.FormatType == Asc.c_oAscNumFormatType.Number || this.FormatType == Asc.c_oAscNumFormatType.Currency || this.FormatType == Asc.c_oAscNumFormatType.Accounting) {
@ -479,7 +484,7 @@ define([
me = this,
valDecimal = (initFormatInfo) ? initFormatInfo.asc_getDecimalPlaces() : this.spnDecimal.getNumberValue(),
valSeparator = (initFormatInfo) ? initFormatInfo.asc_getSeparator() : (this.chSeparator.getValue()=='checked'),
valSymbol = (initFormatInfo) ? initFormatInfo.asc_getSymbol() : this.langId;
valSymbol = (initFormatInfo) ? (initFormatInfo.asc_getSymbol() || initFormatInfo.asc_getCurrencySymbol()) : this.langId;
if (record.value !== Asc.c_oAscNumFormatType.Custom) {
var info = new Asc.asc_CFormatCellsInfo();
@ -503,6 +508,10 @@ define([
return 0;
});
me.CurrencySymbolsData.unshift({value: null, displayValue: me.txtNone});
symbolssarr = this.api.asc_getAdditionalCurrencySymbols();
symbolssarr.forEach(function(item) {
me.CurrencySymbolsData.push({value: item, displayValue: item});
});
this.cmbSymbols.setData(this.CurrencySymbolsData);
this.cmbSymbols.setValue(valSymbol);
}