sea-chart 1.1.50 → 1.1.52

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.
Files changed (3) hide show
  1. package/dist/utils/chart-utils/base-utils.js +13 -5
  2. package/dist/utils/chart-utils/sql-statistics-utils.js +30 -29
  3. package/package.json +1 -1
package/dist/utils/chart-utils/base-utils.js CHANGED
@@ -35,14 +35,22 @@ BaseUtils.updateSummaryValuePrecision = (result, summaryColumn, summaryValueKey)
35
35
  if (!data) return;
36
36
  const {
37
37
  enable_precision,
38
- precision
38
+ precision,
39
+ format
39
40
  } = data;
40
41
  if (enable_precision) {
41
42
  result.forEach(item => {
42
- item[summaryValueKey] = parseFloat(getPrecisionNumber(item[summaryValueKey], {
43
- enable_precision,
44
- precision
45
- }));
43
+ if (format === 'percent') {
44
+ item[summaryValueKey] = parseFloat(getPrecisionNumber(item[summaryValueKey] * 100, {
45
+ enable_precision,
46
+ precision
47
+ })) / 100;
48
+ } else {
49
+ item[summaryValueKey] = parseFloat(getPrecisionNumber(item[summaryValueKey], {
50
+ enable_precision,
51
+ precision
52
+ }));
53
+ }
46
54
  });
47
55
  }
48
56
  };
package/dist/utils/chart-utils/sql-statistics-utils.js CHANGED
@@ -987,11 +987,11 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = async (chart, sqlRows, char
987
987
  } = chart;
988
988
  const {
989
989
  y_axis_left_group_by_multiple_numeric_column,
990
- y_axis_left_summary_type,
990
+ // y_axis_left_summary_type,
991
991
  y_axis_left_summary_column,
992
992
  y_axis_left_summary_method,
993
- y_axis_right_summary_type,
994
- y_axis_right_summary_column,
993
+ // y_axis_right_summary_type,
994
+ // y_axis_right_summary_column,
995
995
  table_id,
996
996
  y_axis_left_group_by_numeric_columns
997
997
  } = config;
@@ -1012,24 +1012,24 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = async (chart, sqlRows, char
1012
1012
  const isGroupbyColumnDataAsAnArray = findIfColumnDataIsArray(groupbyColumn);
1013
1013
  let result = [];
1014
1014
  if (!y_axis_left_group_by_multiple_numeric_column) {
1015
- let leftSummaryColumn, rightSummaryColumn;
1016
- if (y_axis_left_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1017
- leftSummaryColumn = getTableColumnByKey(table, y_axis_left_summary_column);
1018
- }
1019
- if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1020
- rightSummaryColumn = getTableColumnByKey(table, y_axis_right_summary_column);
1021
- }
1015
+ // let leftSummaryColumn, rightSummaryColumn;
1016
+ // if (y_axis_left_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1017
+ // leftSummaryColumn = getTableColumnByKey(table, y_axis_left_summary_column);
1018
+ // }
1019
+ // if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1020
+ // rightSummaryColumn = getTableColumnByKey(table, y_axis_right_summary_column);
1021
+ // }
1022
1022
  for (const [index, row] of sqlRows.entries()) {
1023
1023
  const cellValue = row[sqlGroupbyColumnKey];
1024
1024
  const key = await _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, chart.config);
1025
1025
  let valueLeft = row[sqlLeftSummaryColumnKey] || 0;
1026
1026
  let valueRight = row[sqlRightSummaryColumnKey] || 0;
1027
- if (y_axis_left_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1028
- valueLeft = BaseUtils.getPrecisionNumber(valueLeft, leftSummaryColumn.data);
1029
- }
1030
- if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1031
- valueRight = BaseUtils.getPrecisionNumber(valueRight, rightSummaryColumn.data);
1032
- }
1027
+ // if (y_axis_left_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1028
+ // valueLeft = BaseUtils.getPrecisionNumber(valueLeft, leftSummaryColumn.data);
1029
+ // }
1030
+ // if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1031
+ // valueRight = BaseUtils.getPrecisionNumber(valueRight, rightSummaryColumn.data);
1032
+ // }
1033
1033
  if (isGroupbyColumnDataAsAnArray) {
1034
1034
  if (!Array.isArray(key) || key.length === 0) {
1035
1035
  let itemIdx = result.findIndex(v => v.name === null);
@@ -1086,10 +1086,10 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = async (chart, sqlRows, char
1086
1086
  }
1087
1087
  }
1088
1088
  } else {
1089
- let rightSummaryColumn;
1090
- if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1091
- rightSummaryColumn = getTableColumnByKey(table, y_axis_right_summary_column);
1092
- }
1089
+ // let rightSummaryColumn;
1090
+ // if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1091
+ // rightSummaryColumn = getTableColumnByKey(table, y_axis_right_summary_column);
1092
+ // }
1093
1093
  const groupItems = [];
