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

Fix the issue of displaying custom formats

Browse source
This commit is contained in:
IvanovYaAl 2022-04-11 15:16:03 +03:00
parent 56f050de03
commit e5ee5d12a2
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -542,6 +542,15 @@ define([
} }
} else { } else {
var clearString = function(item) {
var arrItems = ["(", ")", " ", "-", "$", "₽", "¥", "€", "₩"];
item = item.replaceAll("\\", "");
for (var i = 0; i < arrItems.length; i++) {
if(item.indexOf(arrItems[i]) != -1)
item = item.replaceAll("\""+arrItems[i]+"\"", arrItems[i]);
}
return item;
}
var info = new Asc.asc_CFormatCellsInfo(); var info = new Asc.asc_CFormatCellsInfo();
info.asc_setType(Asc.c_oAscNumFormatType.Custom); info.asc_setType(Asc.c_oAscNumFormatType.Custom);
info.asc_setSymbol(valSymbol); info.asc_setSymbol(valSymbol);
@ -552,7 +561,7 @@ define([
formatsarr.forEach(function(item) { formatsarr.forEach(function(item) {
var rec = new Common.UI.DataViewModel(); var rec = new Common.UI.DataViewModel();
rec.set({ rec.set({
value: me.api.asc_convertNumFormat2NumFormatLocal(item), value: clearString(me.api.asc_convertNumFormat2NumFormatLocal(item))/*.replaceAll("\\", "").replaceAll("\" \"", " ").replaceAll("\"₽\"", "₽").replaceAll("\"-\"", "-").replaceAll("\"(\"", "(").replaceAll("\")\"", ")")*/,
format: item format: item
}); });
data.push(rec); data.push(rec);
@ -586,6 +595,8 @@ define([
this._state = { hasDecimal: hasDecimal, hasNegative: hasNegative, hasSeparator: hasSeparator, hasType: hasType, hasSymbols: hasSymbols, hasCode: hasCode}; this._state = { hasDecimal: hasDecimal, hasNegative: hasNegative, hasSeparator: hasSeparator, hasType: hasType, hasSymbols: hasSymbols, hasCode: hasCode};
!initFormatInfo && this.chLinked.setValue(false, true); !initFormatInfo && this.chLinked.setValue(false, true);
}, },
textTitle: 'Number Format', textTitle: 'Number Format',