dtable-statistic 4.0.6 → 4.0.8

package/es/calculator/workers/compare-bar-chart-calculator-worker.js

@@ -89,14 +89,17 @@ function calculateChart(chart, value, username, userId) {
       var item = _step.value;
       var key = item[0];
       var _value = item[1];
+      var formatted_value = _value;
       if (isAdvance) {
         _value = getSummaryResult(_value, y_axis_summary_method, data.precision);
+        formatted_value = StatUtils.getFormattedValue(_value, summaryColumn, y_axis_summary_method);
       }
       dateRangeResult.push({
         name: key,
-        value: _value,
         group_name: groupName1,
-        raw_name: key
+        raw_name: key,
+        value: _value,
+        formatted_value: formatted_value
       });
     }
   } catch (err) {
@@ -112,14 +115,17 @@ function calculateChart(chart, value, username, userId) {
       var _item = _step2.value;
       var _key = _item[0];
       var _value2 = _item[1];
+      var _formatted_value = _value2;
       if (isAdvance) {
         _value2 = getSummaryResult(_value2, y_axis_summary_method, data.precision);
+        _formatted_value = StatUtils.getFormattedValue(_value2, summaryColumn, y_axis_summary_method);
       }
       comparedDateRangeResult.push({
         name: _key,
-        value: _value2,
         group_name: groupName2,
-        raw_name: _key
+        raw_name: _key,
+        value: _value2,
+        formatted_value: _formatted_value
       });
     }
   } catch (err) {
@@ -132,8 +138,8 @@ function calculateChart(chart, value, username, userId) {
     if (!comparedDateRangeResult[i]) break;
     comparedDateRangeResult[i].name = dateRangeResult[i].name;
     if (display_increase) {
-      var value1 = dateRangeResult[i].value,
-        value2 = comparedDateRangeResult[i].value || 0.001;
+      var value1 = dateRangeResult[i].value;
+      var value2 = comparedDateRangeResult[i].value || 0.001;
       if (!value2) {
         comparedDateRangeResult[i].increase_value = 1;
       } else {

package/es/calculator/workers/mirror-calculator-worker.js

@@ -3,6 +3,7 @@ import { getClientCellValueDisplayString } from '../../utils';
 import { getSummaryResult } from '../../utils/common-utils';
 import { getCellValue } from '../../utils/row-utils';
 import { SUMMARY_TYPE } from '../../constants';
+import StatUtils from '../../utils/stat-utils';
 function calculateStatItem(chart, dtableValue, username, userId) {
   var table_id = chart.table_id,
     view_id = chart.view_id,
@@ -17,6 +18,7 @@ function calculateStatItem(chart, dtableValue, username, userId) {
   var rows = Views.getViewRows(view, table, dtableValue, username, userId);
   var formulaRows = Views.getTableFormulaResults(table, rows, dtableValue);
   var groupColumn = TableUtils.getTableColumnByKey(table, group_column);
+  var numericColumn = summary_column && TableUtils.getTableColumnByKey(table, summary_column);
   var groupItems = getGroupItems(rows, groupColumn);
   if (groupColumn.length === 0) return;
   var result = {};
@@ -50,7 +52,6 @@ function calculateStatItem(chart, dtableValue, username, userId) {
       });
     });
   } else {
-    var numericColumn = TableUtils.getTableColumnByKey(table, summary_column);
     groupItems.forEach(function (groupItem) {
       rows.forEach(function (row) {
         var value = getClientCellValueDisplayString(row, columnItem.type, columnItem.key, {
@@ -79,10 +80,12 @@ function calculateStatItem(chart, dtableValue, username, userId) {
         }
       });
     });
-    var data = numericColumn.data || {};
-    result = summaryResult(result, summary_method, data.precision);
+    if (numericColumn) {
+      var data = numericColumn.data || {};
+      result = summaryResult(result, summary_method, data.precision);
+    }
   }
-  return normalizeResult(result, groupColumn);
+  return normalizeResult(result, groupColumn, numericColumn, summary_type, summary_method);
 }
 function summaryResult(result, summaryMethod, precision) {
   var newResult = {};
@@ -95,7 +98,7 @@ function summaryResult(result, summaryMethod, precision) {
   });
   return newResult;
 }
-function normalizeResult(result, groupColumn) {
+function normalizeResult(result, groupColumn, summaryColumn, summaryType, summaryMethod) {
   var data = [];
   var colorSet = [];
   Object.keys(result).forEach(function (groupId, index) {
@@ -105,9 +108,15 @@ function normalizeResult(result, groupColumn) {
     if (!groupItem) return;
     colorSet[index] = groupItem.color;
     Object.keys(result[groupId]).forEach(function (name) {
+      var value = result[groupId][name];
+      var formattedValue = value;
+      if (summaryType === SUMMARY_TYPE.ADVANCED) {
+        formattedValue = StatUtils.getFormattedValue(value, summaryColumn, summaryMethod);
+      }
       data.push({
         name: name,
-        value: result[groupId][name],
+        value: value,
+        formatted_value: formattedValue,
         group_name: groupItem.name,
         color: groupItem.color
       });

package/es/calculator/workers/pivot-table-calculator-worker.js

@@ -1,7 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { FORMULA_COLUMN_TYPES_MAP, isNumber, TableUtils, Views, isDateColumn, isNumericColumn } from 'dtable-store';
-import { SUMMARY_TYPE } from '../../constants';
+import { SUMMARY_METHOD_MAP, SUMMARY_TYPE } from '../../constants';
 import { isArrayCellValue } from '../../utils/common-utils';
 import { getFormattedLabel, isValidRow } from '../../utils/row-utils';
 import StatUtils from '../../utils/stat-utils';
@@ -73,15 +73,15 @@ function calculateOneDimensionTable(chart, value, username, userId) {
     var column = TableUtils.getTableColumnByKey(table, key);
     return column ? _objectSpread({}, column) : null;
   }).filter(Boolean);
-  if (statisticColumns.length > 1) {
+  if (statisticColumns.length > 0) {
     statisticColumns[0].method = summary_method;
-    Array.isArray(summary_columns_option) && summary_columns_option.forEach(function (option, index) {
-      if (statisticColumns[index + 1]) {
-        statisticColumns[index + 1].method = option.method;
-      }
-    });
   }
-  var _getOneDimensionTotal = getOneDimensionTotal(statisticColumns, summary_type, summary_method, formulaRows, pivot_rows),
+  Array.isArray(summary_columns_option) && summary_columns_option.forEach(function (option, index) {
+    if (statisticColumns[index + 1]) {
+      statisticColumns[index + 1].method = option.method;
+    }
+  });
+  var _getOneDimensionTotal = getOneDimensionTotal(statisticColumns, summary_type, formulaRows, pivot_rows),
     pivot_columns_total = _getOneDimensionTotal.pivot_columns_total;
   StatUtils.sortStatistics(pivot_rows, column, 'name');
   var pivot_columns = summary_type === SUMMARY_TYPE.COUNT ? [] : statisticColumns.map(function (column) {
@@ -93,6 +93,7 @@ function calculateOneDimensionTable(chart, value, username, userId) {
     return TableUtils.getTableColumnByKey(table, item.key);
   });
   pivot_rows.forEach(function (row) {
+    row.original_name = row.name;
     row.name = getFormattedLabel(column, row.name, value.collaborators);
   });
   return {
@@ -109,13 +110,14 @@ function updateOneDimensionRows(pivot_rows, index, name, row) {
   } else {
     var _updatedPivotRow = {
       name: name,
+      original_name: name,
       rows: [row]
     };
     pivot_rows.push(_updatedPivotRow);
   }
 }
-function getOneDimensionTotal(columns, summary_type, summary_method, formula_rows) {
-  var statResult = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
+function getOneDimensionTotal(columns, summary_type, formula_rows) {
+  var statResult = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
   var pivot_columns_total = {};
   var dateColumnsTotalArr = {};
   if (Array.isArray(columns) && columns.length > 0) {
@@ -136,44 +138,60 @@ function getOneDimensionTotal(columns, summary_type, summary_method, formula_row
       if (Array.isArray(columns)) {
         if (columns.length === 1) {
           var summaryColumn = columns[0];
-          var key = summaryColumn.key;
-          var total = getTotal(summaryColumn, summary_type, summary_method, rows, formula_rows);
+          var key = summaryColumn.key,
+            method = summaryColumn.method;
+          var total = getTotal(summaryColumn, summary_type, method, rows, formula_rows);
           if (summaryColumn && isDateColumn(summaryColumn)) {
-            totalMap['total'] = total === 0 ? 0 : total.date;
-            if (total != 0) {
-              dateColumnsTotalArr[key].push(total);
+            if (method === SUMMARY_METHOD_MAP.Distinct_values) {
+              totalMap['total'] = total;
+            } else {
+              totalMap['total'] = total === 0 ? 0 : total.date;
+              if (total !== 0) {
+                dateColumnsTotalArr[key].push(total);
+              }
             }
-            if (summary_method === 'Max') {
-              pivot_columns_total['total'] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], 'Max').date;
-            } else if (summary_method === 'Min') {
-              pivot_columns_total['total'] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], 'Min').date;
+            if (method === SUMMARY_METHOD_MAP.Max) {
+              pivot_columns_total['total'] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], SUMMARY_METHOD_MAP.Max).date;
+            } else if (method === SUMMARY_METHOD_MAP.Min) {
+              pivot_columns_total['total'] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], SUMMARY_METHOD_MAP.Min).date;
+            } else if (method === SUMMARY_METHOD_MAP.Distinct_values) {
+              var pivotColumnTotal = (pivot_columns_total['total'] ? pivot_columns_total['total'] - 0 : 0) + total;
+              pivot_columns_total['total'] = Number.parseFloat(pivotColumnTotal.toFixed(8));
             }
           } else {
             var validTotal = total ? total - 0 : 0;
             totalMap['total'] = validTotal;
-            var pivotColumnTotal = (pivot_columns_total['total'] ? pivot_columns_total['total'] - 0 : 0) + validTotal;
-            pivot_columns_total['total'] = Number.parseFloat(pivotColumnTotal.toFixed(8));
+            var _pivotColumnTotal = (pivot_columns_total['total'] ? pivot_columns_total['total'] - 0 : 0) + validTotal;
+            pivot_columns_total['total'] = Number.parseFloat(_pivotColumnTotal.toFixed(8));
           }
         } else {
           columns.forEach(function (column) {
             var key = column.key,
               method = column.method;
+            var totalKey = key + method;
             var total = getTotal(column, summary_type, method, rows, formula_rows);
             if (column && isDateColumn(column)) {
-              totalMap[key + method] = total === 0 ? 0 : total.date;
-              if (total != 0) {
-                dateColumnsTotalArr[key].push(total);
+              if (method === SUMMARY_METHOD_MAP.Distinct_values) {
+                totalMap[totalKey] = total;
+              } else {
+                totalMap[totalKey] = total === 0 ? 0 : total.date;
+                if (total !== 0) {
+                  dateColumnsTotalArr[key].push(total);
+                }
               }
-              if (method === 'Max') {
-                pivot_columns_total[key + method] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], 'Max').date;
-              } else if (method === 'Min') {
-                pivot_columns_total[key + method] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], 'Min').date;
+              if (method === SUMMARY_METHOD_MAP.Max) {
+                pivot_columns_total[totalKey] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], SUMMARY_METHOD_MAP.Max).date;
+              } else if (method === SUMMARY_METHOD_MAP.Min) {
+                pivot_columns_total[totalKey] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], SUMMARY_METHOD_MAP.Min).date;
+              } else if (method === SUMMARY_METHOD_MAP.Distinct_values) {
+                var _pivotColumnTotal2 = (pivot_columns_total[totalKey] ? pivot_columns_total[totalKey] - 0 : 0) + total;
+                pivot_columns_total[totalKey] = Number.parseFloat(_pivotColumnTotal2.toFixed(8));
               }
             } else {
               var _validTotal = total ? total - 0 : 0;
-              totalMap[key + method] = _validTotal;
-              var _pivotColumnTotal = (pivot_columns_total[key + method] ? pivot_columns_total[key + method] - 0 : 0) + _validTotal;
-              pivot_columns_total[key + method] = Number.parseFloat(_pivotColumnTotal.toFixed(8));
+              totalMap[totalKey] = _validTotal;
+              var _pivotColumnTotal3 = (pivot_columns_total[totalKey] ? pivot_columns_total[totalKey] - 0 : 0) + _validTotal;
+              pivot_columns_total[totalKey] = Number.parseFloat(_pivotColumnTotal3.toFixed(8));
             }
           });
         }
@@ -221,6 +239,7 @@ function calculateTwoDimensionTable(chart, value, username, userId) {
       pivot_summary_multiple_columns.push({
         key: item.key,
         type: column.type,
+        data: column.data,
         method: item.method,
         column_name: column.name
       });
@@ -319,7 +338,8 @@ function updateTwoDimensionColumns(value, pivot_columns, column, row, formulaRow
       });
       if (pivotColumnIndex < 0) {
         pivot_columns.unshift({
-          key: null
+          key: null,
+          original_key: null
         });
       }
     } else {
@@ -329,7 +349,8 @@ function updateTwoDimensionColumns(value, pivot_columns, column, row, formulaRow
         });
         if (pivotColumnIndex < 0) {
           pivot_columns.push({
-            key: k
+            key: k,
+            original_key: k
           });
         }
       });
