sea-chart 0.0.88 → 0.0.89-beta

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

@@ -1,3 +1,4 @@
+import _toaster from "dtable-ui-component/lib/toaster";
 import React, { Fragment } from 'react';
 import { Modal, ModalBody } from 'reactstrap';
 import { getTableById, getViewById, isArchiveView, getFormulaColumnsContainLinks, getViewShownColumns } from 'dtable-utils';
@@ -11,6 +12,7 @@ import ChartDataSQL from '../../utils/sql/chart-data-sql';
 import { getFilterConditions } from '../../utils/row-record-utils';
 import RowCard from '../row-card/row-card';
 import { CommonEventTypes } from '../../constants/common-constants';
+import { getErrorMessage } from '../../utils';
 import './index.css';
 class StatisticRecordDialog extends React.Component {
   constructor(_props) {
@@ -52,7 +54,11 @@ class StatisticRecordDialog extends React.Component {
               results: rows
             } = res.data;
             this.processDrilledRows(rows);
-          }).catch(error => new Error(error));
+          }).catch(error => {
+            const errMsg = getErrorMessage(error);
+            _toaster.danger(errMsg);
+            console.error(error);
+          });
           return;
         }
         const chartDataSQL = new ChartDataSQL({
@@ -69,7 +75,11 @@ class StatisticRecordDialog extends React.Component {
             results: rows
           } = res.data;
           this.processDrilledRows(rows);
-        }).catch(error => new Error(error));
+        }).catch(error => {
+          const errMsg = getErrorMessage(error);
+          _toaster.danger(errMsg);
+          console.error(error);
+        });
         return;
       }
       this.processDrilledRows(rows);

package/dist/constants/index.js

@@ -297,6 +297,6 @@ export const groupAxisMap = {
   [CHART_TYPE.LINE_GROUP]: 'column_groupby_column_key',
   [CHART_TYPE.SCATTER]: 'column_groupby_column_key',
   [CHART_TYPE.MIRROR]: 'group_column_key',
-  [CHART_TYPE.TABLE]: 'groupby_column_key'
+  [CHART_TYPE.TABLE]: 'column_groupby_column_key'
 };
 export { GEOLOCATION_FORMAT_CITY, GEOLOCATION_FORMAT_MAP, CHART_KEY, GENERIC_KEY, GENERIC_KEY_2_SIMILAR_KEYS, STYLE_COLORS, HORIZONTAL_ALIGN, HORIZONTAL_ALIGNS, HORIZONTAL_ALIGN_SHOW, CHART_TYPE, CHART_TYPE_SHOW, CHART_TYPES, CHART_TYPE_IMAGE, GEOLOCATION_GRANULARITY, GEOLOCATION_GRANULARITY_LIST, MAP_LEVEL, MUNICIPALITIES, regions, TABLE_DIMENSIONS };

package/dist/locale/lang/de.js

@@ -227,10 +227,10 @@ const de = {
   "Transpose": "Transpose",
   "Comparison_mode": "Vergleichsmodus",
   "Yesterday_vs_the_day_before_yesterday": "Gestern vs. vorgestern",
-  "Last_week_vs_the_week_before_last": "Letzte Woche vs. die Woche davor",
-  "Last_month_vs_the_month_before_last": "Letzter Monat vs. der Monat davor",
-  "Last_quarter_vs_the_quarter_before_last": "Letztes Quartal vs. das Quartal davor",
-  "Last_year_vs_the_year_before_last": "Letztes Jahr vs. das Jahr davor",
+  "Last_week_vs_the_week_before_last": "Letzte Woche vs. Vorwoche",
+  "Last_month_vs_the_month_before_last": "Letzter Monat vs. Vormonat",
+  "Last_quarter_vs_the_quarter_before_last": "Letztes Quartal vs. Vorquartal",
+  "Last_year_vs_the_year_before_last": "Letztes Jahr vs. Vorjahr",
   "Last_7_days_vs_previous_7_days": "Letzte 7 Tage vs. 7 Tage davor",
   "Last_30_days_vs_previous_30_days": "Letzte 30 Tage vs. 30 Tage davor",
   "The_year_before_last": "Das vorletzte Jahr",
@@ -249,6 +249,7 @@ const de = {
   "Count_description": "Einträge basierend auf den Dateneinstellungen zählen",
   "Display_empty_when_data_is_zero": "Wert 0 als leeren Wert anzeigen",
   "Use_default_color": "Standardfarbe verwenden",
-  "Use_colors_in_single_select_solumn": "Verwenden Sie Farben in einer einzelnen Auswahlspalte"
+  "Use_colors_in_single_select_solumn": "Verwenden Sie Farben in einer einzelnen Auswahlspalte",
+  "Search_records": "Einträge suchen"
 };
 export default de;

package/dist/locale/lang/en.js

@@ -249,6 +249,7 @@ const en = {
   "Count_description": "Count the number of records based on data settings",
   "Display_empty_when_data_is_zero": "Display empty when data is zero",
   "Use_default_color": "Use default color",
-  "Use_colors_in_single_select_solumn": "Use colors in single select column"
+  "Use_colors_in_single_select_solumn": "Use colors in single select column",
+  "Search_records": "Search records"
 };
 export default en;

package/dist/locale/lang/es.js

@@ -249,6 +249,7 @@ const es = {
   "Count_description": "Count the number of records based on data settings",
   "Display_empty_when_data_is_zero": "Display empty when data is zero",
   "Use_default_color": "Use default color",
-  "Use_colors_in_single_select_solumn": "Use colors in single select column"
+  "Use_colors_in_single_select_solumn": "Use colors in single select column",
+  "Search_records": "Search records"
 };
 export default es;

package/dist/locale/lang/fr.js

@@ -229,8 +229,8 @@ const fr = {
   "Yesterday_vs_the_day_before_yesterday": "Hier vs. avant-hier",
   "Last_week_vs_the_week_before_last": "La semaine dernière vs. la semaine précédente",
   "Last_month_vs_the_month_before_last": "Le mois dernier vs. le mois précédent",
-  "Last_quarter_vs_the_quarter_before_last": "Dernier trimestre vs. le trimestre précédent",
-  "Last_year_vs_the_year_before_last": "Dernière année vs. l'année précédente",
+  "Last_quarter_vs_the_quarter_before_last": "Le dernier trimestre vs. le trimestre précédent",
+  "Last_year_vs_the_year_before_last": "La dernière année vs. l'année précédente",
   "Last_7_days_vs_previous_7_days": "7 derniers jours vs. 7 jours précédents",
   "Last_30_days_vs_previous_30_days": "30 derniers jours vs. 30 jours précédents",
   "The_year_before_last": "L'année précédente",
@@ -249,6 +249,7 @@ const fr = {
   "Count_description": "Compter les enregistrements basé sur les paramètres de données",
   "Display_empty_when_data_is_zero": "Afficher la valeur 0 comme valeur vide",
   "Use_default_color": "Utiliser la couleur par défaut",
-  "Use_colors_in_single_select_solumn": "Utiliser les couleurs dans une colonne de sélection unique"
+  "Use_colors_in_single_select_solumn": "Utiliser les couleurs dans une colonne de sélection unique",
+  "Search_records": "Rechercher des enregistrements"
 };
 export default fr;

package/dist/locale/lang/pt.js

@@ -249,6 +249,7 @@ const pt = {
   "Count_description": "Count the number of records based on data settings",
   "Display_empty_when_data_is_zero": "Display empty when data is zero",
   "Use_default_color": "Use default color",
-  "Use_colors_in_single_select_solumn": "Use colors in single select column"
+  "Use_colors_in_single_select_solumn": "Use colors in single select column",
+  "Search_records": "Search records"
 };
 export default pt;

package/dist/locale/lang/ru.js

@@ -249,6 +249,7 @@ const ru = {
   "Count_description": "Count the number of records based on data settings",
   "Display_empty_when_data_is_zero": "Display empty when data is zero",
   "Use_default_color": "Use default color",
-  "Use_colors_in_single_select_solumn": "Use colors in single select column"
+  "Use_colors_in_single_select_solumn": "Use colors in single select column",
+  "Search_records": "Search records"
 };
 export default ru;

package/dist/locale/lang/zh_CN.js

@@ -249,6 +249,7 @@ const zh_CN = {
   "Count_description": "根据数据设置计算记录数量",
   "Display_empty_when_data_is_zero": "数据为零时留空",
   "Use_default_color": "使用默认颜色",
-  "Use_colors_in_single_select_solumn": "使用列中的选项颜色"
+  "Use_colors_in_single_select_solumn": "使用列中的选项颜色",
+  "Search_records": "搜索记录"
 };
 export default zh_CN;

package/dist/settings/stacks-settings/index.js

@@ -33,12 +33,13 @@ class StacksSettings extends Component {
         currentSelectedOptions
       } = this.state;
       if (!Array.isArray(y_axises) || !y_axises[index]) return;
-
       // batch delete current selected options when "deleteStackNumericColumn"
-      currentSelectedOptions.forEach(o => {
-        o[index] && this.removeCurrentSelectedOptions(o[index], index);
-      });
-      this.setCurrentSelectedOptions();
+      if (currentSelectedOptions) {
+        currentSelectedOptions.forEach(o => {
+          o[index] && this.removeCurrentSelectedOptions(o[index], index);
+        });
+        this.setCurrentSelectedOptions();
+      }
       let updatedStacks = [...y_axises];
       updatedStacks.splice(index, 1);
       if (updatedStacks.length === 0) {
@@ -55,6 +56,7 @@ class StacksSettings extends Component {
       const {
         currentSelectedOptions
       } = this.state;
+      if (!currentSelectedOptions) return numericColumnsOptions;
       return numericColumnsOptions.filter(option => {
         const i = currentSelectedOptions.findIndex(o => {
           return Object.values(o)[0] && Object.values(o)[0].key === option.column.key;
@@ -77,6 +79,7 @@ class StacksSettings extends Component {
       } = updatedStack;
       let updatedNumericColumns = column_groupby_numeric_columns ? [...column_groupby_numeric_columns] : [];
       const availableOptions = this.getAvailableNumericColumns();
+      if (!availableOptions.length) return;
       const newNumericColumnKey = availableOptions[0].value;
       updatedNumericColumns.push({
         column_key: newNumericColumnKey,
@@ -99,7 +102,11 @@ class StacksSettings extends Component {
       const {
         y_axises
       } = chart.config;
-      if (columnOption !== prevColumnOption) {
+      if (!prevColumnOption) {
+        this.addCurrentSelectedOptions(columnOption.column, currentAxisesIndex);
+        this.setCurrentSelectedOptions();
+      }
+      if (columnOption !== prevColumnOption && prevColumnOption) {
         // do not need to use "currentAxisesIndex" when delete cause every option is unique , "currentAxisesIndex" was used to batch delete "column_groupby_numeric_columns"
         // need "currentAxisesIndex" to identical the stack index
         this.removeCurrentSelectedOptions(prevColumnOption.column, currentAxisesIndex);
@@ -167,9 +174,10 @@ class StacksSettings extends Component {
       });
     };
     this.addCurrentSelectedOptions = (column, currentAxisesIndex) => {
-      const {
+      let {
         currentSelectedOptions
       } = this.state;
+      if (!currentSelectedOptions) currentSelectedOptions = [];
       const newValue = this.newValue || [...currentSelectedOptions];
       newValue.push({
         [currentAxisesIndex]: column

package/dist/settings/widgets/group-by.js

@@ -111,7 +111,7 @@ class GroupBy extends Component {
             type: 'text'
           },
           label: /*#__PURE__*/React.createElement("span", {
-            className: 'select-module select-module-name ml-0'
+            className: "ml-0"
           }, intl.get('Not_used'))
         });
       }

package/dist/settings/widgets/numeric-summary-item.js

@@ -104,7 +104,7 @@ class NumericSummaryItem extends Component {
     if (currentSelectedOptions) {
       [selectedColumnOption, availableOptions] = this.getAvailableOptions();
     } else {
-      selectedColumnOption = numericColumnOptions.find(option => option.value.key === column_key);
+      selectedColumnOption = numericColumnOptions.find(option => option.value.key === column_key || option.value === column_key);
       availableOptions = numericColumnOptions;
     }
     const selectedSummaryMethodOption = this.summaryMethodOptions.find(option => option.value === summary_method);

package/dist/settings/widgets/y-axis-group-settings.js

@@ -402,6 +402,10 @@ class YAxisGroupSettings extends Component {
       column_groupby_date_granularity,
       column_groupby_geolocation_granularity
     } = chart.config;
+
+    // if user do not select Single Numeric Column, then do not use it as the first config of multiple numeric column
+    const hasSingleNumericColumnConfig = !!(y_axis_summary_column_key && y_axis_summary_method);
+    const hasMultipleNumericColumnsConfig = column_groupby_multiple_numeric_column;
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormGroup, {
       className: "sea-chart-parameter-item"
     }, /*#__PURE__*/React.createElement(Label, null, label), /*#__PURE__*/React.createElement(_DTableSelect, {
@@ -410,7 +414,9 @@ class YAxisGroupSettings extends Component {
       value: selectedTypeOption,
       onChange: this.onGroupTypeChange,
       options: this.groupTypeOptions
-    })), y_axis_summary_type === CHART_SUMMARY_TYPE.ADVANCED && (column_groupby_multiple_numeric_column ? /*#__PURE__*/React.createElement(NumericSummaryItem, {
+    })),
+    // multiple but has single selected numeric column as the first config item
+    hasMultipleNumericColumnsConfig && (hasSingleNumericColumnConfig ? /*#__PURE__*/React.createElement(NumericSummaryItem, {
       index: 0,
       value: {
         column_key: y_axis_summary_column_key,
@@ -420,7 +426,9 @@ class YAxisGroupSettings extends Component {
       numericColumnOptions: this.numericColumnOptions,
       onColumnOptionChange: this.onGroupbyNumericColumnChange,
       onSummaryMethodChange: this.onSummaryMethodChange
-    }) : /*#__PURE__*/React.createElement(SummaryMethodSettings, {
+    }) : null),
+    // single selected numeric columns
+    !hasMultipleNumericColumnsConfig && hasSingleNumericColumnConfig && /*#__PURE__*/React.createElement(SummaryMethodSettings, {
       value: {
         column_key: y_axis_summary_column_key,
         summary_method: y_axis_summary_method
@@ -429,7 +437,7 @@ class YAxisGroupSettings extends Component {
       numericColumnOptions: this.numericColumnOptions,
       onColumnOptionChange: option => this.onGroupbyNumericColumnChange(option, 0),
       onSummaryMethodChange: option => this.onSummaryMethodChange(option, 0)
-    })), this.renderColumnGroupbyMultipleNumericColumn(), (!column_groupby_multiple_numeric_column && y_axis_summary_type === CHART_SUMMARY_TYPE.ADVANCED || y_axis_summary_type === CHART_SUMMARY_TYPE.COUNT) && !this.isMapChart && /*#__PURE__*/React.createElement(Groupby, {
+    }), this.renderColumnGroupbyMultipleNumericColumn(), (!column_groupby_multiple_numeric_column && y_axis_summary_type === CHART_SUMMARY_TYPE.ADVANCED || y_axis_summary_type === CHART_SUMMARY_TYPE.COUNT) && !this.isMapChart && /*#__PURE__*/React.createElement(Groupby, {
       label: intl.get('Group_by'),
       tables: tables,
       selectedTableId: table_id,

package/dist/utils/chart-utils/original-data-utils/index.js

@@ -84,6 +84,7 @@ OriginalDataUtils.calculateChart = async (chart, value, callback) => {
       chartTableColumns
     });
   } catch (error) {
+    console.log('Error', error);
     const error_message = getErrorMessage(error);
     return callback && callback(error_message, '', null);
   }

package/dist/utils/chart-utils/original-data-utils/pivot-table-calculator.js

@@ -240,7 +240,6 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
     return calculateOneDimensionTable(chart, value);
   }
   const isRowGroupbyColumnDataAsAnArray = isArrayCellValue(rowGroupbyColumn);
-  const summaryColumn = getTableColumnByKey(table, summary_column_key);
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
   let pivot_columns = [];
@@ -281,10 +280,44 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
       }
     }
   });
+  let summaryColumn = null;
+  if (summary_column_key) {
+    summaryColumn = getTableColumnByKey(table, summary_column_key);
+  }
+
+  // Single field
   let {
     pivot_columns_total,
     pivot_table_total
-  } = getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formulaRows, pivot_rows, pivot_columns);
+  } = getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formulaRows, pivot_rows, pivot_columns, 0);
+
+  // Multiple field
+  if (Array.isArray(summary_columns) && summary_columns.length > 0) {
+    summary_columns.forEach((item, index) => {
+      if (item && Object.keys(item).length !== 0) {
+        const {
+          column_key,
+          summary_method
+        } = item;
+        const itemSummaryColumn = getTableColumnByKey(table, column_key);
+        const itemSummaryMethod = summary_method;
+        if (itemSummaryColumn && itemSummaryMethod) {
+          // The index of a single field is 0, so the index of a multiple-select field starts at 1.
+          const currentItemIndex = index + 1;
+          const {
+            pivot_columns_total: item_pivot_columns_total,
+            pivot_table_total: item_pivot_table_total
+          } = getTwoDimensionTotal(itemSummaryColumn, summary_type, itemSummaryMethod, formulaRows, pivot_rows, pivot_columns, currentItemIndex);
+
+          // Update pivot_columns_total and pivot_table_total
+          Object.keys(item_pivot_columns_total).forEach(key => {
+            pivot_columns_total[key] = pivot_columns_total[key] + item_pivot_columns_total[key];
+          });
+          pivot_table_total = pivot_table_total + item_pivot_table_total;
+        }
+      }
+    });
+  }
   BaseUtils.sortCharts(pivot_rows, groupbyColumn, 'name');
   BaseUtils.sortCharts(pivot_columns, rowGroupbyColumn, 'key');
 
@@ -314,7 +347,7 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
     pivot_table_total,
     formulaRows,
     dimensions: TABLE_DIMENSIONS.TWO,
-    summary_columns: [summaryColumn, ...(summary_columns === null || summary_columns === void 0 ? void 0 : summary_columns.map(item => getTableColumnByKey(table, item.column_key)))],
+    summary_columns: getAllSummaryColumns(summaryColumn, summary_columns, table),
     isSingleNumericColumn: !summary_columns.length ? 'true' : 'false'
   };
 }
@@ -526,6 +559,7 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
 function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formula_rows) {
   let pivot_rows = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
   let pivot_columns = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : [];
+  let index = arguments.length > 6 ? arguments[6] : undefined;
   let pivot_columns_total = {};
   let pivot_table_total = 0;
   let dateColumnsTotalArr = [];
@@ -548,7 +582,7 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
         let {
           rows
         } = cells[key];
-        let subTotal = getTotal(summaryColumn, summary_type, summary_method, rows, formula_rows, (_cells$key = cells[key]) === null || _cells$key === void 0 ? void 0 : _cells$key.total);
+        let subTotal = getTotal(summaryColumn, summary_type, summary_method, rows, formula_rows, (_cells$key = cells[key]) === null || _cells$key === void 0 ? void 0 : _cells$key.total, index);
         if (isSummaryDateColumn) {
           if (subTotal === 0) {
             cells[key].total = 0;
@@ -561,9 +595,9 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
         } else {
           if (Array.isArray(subTotal)) {
             cells[key].total = subTotal;
-            total += subTotal[0][1] ? subTotal[0][1] - 0 : 0;
+            total += subTotal[index][1] ? subTotal[index][1] - 0 : 0;
             let columnTotal = pivot_columns_total[key] ? pivot_columns_total[key] : 0;
-            columnTotal += subTotal[0][1] ? subTotal[0][1] - 0 : 0;
+            columnTotal += subTotal[index][1] ? subTotal[index][1] - 0 : 0;
             pivot_columns_total[key] = columnTotal;
           } else {
             cells[key].total = subTotal;
@@ -620,6 +654,7 @@ function getTotal(summary_column, summary_type, summary_method) {
   let rows = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
   let formula_rows = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   let oldTotal = arguments.length > 5 ? arguments[5] : undefined;
+  let index = arguments.length > 6 ? arguments[6] : undefined;
   const summary_column_key = summary_column ? summary_column.key : '';
   const summary_column_type = summary_column ? summary_column.type : '';
   const rowsLength = rows.length;
@@ -651,7 +686,7 @@ function getTotal(summary_column, summary_type, summary_method) {
           total++;
         }
       });
-      total = getTotalByType(oldTotal, total);
+      total = getTotalByType(oldTotal, total, index);
       return total;
     }
     if (summary_column && isDateColumn(summary_column)) {
@@ -709,10 +744,10 @@ function getTotal(summary_column, summary_type, summary_method) {
               }
             });
             if (summary_method === 'Sum') {
-              total = getTotalByType(oldTotal, Number.parseFloat(sum.toFixed(8)));
+              total = getTotalByType(oldTotal, Number.parseFloat(sum.toFixed(8)), index);
             } else if (summary_method === 'Mean') {
               const val = validNumbersCount === 0 ? 0 : Number.parseFloat((sum / validNumbersCount).toFixed(8));
-              total = getTotalByType(oldTotal, val);
+              total = getTotalByType(oldTotal, val, index);
             }
             break;
           }
@@ -745,15 +780,15 @@ function getTotal(summary_column, summary_type, summary_method) {
                 let formulaRow = formula_rows[result._id];
                 if (formulaRow) {
                   if (formulaRow[summary_column_key] && typeof formulaRow[summary_column_key] === 'object') {
-                    total = getTotalByType(oldTotal, formulaRow[summary_column_key][0]);
+                    total = getTotalByType(oldTotal, formulaRow[summary_column_key][0], index);
                   } else {
-                    getTotalByType(oldTotal, formulaRow[summary_column_key]);
+                    getTotalByType(oldTotal, formulaRow[summary_column_key], index);
                   }
                 } else {
-                  total = getTotalByType(oldTotal, null);
+                  total = getTotalByType(oldTotal, null, index);
                 }
               } else {
-                total = getTotalByType(oldTotal, result[summary_column_key]);
+                total = getTotalByType(oldTotal, result[summary_column_key], index);
               }
             }
             break;
@@ -767,7 +802,7 @@ function getTotal(summary_column, summary_type, summary_method) {
   }
   // formula_rows result can be '#VALUE!'
   if (total === '#VALUE!') {
-    total = getTotalByType(oldTotal, 0);
+    total = getTotalByType(oldTotal, 0, index);
   }
   return total || 0;
 }
@@ -817,17 +852,31 @@ function getDateMaxOrMinTotal(dateArr, type) {
   dateIndex = list.indexOf(dateValue);
   return dateArr[dateIndex];
 }
-function getTotalByType(oldTotal, value) {
+function getTotalByType(oldTotal, value, index) {
   let newTotal = '';
   if (Array.isArray(oldTotal)) {
     newTotal = JSON.parse(JSON.stringify(oldTotal));
-    newTotal[0][1] = value;
+    newTotal[index][1] = value;
   } else {
     newTotal = value;
   }
   return newTotal;
 }
 
+// Get all non-empty summary columns
+function getAllSummaryColumns(singleSummaryColumn, multipleSummaryColumns, table) {
+  const allSummaryColumns = [];
+  if (singleSummaryColumn) {
+    allSummaryColumns.push(singleSummaryColumn);
+  }
+  multipleSummaryColumns && multipleSummaryColumns.forEach(item => {
+    if (item === null || item === void 0 ? void 0 : item.column_key) {
+      allSummaryColumns.push(getTableColumnByKey(table, item.column_key));
+    }
+  });
+  return allSummaryColumns;
+}
+
 // index
 function calculator(chart, value, _ref3) {
   let {

package/dist/utils/chart-utils/sql-statistics-utils.js

@@ -163,7 +163,10 @@ SQLStatisticsUtils.formatedTableSqlRows = (chart, sqlRows, chartSQLMap, columnMa
       if ((collaborators === null || collaborators === void 0 ? void 0 : collaborators.length) > 1) {
         newSqlRows.splice(index, 1);
         collaborators.forEach(collaborator => {
-          const rowIndex = newSqlRows.findIndex(rows => rows[sqlGroupbyColumnKey][0] === collaborator);
+          const rowIndex = newSqlRows.findIndex(rows => {
+            var _rows$sqlGroupbyColum2;
+            return ((_rows$sqlGroupbyColum2 = rows[sqlGroupbyColumnKey]) === null || _rows$sqlGroupbyColum2 === void 0 ? void 0 : _rows$sqlGroupbyColum2[0]) === collaborator;
+          });
           if (rowIndex !== -1) {
             summarySQLColumnName2ColumnKeys.forEach(key => {
               let newKey = key;

package/dist/utils/index.js

@@ -37,6 +37,8 @@ export function getMapCanvasStyle(container, ratio) {
   };
 }
 export const getErrorMessage = err => {
+  // log error to locate problems
+  console.error(err);
   if (!err.response) {
     return intl.get('Network_error');
   }
@@ -50,8 +52,6 @@ export const getErrorMessage = err => {
   if (status === 500 || status === 502) {
     return intl.get('Internal_server_error');
   }
-  // log error to locate problems
-  console.error(err);
   return intl.get('Error');
 };
 export const getGeoGranularityByLevel = mapLevel => {

package/dist/utils/row-record-utils.js

@@ -3,6 +3,7 @@ import _RateFormatter from "dtable-ui-component/lib/RateFormatter";
 import React from 'react';
 import { CellType, FORMULA_RESULT_TYPE, getNumberDisplayString, getDateDisplayString, getCellValueStringResult, isNumber, isDateColumn, isValidLink } from 'dtable-utils';
 import dayjs from 'dayjs';
+import { isEqual } from 'lodash-es';
 import cellFormatterFactory from '../components/cell-factory/cell-formatter-factory';
 import SimpleCellFormatter from '../components/cell-factory/SimpleCellFormatter';
 import SingleSelectOption from '../components/cell-factory/SingleSelectOption';
@@ -517,7 +518,8 @@ export const getFilterConditions = function (statisticRecord, chart) {
   let columns = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   const {
     name = '',
-    group_name = ''
+    group_name = '',
+    rows
   } = statisticRecord || {};
   const {
     config
@@ -528,11 +530,34 @@ export const getFilterConditions = function (statisticRecord, chart) {
   const filters = [];
   const columnKey = xAxisMap[type];
   const groupColumnKey = groupAxisMap[type];
-  const columnFilter = getFilterByColumnType(config[columnKey], columns, name);
-  filters.push(columnFilter);
-  if (config[groupColumnKey]) {
-    const groupColumnFilter = getFilterByColumnType(config[groupColumnKey], columns, group_name);
-    filters.push(groupColumnFilter);
+  if (!group_name && (rows === null || rows === void 0 ? void 0 : rows.length)) {
+    const xValueList = [];
+    const yValueList = [];
+    rows.forEach(r => {
+      const xValue = r[config[columnKey]];
+      const yValue = r[config[groupColumnKey]];
+      if (!xValueList.some(v => isEqual(v, xValue))) {
+        xValueList.push(xValue);
+      }
+      if (!yValueList.some(v => isEqual(v, yValue))) {
+        yValueList.push(yValue);
+      }
+    });
+    if (xValueList.length === 1) {
+      const columnFilter = getFilterByColumnType(config[columnKey], columns, xValueList[0]);
+      filters.push(columnFilter);
+    }
+    if (yValueList.length === 1) {
+      const columnFilter = getFilterByColumnType(config[groupColumnKey], columns, yValueList[0]);
+      filters.push(columnFilter);
+    }
+  } else {
+    const columnFilter = getFilterByColumnType(config[columnKey], columns, name);
+    filters.push(columnFilter);
+    if (config[groupColumnKey]) {
+      const groupColumnFilter = getFilterByColumnType(config[groupColumnKey], columns, group_name);
+      filters.push(groupColumnFilter);
+    }
   }
   return filters;
 };

package/dist/view/wrapper/table/one-dimension-table-with-numeric-columns.js

@@ -1,5 +1,6 @@
 import React, { PureComponent } from 'react';
 import classnames from 'classnames';
+import { isNumber } from 'dtable-utils';
 import { BaseUtils } from '../../../utils';
 import intl from '../../../intl';
 import { CHART_THEME_COLOR } from '../../../constants';
@@ -22,14 +23,24 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
         });
       }
     };
+    this.getRowTotal = (rowTotal, value) => {
+      if (value && isNumber(value)) {
+        return rowTotal + value;
+      }
+      return rowTotal;
+    };
     this.renderHeader = () => {
       const {
         result,
         groupbyColumn,
         columnGroupbyColumn,
         selectedCell,
-        chartTableColumns
+        chartTableColumns,
+        chart
       } = this.props;
+      const {
+        display_total = true
+      } = chart.config;
       const {
         name: groupName
       } = groupbyColumn;
@@ -43,6 +54,7 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
         rowIdx: selectRowIdx,
         cellIdx: selectedCellIdx
       } = selectedCell || {};
+      const isSelectedTotalHeaderBottom = selectRowIdx === 0 && selectedCellIdx === (pivot_columns === null || pivot_columns === void 0 ? void 0 : pivot_columns.length);
       return /*#__PURE__*/React.createElement("thead", {
         className: "seatable-table-header-sm"
       }, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", {
@@ -59,7 +71,11 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
           }),
           key: "pivot-column-".concat(index)
         }, /*#__PURE__*/React.createElement("div", null, column.name));
-      })));
+      }), display_total && /*#__PURE__*/React.createElement("th", {
+        className: classnames('pivot-table-header', {
+          'selected-pivot-cell-top': isSelectedTotalHeaderBottom
+        })
+      }, /*#__PURE__*/React.createElement("div", null, intl.get('Total')))));
     };
     this.toggleRecords = (cell, selectedCell) => {
       if (window.isMobile) return;
@@ -108,13 +124,20 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
       const pivotRowsLen = Array.isArray(pivot_rows) ? pivot_rows.length : 0;
       let pivotColumnCells = [];
       const isSelectRowTotalCellRight = selectRowIdx === pivotRowsLen && selectedCellIdx === 0;
+      let lastRowTotal = 0;
+      let lastRows = [];
       return /*#__PURE__*/React.createElement("tbody", null, pivotRowsLen > 0 && pivot_rows.map((rowItem, rowIdx) => {
         const {
           name,
           total,
           rows
         } = rowItem;
+        lastRows.push(rows);
         const isSelectedRowNameRight = selectRowIdx === rowIdx && selectedCellIdx === 0;
+        const isSelectedTotalCell = selectRowIdx === rowIdx && selectedCellIdx === (pivot_columns === null || pivot_columns === void 0 ? void 0 : pivot_columns.length);
+        const isSelectedTotalCellTop = selectRowIdx - 1 === rowIdx && selectedCellIdx === (pivot_columns === null || pivot_columns === void 0 ? void 0 : pivot_columns.length);
+        const isSelectedTotalCellLeft = selectRowIdx === rowIdx && selectedCellIdx - 1 === (pivot_columns === null || pivot_columns === void 0 ? void 0 : pivot_columns.length) - 1;
+        let rowTotal = 0;
         if (!Array.isArray(pivot_columns)) {
           pivotColumnCells[rowIdx] = rowItem.rows || [];
         }
@@ -137,6 +160,7 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
             key
           } = columnMap;
           const column = chartTableColumns.find(item => item.key === key);
+          rowTotal = this.getRowTotal(rowTotal, total[key]);
           const displayValue = BaseUtils.getSummaryValueDisplayString(column, total[key], this.summaryColumnsMethodMap[key]);
           const isValidDisplayValue = BaseUtils.isValidValue(displayValue, display_empty);
           if (Array.isArray(rows) && rows.length > 0) {
@@ -168,7 +192,25 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
               'selected-pivot-cell-border': isSelectedCell
             })
           }));
-        }));
+        }), display_total && /*#__PURE__*/React.createElement("td", {
+          className: classnames('pivot-cell', {
+            'selected-pivot-cell': isSelectedTotalCell,
+            'selected-pivot-cell-top': isSelectedTotalCellTop,
+            'selected-pivot-cell-left': isSelectedTotalCellLeft
+          }),
+          onClick: () => this.toggleRecords({
+            rows,
+            name: rowItem === null || rowItem === void 0 ? void 0 : rowItem.name,
+            total: rowTotal
+          }, {
+            rowIdx
+          }),
+          title: rowTotal ? rowTotal : 0
+        }, rowTotal ? rowTotal : /*#__PURE__*/React.createElement("i", null, "0"), /*#__PURE__*/React.createElement("span", {
+          className: classnames({
+            'selected-pivot-cell-border': isSelectedTotalCell
+          })
+        })));
       }), display_total && /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", {
         className: classnames('pivot-column-total', {
           'selected-pivot-cell-left': isSelectRowTotalCellRight
@@ -181,6 +223,7 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
         const isValidTotalDisplayValue = BaseUtils.isValidValue(totalDisplayValue, display_empty);
         const isSelectRowTotalCell = selectRowIdx === pivot_rows.length && selectedCellIdx === index;
         const isSelectRowTotalCellLeft = selectRowIdx === pivot_rows.length && selectedCellIdx - 1 === index;
+        lastRowTotal = this.getRowTotal(lastRowTotal, pivotColumnTotal);
         return /*#__PURE__*/React.createElement("td", {
           className: classnames('pivot-cell', {
             'pivot-empty-cell': !isValidTotalDisplayValue,
@@ -201,7 +244,19 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
             'selected-pivot-cell-border': isSelectRowTotalCell
           })
         }));
-      })));
+      }), /*#__PURE__*/React.createElement("td", {
+        className: classnames('pivot-cell', {
+          'pivot-empty-cell': !BaseUtils.isValidValue(lastRowTotal, display_empty)
+        }),
+        onClick: () => this.toggleRecords({
+          rows: lastRows,
+          total: lastRowTotal
+        }, {
+          rowIdx: pivot_rows.length,
+          cellIdx: pivot_columns === null || pivot_columns === void 0 ? void 0 : pivot_columns.length
+        }),
+        title: lastRowTotal
+      }, BaseUtils.isValidValue(lastRowTotal, display_empty) ? lastRowTotal : /*#__PURE__*/React.createElement("i", null))));
     };
     this.init(_props);
   }

package/dist/view/wrapper/table/two-dimension-table.js

@@ -1,7 +1,6 @@
 import React, { PureComponent } from 'react';
 import classnames from 'classnames';
-import { CellType } from 'dtable-utils';
-import classNames from 'classnames';
+import { CellType, isNumber } from 'dtable-utils';
 import { BaseUtils } from '../../../utils';
 import intl from '../../../intl';
 import { CHART_SUMMARY_TYPE, CHART_THEME_COLOR } from '../../../constants';
@@ -104,7 +103,7 @@ class TwoDimensionTable extends PureComponent {
             globalTheme: globalTheme
           }));
         })));
-      }), /*#__PURE__*/React.createElement("th", {
+      }), display_total && /*#__PURE__*/React.createElement("th", {
         className: "pivot-table-header"
       })));
     };
@@ -134,7 +133,7 @@ class TwoDimensionTable extends PureComponent {
       if (summaryColumns && (summaryColumns === null || summaryColumns === void 0 ? void 0 : summaryColumns.length) !== 0) {
         return summaryColumns.map(item => {
           return /*#__PURE__*/React.createElement("div", {
-            key: "table-cell-".concat(item.key),
+            key: "table-cell-".concat(item === null || item === void 0 ? void 0 : item.key),
             className: classnames('pivot-cell', {
               'pivot-empty-cell': true
             })
@@ -148,6 +147,12 @@ class TwoDimensionTable extends PureComponent {
         })
       }, /*#__PURE__*/React.createElement("i", null));
     };
+    this.getRowTotal = (rowTotal, value) => {
+      if (value && isNumber(value)) {
+        return rowTotal + value;
+      }
+      return rowTotal;
+    };
     this.renderRows = () => {
       const {
         result,
@@ -199,8 +204,7 @@ class TwoDimensionTable extends PureComponent {
         if (!Array.isArray(pivot_columns)) {
           pivotColumnCells[rowIdx] = rowItem.rows || [];
         }
-        const summaryDisplayValue = BaseUtils.getSummaryValueDisplayString(summaryColumn, total, summaryMethod);
-        const isValidSummaryDisplayValue = BaseUtils.isValidValue(summaryDisplayValue, display_empty);
+        let rowTotal = 0;
         return /*#__PURE__*/React.createElement("tr", {
           key: 'table-row' + rowIdx
         }, /*#__PURE__*/React.createElement("td", {
@@ -222,6 +226,7 @@ class TwoDimensionTable extends PureComponent {
           if (isCount) {
             const displayValue = total;
             const isValidDisplayValue = BaseUtils.isValidValue(displayValue, display_empty);
+            rowTotal = this.getRowTotal(rowTotal, displayValue);
             if (c && Array.isArray(c.rows) && c.rows.length > 0) {
               pivotRowCells.push(...c.rows);
               if (pivotColumnCells[cellIdx]) {
@@ -262,6 +267,7 @@ class TwoDimensionTable extends PureComponent {
             const summaryCellColumn = summaryColumns === null || summaryColumns === void 0 ? void 0 : summaryColumns.find(item => item.key === summaryCellColumnKey);
             const displayValue = BaseUtils.getSummaryValueDisplayString(summaryCellColumn, summaryCell[1], summaryMethod);
             const isValidDisplayValue = BaseUtils.isValidValue(displayValue, display_empty);
+            rowTotal = this.getRowTotal(rowTotal, summaryCell[1]);
             return /*#__PURE__*/React.createElement("div", {
               key: "table-cell-".concat(cellIdx, "-").concat(idx),
               className: classnames('pivot-cell', {
@@ -278,7 +284,6 @@ class TwoDimensionTable extends PureComponent {
           }), !total && !(typeof total === 'number') && this.renderEmpty(summaryColumns, cellIdx)));
         }), display_total && /*#__PURE__*/React.createElement("td", {
           className: classnames('pivot-cell', {
-            'pivot-empty-cell': !isValidSummaryDisplayValue,
             'selected-pivot-cell': isSelectedTotalCell,
             'selected-pivot-cell-top': isSelectedTotalCellTop,
             'selected-pivot-cell-left': isSelectedTotalCellLeft
@@ -291,8 +296,8 @@ class TwoDimensionTable extends PureComponent {
             rowIdx,
             cellIdx: cells.length
           }),
-          title: summaryDisplayValue
-        }, isValidSummaryDisplayValue ? summaryDisplayValue : /*#__PURE__*/React.createElement("i", null), /*#__PURE__*/React.createElement("span", {
+          title: rowTotal
+        }, BaseUtils.isValidValue(rowTotal, display_empty) ? rowTotal : /*#__PURE__*/React.createElement("i", null), /*#__PURE__*/React.createElement("span", {
           className: classnames({
             'selected-pivot-cell-border': isSelectedTotalCell
           })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.88",
+  "version": "0.0.89beta",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",
@@ -29,13 +29,13 @@
     "react-dom": "^17.0.0"
   },
   "scripts": {
-    "clean": "rm -rf dist && mkdir dist",
+    "clean": "rimraf dist && mkdirp dist",
     "start.bak": "node scripts/start.js",
     "build": "node scripts/build.js",
     "pub:dist": "cross-env BABEL_ENV=production ./node_modules/.bin/babel src --out-dir dist --copy-files",
     "eslint": "eslint --ext .jsx,.js src --max-warnings=0",
     "lint": "lint-staged",
-    "pub:optimized": "rm dist/config.js",
+    "pub:optimized": "rimraf dist/config.js",
     "prepare": "husky install",
     "prepublishOnly": "npm run clean && npm run pub:dist",
     "release": "release-it",
@@ -122,6 +122,7 @@
     "koa2-cors": "2.0.6",
     "lint-staged": "14.0.0",
     "mini-css-extract-plugin": "^1.3.5",
+    "mkdirp": "^3.0.1",
     "nodemon": "^3.1.0",
     "object-assign": "4.1.1",
     "pnp-webpack-plugin": "1.5.0",
@@ -144,6 +145,7 @@
     "release-it": "16.2.1",
     "resolve": "1.12.0",
     "resolve-url-loader": "5.0.0",
+    "rimraf": "^5.0.7",
     "sass-loader": "13.3.2",
     "style-loader": "^1.0.1",
     "terser-webpack-plugin": "4.2.3",