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
cc1e4ef4
Commit
cc1e4ef4
authored
Jan 20, 2017
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
+ merge from develop
parent
fa1beb31
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+5
-4
No files found.
cell/view/WorksheetView.js
View file @
cc1e4ef4
...
@@ -9408,7 +9408,7 @@
...
@@ -9408,7 +9408,7 @@
}
}
//apply props by cell
//apply props by cell
var
formulaProps
=
{
firstRange
:
firstRange
,
arrFormula
:
arrFormula
,
tablesMap
:
tablesMap
,
newVal
:
newVal
,
isOneMerge
:
isOneMerge
};
var
formulaProps
=
{
firstRange
:
firstRange
,
arrFormula
:
arrFormula
,
tablesMap
:
tablesMap
,
newVal
:
newVal
,
isOneMerge
:
isOneMerge
,
val
:
val
};
t
.
_setPastedDataByCurrentRange
(
range
,
pastedRangeProps
,
formulaProps
,
specialPasteProps
);
t
.
_setPastedDataByCurrentRange
(
range
,
pastedRangeProps
,
formulaProps
,
specialPasteProps
);
};
};
...
@@ -9460,7 +9460,7 @@
...
@@ -9460,7 +9460,7 @@
{
{
var
t
=
this
;
var
t
=
this
;
var
firstRange
,
arrFormula
,
tablesMap
,
newVal
,
isOneMerge
;
var
firstRange
,
arrFormula
,
tablesMap
,
newVal
,
isOneMerge
,
val
;
if
(
formulaProps
)
if
(
formulaProps
)
{
{
//TODO firstRange возможно стоит убрать(добавлено было для правки бага 27745)
//TODO firstRange возможно стоит убрать(добавлено было для правки бага 27745)
...
@@ -9468,7 +9468,8 @@
...
@@ -9468,7 +9468,8 @@
arrFormula
=
formulaProps
.
arrFormula
;
arrFormula
=
formulaProps
.
arrFormula
;
tablesMap
=
formulaProps
.
tablesMap
;
tablesMap
=
formulaProps
.
tablesMap
;
newVal
=
formulaProps
.
newVal
;
newVal
=
formulaProps
.
newVal
;
isOneMerge
=
formulaProps
.
isOneMerge
;
isOneMerge
=
formulaProps
.
isOneMerge
;
val
=
formulaProps
.
val
;
}
}
//set formula - for paste from binary
//set formula - for paste from binary
...
@@ -9505,7 +9506,7 @@
...
@@ -9505,7 +9506,7 @@
//formula
//formula
if
(
newVal
.
getFormula
()
&&
!
isOneMerge
)
{
if
(
newVal
.
getFormula
()
&&
!
isOneMerge
)
{
var
offset
=
range
.
getCells
()[
numFormula
].
getOffset2
(
value2
[
numFormula
].
sId
);
var
offset
=
range
.
getCells
()[
numFormula
].
getOffset2
(
value2
[
numFormula
].
sId
);
var
assemb
,
_p_
=
new
AscCommonExcel
.
parserFormula
(
value2
[
numFormula
].
sFormula
,
null
,
range
.
worksheet
);
var
assemb
,
_p_
=
new
AscCommonExcel
.
parserFormula
(
value2
[
numFormula
].
sFormula
,
null
,
val
);
if
(
_p_
.
parse
())
{
if
(
_p_
.
parse
())
{
if
(
null
!==
tablesMap
)
if
(
null
!==
tablesMap
)
...
...
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