dtable-statistic 4.0.7 → 4.0.8

package/es/utils/sql-utils.js

@@ -101,7 +101,8 @@ export var getSqlString = function getSqlString(statItem, statisticRecord, _ref)
   return sqlString;
 };
 var getSqlGroupName = function getSqlGroupName(name, original_name, column) {
-  var type = column.type;
+  var _ref2 = column || {},
+    type = _ref2.type;
   if (type === CellType.SINGLE_SELECT || type === CellType.MULTIPLE_SELECT) {
     return "'".concat(name, "'");
   }
@@ -111,9 +112,9 @@ var getSqlGroupName = function getSqlGroupName(name, original_name, column) {
   }
   return "'".concat(newName, "'");
 };
-var getGroupName = function getGroupName(selectedColumn, _ref2) {
-  var groupby_date_granularity = _ref2.groupby_date_granularity,
-    groupby_geolocation_granularity = _ref2.groupby_geolocation_granularity;
+var getGroupName = function getGroupName(selectedColumn, _ref3) {
+  var groupby_date_granularity = _ref3.groupby_date_granularity,
+    groupby_geolocation_granularity = _ref3.groupby_geolocation_granularity;
   var groupName = "`".concat(selectedColumn.name, "`");
   var isTimeColumn = TIME_COLUMN_LIST.includes(selectedColumn.type);
   if (isTimeColumn) {
@@ -123,11 +124,11 @@ var getGroupName = function getGroupName(selectedColumn, _ref2) {
   }
   return groupName;
 };
-var getDatabaseGroupName = function getDatabaseGroupName(statItem, selectedTable, _ref3) {
-  var _ref3$isColumn = _ref3.isColumn,
-    isColumn = _ref3$isColumn === void 0 ? false : _ref3$isColumn,
-    _ref3$isCurrentView = _ref3.isCurrentView,
-    isCurrentView = _ref3$isCurrentView === void 0 ? false : _ref3$isCurrentView;
+var getDatabaseGroupName = function getDatabaseGroupName(statItem, selectedTable, _ref4) {
+  var _ref4$isColumn = _ref4.isColumn,
+    isColumn = _ref4$isColumn === void 0 ? false : _ref4$isColumn,
+    _ref4$isCurrentView = _ref4.isCurrentView,
+    isCurrentView = _ref4$isCurrentView === void 0 ? false : _ref4$isCurrentView;
   if (isCurrentView) return '';
   var type = statItem.type;
   var groupName, selectedColumn, columnGroupName, columnSelectedColumn;

package/es/utils/stat-utils.js

@@ -2,7 +2,7 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { DateUtils, isNumber, isNumericColumn, CellType, FORMULA_COLUMN_TYPES_MAP, FORMULA_RESULT_TYPE, sortText, sortNumber, sortDate, sortSingleSelect, getPrecisionNumber, getFormulaDisplayString, getGeolocationDisplayString, getDateDisplayString, getNumberDisplayString } from 'dtable-store';
 import { getClientFormulaDisplayString } from '../utils';
-import { STATISTICS_COUNT_TYPE } from '../constants';
+import { STATISTICS_COUNT_TYPE, SUMMARY_METHOD_MAP } from '../constants';
 var SUPPORT_SORT_COLUMNS = [CellType.TEXT, CellType.NUMBER, CellType.DATE, CellType.SINGLE_SELECT, CellType.FORMULA, CellType.LINK_FORMULA, CellType.CTIME, CellType.MTIME, CellType.RATE];
 var getValidCollaborators = function getValidCollaborators(collaborators, emails) {
   if (!Array.isArray(emails)) {
@@ -337,18 +337,21 @@ var StatUtils = /*#__PURE__*/function () {
     }
   }, {
     key: "getFormattedValue",
-    value: function getFormattedValue(value, column) {
+    value: function getFormattedValue(value, column, summaryMethod) {
       if (!column) {
         return value;
       }
+      if (summaryMethod === SUMMARY_METHOD_MAP.Distinct_values) {
+        return value;
+      }
       var type = column.type,
         data = column.data;
-      if (FORMULA_COLUMN_TYPES_MAP[type]) {
-        return getClientFormulaDisplayString(value, data);
-      }
       if (isNumericColumn(column)) {
         return getNumberDisplayString(value, data);
       }
+      if (FORMULA_COLUMN_TYPES_MAP[type]) {
+        return getClientFormulaDisplayString(value, data);
+      }
       return value;
     }
   }]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.0.7",
+  "version": "4.0.8",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",