pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-02-10 18:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

[se] Refactor numFormat_MonthMinute determination logic

Browse Source
This commit is contained in:
Sergey Konovalov
2025-10-28 00:29:08 +04:00
parent d5dab0eb40
commit bc1ad5266a
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
common/NumFormat.js
View File

@ -1306,21 +1306,24 @@ NumFormat.prototype =
{ {
//Разрешаем конфликты numFormat_MonthMinute //Разрешаем конфликты numFormat_MonthMinute
var bRightCond = false; var bRightCond = false;
//ищем вперед первый элемент с типом datetime if (item.bElapsed)
for(var j = i + 1; j < nFormatLength; ++j)
{ {
var subItem = this.aRawFormat[j]; bRightCond = true;
if(numFormat_Year == subItem.type || numFormat_Month == subItem.type || numFormat_Day == subItem.type || numFormat_MonthMinute == subItem.type ||
numFormat_Hour == subItem.type || numFormat_Minute == subItem.type || numFormat_Second == subItem.type || numFormat_Milliseconds == subItem.type)
{
if(numFormat_Second == subItem.type)
bRightCond = true;
break;
}
} }
if(this.aRawFormat[i].bElapsed) else
{ {
bRightCond = true //ищем вперед первый элемент с типом datetime
for(var j = i + 1; j < nFormatLength; ++j)
{
var subItem = this.aRawFormat[j];
if(numFormat_Year == subItem.type || numFormat_Month == subItem.type || numFormat_Day == subItem.type || numFormat_MonthMinute == subItem.type ||
numFormat_Hour == subItem.type || numFormat_Minute == subItem.type || numFormat_Second == subItem.type || numFormat_Milliseconds == subItem.type)
{
if(numFormat_Second == subItem.type)
bRightCond = true;
break;
}
}
} }
var bLeftCond = false; var bLeftCond = false;
if(false == bRightCond) if(false == bRightCond)
@ -2742,8 +2745,14 @@ NumFormat.prototype =
} }
else if(numFormat_Second == item.type) else if(numFormat_Second == item.type)
{ {
if (item.bElapsed) {
res += "[";
}
for(var j = 0; j < item.val; ++j) for(var j = 0; j < item.val; ++j)
res += second; res += second;
if (item.bElapsed) {
res += "]";
}
} }
else if(numFormat_DayOfWeek == item.type) else if(numFormat_DayOfWeek == item.type)
{ {
@ -2787,7 +2796,6 @@ NumFormatCache.prototype =
}, },
get : function(format, formatType) get : function(format, formatType)
{ {
//return new CellFormat(format, formatType, false);
var key = format + String.fromCharCode(5) + formatType; var key = format + String.fromCharCode(5) + formatType;
var res = this.oNumFormats[key]; var res = this.oNumFormats[key];
if(null == res) if(null == res)