Compare commits

...

7 Commits

Author SHA1 Message Date
Snigdha Snigdha
be710cb17b pivot selection refresh fixed 2020-03-20 18:29:32 +05:30
Avinash
2729321f40 Merge pull request #87 from qlik-oss/bugfix/QB-980
PL Pivot table Error message not showing
2020-02-26 18:06:04 +05:30
Avinash Shinde
2710d4629f fix: PL Pivot table Error message not showing 2020-02-25 13:17:19 +05:30
Purwa Shrivastava
8c093a4692 Merge pull request #86 from qlik-oss/QLIK-98564/sourceMaps
Removing source maps from production mode.
2020-02-14 11:03:05 +01:00
Avinash
ec822b843b Merge pull request #85 from qlik-oss/bugfix/QB-959
bugfix for  Column separator is misaligned
2020-02-14 11:51:42 +05:30
Avinash Shinde
0d98553a71 fix: removing .lock file 2020-02-11 16:32:58 +05:30
Avinash Shinde
6513a294b3 fix: Column separator is misaligned 2020-02-10 15:32:43 +05:30
3 changed files with 31 additions and 19 deletions

View File

@@ -33,27 +33,34 @@ class DataTable extends React.PureComponent {
};
const renderMeasurementData = (dimIndex, atEvery) => {
const injectSeparatorsArray = injectSeparators(
matrix[dimIndex],
columnSeparatorWidth,
atEvery
);
if (dimension2.length <= 0) {
return injectSeparatorsArray;
return injectSeparators(
matrix[dimIndex],
columnSeparatorWidth,
atEvery
);
}
const measurementDataRow = [];
let index = 0,
match;
dimension2.forEach((dim2) => {
dimension2.forEach(dim2 => {
measurements.forEach((measure, mesInd) => {
for (index = 0; index < injectSeparatorsArray.length; index++) {
for (index = 0; index < matrix[dimIndex].length; index++) {
match = false;
if (injectSeparatorsArray[index].parents && dimension1[dimIndex].displayValue === injectSeparatorsArray[index].parents.dimension1.header) {
if (dim2.displayValue === injectSeparatorsArray[index].parents.dimension2.header) {
if (measure.name === injectSeparatorsArray[index].parents.measurement.header) {
measurementDataRow.push(injectSeparatorsArray[index]);
if (
matrix[dimIndex][index].parents &&
dimension1[dimIndex].displayValue ===
matrix[dimIndex][index].parents.dimension1.header
) {
if (
dim2.displayValue ===
matrix[dimIndex][index].parents.dimension2.header
) {
if (
measure.name ===
matrix[dimIndex][index].parents.measurement.header
) {
measurementDataRow.push(matrix[dimIndex][index]);
match = true;
break;
}
@@ -62,7 +69,7 @@ class DataTable extends React.PureComponent {
}
if (!match) {
measurementDataRow.push({
displayValue: '',
displayValue: "",
parents: {
dimension1: {
elementNumber: dimension1[dimIndex].elementNumber,
@@ -81,9 +88,14 @@ class DataTable extends React.PureComponent {
}
});
});
return measurementDataRow;
return injectSeparators(
measurementDataRow,
columnSeparatorWidth,
atEvery
);
};
return (
<div className="row-wrapper">
<table>
@@ -109,7 +121,7 @@ class DataTable extends React.PureComponent {
};
return (
<tr key={dimensionEntry.displayValue}>
<tr key={`${dimensionEntry.displayValue}-${dimensionIndex}-separator`}>
{!renderData ?
<RowHeader
component={component}

View File

@@ -77,7 +77,7 @@ class HeadersTable extends React.PureComponent {
colSpan={measurements.length}
component={component}
entry={entry}
key={entry.displayValue}
key={`${entry.displayValue}-${index}-separator`}
styling={styling}
/>
);

View File

@@ -33,7 +33,7 @@ class Root extends React.PureComponent {
// Determine cell- and column separator width
let cellWidth = '0px';
let columnSeparatorWidth = '';
if (this.dataTableRef) {
if (this.dataTableRef && !error) {
const tableWidth = this.dataTableRef.getBoundingClientRect().width;
this.renderedTableWidth = tableWidth;