dtable-statistic 4.0.12 → 4.1.0

package/es/utils/pivot-table.js

@@ -0,0 +1,91 @@
+import { FORMULA_COLUMN_TYPES_MAP, isNumber } from 'dtable-store';
+import { STATISTICS_COUNT_TYPE, SUMMARY_METHOD_MAP } from '../constants';
+var getCellValueFromRow = function getCellValueFromRow(row, formulaRow, columnType, columnKey, sqlKey, isSqlQuery) {
+  if (!isSqlQuery) {
+    if (FORMULA_COLUMN_TYPES_MAP[columnType]) {
+      var cellValue = formulaRow[columnKey];
+      return Array.isArray(cellValue) ? cellValue[0] : cellValue;
+    }
+    return row[columnKey];
+  }
+  return row[sqlKey];
+};
+export var getPivotTableSummaryTotal = function getPivotTableSummaryTotal(summaryColumnType, summaryColumnKey, sqlKey, summaryType, summaryMethod, rows, formulaRows, isSqlQuery) {
+  if (summaryType === STATISTICS_COUNT_TYPE.COUNT) {
+    return rows.length;
+  }
+  if (summaryType !== STATISTICS_COUNT_TYPE.ADVANCED) {
+    return 0;
+  }
+  switch (summaryMethod) {
+    case SUMMARY_METHOD_MAP.Distinct_values:
+      {
+        var count = 0;
+        var existMap = {};
+        rows.forEach(function (row) {
+          var formulaRow = formulaRows && formulaRows[row._id];
+          var cellValue = getCellValueFromRow(row, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+          if (!cellValue) {
+            if (cellValue === 0) {
+              cellValue = '0';
+            } else {
+              cellValue = !!cellValue;
+            }
+          }
+          if (!existMap[cellValue]) {
+            existMap[cellValue] = true;
+            count++;
+          }
+        });
+        return count;
+      }
+    case SUMMARY_METHOD_MAP.Sum:
+    case SUMMARY_METHOD_MAP.Mean:
+      {
+        var sum = 0;
+        var validNumbersCount = 0;
+        rows.forEach(function (row) {
+          var formulaRow = formulaRows && formulaRows[row._id];
+          var cellValue = getCellValueFromRow(row, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+          if (isNumber(cellValue)) {
+            validNumbersCount++;
+            sum += cellValue;
+          }
+        });
+        if (summaryMethod === SUMMARY_METHOD_MAP.Sum) {
+          sum = Number.parseFloat(sum.toFixed(8));
+        } else if (summaryMethod === SUMMARY_METHOD_MAP.Mean) {
+          sum = validNumbersCount === 0 ? 0 : Number.parseFloat((sum / validNumbersCount).toFixed(8));
+        }
+        return sum;
+      }
+    case SUMMARY_METHOD_MAP.Max:
+    case SUMMARY_METHOD_MAP.Min:
+      {
+        if (rows.length === 0) {
+          return 0;
+        }
+        var result = rows.reduce(function (current, next) {
+          var currentFormulaRow = formulaRows && formulaRows[current._id];
+          var nextFormulaRow = formulaRows && formulaRows[next._id];
+          var currentValue = getCellValueFromRow(current, currentFormulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+          var nextValue = getCellValueFromRow(next, nextFormulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+          if (!nextValue && nextValue !== 0) {
+            return current;
+          }
+          var isNextGreater = currentValue < nextValue;
+          if (summaryMethod === SUMMARY_METHOD_MAP.Min) {
+            return isNextGreater ? current : next;
+          } else {
+            return isNextGreater ? next : current;
+          }
+        });
+        var formulaRow = formulaRows && formulaRows[result._id];
+        return getCellValueFromRow(result, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+      }
+    default:
+      {
+        return 0;
+      }
+  }
+};

package/es/utils/sql-utils.js

@@ -37,6 +37,21 @@ export var getSqlGroup = function getSqlGroup(granularity, column) {
   }
   return "`".concat(columnName, "`");
 };
+export var getPieChartSqlGroupName = function getPieChartSqlGroupName(statisticRecord, selectedColumn, groupName) {
+  var original_name_list = statisticRecord.original_name_list,
+    name_list = statisticRecord.name_list;
+  var sqlString = '';
+  var list = original_name_list.length > 0 ? original_name_list : name_list;
+  list.forEach(function (item, index) {
+    if (index === 0) {
+      sqlString += getSqlGroupName(name_list[0], original_name_list[0], selectedColumn);
+    } else {
+      var sqlName = getSqlGroupName(name_list[index], original_name_list[index], selectedColumn);
+      sqlString = "".concat(sqlString, " or ").concat(groupName, "=").concat(sqlName);
+    }
+  });
+  return sqlString;
+};
 export var getSqlString = function getSqlString(statItem, statisticRecord, _ref) {
   var isColumn = _ref.isColumn,
     isCurrentView = _ref.isCurrentView,
@@ -63,6 +78,9 @@ export var getSqlString = function getSqlString(statItem, statisticRecord, _ref)
     group_original_name = statisticRecord.group_original_name,
     group_name = statisticRecord.group_name;
   var sqlName = getSqlGroupName(name, original_name, selectedColumn);
+  if ((type === STAT_TYPE.PIE || type === STAT_TYPE.RING) && original_name === 'Others') {
+    sqlName = getPieChartSqlGroupName(statisticRecord, selectedColumn, groupName);
+  }
   var sqlGroupName;
   if (isGroup) {
     sqlGroupName = getSqlGroupName(group_name, group_original_name, columnSelectedColumn);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.0.12",
+  "version": "4.1.0",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -12,8 +12,8 @@
     "@seafile/seafile-calendar": "0.0.24",
     "comlink": "^4.3.1",
     "dayjs": "1.10.7",
-    "dtable-store": "4.0.6",
-    "dtable-web-api": "4.0.4",
+    "dtable-store": "4.1.0",
+    "dtable-web-api": "4.0.5",
     "glamor": "^2.20.40",
     "html2canvas": "^1.4.1",
     "rc-slider": "^9.7.4",