sea-chart 0.0.85 → 0.0.86

package/dist/settings/table-settings/data-settings.js

@@ -506,6 +506,7 @@ const DataSettings = _ref => {
     tables: tables,
     className: "selected-x-axis",
     label: intl.get('Row_grouping_field'),
+    isRenderNoUsed: false,
     selectedTableId: table_id,
     selectedColumnKey: groupby_column_key,
     selectedDateGranularity: groupby_date_granularity,
@@ -524,6 +525,7 @@ const DataSettings = _ref => {
     tables: tables,
     className: "selected-x-axis",
     label: intl.get('Column_grouping_field'),
+    isRenderNoUsed: true,
     selectedTableId: table_id,
     selectedColumnKey: column_groupby_column_key,
     selectedDateGranularity: column_groupby_date_granularity,

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

@@ -84,8 +84,8 @@ class GroupBy extends Component {
     };
     this.getColumnOptions = columns => {
       const {
-        chart,
-        type
+        type,
+        isRenderNoUsed
       } = this.props;
       let newColumns = columns.map(column => {
         return {
@@ -104,7 +104,7 @@ class GroupBy extends Component {
       } else if (type === CHART_TYPE.SCATTER) {
         newColumns = newColumns.filter(column => NUMBERIC_COLUMN_TYPE.includes(column.value.type));
       }
-      if ((chart === null || chart === void 0 ? void 0 : chart.config.type) === CHART_TYPE.TABLE) {
+      if (isRenderNoUsed) {
         newColumns.unshift({
           value: {
             key: '',

package/dist/utils/chart-utils/base-utils.js

@@ -310,6 +310,14 @@ BaseUtils.getSummaryValue = (_ref, currentValue, nextValue) => {
     if (currentValue === null && nextValue === null) return null;
     if (currentValue === null) return nextValue;
     if (nextValue === null) return currentValue;
+    if (currentValue && nextValue) {
+      if (summaryMethod === 'MAX') {
+        return Math.max(currentValue, nextValue);
+      }
+      if (summaryMethod === 'MIN') {
+        return Math.min(currentValue, nextValue);
+      }
+    }
   }
   return (currentValue - 0 || 0) + (nextValue - 0 || 0);
 };

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

@@ -5,6 +5,8 @@ import { isArrayCellValue } from '../../cell-value-utils';
 import { getFormattedLabel, isValidRow } from '../../row-utils';
 import BaseUtils from '../base-utils';
 import { summaryMethodColumn2SqlColumn } from '../../sql/column-2-sql-column';
+
+// one
 async function calculateOneDimensionTable(chart, value, _ref) {
   let {
     getViewRows,
@@ -56,7 +58,7 @@ async function calculateOneDimensionTable(chart, value, _ref) {
       }
     }
   });
-  const summary_columns_option_keys = Array.isArray(summary_columns) ? summary_columns.map(option => option.key) : [];
+  const summary_columns_option_keys = Array.isArray(summary_columns) ? summary_columns.map(option => option.column_key) : [];
   const statisticColumnKeys = [summary_column_key, ...summary_columns_option_keys];
   const validStatisticColumnKeys = statisticColumnKeys;
   let statisticColumns = validStatisticColumnKeys.map(key => {
@@ -70,7 +72,7 @@ async function calculateOneDimensionTable(chart, value, _ref) {
   }
   Array.isArray(summary_columns) && summary_columns.forEach((option, index) => {
     if (statisticColumns[index + 1]) {
-      statisticColumns[index + 1].method = option.method;
+      statisticColumns[index + 1].method = option.summary_method;
     }
   });
   const {
@@ -205,6 +207,8 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
     pivot_columns_total
   };
 }
+
+// two
 async function calculateTwoDimensionTable(chart, value, _ref2) {
   let {
     getViewRows,
@@ -239,34 +243,7 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
   const summaryColumn = getTableColumnByKey(table, summary_column_key);
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
-  const pivot_summary_multiple_columns = [];
-  Array.isArray(summary_columns) && summary_columns.forEach(item => {
-    const column = getTableColumnByKey(table, item.column_key);
-    if (column && isNumericColumn(column)) {
-      pivot_summary_multiple_columns.push({
-        key: item.column_key,
-        type: column.type,
-        data: column.data,
-        method: item.summary_method,
-        column_name: column.name
-      });
-    }
-  });
-
-  // [{key: null}, {key: cell_value}, {key: cell_value}, ...]
   let pivot_columns = [];
-
-  //  [
-  //    {
-  //      name: '',
-  //      cells: {
-  //        [key1]: {rows: [], total: ''},
-  //        [key2]: {rows: [], total: ''},
-  //        [key3]: {rows: [], total: ''},
-  //      }
-  //    },
-  //    ...
-  //  ]
   let pivot_rows = [];
   statRows.forEach(row => {
     const {
@@ -329,9 +306,10 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
     pivot_columns,
     pivot_columns_total: new_pivot_columns_total,
     pivot_table_total,
-    pivot_summary_multiple_columns,
     formulaRows,
-    dimensions: TABLE_DIMENSIONS.TWO
+    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)))],
+    isSingleNumericColumn: !summary_columns.length ? 'true' : 'false'
   };
 }
 function updateTwoDimensionColumns(value, pivot_columns, column, row, formulaRow, isIncludeEmpty, dateGranularity, geolocationGranularity, isRowGroupbyColumnDataAsAnArray) {
@@ -434,7 +412,7 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
               const nextValue = row[current === null || current === void 0 ? void 0 : current.column.key];
               const currentValue = Object.values(cells[key].total).find(item => item[2] === columnKey)[1];
               const computedValue = BaseUtils.getSummaryValue({
-                summaryMethod: current.summary_method,
+                summaryMethod: current.summary_method.toUpperCase(),
                 summaryColumn: current.column
               }, currentValue, nextValue);
               const columnName = current.column.name;
@@ -528,21 +506,6 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
     total
   });
 }
-function isSameName(prevName, currName) {
-  if (isNumber(prevName) && isNumber(currName)) {
-    return prevName === currName;
-  }
-  if (!prevName && !currName) {
-    return prevName === null && currName === null || prevName === undefined && currName === undefined || isNaN(prevName) && isNaN(currName);
-  }
-  return prevName === currName;
-}
-function isSameGroup(isColumnDataAsAnArray, source, target) {
-  if (isColumnDataAsAnArray) {
-    return (!source || source.length === 0) && !target || source && source.includes(target);
-  }
-  return source === null && target === null || source === undefined && target === undefined || source === target;
-}
 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] : [];
@@ -619,6 +582,23 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
     pivot_table_total
   };
 }
+
+// utils
+function isSameName(prevName, currName) {
+  if (isNumber(prevName) && isNumber(currName)) {
+    return prevName === currName;
+  }
+  if (!prevName && !currName) {
+    return prevName === null && currName === null || prevName === undefined && currName === undefined || isNaN(prevName) && isNaN(currName);
+  }
+  return prevName === currName;
+}
+function isSameGroup(isColumnDataAsAnArray, source, target) {
+  if (isColumnDataAsAnArray) {
+    return (!source || source.length === 0) && !target || source && source.includes(target);
+  }
+  return source === null && target === null || source === undefined && target === undefined || source === target;
+}
 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] : {};
@@ -654,6 +634,7 @@ function getTotal(summary_column, summary_type, summary_method) {
           total++;
         }
       });
+      total = getTotalByType(oldTotal, total);
       return total;
     }
     if (summary_column && isDateColumn(summary_column)) {
@@ -711,22 +692,10 @@ function getTotal(summary_column, summary_type, summary_method) {
               }
             });
             if (summary_method === 'Sum') {
-              if (Array.isArray(oldTotal)) {
-                const newTotal = JSON.parse(JSON.stringify(oldTotal));
-                newTotal[0][1] = Number.parseFloat(sum.toFixed(8));
-                total = newTotal;
-              } else {
-                total = Number.parseFloat(sum.toFixed(8));
-              }
+              total = getTotalByType(oldTotal, Number.parseFloat(sum.toFixed(8)));
             } else if (summary_method === 'Mean') {
-              if (Array.isArray(oldTotal)) {
-                const newTotal = JSON.parse(JSON.stringify(oldTotal));
-                const val = validNumbersCount === 0 ? 0 : Number.parseFloat((sum / validNumbersCount).toFixed(8));
-                newTotal[0][1] = val;
-                total = newTotal;
-              } else {
-                total = validNumbersCount === 0 ? 0 : Number.parseFloat((sum / validNumbersCount).toFixed(8));
-              }
+              const val = validNumbersCount === 0 ? 0 : Number.parseFloat((sum / validNumbersCount).toFixed(8));
+              total = getTotalByType(oldTotal, val);
             }
             break;
           }
