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
d0b9f9e2
Commit
d0b9f9e2
authored
May 30, 2016
by
konovalovsergey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
corrupt changes while ConfirmPutMergeRange and autosave
parent
ee38f79f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+6
-5
No files found.
cell/view/WorksheetView.js
View file @
d0b9f9e2
...
...
@@ -8846,11 +8846,12 @@
if
(
null
!==
t
.
model
.
getRange3
(
arnTo
.
r1
,
arnTo
.
c1
,
arnTo
.
r2
,
arnTo
.
c2
).
hasMerged
()
&&
false
!==
t
.
model
.
autoFilters
.
_intersectionRangeWithTableParts
(
arnTo
))
{
t
.
model
.
workbook
.
handlers
.
trigger
(
"
asc_onConfirmAction
"
,
Asc
.
c_oAscConfirm
.
ConfirmPutMergeRange
,
function
()
{
t
.
model
.
autoFilters
.
unmergeTablesAfterMove
(
arnTo
);
t
.
_updateCellsRange
(
arnTo
,
false
,
true
);
t
.
_recalculateAfterUpdate
(
[
arnFrom
,
arnTo
]
);
});
t
.
model
.
autoFilters
.
unmergeTablesAfterMove
(
arnTo
);
t
.
_updateCellsRange
(
arnTo
,
false
,
true
);
t
.
_recalculateAfterUpdate
(
[
arnFrom
,
arnTo
]
);
//не делаем действий в asc_onConfirmAction, потому что во время диалога может выполниться autosave и новые измения добавятся в точку, которую уже отправили
//тем более результат диалога ни на что не влияет
t
.
model
.
workbook
.
handlers
.
trigger
(
"
asc_onConfirmAction
"
,
Asc
.
c_oAscConfirm
.
ConfirmPutMergeRange
,
function
()
{});
}
};
...
...
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