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
1e059cad
Commit
1e059cad
authored
Oct 05, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
activeRange -> selectionRange
parent
314467a1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+7
-7
No files found.
cell/view/WorksheetView.js
View file @
1e059cad
...
...
@@ -1645,11 +1645,11 @@
var
maxRows
=
this
.
model
.
getRowsCount
();
var
lastC
=
-
1
,
lastR
=
-
1
;
// ToDo print each range on new page (now only last)
var
active
Range
=
printOnlySelection
?
this
.
model
.
selectionRange
.
getLast
()
:
null
;
var
selection
Range
=
printOnlySelection
?
this
.
model
.
selectionRange
.
getLast
()
:
null
;
var
bFitToWidth
=
false
;
var
bFitToHeight
=
false
;
if
(
null
===
active
Range
)
{
if
(
null
===
selection
Range
)
{
range
=
new
asc_Range
(
0
,
0
,
maxCols
,
maxRows
);
this
.
_prepareCellTextMetricsCache
(
range
);
for
(
var
c
=
0
;
c
<
maxCols
;
++
c
)
{
...
...
@@ -1678,8 +1678,8 @@
maxRows
=
Math
.
max
(
maxRows
,
maxObjectsCoord
.
maxRow
);
}
}
else
{
maxCols
=
active
Range
.
c2
+
1
;
maxRows
=
active
Range
.
r2
+
1
;
maxCols
=
selection
Range
.
c2
+
1
;
maxRows
=
selection
Range
.
r2
+
1
;
range
=
new
asc_Range
(
0
,
0
,
maxCols
,
maxRows
);
this
.
_prepareCellTextMetricsCache
(
range
);
}
...
...
@@ -1766,9 +1766,9 @@
var
pageWidthWithFieldsHeadings
=
(
pageWidth
-
pageRightField
)
/
vector_koef
-
leftFieldInPt
;
var
pageHeightWithFieldsHeadings
=
(
pageHeight
-
pageBottomField
)
/
vector_koef
-
topFieldInPt
;
var
currentColIndex
=
(
null
!==
activeRange
)
?
active
Range
.
c1
:
0
;
var
currentColIndex
=
(
null
!==
selectionRange
)
?
selection
Range
.
c1
:
0
;
var
currentWidth
=
0
;
var
currentRowIndex
=
(
null
!==
activeRange
)
?
active
Range
.
r1
:
0
;
var
currentRowIndex
=
(
null
!==
selectionRange
)
?
selection
Range
.
r1
:
0
;
var
currentHeight
=
0
;
var
isCalcColumnsWidth
=
true
;
...
...
@@ -1882,7 +1882,7 @@
currentHeight
=
0
;
}
else
{
// Мы дорисовали все колонки, нужна новая строка и стартовая колонка
currentColIndex
=
(
null
!==
activeRange
)
?
active
Range
.
c1
:
0
;
currentColIndex
=
(
null
!==
selectionRange
)
?
selection
Range
.
c1
:
0
;
currentRowIndex
=
rowIndex
;
currentHeight
=
0
;
}
...
...
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