Commit d078bf4d authored by Alexander.Trofimov's avatar Alexander.Trofimov

asc_getNumFormatType -> asc_getNumFormatInfo

numFormatType -> numFormatInfo

add methods asc_getType, asc_getDecimalPlaces, asc_getSeparator, asc_getSymbol
parent c9145df7
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
this.isLockedTable = false; this.isLockedTable = false;
this.isLockedSparkline = false; this.isLockedSparkline = false;
this.styleName = null; this.styleName = null;
this.numFormatType = null; this.numFormatInfo = null;
this.angle = null; this.angle = null;
this.autoFilterInfo = null; this.autoFilterInfo = null;
this.formatTableInfo = null; this.formatTableInfo = null;
...@@ -324,8 +324,8 @@ ...@@ -324,8 +324,8 @@
asc_CCellInfo.prototype.asc_getStyleName = function () { asc_CCellInfo.prototype.asc_getStyleName = function () {
return this.styleName; return this.styleName;
}; };
asc_CCellInfo.prototype.asc_getNumFormatType = function () { asc_CCellInfo.prototype.asc_getNumFormatInfo = function () {
return this.numFormatType; return this.numFormatInfo;
}; };
asc_CCellInfo.prototype.asc_getAngle = function () { asc_CCellInfo.prototype.asc_getAngle = function () {
return this.angle; return this.angle;
...@@ -467,7 +467,7 @@ ...@@ -467,7 +467,7 @@
prot["asc_getLockedTable"] = prot.asc_getLockedTable; prot["asc_getLockedTable"] = prot.asc_getLockedTable;
prot["asc_getLockedSparkline"] = prot.asc_getLockedSparkline; prot["asc_getLockedSparkline"] = prot.asc_getLockedSparkline;
prot["asc_getStyleName"] = prot.asc_getStyleName; prot["asc_getStyleName"] = prot.asc_getStyleName;
prot["asc_getNumFormatType"] = prot.asc_getNumFormatType; prot["asc_getNumFormatInfo"] = prot.asc_getNumFormatInfo;
prot["asc_getAngle"] = prot.asc_getAngle; prot["asc_getAngle"] = prot.asc_getAngle;
prot["asc_getAutoFilterInfo"] = prot.asc_getAutoFilterInfo; prot["asc_getAutoFilterInfo"] = prot.asc_getAutoFilterInfo;
prot["asc_getFormatTableInfo"] = prot.asc_getFormatTableInfo; prot["asc_getFormatTableInfo"] = prot.asc_getFormatTableInfo;
......
...@@ -2190,6 +2190,10 @@ ...@@ -2190,6 +2190,10 @@
asc_CFormatCellsInfo.prototype.asc_setDecimalPlaces = function (val) {this.decimalPlaces = val;}; asc_CFormatCellsInfo.prototype.asc_setDecimalPlaces = function (val) {this.decimalPlaces = val;};
asc_CFormatCellsInfo.prototype.asc_setSeparator = function (val) {this.separator = val;}; asc_CFormatCellsInfo.prototype.asc_setSeparator = function (val) {this.separator = val;};
asc_CFormatCellsInfo.prototype.asc_setSymbol = function (val) {this.symbol = val;}; asc_CFormatCellsInfo.prototype.asc_setSymbol = function (val) {this.symbol = val;};
asc_CFormatCellsInfo.prototype.asc_getType = function () {return this.type;};
asc_CFormatCellsInfo.prototype.asc_getDecimalPlaces = function () {return this.decimalPlaces;};
asc_CFormatCellsInfo.prototype.asc_getSeparator = function () {return this.separator;};
asc_CFormatCellsInfo.prototype.asc_getSymbol = function () {return this.symbol;};
/* /*
* Export * Export
...@@ -2367,4 +2371,8 @@ ...@@ -2367,4 +2371,8 @@
prot["asc_setDecimalPlaces"] = prot.asc_setDecimalPlaces; prot["asc_setDecimalPlaces"] = prot.asc_setDecimalPlaces;
prot["asc_setSeparator"] = prot.asc_setSeparator; prot["asc_setSeparator"] = prot.asc_setSeparator;
prot["asc_setSymbol"] = prot.asc_setSymbol; prot["asc_setSymbol"] = prot.asc_setSymbol;
prot["asc_getType"] = prot.asc_getType;
prot["asc_getDecimalPlaces"] = prot.asc_getDecimalPlaces;
prot["asc_getSeparator"] = prot.asc_getSeparator;
prot["asc_getSymbol"] = prot.asc_getSymbol;
})(window); })(window);
...@@ -6949,7 +6949,7 @@ ...@@ -6949,7 +6949,7 @@
cell_info.fill = new asc_CFill((null != bg) ? asc_obj2Color(bg) : bg); cell_info.fill = new asc_CFill((null != bg) ? asc_obj2Color(bg) : bg);
cell_info.numFormat = c.getNumFormatStr(); cell_info.numFormat = c.getNumFormatStr();
cell_info.numFormatType = c.getNumFormatType(); cell_info.numFormatInfo = c.getNumFormatTypeInfo();
// Получаем гиперссылку (//ToDo) // Получаем гиперссылку (//ToDo)
var ar = selectionRange.getLast().clone(); var ar = selectionRange.getLast().clone();
......
...@@ -4057,7 +4057,7 @@ function setCurrentCultureInfo(val) { ...@@ -4057,7 +4057,7 @@ function setCurrentCultureInfo(val) {
res.push(getCurrencyFormat(cultureInfo, info.decimalPlaces, currency, currency)); res.push(getCurrencyFormat(cultureInfo, info.decimalPlaces, currency, currency));
} else if (Asc.c_oAscNumFormatType.Date === info.type) { } else if (Asc.c_oAscNumFormatType.Date === info.type) {
//todo locale dependence //todo locale dependence
if (info.symbol == AscCommon.g_oDefaultCultureInfo.LCID) { if (info.symbol == g_oDefaultCultureInfo.LCID) {
res.push(getShortDateFormat(cultureInfo)); res.push(getShortDateFormat(cultureInfo));
res.push('[$-F800]dddd, mmmm dd, yyyy'); res.push('[$-F800]dddd, mmmm dd, yyyy');
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment