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
fff06241
Commit
fff06241
authored
Jul 28, 2017
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add update row items in pivot table
parent
031bf62e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
53 additions
and
5 deletions
+53
-5
cell/model/PivotTables.js
cell/model/PivotTables.js
+12
-0
cell/model/Workbook.js
cell/model/Workbook.js
+41
-5
No files found.
cell/model/PivotTables.js
View file @
fff06241
...
...
@@ -5059,6 +5059,9 @@ CT_CacheField.prototype.toXml = function(writer, name) {
CT_CacheField
.
prototype
.
asc_getName
=
function
()
{
return
this
.
name
;
};
CT_CacheField
.
prototype
.
getSharedItem
=
function
(
index
)
{
return
this
.
sharedItems
&&
this
.
sharedItems
.
Items
[
index
];
};
function
CT_CacheHierarchy
()
{
//Attributes
this
.
uniqueName
=
null
;
...
...
@@ -5893,6 +5896,9 @@ CT_X.prototype.toXml = function(writer, name) {
}
writer
.
WriteXmlNodeEnd
(
name
,
true
,
true
);
};
CT_X
.
prototype
.
getV
=
function
()
{
return
this
.
v
||
0
;
};
function
CT_Tuples
()
{
//Attributes
this
.
c
=
null
;
...
...
@@ -6379,6 +6385,9 @@ CT_PivotField.prototype.toXml = function(writer, name) {
CT_PivotField
.
prototype
.
asc_getName
=
function
()
{
return
this
.
name
;
};
CT_PivotField
.
prototype
.
getItem
=
function
(
index
)
{
return
this
.
items
&&
this
.
items
.
item
[
index
];
};
function
CT_Field
()
{
//Attributes
this
.
x
=
null
;
...
...
@@ -6463,6 +6472,9 @@ CT_I.prototype.toXml = function(writer, name) {
}
writer
.
WriteXmlNodeEnd
(
name
);
};
CT_I
.
prototype
.
getR
=
function
(
writer
,
name
)
{
return
this
.
r
||
0
;
}
function
CT_PageField
()
{
//Attributes
this
.
fld
=
null
;
...
...
cell/model/Workbook.js
View file @
fff06241
...
...
@@ -4874,18 +4874,29 @@
cells
.
clearTableStyle
();
cells
.
cleanAll
();
}
var
pivotRange
=
pivotTable
.
getRange
();
cells
=
this
.
getRange3
(
pivotRange
.
r1
,
pivotRange
.
c1
,
pivotRange
.
r2
,
pivotRange
.
c2
);
cells
.
clearTableStyle
();
cells
.
cleanAll
();
};
Worksheet
.
prototype
.
updatePivotTable
=
function
(
pivotTable
)
{
pivotTable
.
init
();
var
pos
,
cells
,
bWarning
;
var
cleanRanges
=
[];
var
pos
,
cells
,
bWarning
,
pivotRange
;
var
l
=
pivotTable
.
pageFieldsPositions
.
length
;
pos
=
0
<
l
&&
pivotTable
.
pageFieldsPositions
[
0
];
if
(
pos
&&
0
>
pos
.
row
)
{
// ToDo add check exist data in cells
pivotTable
.
getRange
().
setOffset
(
new
AscCommonExcel
.
CRangeOffset
(
0
,
-
1
*
pos
.
row
));
pivotRange
=
pivotTable
.
getRange
();
pivotRange
.
setOffset
(
new
AscCommonExcel
.
CRangeOffset
(
0
,
-
1
*
pos
.
row
));
pivotTable
.
init
();
cells
=
this
.
getRange3
(
pivotRange
.
r1
,
pivotRange
.
c1
,
pivotRange
.
r2
,
pivotRange
.
c2
);
cells
.
_foreachNoEmpty
(
function
(
cell
)
{
return
(
bWarning
=
!
cell
.
isEmptyText
())
?
null
:
cell
;
});
cleanRanges
.
push
(
cells
);
}
var
cleanRanges
=
[];
pivotTable
.
pageFieldsPositions
.
forEach
(
function
(
pageFieldPos
)
{
cells
=
this
.
getRange3
(
pageFieldPos
.
row
,
pageFieldPos
.
col
,
pageFieldPos
.
row
,
pageFieldPos
.
col
+
1
);
if
(
!
bWarning
)
{
...
...
@@ -4913,9 +4924,11 @@
element
.
cleanAll
();
});
var
pos
,
cells
,
index
,
i
;
var
pivotRange
=
pivotTable
.
getRange
();
var
cacheFields
=
pivotTable
.
asc_getCacheFields
();
var
pivotFields
=
pivotTable
.
asc_getPivotFields
();
var
pageFields
=
pivotTable
.
asc_getPageFields
();
var
rowFields
=
pivotTable
.
asc_getRowFields
();
for
(
i
=
0
;
i
<
pivotTable
.
pageFieldsPositions
.
length
;
++
i
)
{
pos
=
pivotTable
.
pageFieldsPositions
[
i
];
cells
=
this
.
getRange3
(
pos
.
row
,
pos
.
col
,
pos
.
row
,
pos
.
col
);
...
...
@@ -4926,6 +4939,29 @@
cells
=
this
.
getRange3
(
pos
.
row
,
pos
.
col
+
1
,
pos
.
row
,
pos
.
col
+
1
);
cells
.
setValue
(
'
(All)
'
);
}
var
countC
=
pivotTable
.
getColumnFieldsCount
();
var
countR
=
pivotTable
.
getRowFieldsCount
(
true
);
var
c1
=
pivotRange
.
c1
;
var
start
=
pivotRange
.
r1
+
countC
;
cells
=
this
.
getRange3
(
start
,
c1
,
start
,
c1
);
cells
.
setValue
(
'
Row Labels
'
);
++
start
;
pivotTable
.
forEachRowItems
(
function
(
rowItem
,
rIndex
)
{
rowItem
.
x
.
forEach
(
function
(
x
,
i
)
{
var
v
;
if
(
AscCommonExcel
.
c_oAscItemType
.
Grand
===
rowItem
.
t
)
{
v
=
'
Grand Total
'
;
}
else
{
var
indexField
=
rowFields
[
rowItem
.
getR
()].
asc_getIndex
();
var
cacheIndex
=
pivotFields
[
indexField
].
getItem
(
x
.
getV
());
var
sharedItem
=
cacheFields
[
indexField
].
getSharedItem
(
cacheIndex
.
x
);
v
=
sharedItem
.
v
;
}
cells
=
this
.
getRange3
(
start
+
rIndex
,
c1
+
i
,
start
+
rIndex
,
c1
+
i
);
cells
.
setValue
(
v
);
},
this
);
},
this
);
};
Worksheet
.
prototype
.
updatePivotTablesStyle
=
function
(
range
)
{
...
...
@@ -5025,7 +5061,7 @@
if
(
AscCommonExcel
.
c_oAscItemType
.
Grand
===
item
.
t
||
0
===
_countC
)
{
_dxf
=
_style
.
lastColumn
;
}
else
{
r
=
item
.
r
||
0
;
r
=
item
.
getR
()
;
if
(
r
+
1
!==
_countC
)
{
if
(
0
===
r
)
{
_dxf
=
item
.
t
?
_style
.
firstSubtotalColumn
:
_style
.
firstColumnSubheading
;
...
...
@@ -5050,7 +5086,7 @@
if
(
AscCommonExcel
.
c_oAscItemType
.
Grand
===
item
.
t
||
0
===
_countR
)
{
_dxf
=
_style
.
totalRow
;
}
else
if
(
_styleInfo
.
showRowHeaders
)
{
r
=
item
.
r
||
0
;
r
=
item
.
getR
()
;
if
(
r
+
1
!==
_countR
)
{
if
(
0
===
r
)
{
_dxf
=
item
.
t
?
_style
.
firstSubtotalRow
:
_style
.
firstRowSubheading
;
...
...
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