sea-chart 0.0.66 → 0.0.67-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -646,7 +646,9 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
|
|
|
646
646
|
pivot_table_total, chart);
|
|
647
647
|
BaseUtils.sortCharts(pivot_rows, groupbyColumn, 'name');
|
|
648
648
|
BaseUtils.sortCharts(pivot_columns, columnGroupbyColumn, 'key');
|
|
649
|
-
|
|
649
|
+
if ((groupbyColumn === null || groupbyColumn === void 0 ? void 0 : groupbyColumn.type) === CellType.COLLABORATOR) {
|
|
650
|
+
pivot_rows = BaseUtils.mergePivotTableSameCollaborator(pivot_rows);
|
|
651
|
+
}
|
|
650
652
|
const summary_columns = [summaryColumn, ...summaryColumnsWithMethod.map(item => item.column)];
|
|
651
653
|
return {
|
|
652
654
|
summary_columns,
|
|
@@ -1637,7 +1639,7 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, chartSQLMap, tables)
|
|
|
1637
1639
|
} else if (!targetValue && !completedValue) {
|
|
1638
1640
|
completedRate = 'empty';
|
|
1639
1641
|
} else {
|
|
1640
|
-
completedRate = (
|
|
1642
|
+
completedRate = (completedValue / targetValue * 100).toFixed(0);
|
|
1641
1643
|
}
|
|
1642
1644
|
res.push({
|
|
1643
1645
|
name: nameValue,
|