1094
1094
  let leftSummaryColumn = getTableColumnByKey(table, y_axis_left_summary_column);
1095
1095
  const summaryMethod = y_axis_left_summary_method.toUpperCase();
@@ -1125,9 +1125,10 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = async (chart, sqlRows, char
1125
1125
  const cellValue = item[sqlGroupbyColumnKey];
1126
1126
  const key = await _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, chart.config);
1127
1127
  let valueRight = item[sqlRightSummaryColumnKey] || 0;
1128
- if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1129
- valueRight = BaseUtils.getPrecisionNumber(valueRight, rightSummaryColumn.data);
1130
- }
1128
+ // if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1129
+ // valueRight = BaseUtils.getPrecisionNumber(valueRight, rightSummaryColumn.data);
1130
+ // }
1131
+
1131
1132
  if (isGroupbyColumnDataAsAnArray) {
1132
1133
  key.forEach(key => {
1133
1134
  groupItems.forEach((groupItem, index) => {
@@ -1135,9 +1136,9 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = async (chart, sqlRows, char
1135
1136
  const sqlName = groupItem.sqlName;
1136
1137
  const groupName = (_groupItem$column = groupItem.column) === null || _groupItem$column === void 0 ? void 0 : _groupItem$column.name;
1137
1138
  let value = item[sqlName] || 0;
1138
- if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1139
- value = BaseUtils.getPrecisionNumber(value, leftSummaryColumn.data);
1140
- }
1139
+ // if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1140
+ // value = BaseUtils.getPrecisionNumber(value, leftSummaryColumn.data);
1141
+ // }
1141
1142
  const itemIdx = result.findIndex(v => {
1142
1143
  var _groupItem$column2;
1143
1144
  return v.group_name === ((_groupItem$column2 = groupItem.column) === null || _groupItem$column2 === void 0 ? void 0 : _groupItem$column2.name) && v.name === key;
@@ -1164,9 +1165,9 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = async (chart, sqlRows, char
1164
1165
  const sqlName = groupItem.sqlName;
1165
1166
  const groupName = (_groupItem$column3 = groupItem.column) === null || _groupItem$column3 === void 0 ? void 0 : _groupItem$column3.name;
1166
1167
  let value = item[sqlName] || 0;
1167
- if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1168
- value = BaseUtils.getPrecisionNumber(value, leftSummaryColumn.data);
1169
- }
1168
+ // if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
1169
+ // value = BaseUtils.getPrecisionNumber(value, leftSummaryColumn.data);
1170
+ // }
1170
1171
  result.push({
1171
1172
  name: key,
1172
1173
  value_left: value,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sea-chart",
3
- "version": "1.1.50",
3
+ "version": "1.1.52",
4
4
  "main": "./dist/index.js",
5
5
  "dependencies": {
6
6
  "@antv/data-set": "0.11.8",