@@ -759,15 +728,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 = formulaRow[summary_column_key][0];
+                    total = getTotalByType(oldTotal, formulaRow[summary_column_key][0]);
                   } else {
-                    total = formulaRow[summary_column_key];
+                    getTotalByType(oldTotal, formulaRow[summary_column_key]);
                   }
                 } else {
-                  total = null;
+                  total = getTotalByType(oldTotal, null);
                 }
               } else {
-                total = result[summary_column_key];
+                total = getTotalByType(oldTotal, result[summary_column_key]);
               }
             }
             break;
@@ -781,7 +750,7 @@ function getTotal(summary_column, summary_type, summary_method) {
   }
   // formula_rows result can be '#VALUE!'
   if (total === '#VALUE!') {
-    total = 0;
+    total = getTotalByType(oldTotal, 0);
   }
   return total || 0;
 }
@@ -831,6 +800,18 @@ function getDateMaxOrMinTotal(dateArr, type) {
   dateIndex = list.indexOf(dateValue);
   return dateArr[dateIndex];
 }
+function getTotalByType(oldTotal, value) {
+  let newTotal = '';
+  if (Array.isArray(oldTotal)) {
+    newTotal = JSON.parse(JSON.stringify(oldTotal));
+    newTotal[0][1] = value;
+  } else {
+    newTotal = value;
+  }
+  return newTotal;
+}
+
+// index
 function calculator(chart, value, _ref3) {
   let {
     getViewRows,

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

@@ -502,10 +502,6 @@ class ChartDataSQL {
       const groupby_include_empty_cells = this.chart['groupby_include_empty_cells'] || false;
       let summary_method = this.chart['summary_method'] || '';
       const summary_columns = this.chart['summary_columns'] || [];
-      if (!summary_method) {
-        this.error = 'Summary_method_is_not_valid';
-        return '';
-      }
       const groupby_column = this._get_column_by_key(groupby_column_key);
       if (!groupby_column) {
         this.error = 'Group_by_column_not_found';

package/dist/view/wrapper/index.js

@@ -87,8 +87,7 @@ const Wrapper = _ref => {
             summaryColumns: summary_columns,
             columnGroupbyColumn: columnGroupbyColumn,
             summaryMethod: summary_method,
-            chartTableColumns: chartTableColumns,
-            isCalculateByView: isCalculateByView
+            chartTableColumns: chartTableColumns
           }));
         }
       case CHART_TYPE.COMBINATION:

package/dist/view/wrapper/table/index.css

@@ -18,7 +18,7 @@
 
 .sea-chart-pivot-table th,
 .sea-chart-pivot-table td {
-  padding: 10px;
+  padding: 5px;
   border-right: 1px solid #ccc;
   border-left: 1px solid #ccc;
   border-bottom: none;
@@ -30,6 +30,8 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   text-align: center;
+  height: 32px;
+  max-height: 32px;
 }
 
 .sea-chart-pivot-table .column-title,
@@ -161,9 +163,11 @@
 
 .sea-chart-pivot-table .pivot-table-header-summary-columns-container > div,
 .sea-chart-pivot-table .pivot-cells-container > div {
-  flex:1;
-  padding: 10px;
-  
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
 .sea-chart-pivot-table .pivot-table-header-summary-columns-container > div:not(:first-child), 

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

@@ -1,8 +1,9 @@
 import React, { PureComponent } from 'react';
 import classnames from 'classnames';
+import { getTableById } from 'dtable-utils';
 import { BaseUtils, ObjectUtils } from '../../../utils';
 import intl from '../../../intl';
-import { CHART_THEME_COLOR } from '../../../constants';
+import { CHART_THEME_COLOR, CHART_SUMMARY_TYPE } from '../../../constants';
 import PivotTableDisplayName from './pivot-table-display-name';
 class OneDimensionTableNoNumericColumns extends PureComponent {
   constructor() {
@@ -14,11 +15,15 @@ class OneDimensionTableNoNumericColumns extends PureComponent {
         chart
       } = this.props;
       const {
-        display_total = true
+        display_total = true,
+        table_id,
+        summary_type
       } = chart.config;
       const {
         name: groupName
       } = groupbyColumn;
+      const isCount = summary_type === CHART_SUMMARY_TYPE.COUNT;
+      const columnName = isCount ? intl.get('Amount') : this.getColumnName();
       const {
         rowIdx: selectRowIdx,
         cellIdx: selectedCellIdx
@@ -28,12 +33,35 @@ class OneDimensionTableNoNumericColumns extends PureComponent {
         className: "seatable-table-header-sm"
       }, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", {
         className: "pivot-table-header"
-      }, groupName), display_total && /*#__PURE__*/React.createElement("th", {
+      }, groupName), /*#__PURE__*/React.createElement("th", {
+        className: classnames('pivot-table-header', {
+          'selected-pivot-cell-top': isSelectedTotalCellBottom
+        })
+      }, /*#__PURE__*/React.createElement("div", null, columnName)), display_total && /*#__PURE__*/React.createElement("th", {
         className: classnames('pivot-table-header', {
           'selected-pivot-cell-top': isSelectedTotalCellBottom
         })
       }, /*#__PURE__*/React.createElement("div", null, intl.get('Total')))));
     };
