Skip to content

S
sdkjs
Commit 8ce18b09 authored by Alexander.Trofimov's avatar Alexander.Trofimov
Browse files
Options

fix format table methods

parent 81138dc2
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 132 deletions
cell/view/WorksheetView.js
View file @ 8ce18b09
...@@ -11195,56 +11195,55 @@ ...@@ -11195,56 +11195,55 @@
this._updateCellsRange( range, canChangeColWidth, lockDraw ); this._updateCellsRange( range, canChangeColWidth, lockDraw );
}; };
WorksheetView.prototype._updateCellsRange = function ( range, canChangeColWidth, lockDraw ) { WorksheetView.prototype._updateCellsRange = function (range, canChangeColWidth, lockDraw) {
var r, c, h, d, ct, isMerged; var r, c, h, d, ct, isMerged;
var mergedRange, bUpdateRowHeight; var mergedRange, bUpdateRowHeight;
if ( range === undefined ) { if (range === undefined) {
range = this.activeRange.clone( true ); range = this.model.selectionRange.getLast().clone();
} } else {
else {
// ToDo заглушка..пора уже переделать обновление данных // ToDo заглушка..пора уже переделать обновление данных
if ( range.r1 >= this.nRowsCount || range.c1 >= this.nColsCount ) { if (range.r1 >= this.nRowsCount || range.c1 >= this.nColsCount) {
return; return;
} }
range.r2 = Math.min( range.r2, this.nRowsCount - 1 ); range.r2 = Math.min(range.r2, this.nRowsCount - 1);
range.c2 = Math.min( range.c2, this.nColsCount - 1 ); range.c2 = Math.min(range.c2, this.nColsCount - 1);
} }
if ( gc_nMaxCol0 === range.c2 || gc_nMaxRow0 === range.r2 ) { if (gc_nMaxCol0 === range.c2 || gc_nMaxRow0 === range.r2) {
range = range.clone(); range = range.clone();
if ( gc_nMaxCol0 === range.c2 ) { if (gc_nMaxCol0 === range.c2) {
range.c2 = this.cols.length - 1; range.c2 = this.cols.length - 1;
} }
if ( gc_nMaxRow0 === range.r2 ) { if (gc_nMaxRow0 === range.r2) {
range.r2 = this.rows.length - 1; range.r2 = this.rows.length - 1;
} }
} }
this._cleanCache( range ); this._cleanCache(range);
// Если размер диапазона превышает размер видимой области больше чем в 3 раза, то очищаем весь кэш // Если размер диапазона превышает размер видимой области больше чем в 3 раза, то очищаем весь кэш
if ( this._isLargeRange( range ) ) { if (this._isLargeRange(range)) {
this.changeWorksheet( "update", {lockDraw: lockDraw} ); this.changeWorksheet("update", {lockDraw: lockDraw});
this._updateSelectionNameAndInfo(); this._updateSelectionNameAndInfo();
return; return;
} }
var cto; var cto;
for ( r = range.r1; r <= range.r2; ++r ) { for (r = range.r1; r <= range.r2; ++r) {
if ( this.height_1px > this.rows[r].height ) { if (this.height_1px > this.rows[r].height) {
continue; continue;
} }
for ( c = range.c1; c <= range.c2; ++c ) { for (c = range.c1; c <= range.c2; ++c) {
if ( this.width_1px > this.cols[c].width ) { if (this.width_1px > this.cols[c].width) {
continue; continue;
} }
c = this._addCellTextToCache( c, r, canChangeColWidth ); // may change member 'this.isChanged' c = this._addCellTextToCache(c, r, canChangeColWidth); // may change member 'this.isChanged'
} }
for ( h = this.defaultRowHeight, d = this.defaultRowDescender, c = 0; c < this.cols.length; ++c ) { for (h = this.defaultRowHeight, d = this.defaultRowDescender, c = 0; c < this.cols.length; ++c) {
ct = this._getCellTextCache( c, r, true ); ct = this._getCellTextCache(c, r, true);
if ( !ct ) { if (!ct) {
continue; continue;
} }
...@@ -11252,8 +11251,8 @@ ...@@ -11252,8 +11251,8 @@
* Пробегаемся по строке и смотрим не продолжается ли ячейка на соседние. * Пробегаемся по строке и смотрим не продолжается ли ячейка на соседние.
* С помощью этой правки уйдем от обновления всей строки при каких-либо действиях * С помощью этой правки уйдем от обновления всей строки при каких-либо действиях
*/ */
if ( (c < range.c1 || c > range.c2) && (0 !== ct.sideL || 0 !== ct.sideR) ) { if ((c < range.c1 || c > range.c2) && (0 !== ct.sideL || 0 !== ct.sideR)) {
cto = this._calcCellTextOffset( c, r, ct.cellHA, ct.metrics.width ); cto = this._calcCellTextOffset(c, r, ct.cellHA, ct.metrics.width);
ct.cellW = cto.maxWidth; ct.cellW = cto.maxWidth;
ct.sideL = cto.leftSide; ct.sideL = cto.leftSide;
ct.sideR = cto.rightSide; ct.sideR = cto.rightSide;
...@@ -11261,37 +11260,36 @@ ...@@ -11261,37 +11260,36 @@
// Замерженная ячейка (с 2-мя или более строками) не влияет на высоту строк! // Замерженная ячейка (с 2-мя или более строками) не влияет на высоту строк!
isMerged = ct.flags.isMerged(); isMerged = ct.flags.isMerged();
if ( !isMerged ) { if (!isMerged) {
bUpdateRowHeight = true; bUpdateRowHeight = true;
} } else {
else {
mergedRange = ct.flags.merged; mergedRange = ct.flags.merged;
// Для замерженных ячеек (с 2-мя или более строками) оптимизировать не нужно // Для замерженных ячеек (с 2-мя или более строками) оптимизировать не нужно
bUpdateRowHeight = mergedRange.r1 === mergedRange.r2; bUpdateRowHeight = mergedRange.r1 === mergedRange.r2;
} }
if ( bUpdateRowHeight ) { if (bUpdateRowHeight) {
h = Math.max( h, ct.metrics.height ); h = Math.max(h, ct.metrics.height);
} }
if ( ct.cellVA !== kvaTop && ct.cellVA !== kvaCenter && !isMerged ) { if (ct.cellVA !== kvaTop && ct.cellVA !== kvaCenter && !isMerged) {
d = Math.max( d, ct.metrics.height - ct.metrics.baseline ); d = Math.max(d, ct.metrics.height - ct.metrics.baseline);
} }
} }
if ( Math.abs( h - this.rows[r].height ) > 0.000001 && !this.rows[r].isCustomHeight ) { if (Math.abs(h - this.rows[r].height) > 0.000001 && !this.rows[r].isCustomHeight) {
if ( !this.rows[r].isDefaultHeight ) { if (!this.rows[r].isDefaultHeight) {
this.rows[r].heightReal = this.rows[r].height = Math.min( h, this.maxRowHeight ); this.rows[r].heightReal = this.rows[r].height = Math.min(h, this.maxRowHeight);
this.model.setRowHeight( this.rows[r].height + this.height_1px, r, r, false ); this.model.setRowHeight(this.rows[r].height + this.height_1px, r, r, false);
} }
this.isChanged = true; this.isChanged = true;
} }
if ( Math.abs( d - this.rows[r].descender ) > 0.000001 ) { if (Math.abs(d - this.rows[r].descender) > 0.000001) {
this.rows[r].descender = d; this.rows[r].descender = d;
this.isChanged = true; this.isChanged = true;
} }
} }
if ( !lockDraw ) { if (!lockDraw) {
this._recalculateAfterUpdate( [range] ); this._recalculateAfterUpdate([range]);
} }
}; };
...@@ -11403,104 +11401,102 @@ ...@@ -11403,104 +11401,102 @@
this.arrActiveFormulaRanges = []; this.arrActiveFormulaRanges = [];
}; };
WorksheetView.prototype.addAutoFilter = function ( styleName, addFormatTableOptionsObj ) { WorksheetView.prototype.addAutoFilter = function (styleName, addFormatTableOptionsObj) {
// Проверка глобального лока // Проверка глобального лока
if ( this.collaborativeEditing.getGlobalLock() ) { if (this.collaborativeEditing.getGlobalLock()) {
return; return;
} }
if ( !this.handlers.trigger( "getLockDefNameManagerStatus" ) ) { if (!this.handlers.trigger("getLockDefNameManagerStatus")) {
this.handlers.trigger( "onErrorEvent", c_oAscError.ID.LockCreateDefName, c_oAscError.Level.NoCritical ); this.handlers.trigger("onErrorEvent", c_oAscError.ID.LockCreateDefName, c_oAscError.Level.NoCritical);
return; return;
} }
var t = this; var t = this;
var ar = t.activeRange.clone( true ); var ar = this.model.selectionRange.getLast().clone();
var isChangeAutoFilterToTablePart = function(addFormatTableOptionsObj) var isChangeAutoFilterToTablePart = function (addFormatTableOptionsObj) {
{ var res = false;
var res = false; var worksheet = t.model;
var worksheet = t.model;
var activeRange = AscCommonExcel.g_oRangeCache.getAscRange(addFormatTableOptionsObj.asc_getRange());
var activeRange = AscCommonExcel.g_oRangeCache.getAscRange(addFormatTableOptionsObj.asc_getRange()); if (activeRange && worksheet.AutoFilter && activeRange.containsRange(worksheet.AutoFilter.Ref) &&
if(activeRange && worksheet.AutoFilter && activeRange.containsRange(worksheet.AutoFilter.Ref) && activeRange.r1 === worksheet.AutoFilter.Ref.r1) activeRange.r1 === worksheet.AutoFilter.Ref.r1) {
res = true; res = true;
}
return res;
}; return res;
};
var onChangeAutoFilterCallback = function ( isSuccess ) {
if ( false === isSuccess ) { var onChangeAutoFilterCallback = function (isSuccess) {
t.model.workbook.handlers.trigger( "asc_onError", c_oAscError.ID.LockedAllError, c_oAscError.Level.NoCritical ); if (false === isSuccess) {
t.handlers.trigger( "selectionChanged", t.getSelectionInfo() ); t.model.workbook.handlers.trigger("asc_onError", c_oAscError.ID.LockedAllError,
c_oAscError.Level.NoCritical);
t.handlers.trigger("selectionChanged", t.getSelectionInfo());
return; return;
} }
if ( addFormatTableOptionsObj && isChangeAutoFilterToTablePart( addFormatTableOptionsObj ) === true )//CHANGE FILTER TO TABLEPART if (addFormatTableOptionsObj && isChangeAutoFilterToTablePart(addFormatTableOptionsObj) === true)//CHANGE FILTER TO TABLEPART
{ {
var filterRange = t.model.AutoFilter.Ref.clone(); var filterRange = t.model.AutoFilter.Ref.clone();
var addFilterCallBack = function() var addFilterCallBack = function () {
{ History.Create_NewPoint();
History.Create_NewPoint(); History.StartTransaction();
History.StartTransaction();
t.model.autoFilters.changeAutoFilterToTablePart(styleName, ar, addFormatTableOptionsObj);
t.model.autoFilters.changeAutoFilterToTablePart( styleName, ar, addFormatTableOptionsObj ); t._onUpdateFormatTable(filterRange, !!(styleName), true);
t._onUpdateFormatTable(filterRange, !!(styleName), true);
History.EndTransaction();
History.EndTransaction(); };
};
var addNameColumn = false;
var addNameColumn = false; if (addFormatTableOptionsObj === false) {
if(addFormatTableOptionsObj === false) addNameColumn = true;
addNameColumn = true; } else if (typeof addFormatTableOptionsObj == 'object') {
else if(typeof addFormatTableOptionsObj == 'object')
addNameColumn = !addFormatTableOptionsObj.asc_getIsTitle(); addNameColumn = !addFormatTableOptionsObj.asc_getIsTitle();
if(addNameColumn) }
filterRange.r2 = filterRange.r2 + 1; if (addNameColumn) {
filterRange.r2 = filterRange.r2 + 1;
t._isLockedCells(filterRange, /*subType*/null, addFilterCallBack); }
}
else//ADD t._isLockedCells(filterRange, /*subType*/null, addFilterCallBack);
{ } else//ADD
var addNameColumn; {
var addFilterCallBack = function() var addNameColumn;
{ var addFilterCallBack = function () {
History.Create_NewPoint(); History.Create_NewPoint();
History.StartTransaction(); History.StartTransaction();
t.model.autoFilters.addAutoFilter(styleName, ar, addFormatTableOptionsObj); t.model.autoFilters.addAutoFilter(styleName, ar, addFormatTableOptionsObj);
//updates //updates
if(styleName && addNameColumn) if (styleName && addNameColumn) {
t.setSelection(filterRange); t.setSelection(filterRange);
}
t._onUpdateFormatTable(filterRange, !!(styleName), true); t._onUpdateFormatTable(filterRange, !!(styleName), true);
History.EndTransaction(); History.EndTransaction();
}; };
if(styleName === null) if (styleName === null) {
{ addFilterCallBack();
addFilterCallBack(); } else {
} var filterInfo = t.model.autoFilters._getFilterInfoByAddTableProps(ar, addFormatTableOptionsObj);
else var filterRange = filterInfo.filterRange
{ var addNameColumn = filterInfo.addNameColumn;
var filterInfo = t.model.autoFilters._getFilterInfoByAddTableProps(ar, addFormatTableOptionsObj);
var filterRange = filterInfo.filterRange
var addNameColumn = filterInfo.addNameColumn;
t._isLockedCells(filterRange, null, addFilterCallBack) t._isLockedCells(filterRange, null, addFilterCallBack)
} }
} }
}; };
if ( t._checkAddAutoFilter( ar, styleName, addFormatTableOptionsObj ) === true ) { if (t._checkAddAutoFilter(ar, styleName, addFormatTableOptionsObj) === true) {
this._isLockedAll( onChangeAutoFilterCallback ); this._isLockedAll(onChangeAutoFilterCallback);
this._isLockedDefNames( null, null ); this._isLockedDefNames(null, null);
} } else//для того, чтобы в случае ошибки кнопка отжималась!
else//для того, чтобы в случае ошибки кнопка отжималась!
{ {
t.handlers.trigger( "selectionChanged", t.getSelectionInfo() ); t.handlers.trigger("selectionChanged", t.getSelectionInfo());
} }
}; };
...@@ -11511,7 +11507,7 @@ ...@@ -11511,7 +11507,7 @@
} }
var t = this; var t = this;
var ar = t.activeRange.clone(true); var ar = this.model.selectionRange.getLast().clone();
var onChangeAutoFilterCallback = function (isSuccess) { var onChangeAutoFilterCallback = function (isSuccess) {
if (false === isSuccess) { if (false === isSuccess) {
...@@ -11598,7 +11594,7 @@ ...@@ -11598,7 +11594,7 @@
WorksheetView.prototype.applyAutoFilter = function (autoFilterObject) { WorksheetView.prototype.applyAutoFilter = function (autoFilterObject) {
var t = this; var t = this;
var ar = t.activeRange.clone(true); var ar = this.model.selectionRange.getLast().clone();
var onChangeAutoFilterCallback = function (isSuccess) { var onChangeAutoFilterCallback = function (isSuccess) {
if (false === isSuccess) { if (false === isSuccess) {
return; return;
...@@ -11621,7 +11617,7 @@ ...@@ -11621,7 +11617,7 @@
WorksheetView.prototype.reapplyAutoFilter = function (tableName) { WorksheetView.prototype.reapplyAutoFilter = function (tableName) {
var t = this; var t = this;
var ar = t.activeRange.clone(true); var ar = this.model.selectionRange.getLast().clone();
var onChangeAutoFilterCallback = function (isSuccess) { var onChangeAutoFilterCallback = function (isSuccess) {
if (false === isSuccess) { if (false === isSuccess) {
return; return;
...@@ -11686,7 +11682,7 @@ ...@@ -11686,7 +11682,7 @@
WorksheetView.prototype.applyAutoFilterByType = function (autoFilterObject) { WorksheetView.prototype.applyAutoFilterByType = function (autoFilterObject) {
var t = this; var t = this;
var ar = t.activeRange.clone(true); var ar = this.model.selectionRange.getLast().clone();
var isStartRangeIntoFilterOrTable = t.model.autoFilters.isStartRangeContainIntoTableOrFilter(ar); var isStartRangeIntoFilterOrTable = t.model.autoFilters.isStartRangeContainIntoTableOrFilter(ar);
var isApplyAutoFilter = null, isAddAutoFilter = null, cellId = null, isFromatTable = null; var isApplyAutoFilter = null, isAddAutoFilter = null, cellId = null, isFromatTable = null;
...@@ -11789,7 +11785,7 @@ ...@@ -11789,7 +11785,7 @@
WorksheetView.prototype.sortColFilter = function (type, cellId, displayName, color) { WorksheetView.prototype.sortColFilter = function (type, cellId, displayName, color) {
var t = this; var t = this;
var ar = this.activeRange.clone(true); var ar = this.model.selectionRange.getLast().clone();
var onChangeAutoFilterCallback = function (isSuccess) { var onChangeAutoFilterCallback = function (isSuccess) {
if (false === isSuccess) { if (false === isSuccess) {
return; return;
...@@ -11832,7 +11828,7 @@ ...@@ -11832,7 +11828,7 @@
WorksheetView.prototype.clearFilter = function () { WorksheetView.prototype.clearFilter = function () {
var t = this; var t = this;
var ar = this.activeRange.clone(true); var ar = this.model.selectionRange.getLast().clone();
var onChangeAutoFilterCallback = function (isSuccess) { var onChangeAutoFilterCallback = function (isSuccess) {
if (false === isSuccess) { if (false === isSuccess) {
return; return;
...@@ -11888,7 +11884,7 @@ ...@@ -11888,7 +11884,7 @@
return; return;
} }
if (!this.activeRange.isEqual(range)) { if (!this.model.selectionRange.getLast().isEqual(range)) {
this.setSelection(range); this.setSelection(range);
} }
...@@ -12692,10 +12688,11 @@ ...@@ -12692,10 +12688,11 @@
var refTablePart = tablePart.Ref; var refTablePart = tablePart.Ref;
var startCol = this.activeRange.c1; var lastSelection = this.model.selectionRange.getLast();
var endCol = this.activeRange.c2; var startCol = lastSelection.c1;
var startRow = this.activeRange.r1; var endCol = lastSelection.c2;
var endRow = this.activeRange.r2; var startRow = lastSelection.r1;
var endRow = lastSelection.r2;
switch (optionType) { switch (optionType) {
case c_oAscChangeSelectionFormatTable.all: case c_oAscChangeSelectionFormatTable.all:
...@@ -12721,15 +12718,15 @@ ...@@ -12721,15 +12718,15 @@
{ {
startCol = refTablePart.c1; startCol = refTablePart.c1;
endCol = refTablePart.c2; endCol = refTablePart.c2;
startRow = this.activeRange.r1 < refTablePart.r1 ? refTablePart.r1 : this.activeRange.r1; startRow = lastSelection.r1 < refTablePart.r1 ? refTablePart.r1 : lastSelection.r1;
endRow = this.activeRange.r2 > refTablePart.r2 ? refTablePart.r2 : this.activeRange.r2; endRow = lastSelection.r2 > refTablePart.r2 ? refTablePart.r2 : lastSelection.r2;
break; break;
} }
case c_oAscChangeSelectionFormatTable.column: case c_oAscChangeSelectionFormatTable.column:
{ {
startCol = this.activeRange.c1 < refTablePart.c1 ? refTablePart.c1 : this.activeRange.c1; startCol = lastSelection.c1 < refTablePart.c1 ? refTablePart.c1 : lastSelection.c1;
endCol = this.activeRange.c2 > refTablePart.c2 ? refTablePart.c2 : this.activeRange.c2; endCol = lastSelection.c2 > refTablePart.c2 ? refTablePart.c2 : lastSelection.c2;
startRow = refTablePart.r1; startRow = refTablePart.r1;
endRow = refTablePart.r2; endRow = refTablePart.r2;
...@@ -12743,7 +12740,7 @@ ...@@ -12743,7 +12740,7 @@
WorksheetView.prototype.af_changeFormatTableInfo = function (tableName, optionType, val) { WorksheetView.prototype.af_changeFormatTableInfo = function (tableName, optionType, val) {
var tablePart = this.model.autoFilters._getFilterByDisplayName(tableName); var tablePart = this.model.autoFilters._getFilterByDisplayName(tableName);
var t = this; var t = this;
var ar = this.activeRange; var ar = this.model.selectionRange.getLast();
if (!tablePart || (tablePart && !tablePart.TableStyleInfo)) { if (!tablePart || (tablePart && !tablePart.TableStyleInfo)) {
return false; return false;
...@@ -12888,7 +12885,7 @@ ...@@ -12888,7 +12885,7 @@
t._isLockedCells(changedRange, null, callback); t._isLockedCells(changedRange, null, callback);
}; };
var newActiveRange = this.activeRange.clone(); var newActiveRange = this.model.selectionRange.getLast().clone();
var displayName = null; var displayName = null;
var type = null; var type = null;
switch (optionType) { switch (optionType) {
...@@ -13013,7 +13010,7 @@ ...@@ -13013,7 +13010,7 @@
t._isLockedCells(ref, null, callback); t._isLockedCells(ref, null, callback);
}; };
var newActiveRange = this.activeRange.clone(); var newActiveRange = this.model.selectionRange.getLast().clone();
var val = null; var val = null;
switch (optionType) { switch (optionType) {
case c_oAscDeleteOptions.DeleteColumns: case c_oAscDeleteOptions.DeleteColumns:
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7