Commit 93ca1b55 authored by GoshaZotov's avatar GoshaZotov

changes for format table special paste

parent 41adcdef
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
this.angle = true; this.angle = true;
this.format = true; this.format = true;
this.formatTable = true;
this.images = true; this.images = true;
} }
...@@ -117,6 +118,7 @@ ...@@ -117,6 +118,7 @@
this.angle = true; this.angle = true;
this.format = true; this.format = true;
this.formatTable = true;
this.images = true; this.images = true;
}, },
...@@ -137,6 +139,7 @@ ...@@ -137,6 +139,7 @@
this.angle = null; this.angle = null;
this.format = null; this.format = null;
this.formatTable = null;
this.images = null; this.images = null;
}, },
...@@ -204,12 +207,14 @@ ...@@ -204,12 +207,14 @@
{ {
//все кроме формул //все кроме формул
this.formula = null; this.formula = null;
this.formatTable = null;
break; break;
} }
case c_oSpecialPasteProps.pasteOnlyFormating: case c_oSpecialPasteProps.pasteOnlyFormating:
{ {
this.formula = null; this.formula = null;
this.val = null; this.val = null;
this.formatTable = null;
break; break;
} }
case c_oSpecialPasteProps.transpose: case c_oSpecialPasteProps.transpose:
......
...@@ -8837,6 +8837,9 @@ ...@@ -8837,6 +8837,9 @@
this.model.selectionRange = specialPasteData.activeRange.clone(this.model); this.model.selectionRange = specialPasteData.activeRange.clone(this.model);
} }
//нужно удалить данные предыдущей вставки(нужно для удаления ф/т)
t.model.autoFilters.isEmptyAutoFilters(this.model.selectionRange.getLast());
undoPreviousPaste(); undoPreviousPaste();
} }
else if(isIntoShape && preSpecialPasteData && preSpecialPasteData.shapeSelectionState)//курсор и специальная вставка в шейпе else if(isIntoShape && preSpecialPasteData && preSpecialPasteData.shapeSelectionState)//курсор и специальная вставка в шейпе
...@@ -8876,7 +8879,7 @@ ...@@ -8876,7 +8879,7 @@
//добавляем форматированные таблицы //добавляем форматированные таблицы
var arnToRange = t.model.selectionRange.getLast(); var arnToRange = t.model.selectionRange.getLast();
var tablesMap = null; var tablesMap = null;
if (fromBinary && val.TableParts && val.TableParts.length) { if (fromBinary && val.TableParts && val.TableParts.length && specialPasteProps.formatTable) {
var range, tablePartRange, tables = val.TableParts, diffRow, diffCol, curTable, bIsAddTable; var range, tablePartRange, tables = val.TableParts, diffRow, diffCol, curTable, bIsAddTable;
var activeRange = window["Asc"]["editor"].wb.clipboard.pasteProcessor.activeRange; var activeRange = window["Asc"]["editor"].wb.clipboard.pasteProcessor.activeRange;
var refInsertBinary = AscCommonExcel.g_oRangeCache.getAscRange(activeRange); var refInsertBinary = AscCommonExcel.g_oRangeCache.getAscRange(activeRange);
...@@ -9181,6 +9184,7 @@ ...@@ -9181,6 +9184,7 @@
if(specialPasteProps.format) if(specialPasteProps.format)
{ {
rangeUnMerge.unmerge(); rangeUnMerge.unmerge();
//this.cellCommentator.deleteCommentsRange(rangeUnMerge.bbox);
} }
if (!isOneMerge) { if (!isOneMerge) {
...@@ -9418,6 +9422,7 @@ ...@@ -9418,6 +9422,7 @@
if(specialPasteProps.format) if(specialPasteProps.format)
{ {
rangeUnMerge.unmerge(); rangeUnMerge.unmerge();
//this.cellCommentator.deleteCommentsRange(rangeUnMerge.bbox);
} }
if (!isOneMerge) { if (!isOneMerge) {
arn.r2 = rMax2 - 1; arn.r2 = rMax2 - 1;
......
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