Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
2de28ba9
Commit
2de28ba9
authored
Feb 03, 2017
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reset format table styles(if manually hide rows and undo)
parent
a9296562
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
10 deletions
+11
-10
cell/model/UndoRedo.js
cell/model/UndoRedo.js
+6
-8
cell/model/autofilters.js
cell/model/autofilters.js
+5
-2
No files found.
cell/model/UndoRedo.js
View file @
2de28ba9
...
...
@@ -3143,9 +3143,10 @@ UndoRedoWoorksheet.prototype = {
else
row
.
setHeightProp
(
Data
.
oNewVal
);
//TODO проверить без этой перерисовки и убрать!!!
//var workSheetView = wb.oApi.wb.getWorksheetById(nSheetId);
//workSheetView.autoFilters.reDrawFilter(null, index);
//нужно для того, чтобы грамотно выставлялись цвета в ф/т при ручном скрытии строк, затрагивающих ф/т(undo/redo)
//TODO для случая скрытия строк фильтром(undo), может два раза вызываться функция setColorStyleTable - пересмотреть
var
workSheetView
=
wb
.
oApi
.
wb
.
getWorksheetById
(
nSheetId
);
workSheetView
.
model
.
autoFilters
.
reDrawFilter
(
null
,
index
);
}
else
if
(
AscCH
.
historyitem_Worksheet_RowHide
==
Type
)
{
...
...
@@ -3170,11 +3171,8 @@ UndoRedoWoorksheet.prototype = {
ws
.
setRowHidden
(
nRow
,
from
,
to
);
if
(
bUndo
)
{
var
workSheetView
=
wb
.
oApi
.
wb
.
getWorksheetById
(
nSheetId
);
workSheetView
.
model
.
autoFilters
.
reDrawFilter
(
new
Asc
.
Range
(
0
,
from
,
ws
.
nColsCount
-
1
,
to
));
}
var
workSheetView
=
wb
.
oApi
.
wb
.
getWorksheetById
(
nSheetId
);
workSheetView
.
model
.
autoFilters
.
reDrawFilter
(
new
Asc
.
Range
(
0
,
from
,
ws
.
nColsCount
-
1
,
to
));
}
else
if
(
AscCH
.
historyitem_Worksheet_AddRows
==
Type
||
AscCH
.
historyitem_Worksheet_RemoveRows
==
Type
)
{
...
...
cell/model/autofilters.js
View file @
2de28ba9
...
...
@@ -714,8 +714,11 @@
this
.
_addHistoryObj
(
oldFilter
,
AscCH
.
historyitem_AutoFilter_ApplyMF
,
{
activeCells
:
ar
,
autoFiltersObject
:
autoFiltersObject
});
History
.
EndTransaction
();
this
.
_resetTablePartStyle
();
if
(
!
bUndoChanges
&&
!
bRedoChanges
)
{
this
.
_resetTablePartStyle
();
}
return
{
minChangeRow
:
minChangeRow
,
rangeOldFilter
:
rangeOldFilter
,
nOpenRowsCount
:
nOpenRowsCount
,
nAllRowsCount
:
nAllRowsCount
};
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment