dtable-statistic 4.1.6 → 4.1.8

package/es/calculator/basic-chart-calculator.js

@@ -438,7 +438,7 @@ var BasicChartCalculator = /*#__PURE__*/function (_BaseCalculator) {
                   }
                   var color;
                   if (columnGroupbyColumn.type === CellType.SINGLE_SELECT) {
-                    var tempValue = StatUtils.getGroupLabel(item[columnGroupbyColumn.key], {}, columnGroupbyColumn, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, _this2.value);
+                    var tempValue = StatUtils.getGroupLabel(item[columnGroupbyColumn.key], item, columnGroupbyColumn, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, _this2.value);
                     color = getColorFromSingleSelectColumn(columnGroupbyColumn, tempValue);
                   }
                   var groupLabel = _this2.getLabel(columnGroupbyColumn, columnGroupbyColumnName, item, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity);
@@ -564,7 +564,7 @@ var BasicChartCalculator = /*#__PURE__*/function (_BaseCalculator) {
         label = item[groupName];
       } else {
         var currentGroupLabel = item[groupColumn.key];
-        label = StatUtils.getGroupLabel(currentGroupLabel, {}, groupColumn, groupby_date_granularity, groupby_geolocation_granularity, this.value);
+        label = StatUtils.getGroupLabel(currentGroupLabel, item, groupColumn, groupby_date_granularity, groupby_geolocation_granularity, this.value);
         label = getFormattedLabel(groupColumn, label, this.value.collaborators);
       }
       return label;

package/es/calculator/combination-calculator.js

@@ -310,7 +310,7 @@ var CombinationCalculator = /*#__PURE__*/function (_BaseCalculator) {
         label = item[groupName];
       } else {
         var currentGroupLabel = item[groupColumn.key];
-        label = StatUtils.getGroupLabel(currentGroupLabel, {}, groupColumn, groupby_date_granularity, groupby_geolocation_granularity, this.value);
+        label = StatUtils.getGroupLabel(currentGroupLabel, item, groupColumn, groupby_date_granularity, groupby_geolocation_granularity, this.value);
         label = getFormattedLabel(groupColumn, label);
       }
       return label;

package/es/calculator/compare-bar-calculator.js

