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
a85f07e4
Commit
a85f07e4
authored
Aug 25, 2017
by
konovalovsergey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
_foreachNoEmpty;_promoteFromTo
parent
209bc7b0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
14 deletions
+8
-14
cell/model/Workbook.js
cell/model/Workbook.js
+8
-14
No files found.
cell/model/Workbook.js
View file @
a85f07e4
...
...
@@ -7067,7 +7067,9 @@
oRes
=
actionRow
(
tempRow
,
excludedCount
);
tempRow
.
saveContent
(
true
);
if
(
null
!=
oRes
)
{
wb
.
loadCells
.
pop
();
if
(
actionCell
)
{
wb
.
loadCells
.
pop
();
}
return
oRes
;
}
}
else
if
(
bExcludeHiddenRows
&&
allRowHidden
)
{
...
...
@@ -7099,7 +7101,9 @@
oRes
=
actionCell
(
targetCell
,
i
,
nCol
,
oBBox
.
r1
,
oBBox
.
c1
,
excludedCount
);
}
if
(
null
!=
oRes
)
{
wb
.
loadCells
.
pop
();
if
(
actionCell
)
{
wb
.
loadCells
.
pop
();
}
return
oRes
;
}
}
else
{
...
...
@@ -7133,8 +7137,8 @@
return
this
.
_foreachNoEmpty
(
actionCell
);
}
};
Range
.
prototype
.
_foreachRowNoEmpty
=
function
(
actionRow
,
actionCell
)
{
return
this
.
_foreachNoEmpty
(
actionCell
,
actionRow
);
Range
.
prototype
.
_foreachRowNoEmpty
=
function
(
actionRow
,
actionCell
,
excludeHiddenRows
)
{
return
this
.
_foreachNoEmpty
(
actionCell
,
actionRow
,
excludeHiddenRows
);
};
Range
.
prototype
.
_foreachCol
=
function
(
actionCol
,
actionCell
){
var
oBBox
=
this
.
bbox
;
...
...
@@ -7276,12 +7280,6 @@
Range
.
prototype
.
getName
=
function
(){
return
this
.
bbox
.
getName
();
};
Range
.
prototype
.
getLeftTopCell
=
function
(
fAction
)
{
return
this
.
worksheet
.
_getCell
(
this
.
bbox
.
r1
,
this
.
bbox
.
c1
,
fAction
);
};
Range
.
prototype
.
getLeftTopCellNoEmpty
=
function
(
fAction
)
{
return
this
.
worksheet
.
_getCellNoEmpty
(
this
.
bbox
.
r1
,
this
.
bbox
.
c1
,
fAction
);
};
Range
.
prototype
.
setValue
=
function
(
val
,
callback
,
isCopyPaste
){
History
.
Create_NewPoint
();
History
.
StartTransaction
();
...
...
@@ -10050,11 +10048,7 @@
{
//копируем полностью
if
(
!
oFromCell
.
formulaParsed
){
var
DataOld
=
oCopyCell
.
getValueData
();
oCopyCell
.
setValueData
(
oFromCell
.
getValueData
());
var
DataNew
=
oCopyCell
.
getValueData
();
if
(
false
==
DataOld
.
isEqual
(
DataNew
))
History
.
Add
(
AscCommonExcel
.
g_oUndoRedoCell
,
AscCH
.
historyitem_Cell_ChangeValue
,
wsTo
.
getId
(),
new
Asc
.
Range
(
oCopyCell
.
nCol
,
oCopyCell
.
nRow
,
oCopyCell
.
nCol
,
oCopyCell
.
nRow
),
new
UndoRedoData_CellSimpleData
(
oCopyCell
.
nRow
,
oCopyCell
.
nCol
,
DataOld
,
DataNew
));
//todo
// if(oCopyCell.isEmptyTextString())
// wsTo._getHyperlink().remove({r1: oCopyCell.nRow, c1: oCopyCell.nCol, r2: oCopyCell.nRow, c2: oCopyCell.nCol});
...
...
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