@@ -341,7 +362,8 @@ function updateTwoDimensionColumns(value, pivot_columns, column, row, formulaRow
     });
     if (pivotColumnIndex < 0) {
       pivot_columns.push({
-        key: key
+        key: key,
+        original_key: key
       });
     }
   }
@@ -376,6 +398,7 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
     });
     pivot_rows.push({
       name: name,
+      original_name: name,
       cells: _cells
     });
   }
@@ -422,13 +445,17 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
         }
       }
     });
-    if (summary_column_type != 'date') {
+    if (summary_column_type !== 'date') {
       pivotRow.total = Number.parseFloat(total.toFixed(8));
       pivot_table_total += total;
     }
   });
   if (summaryColumn && isDateColumn(summaryColumn)) {
-    pivot_columns_total = showTwoDimensionDateColumnsAndRowsTotal(dateColumnsTotalArr, pivot_rows, date_summary_column_format, pivot_columns, summary_method);
+    if (summary_method === SUMMARY_METHOD_MAP.Distinct_values) {
+      pivot_columns_total = Number.parseFloat(pivot_table_total.toFixed(8));
+    } else {
+      pivot_columns_total = showTwoDimensionDateColumnsAndRowsTotal(dateColumnsTotalArr, pivot_rows, date_summary_column_format, pivot_columns, summary_method);
+    }
     if (summary_method === 'Max') {
       pivot_table_total = dateColumnsTotalArr.length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr, 'Max').date;
     } else if (summary_method === 'Min') {
@@ -452,6 +479,32 @@ function getTotal(summary_column, summary_type, summary_method) {
   if (summary_type === SUMMARY_TYPE.COUNT) {
     total = rowsLength;
   } else if (summary_type === SUMMARY_TYPE.ADVANCED) {
+    if (summary_method === SUMMARY_METHOD_MAP.Distinct_values) {
+      total = 0;
+      var existMap = {};
+      rows.forEach(function (row) {
+        var num;
+        if (FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+          var formulaRow = formula_rows[row._id] || {};
+          num = formulaRow[summary_column_key];
+          num = Array.isArray(num) ? num[0] : num;
+        } else {
+          num = row[summary_column_key];
+        }
+        if (!num) {
+          if (num === 0) {
+            num = '0';
+          } else {
+            num = !!num;
+          }
+        }
+        if (!existMap[num]) {
+          existMap[num] = true;
+          total++;
+        }
+      });
+      return total;
+    }
     if (summary_column && isDateColumn(summary_column)) {
       if (rowsLength === 0) return;
       var dateArr = [];
@@ -476,15 +529,15 @@ function getTotal(summary_column, summary_type, summary_method) {
         formatDate.value = Date.parse(formatDateData);
         dateArr.push(formatDate);
       });
-      if (summary_method === 'Max') {
-        total = getDateMaxOrMinTotal(dateArr, 'Max');
-      } else if (summary_method === 'Min') {
-        total = getDateMaxOrMinTotal(dateArr, 'Min');
+      if (summary_method === SUMMARY_METHOD_MAP.Max) {
+        total = getDateMaxOrMinTotal(dateArr, SUMMARY_METHOD_MAP.Max);
+      } else if (summary_method === SUMMARY_METHOD_MAP.Min) {
+        total = getDateMaxOrMinTotal(dateArr, SUMMARY_METHOD_MAP.Min);
       }
     } else {
       switch (summary_method) {
-        case 'Sum':
-        case 'Mean':
+        case SUMMARY_METHOD_MAP.Sum:
+        case SUMMARY_METHOD_MAP.Mean:
           {
             var sum = 0;
             var validNumbersCount = 0;
@@ -512,8 +565,8 @@ function getTotal(summary_column, summary_type, summary_method) {
             }
             break;
           }
-        case 'Max':
-        case 'Min':
+        case SUMMARY_METHOD_MAP.Max:
+        case SUMMARY_METHOD_MAP.Min:
           {
             if (rowsLength > 0) {
               var result = rows.reduce(function (current, next) {

package/es/calculator/world-map-calculator.js

@@ -109,29 +109,40 @@ var WorldMapCalculator = /*#__PURE__*/function (_BaseCalculator) {
                 sqlCondition = filter2SqlCondition(selectedTable, selectedView);
                 summaryColumnName = '';
                 sqlString = '';
-                if (isAdvanced) {
-                  summaryColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
-                  summaryColumnName = summaryColumn.name;
-                  summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
-                  sqlString = "select `".concat(columnName, "`, ").concat(summaryColumnMethod, " from ").concat(selectedTable.name, " ").concat(sqlCondition, " group by ").concat(columnName, " limit 5000");
-                } else {
-                  sqlString = "select `".concat(columnName, "`, ").concat(method, "(").concat(columnName, ") from ").concat(selectedTable.name, " ").concat(sqlCondition, " group by ").concat(columnName, " limit 5000");
+                if (!isAdvanced) {
+                  _context2.next = 21;
+                  break;
+                }
+                summaryColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
+                if (summaryColumn) {
+                  _context2.next = 16;
+                  break;
                 }
-                _context2.next = 15;
+                return _context2.abrupt("return", []);
+              case 16:
+                summaryColumnName = summaryColumn.name;
+                summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
+                sqlString = "select `".concat(columnName, "`, ").concat(summaryColumnMethod, " from ").concat(selectedTable.name, " ").concat(sqlCondition, " group by ").concat(columnName, " limit 5000");
+                _context2.next = 22;
+                break;
+              case 21:
+                sqlString = "select `".concat(columnName, "`, ").concat(method, "(").concat(columnName, ") from ").concat(selectedTable.name, " ").concat(sqlCondition, " group by ").concat(columnName, " limit 5000");
+              case 22:
+                _context2.next = 24;
                 return this.sqlQuery(sqlString);
-              case 15:
+              case 24:
                 result = _context2.sent;
                 if (!(result.status === 200 && result.data.success)) {
-                  _context2.next = 25;
+                  _context2.next = 34;
                   break;
                 }
                 data = result.data;
                 if (data.results) {
-                  _context2.next = 20;
+                  _context2.next = 29;
                   break;
                 }
                 return _context2.abrupt("return", []);
-              case 20:
+              case 29:
                 newResult = [];
                 _summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
                 valueKey = isAdvanced ? "".concat(_summaryColumnMethod) : "".concat(method, "(").concat(columnName, ")");
@@ -150,9 +161,9 @@ var WorldMapCalculator = /*#__PURE__*/function (_BaseCalculator) {
                   }
                 });
                 return _context2.abrupt("return", newResult);
-              case 25:
+              case 34:
                 return _context2.abrupt("return", []);
-              case 26:
+              case 35:
               case "end":
                 return _context2.stop();
             }

package/es/components/dialog/enlarged-chart-dialog.js

@@ -26,7 +26,7 @@ var EnlargeChartDialog = /*#__PURE__*/function (_Component) {
     _this.renderStatisticView = function () {
       var _this$props = _this.props,
         colorThemeName = _this$props.colorThemeName,
-        refresh = _this$props.refresh,
+        dtableChangedTime = _this$props.dtableChangedTime,
         statItem = _this$props.statItem,
         eventBus = _this$props.eventBus,
         chartCalculator = _this$props.chartCalculator,
@@ -35,7 +35,7 @@ var EnlargeChartDialog = /*#__PURE__*/function (_Component) {
       var viewProps = {
         isEnlarge: true,
         isPreview: true,
-        refresh: refresh,
+        dtableChangedTime: dtableChangedTime,
         colorThemeName: colorThemeName,
         statItem: statItem,
         eventBus: eventBus,

package/es/components/dialog/statistic-record-dialog/index.css

@@ -98,6 +98,8 @@
   padding: 0;
   overflow-y: hidden;
   background-color: #f8f8f8;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
 }
 
 .statistic-records-dialog.statistic-records-container .records-list {