@@ -147,7 +147,7 @@ var CompareBarCalculator = /*#__PURE__*/function (_BaseCalculator) {
                 valueKey = isAdvanced ? "".concat(method, "(").concat(summaryColumnName, ")") : "".concat(method, "(").concat(selectedColumn.name, ")");
                 result.data.results.forEach(function (item) {
                   var name = item[groupName];
-                  var label = StatUtils.getGroupLabel(name, {}, selectedColumn, x_axis_date_granularity, '', _this.value);
+                  var label = StatUtils.getGroupLabel(name, item, selectedColumn, x_axis_date_granularity, '', _this.value);
                   var value = item[valueKey];
                   if (name >= x_axis_date_range_start && name <= x_axis_date_range_end) {
                     var currentValue = dateRangeResult.get(label);

package/es/calculator/completeness-calculator.js

@@ -150,7 +150,7 @@ var CompletenessCalculator = /*#__PURE__*/function (_BaseCalculator) {
                   var name = item[selectedColumn.key];
                   var label;
                   if (name || Number.isFinite(name)) {
-                    label = StatUtils.getGroupLabel(name, {}, selectedColumn, '', '', _this.value);
+                    label = StatUtils.getGroupLabel(name, item, selectedColumn, '', '', _this.value);
                     if (isColumnDataAsAnArray) {
                       label = label[0];
                     }
@@ -226,7 +226,7 @@ var CompletenessCalculator = /*#__PURE__*/function (_BaseCalculator) {
 
                   // get and format name
                   if (name || Number.isFinite(name)) {
-                    label = StatUtils.getGroupLabel(name, {}, selectedColumn, '', '', _this.value);
+                    label = StatUtils.getGroupLabel(name, item, selectedColumn, '', '', _this.value);
                     if (isColumnDataAsAnArray) {
                       label = label[0];
                     }
@@ -236,7 +236,7 @@ var CompletenessCalculator = /*#__PURE__*/function (_BaseCalculator) {
                   // get and format group name
                   if (!isTimeGroupColumn) {
                     groupLabel = item[groupColumn.key];
-                    groupLabel = StatUtils.getGroupLabel(groupLabel, {}, groupColumn, '', '', _this.value);
+                    groupLabel = StatUtils.getGroupLabel(groupLabel, item, groupColumn, '', '', _this.value);
                     if (groupLabel && isGroupColumnDataAsAnArray) {
                       groupLabel = groupLabel[0];
                     }

package/es/calculator/mirror-calculator.js

@@ -127,7 +127,7 @@ var MirrorCalculator = /*#__PURE__*/function (_BaseCalculator) {
                 _context2.next = 22;
                 break;
               case 21:
-                sqlString = "select `".concat(columnName, "`, `").concat(groupColumnName, "`, ").concat(method, "(").concat(columnName, ") from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by `").concat(columnName, "`, `").concat(groupColumnName, "` limit 5000");
+                sqlString = "select `".concat(columnName, "`, `").concat(groupColumnName, "`, ").concat(method, "(`").concat(columnName, "`) from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by `").concat(columnName, "`, `").concat(groupColumnName, "` limit 5000");
               case 22:
                 _context2.next = 24;
                 return this.sqlQuery(sqlString);
@@ -152,7 +152,7 @@ var MirrorCalculator = /*#__PURE__*/function (_BaseCalculator) {
                   groupData0 = groupData[0] || {};
                   groupData1 = groupData[1] || {};
                   data.results.forEach(function (item) {
-                    var label = StatUtils.getGroupLabel(item[column], {}, selectedColumn, '', '', _this.value);
+                    var label = StatUtils.getGroupLabel(item[column], item, selectedColumn, '', '', _this.value);
                     var groupValue = item[group_column];
                     var equal2GroupData0 = groupData0.id === groupValue;
                     var equal2GroupData1 = groupData1.id === groupValue;

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

@@ -369,7 +369,8 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
       var groupbyColumn = columnMap.groupbyColumn;
       var summary_type = chart.summary_type,
         groupby_geolocation_granularity = chart.groupby_geolocation_granularity,
-        groupby_date_granularity = chart.groupby_date_granularity;
+        groupby_date_granularity = chart.groupby_date_granularity,
+        groupby_include_empty_cells = chart.groupby_include_empty_cells;
       var pivot_columns = [];
       var pivot_rows = [];
       var isCount = summary_type === SUMMARY_TYPE.COUNT;
@@ -378,11 +379,14 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
           sqlSummaryColumnKey = statisticSQLMap.sqlSummaryColumnKey;
         var _allTotal = 0;
         sqlRows.forEach(function (row) {
-          var total = row[sqlSummaryColumnKey] || 0;
-          _allTotal += total;
           var originalLabel = _this3.getOriginalLabel(groupbyColumn, _sqlGroupbyColumnKey, row, groupby_geolocation_granularity, groupby_date_granularity);
           var name = _this3.getLabel(groupbyColumn, originalLabel);
           var original_name = _this3.getOriginalName(groupbyColumn, originalLabel);
+          if (!groupby_include_empty_cells && !name) {
+            return;
+          }
+          var total = row[sqlSummaryColumnKey] || 0;
+          _allTotal += total;
           pivot_rows.push({
             name: name,
             original_name: original_name,
@@ -653,7 +657,7 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
         return statRow[groupName];
       }
       var currentGroupLabel = statRow[groupColumn.key];
-      return StatUtils.getGroupLabel(currentGroupLabel, {}, groupColumn, groupby_date_granularity, groupby_geolocation_granularity, this.value);
+      return StatUtils.getGroupLabel(currentGroupLabel, statRow, groupColumn, groupby_date_granularity, groupby_geolocation_granularity, this.value);
     }
   }, {
     key: "getOriginalName",
@@ -663,7 +667,7 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
         return originalLabel;
       }
       var columnType = groupColumn.type;
-      if (columnType === CellType.MULTIPLE_SELECT || columnType === CellType.COLLABORATOR || columnType === CellType.LINK) {
+      if (columnType === CellType.MULTIPLE_SELECT || columnType === CellType.COLLABORATOR) {
         return Array.isArray(originalLabel) ? originalLabel[0] : null;
       }
       return originalLabel;

package/es/calculator/scatter-calculator.js

@@ -141,7 +141,7 @@ var ScatterCalculator = /*#__PURE__*/function (_BaseCalculator) {
     key: "getColumnValue",
     value: function getColumnValue(data, column) {
       var tempValue = data[column.key];
-      var value = StatUtils.getGroupLabel(tempValue, {}, column, DATE_GRANULARITY.DAY, '', this.value);
+      var value = StatUtils.getGroupLabel(tempValue, data, column, DATE_GRANULARITY.DAY, '', this.value);
       return getFormattedLabel(column, value, this.value.collaborators);
     }
   }]);

package/es/components/dialog/new-table-dialog.js

@@ -25,7 +25,8 @@ var NewTableDialog = /*#__PURE__*/function (_React$Component) {
         return;
       }
       _this.setState({
-        tableName: value
+        tableName: value,
+        errMessage: ''
       });
     };
     _this.toggle = function () {
@@ -58,12 +59,22 @@ var NewTableDialog = /*#__PURE__*/function (_React$Component) {
         });
         return;
       }
+      var isExist = _this.tables.find(function (item) {
+        return item.name === tableName;
+      });
+      if (isExist) {
+        _this.setState({
+          errMessage: 'Table_xxx_exist'
+        });
+        return;
+      }
       _this.props.onNewTableConfirm(tableName);
     };
     _this.state = {
       tableName: props.tableName,
       errMessage: ''
     };
+    _this.tables = props.getTables();
     return _this;
   }
   _createClass(NewTableDialog, [{
@@ -79,7 +90,8 @@ var NewTableDialog = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this2 = this;
+      var _this2 = this,
+        _this$state$tableName;
       return /*#__PURE__*/React.createElement(Modal, {
         isOpen: true,
         toggle: this.toggle,
@@ -99,7 +111,9 @@ var NewTableDialog = /*#__PURE__*/function (_React$Component) {
       }))), this.state.errMessage && /*#__PURE__*/React.createElement(Alert, {
         color: "danger",
         className: "mt-2"
-      }, intl.get(this.state.errMessage))), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
+      }, intl.get(this.state.errMessage, {
+        name: (_this$state$tableName = this.state.tableName) === null || _this$state$tableName === void 0 ? void 0 : _this$state$tableName.trim()
+      }))), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
         color: "secondary",
         onClick: this.toggle
       }, intl.get('Cancel')), /*#__PURE__*/React.createElement(Button, {

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

@@ -114,3 +114,7 @@
 .statistic-records-dialog .statistic-records-container .records-list .records-container {
   height: auto;
 }
+
+.statistic-records-dialog .row-card-item-content .grid-cell-type-button .grid-cell-type-button-inner {
+  justify-content: flex-start;
+}

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

@@ -1,19 +1,19 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { Fragment } from 'react';
 import intl from 'react-intl-universal';
 import { Modal, ModalBody } from 'reactstrap';
-import { CellType, Views } from 'dtable-store';
+import { Views } from 'dtable-store';
 import dtableDbAPI from '../../../api/dtable-db-api';
 import { DtableSearchInput, Loading } from '../../index';
 import { searchRows } from '../../../utils';
 import { getSqlString } from '../../../utils/sql-utils';
 import { CommonEventTypes } from '../../../constants';
 import './index.css';
-export var UNSHOWN_COLUMN_TYPES = [CellType.LINK, CellType.LONG_TEXT, CellType.FORMULA, CellType.LINK_FORMULA];
 var StatisticRecordDialog = /*#__PURE__*/function (_React$Component) {
   _inherits(StatisticRecordDialog, _React$Component);
   var _super = _createSuper(StatisticRecordDialog);
@@ -37,6 +37,8 @@ var StatisticRecordDialog = /*#__PURE__*/function (_React$Component) {
       _this.table = getTableById(table_id);
       _this.view = Views.getViewById(_this.table.views, view_id);
       _this.isArchiveView = Views.isArchiveView(_this.view);
+      _this.unShowColumnKeyList = _this.getUnShowColumnKeyList(_this.view);
+      _this.renderedColumns = _this.getRenderedColumns(_this.table);
       if (_this.isArchiveView || !records) {
         var sqlString = getSqlString(chart, statisticRecord, {
           isColumn: isColumn,
@@ -60,6 +62,7 @@ var StatisticRecordDialog = /*#__PURE__*/function (_React$Component) {
       drilledRows.forEach(function (row) {
         idRowMap[row._id] = row;
       });
+      _this.initComputedProperties(drilledRows);
       _this.setState({
         loading: false,
         title: name,
@@ -68,6 +71,25 @@ var StatisticRecordDialog = /*#__PURE__*/function (_React$Component) {
         searchedRowsIds: searchedRowsIds
       });
     };
+    _this.initComputedProperties = function (drilledRows) {
+      if (_this.isArchiveView) {
+        var formulaColumns = Views.getFormulaColumnsContainLinks(_this.table);
+        if (formulaColumns.length === 0) return {};
+        var _formulaRows = {};
+        drilledRows.forEach(function (row) {
+          var rowId = row._id;
+          _formulaRows[rowId] = {};
+          formulaColumns.forEach(function (column) {
+            return _formulaRows[rowId][column.key] = row[column.key];
+          });
+        });
+        _this.formulaRows = _formulaRows;
+        return;
+      }
+      var _this$getTableViewFor = _this.getTableViewFormulaRows(),
+        formulaRows = _this$getTableViewFor.formulaRows;
+      _this.formulaRows = formulaRows;
+    };
     _this.onSearch = function (searchVal) {
       var rows = _this.state.rows;
       var searchedRowsIds = _this.getSearchedRows(rows, searchVal);
@@ -176,22 +198,49 @@ var StatisticRecordDialog = /*#__PURE__*/function (_React$Component) {
         searchedRowsIds: updatedSearchedRowsIds
       });
     };
+    _this.getUnShowColumnKeyList = function (view) {
+      var firstColumnKey = '0000';
+      var _view$hidden_columns = view.hidden_columns,
+        hidden_columns = _view$hidden_columns === void 0 ? [] : _view$hidden_columns;
+      return [firstColumnKey].concat(_toConsumableArray(hidden_columns));
+    };
+    _this.getRenderedColumns = function (table) {
+      var columns = table.columns;
+      return columns.filter(function (column) {
+        return !_this.unShowColumnKeyList.includes(column.key);
+      });
+    };
+    _this.getTableViewFormulaRows = function () {
+      var _assertThisInitialize = _assertThisInitialized(_this),
+        table = _assertThisInitialize.table,
+        view = _assertThisInitialize.view;
+      var value = _this.props.getValue();
+      if (view.formula_rows && Object.keys(view.formula_rows).length > 0) {
+        return {
+          formulaRows: view.formula_rows
+        };
+      }
+      Views.cacheFormulaResults(table.rows, {
+        targetViewId: view._id,
+        table: table,
+        value: value
+      });
+      return {
+        formulaRows: view.formula_rows
+      };
+    };
     _this.renderRowsCards = function () {
       var searchedRowsIds = _this.state.searchedRowsIds;
       var searchedRows = _this.getRowsByIds(searchedRowsIds);
       if (searchedRows.length === 0) return null;
-      var unShowColumnKeyList = ['0000'];
-      var allColumns = _this.table.columns;
-      var renderedColumns = allColumns.filter(function (column) {
-        return !unShowColumnKeyList.includes(column.key) && !UNSHOWN_COLUMN_TYPES.includes(column.type);
-      });
       if (!window.app || !window.app.renderRowsCards) return null;
       return window.app.renderRowsCards({
         table: _this.table,
-        renderedColumns: renderedColumns,
-        unShowColumnKeyList: unShowColumnKeyList,
+        renderedColumns: _this.renderedColumns,
+        unShowColumnKeyList: _this.unShowColumnKeyList,
         isShowRowCardHeader: true,
-        columns: allColumns,
+        formulaRows: _this.formulaRows,
+        columns: _this.renderedColumns,
         rows: searchedRows,
         rowCardType: 'statistic'
       });
@@ -208,6 +257,9 @@ var StatisticRecordDialog = /*#__PURE__*/function (_React$Component) {
     _this.view = null;
     _this.isArchiveView = false;
     _this.valueChanged = false;
+    _this.renderedColumns = [];
+    _this.formulaRows = null;
+    _this.unShowColumnKeyList = null;
     return _this;
   }
   _createClass(StatisticRecordDialog, [{

package/es/dashboard.js

@@ -378,6 +378,9 @@ var DashBoard = /*#__PURE__*/function (_Component) {
     _this.getViews = function (table) {
       return table.views;
     };
+    _this.getValue = function () {
+      return _this.value;
+    };
     _this.isTableReadOnly = function () {
       if (window.dtable.modulePermission) {
         return window.dtable.modulePermission.isTableReadOnly;
@@ -484,6 +487,7 @@ var DashBoard = /*#__PURE__*/function (_Component) {
         getTableById: this.getTableById,
         getTables: this.getTables,
         getViews: this.getViews,
+        getValue: this.getValue,
         queryMapJson: this.queryMapJson,
         getInitChart: this.getInitChart,
         getConvertedChart: this.getConvertedChart,

package/es/desktop-dashboard.js

@@ -145,6 +145,7 @@ var DesktopDashboard = /*#__PURE__*/function (_Component) {
     value: function render() {
       var _this$props4 = this.props,
         getTableById = _this$props4.getTableById,
+        getValue = _this$props4.getValue,
         isTableReadOnly = _this$props4.isTableReadOnly,
         dtableChangedTime = _this$props4.dtableChangedTime,
         colorThemeName = _this$props4.colorThemeName,
@@ -271,6 +272,7 @@ var DesktopDashboard = /*#__PURE__*/function (_Component) {
         eventBus: this.props.eventBus,
         chartRecordsParams: chartRecordsParams,
         getTableById: getTableById,
+        getValue: getValue,
         toggleStatisticRecordsDialog: this.toggleStatisticRecordsDialog
       }));
     }

package/es/locale/lang/de.js

@@ -12,6 +12,9 @@ var de = {
   'Submit': 'Einreichen',
   'Cancel': 'Abbrechen',
   'Name_is_required': 'Der Name ist erforderlich.',
+  'Name_cannot_contain_backtick': 'Name cannot contain backtick.',
+  'Name_cannot_contain_slash': 'Der Name darf keinen Schrägstrich ( / ) enthalten.',
+  'Name_cannot_contain_backslash': 'Der Name darf keinen Backslash ( \\ ) enthalten.',
   'Rename_dashboard': 'Dashboard umbenennen',
   'Rename': 'Umbenennen',
   'Delete': 'Löschen',
@@ -237,9 +240,11 @@ var de = {
   'Add_new_stack': 'Neuen Stapel hinzufügen',
   'Chart_type': 'Diagrammtyp',
   'Edit_type': 'Typ ändern',
-  'New_table': 'New table',
+  'New_table': 'Neue Tabelle',
   'Select_table': 'Tabelle auswählen',
   'Update_to_a_table': 'Aktualisierung in eine Tabelle',
-  'Export_to_a_new_table': 'In neue Tabelle exportieren'
+  'Export_to_a_new_table': 'In neue Tabelle exportieren',
+  'Move_to': 'Move to...',
+  'Table_xxx_exist': 'Table {name} exist'
 };
 export default de;

package/es/locale/lang/en.js

@@ -12,6 +12,9 @@ var en = {
   'Submit': 'Submit',
   'Cancel': 'Cancel',
   'Name_is_required': 'Name is required',
+  'Name_cannot_contain_backtick': 'Name cannot contain backtick.',
+  'Name_cannot_contain_slash': 'Name cannot contain slash',
+  'Name_cannot_contain_backslash': 'Name cannot contain backslash',
   'Rename_dashboard': 'Rename dashboard',
   'Rename': 'Rename',
   'Delete': 'Delete',
@@ -241,6 +244,7 @@ var en = {
   'Select_table': 'Select table',
   'Update_to_a_table': 'Update to a table',
   'Export_to_a_new_table': 'Export to a new table',
-  "Move_to": "Move to..."
+  'Move_to': 'Move to...',
+  'Table_xxx_exist': 'Table {name} exist'
 };
 export default en;

package/es/locale/lang/fr.js

@@ -12,6 +12,9 @@ var fr = {
   'Submit': 'Soumettre',
   'Cancel': 'Annuler',
   'Name_is_required': 'Le nom est nécessaire.',
+  'Name_cannot_contain_backtick': 'Name cannot contain backtick.',
+  'Name_cannot_contain_slash': 'Le nom ne doit pas contenir de barre oblique ( / ).',
+  'Name_cannot_contain_backslash': 'Le nom ne doit pas contenir de barre oblique inverse ( \\ ).',
   'Rename_dashboard': 'Renommer le tableau de bord',
   'Rename': 'Renommer',
   'Delete': 'Supprimer',
@@ -25,7 +28,7 @@ var fr = {
   'Grouped_histogram': 'Histogramme groupé',
   'Stacked_histogram': 'Histogramme empilé',
   'Time_comparison_histogram': 'Histogramme comparaison de temps',
-  'Custom_histogram': 'Historgramme personnalisé',
+  'Custom_histogram': 'Histogramme personnalisé',
   'Bar_chart': 'Graphique à barres',
   'Basic_bar_chart': 'Graphique à barres simple',
   'Grouped_bar_chart': 'Graphique à barres groupé',
@@ -237,9 +240,11 @@ var fr = {
   'Add_new_stack': 'Ajouter une nouvelle pile',
   'Chart_type': 'Type de diagramme',
   'Edit_type': 'Modifier le type',
-  'New_table': 'New table',
+  'New_table': 'Nouveau tableau',
   'Select_table': 'Sélectionner un tableau',
   'Update_to_a_table': 'Mettre à jour vers un tableau',
-  'Export_to_a_new_table': 'Exporter dans un nouveau tableau'
+  'Export_to_a_new_table': 'Exporter dans un nouveau tableau',
+  'Move_to': 'Move to...',
+  'Table_xxx_exist': 'Table {name} exist'
 };
 export default fr;

package/es/locale/lang/zh_CN.js

@@ -12,6 +12,9 @@ var zh_CN = {
   'Submit': '提交',
   'Cancel': '取消',
   'Name_is_required': '名称为必填项',
+  'Name_cannot_contain_backtick': '名称不能包含反引号。',
+  'Name_cannot_contain_slash': '名称不能包含斜杠',
+  'Name_cannot_contain_backslash': '名称不能包含反斜杠',
   'Rename_dashboard': '重命名仪表盘',
   'Rename': '重命名',
   'Delete': '删除',
@@ -241,6 +244,7 @@ var zh_CN = {
   'Select_table': '选择子表',
   'Update_to_a_table': '更新到子表',
   'Export_to_a_new_table': '导出到新的子表',
-  "Move_to": "移动到..."
+  'Move_to': '移动到...',
+  'Table_xxx_exist': '子表 { name } 已存在'
 };
 export default zh_CN;

package/es/stat-list/index.js

@@ -268,6 +268,7 @@ var StatList = /*#__PURE__*/function (_Component) {
         onToggleShowEnlarged: this.closeEnlargedChart,
         toggleStatisticRecordsDialog: this.props.toggleStatisticRecordsDialog
       }), chartExport2Table && /*#__PURE__*/React.createElement(NewTableDialog, {
+        getTables: this.props.getTables,
         tableName: chartExport2Table.name,
         onNewTableConfirm: function onNewTableConfirm(tableName) {
           return _this2.exportChart2Table(tableName, chartExport2Table);

package/es/stat-view/pivot-table/pivot-table-display-name.js

@@ -99,9 +99,12 @@ var PivotTableDisplayName = /*#__PURE__*/function (_React$Component) {
           }
         case CellType.LINK:
           {
-            var _displayValue = getClientFormulaDisplayString([value], data, {
+            var _displayValue = getClientFormulaDisplayString(Array.isArray(value) ? value : [value], data, {
               collaborators: collaborators
             }) || null;
+            if (!_displayValue) {
+              break;
+            }
             displayName = /*#__PURE__*/React.createElement("div", {
               title: _displayValue,
               "aria-label": _displayValue
@@ -177,7 +180,10 @@ var PivotTableDisplayName = /*#__PURE__*/function (_React$Component) {
       var _this$props2 = this.props,
         value = _this$props2.value,
         column = _this$props2.column;
-      var displayName = value ? this.getDisplayName(value, column) : /*#__PURE__*/React.createElement("div", null, "(".concat(intl.get(EMPTY_NAME), ")"));
+      var displayName = value && this.getDisplayName(value, column);
+      if (!displayName) {
+        return /*#__PURE__*/React.createElement("div", null, "(".concat(intl.get(EMPTY_NAME), ")"));
+      }
       return /*#__PURE__*/React.createElement(Fragment, null, displayName);
     }
   }]);

package/es/utils/column-utils.js

@@ -1,4 +1,4 @@
-import { CellType, isDateColumn, FORMULA_RESULT_TYPE, FORMULA_COLUMN_TYPES } from 'dtable-store';
+import { CellType, isDateColumn, FORMULA_RESULT_TYPE, FORMULA_COLUMN_TYPES, Views } from 'dtable-store';
 import { MIRROR_COLUMN_LIST } from '../constants';
 export function getColorFromSingleSelectColumn(column, target) {
   var columnType = column.type,

package/es/utils/common-utils.js

@@ -227,7 +227,11 @@ var getPieColor = function getPieColor(color_option, column, index, data, curren
 };
 export function formatPieChartData(data, statItem, table, currentTheme) {
   var groupby_column_key = statItem.groupby_column_key,
-    color_option = statItem.color_option;
+    color_option = statItem.color_option,
+    summary_column_key = statItem.summary_column_key,
+    summaryMethod = statItem.summary_method,
+    summary_type = statItem.summary_type;
+  var isAdvanced = summary_type === 'advanced';
   var column = TableUtils.getTableColumnByKey(table, groupby_column_key);
   var sum = data.reduce(function (total, currentValue) {
     return total += currentValue.value;
@@ -257,6 +261,11 @@ export function formatPieChartData(data, statItem, table, currentTheme) {
     var filteredSum = filteredItems.reduce(function (total, currentValue) {
       return total += currentValue.value;
     }, 0);
+    var formattedValueSum = filteredSum;
+    if (isAdvanced) {
+      var summaryColumn = TableUtils.getTableColumnByKey(table, summary_column_key);
+      formattedValueSum = StatUtils.getFormattedValue(filteredSum, summaryColumn, summaryMethod);
+    }
     var original_name_list = [];
     var name_list = [];
     var rows = [];
@@ -277,6 +286,7 @@ export function formatPieChartData(data, statItem, table, currentTheme) {
       original_name_list: original_name_list,
       name: intl.get('Others'),
       value: filteredSum,
+      formatted_value: formattedValueSum,
       color: '#dbdbdb',
       original_name: 'Others',
       percent: String(Number.parseFloat(filteredSum / sum * 100).toFixed(1)) + '%'

package/es/utils/row-utils.js

@@ -64,7 +64,7 @@ export var getFormattedLabel = function getFormattedLabel(column, name, collabor
       }
     }
   } else if (columnType === CellType.LINK) {
-    return getClientFormulaDisplayString([name], columnData, {
+    return getClientFormulaDisplayString(Array.isArray(name) ? name : [name], columnData, {
       collaborators: collaborators
     });
   } else if (columnType === CellType.CHECKBOX) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.1.6",
+  "version": "4.1.8",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -12,7 +12,7 @@
     "@seafile/seafile-calendar": "0.0.24",
     "comlink": "^4.3.1",
     "dayjs": "1.10.7",
-    "dtable-store": "4.1.2",
+    "dtable-store": "4.1.5",
     "dtable-web-api": "4.0.11",
     "glamor": "^2.20.40",
     "html2canvas": "^1.4.1",