sea-chart 0.0.101 → 0.0.102

package/dist/constants/index.js

@@ -19,6 +19,8 @@ export const ZH_CN_SUPPORT_CHARTS = [CHART_TYPE.MAP, CHART_TYPE.MAP_BUBBLE];
 export const SUPPORT_DATA_SORT_CHART_TYPES = [CHART_TYPE.BAR, CHART_TYPE.BAR_STACK, CHART_TYPE.LINE, CHART_TYPE.PIE, CHART_TYPE.RING, CHART_TYPE.HORIZONTAL_BAR, CHART_TYPE.STACKED_HORIZONTAL_BAR, CHART_TYPE.AREA, CHART_TYPE.TREE_MAP];
 export const SUPPORT_STACK_VALUE_CHART_TYPES = [CHART_TYPE.BAR_STACK, CHART_TYPE.BAR_CUSTOM];
 export const X_AXIS_IS_GROUPBY_COLUMN_KEY_CHART_TYPES = [CHART_TYPE.TABLE, CHART_TYPE.PIE, CHART_TYPE.RING, CHART_TYPE.TREE_MAP];
+export const COMPLTETELESS_CHART_TYPES = [CHART_TYPE.COMPLETENESS, CHART_TYPE.COMPLETENESS_GROUP];
+export const HORIZONTAL_BAR_CHART_TYPES = [CHART_TYPE.HORIZONTAL_BAR, CHART_TYPE.HORIZONTAL_GROUP_BAR, CHART_TYPE.STACKED_HORIZONTAL_BAR];
 export const CHART_CHART_MAP = {
   [CHART_TYPE.BAR]: CHART_TYPE.BAR,
   [CHART_TYPE.PIE]: CHART_TYPE.PIE,

package/dist/locale/lang/de.js

@@ -250,6 +250,8 @@ const de = {
   "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",
-  "Search_records": "Einträge suchen"
+  "Search_records": "Einträge suchen",
+  "Please_select_a_grouping_column": "Bitte Gruppierungsspalte auswählen",
+  "View": "Sicht"
 };
 export default de;

package/dist/locale/lang/en.js

@@ -250,6 +250,8 @@ const en = {
   "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",
-  "Search_records": "Search records"
+  "Search_records": "Search records",
+  "Please_select_a_grouping_column": "Please select grouping column",
+  "View": "View"
 };
 export default en;

package/dist/locale/lang/es.js

@@ -250,6 +250,8 @@ const es = {
   "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",
-  "Search_records": "Search records"
+  "Search_records": "Search records",
+  "Please_select_a_grouping_column": "Please select grouping column",
+  "View": "View"
 };
 export default es;

package/dist/locale/lang/fr.js

@@ -250,6 +250,8 @@ const fr = {
   "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",
-  "Search_records": "Rechercher des enregistrements"
+  "Search_records": "Rechercher des enregistrements",
+  "Please_select_a_grouping_column": "Veuillez sélectionner la colonne de regroupement",
+  "View": "Voir"
 };
 export default fr;

package/dist/locale/lang/pt.js

@@ -250,6 +250,8 @@ const pt = {
   "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",
-  "Search_records": "Search records"
+  "Search_records": "Search records",
+  "Please_select_a_grouping_column": "Please select grouping column",
+  "View": "View"
 };
 export default pt;

package/dist/locale/lang/ru.js

@@ -250,6 +250,8 @@ const ru = {
   "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",
-  "Search_records": "Search records"
+  "Search_records": "Search records",
+  "Please_select_a_grouping_column": "Please select grouping column",
+  "View": "View"
 };
 export default ru;

package/dist/locale/lang/zh_CN.js

@@ -250,6 +250,8 @@ const zh_CN = {
   "Display_empty_when_data_is_zero": "数据为零时留空",
   "Use_default_color": "使用默认颜色",
   "Use_colors_in_single_select_solumn": "使用列中的选项颜色",
-  "Search_records": "搜索记录"
+  "Search_records": "搜索记录",
+  "Please_select_a_grouping_column": "请选择一个分组列",
+  "View": "视图"
 };
 export default zh_CN;

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

@@ -114,7 +114,8 @@ export default function ScatterDataSettings(_ref) {
     label: intl.get('X_axis'),
     selectedTableId: table_id,
     selectedColumnKey: x_axis_column_key,
-    onGroupByChange: onXAxisColumnChange
+    onGroupByChange: onXAxisColumnChange,
+    supportFormulaColumns: true
   }), /*#__PURE__*/React.createElement(_DTableSwitch, {
     checked: x_axis_include_empty_cells,
     placeholder: intl.get('Include_empty'),
@@ -128,7 +129,8 @@ export default function ScatterDataSettings(_ref) {
     label: intl.get('Y_axis'),
     selectedTableId: table_id,
     selectedColumnKey: y_axis_column_key,
-    onGroupByChange: onYAxisColumnChange
+    onGroupByChange: onYAxisColumnChange,
+    supportFormulaColumns: true
   }), /*#__PURE__*/React.createElement(GroupBy, {
     tables: tables,
     label: intl.get('Group_by'),

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

@@ -102,7 +102,15 @@ class GroupBy extends Component {
       if ([CHART_TYPE.COMPLETENESS, CHART_TYPE.COMPLETENESS_GROUP].includes(type)) {
         newColumns = newColumns.filter(column => COMPLETENESS_GROUPBY_SUPPORTED_COLUMN_TYPE.includes(column.value.type));
       } else if (type === CHART_TYPE.SCATTER) {
-        newColumns = newColumns.filter(column => NUMBERIC_COLUMN_TYPE.includes(column.value.type));
+        newColumns = newColumns.filter(column => {
+          if (column.value.type === CellType.FORMULA) {
+            return column.value.data.result_type === CellType.NUMBER;
+          } else if (column.value.type === CellType.LINK_FORMULA) {
+            return [CellType.NUMBER, CellType.RATE].includes(column.value.data.array_type);
+          } else {
+            return NUMBERIC_COLUMN_TYPE.includes(column.value.type);
+          }
+        });
       }
       if (isRenderNoUsed) {
         newColumns.unshift({

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

@@ -2,7 +2,7 @@ var _BaseUtils;
 import shallowEqual from 'shallowequal';
 import dayjs from 'dayjs';
 import { CellType, COLLABORATOR_COLUMN_TYPES, FORMULA_COLUMN_TYPES_MAP, FORMULA_RESULT_TYPE, getDateDisplayString, getNumberDisplayString, getOption, getPrecisionNumber, getTableById, getTableColumnByKey, isNumber, isNumericColumn, isDateColumn, sortText, sortNumber, sortDate, sortSingleSelect, sortFormula, getColumnOptions, DateUtils, getGeolocationDisplayString, getFormulaDisplayString, isArchiveView, getViewById } from 'dtable-utils';
-import { PIE_CHART_COLORS, CHART_SUMMARY_TYPE, CHART_SUPPORT_SORT_COLUMNS, CHART_TYPE, CHART_STYLE_SETTING_KEYS, DEFAULT_LABEL_FONT_SIZE, DEFAULT_NUMBER_FORMAT_OBJECT, X_AXIS_IS_GROUPBY_COLUMN_KEY_CHART_TYPES, STYLE_COLORS, CHART_DATA_SORT_TYPE, CHART_Y_GROUP_TYPE } from '../../constants';
+import { PIE_CHART_COLORS, CHART_SUMMARY_TYPE, CHART_SUPPORT_SORT_COLUMNS, CHART_TYPE, CHART_STYLE_SETTING_KEYS, DEFAULT_LABEL_FONT_SIZE, DEFAULT_NUMBER_FORMAT_OBJECT, X_AXIS_IS_GROUPBY_COLUMN_KEY_CHART_TYPES, STYLE_COLORS, CHART_DATA_SORT_TYPE, CHART_Y_GROUP_TYPE, HORIZONTAL_BAR_CHART_TYPES, COMPLTETELESS_CHART_TYPES } from '../../constants';
 import { getClientFormulaDisplayString } from '../cell-format-utils';
 import { getKnownCollaboratorByEmail, generateDefaultUser, getUsers } from '../collaborator-utils';
 import { getDateColumnFormat, getColumnByKey } from '../column-utils';
@@ -42,6 +42,12 @@ BaseUtils.isValidExistChart = (tables, chart) => {
   } = config;
   const table = getTableById(tables, table_id);
   if (!table) return false;
+  if (type === CHART_TYPE.SCATTER) {
+    const {
+      column_groupby_column_key
+    } = config;
+    if (!column_groupby_column_key) return false;
+  }
   if (config.type === CHART_TYPE.BASIC_NUMBER_CARD) {
     const {
       summary_type
@@ -108,6 +114,12 @@ BaseUtils.getGroupColumn = (table, chart) => {
   const {
     type
   } = config;
+  if (COMPLTETELESS_CHART_TYPES.includes(type)) {
+    return getTableColumnByKey(table, config.completed_column_key);
+  }
+  if (HORIZONTAL_BAR_CHART_TYPES.includes(type)) {
+    return getTableColumnByKey(table, config.vertical_axis_column_key);
+  }
   if (X_AXIS_IS_GROUPBY_COLUMN_KEY_CHART_TYPES.includes(type)) {
     return getTableColumnByKey(table, config.groupby_column_key);
   }
@@ -138,7 +150,7 @@ BaseUtils.getColumnGroupColumn = (table, chart) => {
   if (X_AXIS_IS_GROUPBY_COLUMN_KEY_CHART_TYPES.includes(type)) {
     return getTableColumnByKey(table, config.column_groupby_column_key);
   }
-  if ([CHART_TYPE.BAR_GROUP, CHART_TYPE.BAR_STACK, CHART_TYPE.LINE_GROUP, CHART_TYPE.HORIZONTAL_GROUP_BAR, CHART_TYPE.STACKED_HORIZONTAL_BAR, CHART_TYPE.AREA_GROUP].includes(type)) {
+  if ([CHART_TYPE.BAR_GROUP, CHART_TYPE.BAR_STACK, CHART_TYPE.LINE_GROUP, CHART_TYPE.HORIZONTAL_GROUP_BAR, CHART_TYPE.STACKED_HORIZONTAL_BAR, CHART_TYPE.AREA_GROUP, CHART_TYPE.COMPLETENESS, CHART_TYPE.COMPLETENESS_GROUP].includes(type)) {
     return getTableColumnByKey(table, config.column_groupby_column_key);
   }
   if ([CHART_TYPE.MIRROR].includes(type)) {
@@ -157,18 +169,27 @@ BaseUtils.getSummaryColumn = (table, chart) => {
     summary_column_key,
     y_axis_summary_column_key,
     type,
-    numeric_column_key
+    numeric_column_key,
+    horizontal_axis_column_key
   } = config;
   switch (type) {
+    case CHART_TYPE.COMPLETENESS:
+    case CHART_TYPE.COMPLETENESS_GROUP:
+      {
+        return getTableColumnByKey(table, config.target_column_key);
+      }
+    case CHART_TYPE.HORIZONTAL_BAR:
+    case CHART_TYPE.STACKED_HORIZONTAL_BAR:
+    case CHART_TYPE.HORIZONTAL_GROUP_BAR:
+      {
+        return getTableColumnByKey(table, horizontal_axis_column_key);
+      }
     case CHART_TYPE.BAR:
     case CHART_TYPE.BAR_GROUP:
     case CHART_TYPE.LINE:
     case CHART_TYPE.LINE_GROUP:
     case CHART_TYPE.AREA:
     case CHART_TYPE.AREA_GROUP:
-    case CHART_TYPE.HORIZONTAL_BAR:
-    case CHART_TYPE.STACKED_HORIZONTAL_BAR:
-    case CHART_TYPE.HORIZONTAL_GROUP_BAR:
     case CHART_TYPE.BAR_STACK:
       {
         return getTableColumnByKey(table, y_axis_summary_column_key);
@@ -575,7 +596,7 @@ BaseUtils.formatPieChartData = (data, chart, tables, currentTheme, useColumnColo
 };
 // table
 // format SINGLE_SELECT, LAST_MODIFIER, CREATOR, COLLABORATOR, DATE, NUMBER
-BaseUtils.updateTableViewListItemNameAndColor = (result, column, nameKey, colorKey) => {
+BaseUtils.updateTableViewListItemNameAndColor = (result, column, nameKey, colorKey, isScatterChart) => {
   let {
     type: columnType,
     data: columnData
@@ -632,11 +653,18 @@ BaseUtils.updateTableViewListItemNameAndColor = (result, column, nameKey, colorK
       }
       result[nameKey] = dayjs(name).format(format);
     }
+  } else if (columnType === CellType.LINK_FORMULA) {
+    // scatter only use number
+    if (isScatterChart) {
+      name.length && (name = name[0]);
+      let valueNumber = parseFloat(name);
+      result[nameKey] = isNumber(valueNumber) ? getNumberDisplayString(valueNumber, columnData) : name;
+    }
   }
 };
-BaseUtils.updateTableViewList = (result, column, nameKey, colorKey) => {
+BaseUtils.updateTableViewList = (result, column, nameKey, colorKey, isScatter) => {
   result.forEach(result => {
-    _BaseUtils.updateTableViewListItemNameAndColor(result, column, nameKey, colorKey);
+    _BaseUtils.updateTableViewListItemNameAndColor(result, column, nameKey, colorKey, isScatter);
   });
 };
 // sort chart
@@ -1618,7 +1646,7 @@ BaseUtils.updateCollaboratorAndMultipleAvg = (pivot_rows, all) => {
           let allCount = 0;
           cell.rows.forEach(r => {
             allSum = allSum + r["SUM(".concat(avgColumnName, ")")];
-            allCount = allCount + r["COUNT(*)"];
+            allCount = allCount + r['COUNT(*)'];
           });
 
           // set avg, avg = sum / count

package/dist/utils/chart-utils/original-data-utils/scatter-calculator.js

@@ -12,7 +12,6 @@ function updateBasicChartRows(results, index, name, dataItem, row) {
   } else {
     updatedResult = {
       ...dataItem,
-      name,
       rows: [row]
     };
     results.push(updatedResult);

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

@@ -1685,14 +1685,15 @@ SQLStatisticsUtils.scatterSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, c
   } = columnMap;
   // format sql rows
   const originalSqlRows = cloneDeep(sqlRows);
-  BaseUtils.updateTableViewList(sqlRows, groupbyColumn, groupbyColumn.key, 'color');
-  BaseUtils.updateTableViewList(sqlRows, summaryColumn, summaryColumn.key, 'color');
+  const isScatter = true;
+  BaseUtils.updateTableViewList(sqlRows, groupbyColumn, groupbyColumn.key, 'color', isScatter);
+  BaseUtils.updateTableViewList(sqlRows, summaryColumn, summaryColumn.key, 'color', isScatter);
   if (sqlColumnGroupbyColumnKey) BaseUtils.updateTableViewList(sqlRows, columnGroupbyColumn, sqlColumnGroupbyColumnKey, 'color');
   const res = [];
   sqlRows.forEach((row, index) => {
-    const xValue = '' + row[sqlXColumnKey] || intl.get('Empty');
-    const yValue = '' + row[sqlYColumnKey] || intl.get('Empty');
-    const groupby = '' + row[sqlColumnGroupbyColumnKey] || intl.get('Empty');
+    const xValue = row[sqlXColumnKey] ? '' + row[sqlXColumnKey] : intl.get('Empty');
+    const yValue = row[sqlYColumnKey] ? '' + row[sqlYColumnKey] : intl.get('Empty');
+    const groupby = row[sqlColumnGroupbyColumnKey] ? '' + row[sqlColumnGroupbyColumnKey] : null;
     const originalSqlRow = originalSqlRows[index];
     const originalXValue = originalSqlRow[sqlXColumnKey];
     const originalYValue = originalSqlRow[sqlYColumnKey];
@@ -1799,7 +1800,8 @@ SQLStatisticsUtils.calculateChart = (chart, value, callback, sqlRows) => {
   try {
     chartSQLMap = chartColumn2SqlColumn(newChart, table);
   } catch (error) {
-    const error_message = 'There_are_some_problems_with_the_filters';
+    let error_message = 'There_are_some_problems_with_the_filters';
+    if (error.message) error_message = error.message;
     return callback && callback(error_message, '', null);
   }
   const tipMessage = 'There_are_no_statistic_results_yet';

package/dist/utils/sql/column-2-sql-column.js

@@ -3,6 +3,7 @@ import { CHART_SUMMARY_TYPE, CHART_TYPE, DTABLE_DB_SUMMARY_METHOD, MAP_LEVEL } f
 import BaseUtils from '../chart-utils/base-utils';
 import { fixGeoGranularity } from '../map';
 import { getSqlGroup } from '../column-utils';
+import intl from '../../intl';
 export const column2SqlColumn = function (column) {
   let {
     dateGranularity,
@@ -674,6 +675,7 @@ const scatterStatisticColumn2sqlColumn = (chart, table) => {
     });
     sqlColumnGroupbyColumnKey = key;
   }
+  if (!sqlColumnGroupbyColumnKey) throw Error(intl.get('Please_select_a_grouping_column'));
   return {
     sqlXColumnKey,
     sqlYColumnKey,

package/dist/view/wrapper/scatter.js

@@ -96,8 +96,8 @@ export function Scatter(_ref) {
       }).shape('circle').tooltip('groupby*name*value', (groupby, name, value) => {
         return {
           name: groupby || groupby === 0 ? groupby : intl.get('Empty'),
-          valueX: "".concat(selectedXAxisColumn.name, ": ").concat(name),
-          valueY: "".concat(selectedYAxisColumn.name, ": ").concat(value)
+          valueX: "".concat(selectedXAxisColumn === null || selectedXAxisColumn === void 0 ? void 0 : selectedXAxisColumn.name, ": ").concat(name),
+          valueY: "".concat(selectedYAxisColumn === null || selectedYAxisColumn === void 0 ? void 0 : selectedYAxisColumn.name, ": ").concat(value)
         };
       }).style({
         fillOpacity: 0.85

package/package.json

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