+    this.getColumnName = () => {
+      const {
+        tables,
+        result,
+        chart
+      } = this.props;
+      const {
+        pivot_columns
+      } = result;
+      const {
+        table_id
+      } = chart.config;
+      if (Array.isArray(pivot_columns) && pivot_columns.length !== 0) {
+        const table = getTableById(tables, table_id);
+        const column = table === null || table === void 0 ? void 0 : table.columns.find(item => item.key === pivot_columns[0].key);
+        return (column === null || column === void 0 ? void 0 : column.name) || '';
+      }
+      return '';
+    };
     this.toggleRecords = (cell, selectedCell) => {
       if (window.isMobile) return;
       const {
@@ -81,7 +109,6 @@ class OneDimensionTableNoNumericColumns extends PureComponent {
       let pivotColumnCells = [];
       const isSelectRowTotalCellRight = selectRowIdx === pivotRowsLen && selectedCellIdx === 0;
       const isSelectTotal = selectRowIdx === pivotRowsLen && selectedCellIdx === 0;
-      // eslint-disable-next-line
       const total = ObjectUtils.hasOwnProperty(pivot_columns_total, 'total') ? pivot_columns_total['total'] : 0;
       const summaryDisplayValue = BaseUtils.getSummaryValueDisplayString(summaryColumn, total);
       const isValidSummaryDisplayValue = BaseUtils.isValidValue(summaryDisplayValue, display_empty);
@@ -108,6 +135,18 @@ class OneDimensionTableNoNumericColumns extends PureComponent {
           column: groupbyColumn,
           rowData: rowItem,
           globalTheme: globalTheme
+        })), /*#__PURE__*/React.createElement("td", {
+          className: classnames('pivot-cell', {
+            'pivot-empty-cell': !isValidTotalDisplayValue,
+            'selected-pivot-cell': isSelectedTotalCell,
+            'selected-pivot-cell-top': isSelectedTotalCellTop,
+            'selected-pivot-cell-left': isSelectedTotalCellLeft
+          }),
+          total: totalDisplayValue
+        }, isValidTotalDisplayValue ? totalDisplayValue : /*#__PURE__*/React.createElement("i", null), /*#__PURE__*/React.createElement("span", {
+          className: classnames({
+            'selected-pivot-cell-border': isSelectedTotalCell
+          })
         })), display_total && /*#__PURE__*/React.createElement("td", {
           className: classnames('pivot-cell', {
             'pivot-empty-cell': !isValidTotalDisplayValue,
@@ -134,6 +173,16 @@ class OneDimensionTableNoNumericColumns extends PureComponent {
           'selected-pivot-cell-left': isSelectRowTotalCellRight
         })
       }, /*#__PURE__*/React.createElement("div", null, intl.get('Total'))), /*#__PURE__*/React.createElement("td", {
+        className: classnames('pivot-cell pivot-table-total', {
+          'pivot-empty-cell': !isValidSummaryDisplayValue,
+          'selected-pivot-cell': isSelectTotal
+        }),
+        title: isValidSummaryDisplayValue ? summaryDisplayValue : ''
+      }, isValidSummaryDisplayValue ? summaryDisplayValue : /*#__PURE__*/React.createElement("i", null), /*#__PURE__*/React.createElement("span", {
+        className: classnames({
+          'selected-pivot-cell-border': isSelectTotal
+        })
+      })), /*#__PURE__*/React.createElement("td", {
         className: classnames('pivot-cell pivot-table-total', {
           'pivot-empty-cell': !isValidSummaryDisplayValue,
           'selected-pivot-cell': isSelectTotal

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

@@ -132,9 +132,9 @@ class TwoDimensionTable extends PureComponent {
     };
     this.renderEmpty = (summaryColumns, cellIdx) => {
       if (summaryColumns && (summaryColumns === null || summaryColumns === void 0 ? void 0 : summaryColumns.length) !== 0) {
-        return summaryColumns === null || summaryColumns === void 0 ? void 0 : summaryColumns.map(() => {
+        return summaryColumns.map(item => {
           return /*#__PURE__*/React.createElement("div", {
-            key: "table-cell-".concat(cellIdx),
+            key: "table-cell-".concat(item.key),
             className: classnames('pivot-cell', {
               'pivot-empty-cell': true
             })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.85",
+  "version": "0.0.86",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",