sea-chart 0.0.88 → 0.0.89

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/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/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,6 +280,10 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
       }
     }
   });
+  let summaryColumn = null;
+  if (summary_column_key) {
+    summaryColumn = getTableColumnByKey(table, summary_column_key);
+  }
   let {
     pivot_columns_total,
     pivot_table_total
@@ -314,7 +317,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'
   };
 }
@@ -828,6 +831,20 @@ function getTotalByType(oldTotal, 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/two-dimension-table.js

@@ -134,7 +134,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
             })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.88",
+  "version": "0.0.89",
   "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",