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
ebef1719
Commit
ebef1719
authored
May 12, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 32410
update working with lockCounter
parent
4c636996
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
206 additions
and
215 deletions
+206
-215
cell/model/History.js
cell/model/History.js
+3
-3
cell/model/Workbook.js
cell/model/Workbook.js
+194
-203
cell/model/autofilters.js
cell/model/autofilters.js
+1
-1
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+8
-8
No files found.
cell/model/History.js
View file @
ebef1719
...
...
@@ -226,7 +226,7 @@ CHistory.prototype.UndoRedoPrepare = function (oRedoObjectParam, bUndo) {
this
.
TurnOff
();
}
/* отключаем отрисовку на случай необходимости пересчета ячеек, заносим ячейку, при необходимости в список перерисовываемых */
AscCommonExcel
.
lockDraw
(
this
.
workbook
);
this
.
workbook
.
lockDraw
(
);
if
(
bUndo
)
this
.
workbook
.
bUndoChanges
=
true
;
...
...
@@ -440,8 +440,8 @@ CHistory.prototype.UndoRedoEnd = function (Point, oRedoObjectParam, bUndo) {
}
/* возвращаем отрисовку. и перерисовываем ячейки с предварительным пересчетом */
AscCommonExcel
.
buildRecalc
(
this
.
workbook
);
AscCommonExcel
.
unLockDraw
(
this
.
workbook
);
this
.
workbook
.
unLockDraw
(
);
this
.
workbook
.
buildRecalc
(
);
if
(
oRedoObjectParam
.
bIsOn
)
this
.
TurnOn
();
};
...
...
cell/model/Workbook.js
View file @
ebef1719
This diff is collapsed.
Click to expand it.
cell/model/autofilters.js
View file @
ebef1719
...
...
@@ -2528,7 +2528,7 @@
if
(
worksheet
.
TableParts
)
{
//TODO: buildRecalc вызывать из модели!!!
AscCommonExcel
.
buildRecalc
(
worksheet
.
workbook
,
true
,
false
);
worksheet
.
workbook
.
buildRecalc
(
true
,
false
);
for
(
var
i
=
0
;
i
<
worksheet
.
TableParts
.
length
;
i
++
)
{
var
filter
=
worksheet
.
TableParts
[
i
];
...
...
cell/view/WorksheetView.js
View file @
ebef1719
...
...
@@ -9083,7 +9083,7 @@
t
.
handlers
.
trigger
(
"
slowOperation
"
,
true
);
}
/* отключаем отрисовку на случай необходимости пересчета ячеек, заносим ячейку, при необходимости в список перерисовываемых */
AscCommonExcel
.
lockDraw
(
t
.
model
.
workbook
);
t
.
model
.
workbook
.
lockDraw
(
);
// Если нужно удалить автофильтры - удаляем
if
(
val
===
c_oAscCleanOptions
.
All
||
val
===
c_oAscCleanOptions
.
Text
)
{
...
...
@@ -9115,8 +9115,8 @@
t
.
model
.
autoFilters
.
renameTableColumn
(
arn
);
/* возвращаем отрисовку. и перерисовываем ячейки с предварительным пересчетом */
AscCommonExcel
.
buildRecalc
(
t
.
model
.
workbook
);
AscCommonExcel
.
unLockDraw
(
t
.
model
.
workbook
);
t
.
model
.
workbook
.
unLockDraw
(
);
t
.
model
.
workbook
.
buildRecalc
(
);
break
;
case
"
changeDigNum
"
:
...
...
@@ -9221,7 +9221,7 @@
t
.
handlers
.
trigger
(
"
slowOperation
"
,
true
);
}
AscCommonExcel
.
lockDraw
(
t
.
model
.
workbook
);
t
.
model
.
workbook
.
lockDraw
(
);
var
selectData
;
if
(
isLocal
===
'
binary
'
)
{
selectData
=
t
.
_pasteFromBinary
(
val
);
...
...
@@ -9234,8 +9234,8 @@
if
(
!
selectData
)
{
bIsUpdate
=
false
;
AscCommonExcel
.
buildRecalc
(
t
.
model
.
workbook
);
AscCommonExcel
.
unLockDraw
(
t
.
model
.
workbook
);
t
.
model
.
workbook
.
unLockDraw
(
);
t
.
model
.
workbook
.
buildRecalc
(
);
if
(
callTrigger
)
{
t
.
handlers
.
trigger
(
"
slowOperation
"
,
false
);
}
...
...
@@ -9257,8 +9257,8 @@
}
}
AscCommonExcel
.
buildRecalc
(
t
.
model
.
workbook
);
AscCommonExcel
.
unLockDraw
(
t
.
model
.
workbook
);
t
.
model
.
workbook
.
unLockDraw
(
);
t
.
model
.
workbook
.
buildRecalc
(
);
var
arn
=
selectData
[
0
];
var
selectionRange
=
arn
.
clone
(
true
);
...
...
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