Commit 22ec0030 authored by GoshaZotov's avatar GoshaZotov

commit changes, which not merge from develop

parent 06a47026
......@@ -125,14 +125,19 @@ var c_oAscInsertOptions = {
InsertCellsAndShiftRight: 1,
InsertCellsAndShiftDown: 2,
InsertColumns: 3,
InsertRows: 4
InsertRows: 4,
InsertTableRowAbove: 5,
InsertTableRowBelow: 6,
InsertTableColLeft: 7,
InsertTableColRight: 8
};
var c_oAscDeleteOptions = {
DeleteCellsAndShiftLeft: 1,
DeleteCellsAndShiftTop: 2,
DeleteColumns: 3,
DeleteRows: 4
DeleteRows: 4,
DeleteTable: 5
};
var c_oAscBorderOptions = {
......@@ -273,6 +278,23 @@ var c_oAscChangeFilterOptions = {
style: 2
};
var c_oAscChangeSelectionFormatTable = {
all: 1,
data: 2,
row: 3,
column: 4
};
var c_oAscChangeTableStyleInfo = {
columnFirst: 1,
columnLast: 2,
columnBanded: 3,
rowHeader: 4,
rowTotal: 5,
rowBanded: 6,
filterButton: 7
};
// Состояние редактора ячейки
var c_oAscCellEditorState = {
editEnd: 0, // Окончание редактирования
......
......@@ -194,6 +194,76 @@
prot["asc_getIsAutoFilter"] = prot.asc_getIsAutoFilter;
prot["asc_getIsApplyAutoFilter"] = prot.asc_getIsApplyAutoFilter;
/** @constructor */
function asc_CFormatTableInfo() {
this.tableStyleName = null;
this.tableName = null;
this.isShowColumnStripes = null;
this.isShowFirstColumn = null;
this.isShowLastColumn = null;
this.isShowRowStripes = null;
this.isShowTotalRow = null;
this.isShowHeaderRow = null;
this.tableRange = null;
this.isInsertRowAbove = null;
this.isInsertRowBelow = null;
this.isInsertColumnLeft = null;
this.isInsertColumnRight = null;
this.isDeleteRow = null;
this.isDeleteColumn = null;
this.isDeleteTable = null;
}
asc_CFormatTableInfo.prototype = {
asc_getTableStyleName: function () { return this.tableStyleName; },
asc_getTableName: function () { return this.tableName; },
asc_getFirstRow: function () { return this.firstRow; },
asc_getLastRow: function () { return this.lastRow; },
asc_getBandHor: function () { return this.bandHor; },
asc_getFirstCol: function () { return this.firstCol; },
asc_getLastCol: function () { return this.lastCol; },
asc_getBandVer: function () { return this.bandVer; },
asc_getFilterButton: function () { return this.filterButton; },
asc_getTableRange: function () { return this.tableRange; },
asc_getIsInsertRowAbove: function () { return this.isInsertRowAbove; },
asc_getIsInsertRowBelow: function () { return this.isInsertRowBelow; },
asc_getIsInsertColumnLeft: function () { return this.isInsertColumnLeft; },
asc_getIsInsertColumnRight: function () { return this.isInsertColumnRight; },
asc_getIsDeleteRow: function () { return this.isDeleteRow; },
asc_getIsDeleteColumn: function () { return this.isDeleteColumn; },
asc_getIsDeleteTable: function () { return this.isDeleteTable; }
};
window["Asc"].asc_CFormatTableInfo = window["Asc"]["asc_CFormatTableInfo"] = asc_CFormatTableInfo;
prot = asc_CFormatTableInfo.prototype;
prot["asc_getTableStyleName"] = prot.asc_getTableStyleName;
prot["asc_getTableName"] = prot.asc_getTableName;
prot["asc_getFirstRow"] = prot.asc_getFirstRow;
prot["asc_getLastRow"] = prot.asc_getLastRow;
prot["asc_getBandHor"] = prot.asc_getBandHor;
prot["asc_getFirstCol"] = prot.asc_getFirstCol;
prot["asc_getLastCol"] = prot.asc_getLastCol;
prot["asc_getBandVer"] = prot.asc_getBandVer;
prot["asc_getFilterButton"] = prot.asc_getFilterButton;
prot["asc_getTableRange"] = prot.asc_getTableRange;
prot["asc_getIsInsertRowAbove"] = prot.asc_getIsInsertRowAbove;
prot["asc_getIsInsertRowBelow"] = prot.asc_getIsInsertRowBelow;
prot["asc_getIsInsertColumnLeft"] = prot.asc_getIsInsertColumnLeft;
prot["asc_getIsInsertColumnRight"] = prot.asc_getIsInsertColumnRight;
prot["asc_getIsDeleteRow"] = prot.asc_getIsDeleteRow;
prot["asc_getIsDeleteColumn"] = prot.asc_getIsDeleteColumn;
prot["asc_getIsDeleteTable"] = prot.asc_getIsDeleteTable;
/** @constructor */
function asc_CCellInfo() {
......@@ -214,7 +284,8 @@
this.styleName = null;
this.numFormatType = null;
this.angle = null;
this.autoFilterInfo = null;
this.autoFilterInfo = null;
this.formatTableInfo = null;
}
asc_CCellInfo.prototype = {
......@@ -235,7 +306,8 @@
asc_getStyleName: function () { return this.styleName; },
asc_getNumFormatType: function(){ return this.numFormatType; },
asc_getAngle: function () { return this.angle; },
asc_getAutoFilterInfo: function () { return this.autoFilterInfo; },
asc_getAutoFilterInfo: function () { return this.autoFilterInfo; },
asc_getFormatTableInfo: function () { return this.formatTableInfo; },
asc_getIsFormatTable: function() {return null},//TODO DELETE
asc_getIsAutoFilter: function() {return null},//TODO DELETE
asc_getTableStyleName: function() {return null},//TODO DELETE
......@@ -262,7 +334,8 @@
prot["asc_getStyleName"] = prot.asc_getStyleName;
prot["asc_getNumFormatType"] = prot.asc_getNumFormatType;
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_getIsFormatTable"] = prot.asc_getIsFormatTable;//TODO DELETE
prot["asc_getIsAutoFilter"] = prot.asc_getIsAutoFilter;//TODO DELETE
prot["asc_getTableStyleName"] = prot.asc_getTableStyleName;//TODO DELETE
......
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