sea-chart 0.0.28-beta → 0.0.28

package/dist/locale/lang/en.js

@@ -245,7 +245,6 @@ const en = {
   'Line_type': 'Line type',
   'Summarize_description': 'Count the sum, maximum, minimum, average, or number of distinct values of records based on a field',
   'Count_description': 'Count the number of records based on  data settings',
-  'Display_empty_when_data_is_zero': 'Display empty when data is zero',
-  'Count_description': 'Count the number of records based on  data settings'
+  'Display_empty_when_data_is_zero': 'Display empty when data is zero'
 };
 export default en;

package/dist/locale/lang/es.js

@@ -168,7 +168,6 @@ const es = {
   'Line_type': 'Line type',
   'Summarize_description': 'Count the sum, maximum, minimum, average, or number of distinct values of records based on a field',
   'Count_description': 'Count the number of records based on  data settings',
-  'Display_empty_when_data_is_zero': 'Display empty when data is zero',
-  'Count_description': 'Count the number of records based on  data settings'
+  'Display_empty_when_data_is_zero': 'Display empty when data is zero'
 };
 export default es;

package/dist/locale/lang/fr.js

@@ -168,7 +168,6 @@ const fr = {
   'Line_type': 'Line type',
   'Summarize_description': 'Count the sum, maximum, minimum, average, or number of distinct values of records based on a field',
   'Count_description': 'Count the number of records based on  data settings',
-  'Display_empty_when_data_is_zero': 'Display empty when data is zero',
-  'Count_description': 'Count the number of records based on  data settings'
+  'Display_empty_when_data_is_zero': 'Display empty when data is zero'
 };
 export default fr;

package/dist/locale/lang/pt.js

@@ -168,7 +168,6 @@ const pt = {
   'Line_type': 'Line type',
   'Summarize_description': 'Count the sum, maximum, minimum, average, or number of distinct values of records based on a field',
   'Count_description': 'Count the number of records based on  data settings',
-  'Display_empty_when_data_is_zero': 'Display empty when data is zero',
-  'Count_description': 'Count the number of records based on  data settings'
+  'Display_empty_when_data_is_zero': 'Display empty when data is zero'
 };
 export default pt;

package/dist/locale/lang/ru.js

@@ -168,7 +168,6 @@ const ru = {
   'Line_type': 'Line type',
   'Summarize_description': 'Count the sum, maximum, minimum, average, or number of distinct values of records based on a field',
   'Count_description': 'Count the number of records based on  data settings',
-  'Display_empty_when_data_is_zero': 'Display empty when data is zero',
-  'Count_description': 'Count the number of records based on  data settings'
+  'Display_empty_when_data_is_zero': 'Display empty when data is zero'
 };
 export default ru;

package/dist/locale/lang/zh_CN.js

@@ -245,7 +245,6 @@ const zh_CN = {
   'Line_type': '线型',
   'Summarize_description': '按照一个字段计算记录的总和、最大值、最小值或者平均值',
   'Count_description': '根据数据设置计算记录数量',
-  'Display_empty_when_data_is_zero': '数据为零时留空',
-  'Count_description': '根据数据设置计算记录数量'
+  'Display_empty_when_data_is_zero': '数据为零时留空'
 };
 export default zh_CN;

package/dist/model/basic-number-card.js

@@ -1,5 +1,5 @@
 import { isNumericColumn, getTableById, getTableColumnByKey } from 'dtable-utils';
-import { CHART_SUMMARY_CALCULATION_METHOD, CHART_TYPE, CHART_Y_GROUP_TYPE } from '../constants';
+import { CHART_SUMMARY_TYPE, CHART_TYPE } from '../constants';
 import BaseModel from './base-model';
 class BasicNumberCard extends BaseModel {
   constructor(options, tables) {
@@ -16,8 +16,7 @@ class BasicNumberCard extends BaseModel {
         this.numeric_column_key = null;
       }
     }
-    this.summary_type = options.x_axis_summary_type || CHART_Y_GROUP_TYPE.COUNT;
-    this.summary_method = options.y_axis_summary_method || CHART_SUMMARY_CALCULATION_METHOD[0];
+    this.summary_method = options.y_axis_summary_method || CHART_SUMMARY_TYPE.ROW_COUNT;
     this.font_size = options.font_size || 40;
     this.font_color = options.font_color;
     this.label_font_size = options.label_font_size || 12;

package/dist/settings/basic-number-card/data-settings.js

@@ -4,7 +4,7 @@ import { COLUMNS_ICON_CONFIG, getTableById } from 'dtable-utils';
 import DTableSelect from "dtable-ui-component/lib/DTableSelect";
 import CommonDataSettings from '../widgets/common-data-settings';
 import { BaseUtils } from '../../utils';
-import { CHART_SUMMARY_SHOW, CHART_SUMMARY_CALCULATION_METHOD, CHART_SUPPORT_COLUMNS, CHART_Y_GROUP_TYPE } from '../../constants';
+import { CHART_SUMMARY_SHOW, CHART_SUMMARY_CALCULATION_METHOD, CHART_SUPPORT_COLUMNS, BASIC_NUMBER_CARD_CALCULATION_METHOD } from '../../constants';
 import intl from '../../intl';
 const DataSettings = _ref => {
   let {
@@ -14,7 +14,7 @@ const DataSettings = _ref => {
     onChange
   } = _ref;
   const summaryMethodsOptions = useMemo(() => {
-    const numberCardSummaryMethod = [...CHART_SUMMARY_CALCULATION_METHOD];
+    const numberCardSummaryMethod = [BASIC_NUMBER_CARD_CALCULATION_METHOD, ...CHART_SUMMARY_CALCULATION_METHOD];
     return numberCardSummaryMethod.map(method => {
       return {
         label: /*#__PURE__*/React.createElement("span", {
@@ -24,21 +24,6 @@ const DataSettings = _ref => {
       };
     });
   }, []);
-  const summaryTypeOptions = [{
-    value: CHART_Y_GROUP_TYPE.COUNT,
-    label: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-      className: "select-module select-module-name ml-0"
-    }, intl.get(CHART_SUMMARY_SHOW['count'])), /*#__PURE__*/React.createElement("div", {
-      className: "summary-type-explanation"
-    }, intl.get('Count_description')))
-  }, {
-    value: CHART_Y_GROUP_TYPE.SINGLE_NUMERIC_COLUMN,
-    label: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-      className: "select-module select-module-name ml-0"
-    }, intl.get(CHART_SUMMARY_SHOW['advanced'])), /*#__PURE__*/React.createElement("div", {
-      className: "summary-type-explanation"
-    }, intl.get('Summarize_description')))
-  }];
   const selectedTable = useMemo(() => {
     const {
       table_id: selectedTableId
@@ -78,19 +63,6 @@ const DataSettings = _ref => {
       }
     }, ...options];
   }, [numericColumns]);
-  const onSummaryTypeChange = useCallback(option => {
-    const {
-      config
-    } = chart;
-    const {
-      summary_type
-    } = config;
-    const newSummaryType = option.value;
-    if (newSummaryType === summary_type) return;
-    onChange && onChange({
-      summary_type: newSummaryType
-    });
-  }, [chart, onChange]);
   const onSelectColumnChange = useCallback(option => {
     const {
       config
@@ -120,19 +92,23 @@ const DataSettings = _ref => {
   const getSelectedMethodOption = useCallback((method, summaryMethodsOptions) => {
     return summaryMethodsOptions.find(m => m.value === method) || summaryMethodsOptions[0];
   }, []);
-  const selectedSummaryTypeOption = summaryTypeOptions.find(option => option.value === chart.config.summary_type) || summaryTypeOptions[0];
-  const isSummarizeAField = chart.config.summary_type === CHART_Y_GROUP_TYPE.SINGLE_NUMERIC_COLUMN;
-  const {
-    summary_method
-  } = chart.config;
-  const selectedMethodOption = getSelectedMethodOption(summary_method, summaryMethodsOptions);
-  let selectedColumnOption;
-  if (isSummarizeAField) {
+  const renderSummaryMethod = useCallback(() => {
     const {
-      config
-    } = chart;
-    selectedColumnOption = numericColumnOptions.find(option => option.value.key === config.numeric_column_key) || numericColumnOptions[0];
-  }
+      summary_method
+    } = chart.config;
+    const selectedMethodOption = getSelectedMethodOption(summary_method, summaryMethodsOptions);
+    return /*#__PURE__*/React.createElement("div", {
+      className: "dtable-plugin-stat-parameter-item"
+    }, /*#__PURE__*/React.createElement("label", null, intl.get('Summary_method')), /*#__PURE__*/React.createElement(DTableSelect, {
+      value: selectedMethodOption,
+      onChange: onSelectSummaryMethod,
+      options: summaryMethodsOptions
+    }));
+  }, [chart, getSelectedMethodOption, onSelectSummaryMethod, summaryMethodsOptions]);
+  const {
+    config
+  } = chart;
+  const selectedColumnOption = numericColumnOptions.find(option => option.value.key === config.numeric_column_key) || numericColumnOptions[0];
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CommonDataSettings, {
     dataSources: dataSources,
     chart: chart,
@@ -140,26 +116,13 @@ const DataSettings = _ref => {
     onChange: onChange
   }), /*#__PURE__*/React.createElement(FormGroup, {
     className: "sea-chart-parameter-item"
-  }, /*#__PURE__*/React.createElement("label", null, intl.get('Summary_type')), /*#__PURE__*/React.createElement(DTableSelect, {
-    classNamePrefix: "chart-summary-types",
-    value: selectedSummaryTypeOption,
-    options: summaryTypeOptions,
-    placeholder: intl.get('Select_a_column'),
-    onChange: onSummaryTypeChange
-  })), isSummarizeAField && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormGroup, {
-    className: "sea-chart-parameter-item"
-  }, /*#__PURE__*/React.createElement("label", null, intl.get('Summary_field')), /*#__PURE__*/React.createElement(DTableSelect, {
+  }, /*#__PURE__*/React.createElement("label", null, intl.get('Statistic_field')), /*#__PURE__*/React.createElement(DTableSelect, {
     value: selectedColumnOption,
     options: numericColumnOptions,
+    placeholder: intl.get('Select_a_column'),
     onChange: onSelectColumnChange
   })), /*#__PURE__*/React.createElement(FormGroup, {
     className: "sea-chart-parameter-item"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "dtable-plugin-stat-parameter-item"
-  }, /*#__PURE__*/React.createElement("label", null, intl.get('Summary_method')), /*#__PURE__*/React.createElement(DTableSelect, {
-    value: selectedMethodOption,
-    onChange: onSelectSummaryMethod,
-    options: summaryMethodsOptions
-  })))));
+  }, renderSummaryMethod()));
 };
 export default DataSettings;

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

@@ -2,12 +2,12 @@ import React, { Component } from 'react';
 import { FormGroup, Label } from 'reactstrap';
 import DTableSelect from "dtable-ui-component/lib/DTableSelect";
 import { COLUMNS_ICON_CONFIG, getTableById } from 'dtable-utils';
-import { CHART_Y_GROUP_TYPE, CHART_SUMMARY_SHOW, CHART_SUMMARY_CALCULATION_METHOD, CHART_SUMMARY_TYPE, DATE_GRANULATES, GEOLOCATION_GRANULATES, CHART_DATE_SUMMARY_CALCULATION_METHOD, CHART_SUPPORT_COLUMNS, CHART_TYPE } from '../../constants';
-import { BaseUtils } from '../../utils';
-import intl from '../../intl';
 import NumericSummaryItem from './numeric-summary-item';
 import SummaryMethodSettings from './summary-method-setting';
 import Groupby from './group-by';
+import { CHART_Y_GROUP_TYPE, CHART_SUMMARY_SHOW, CHART_SUMMARY_CALCULATION_METHOD, CHART_SUMMARY_TYPE, DATE_GRANULATES, GEOLOCATION_GRANULATES, CHART_DATE_SUMMARY_CALCULATION_METHOD, CHART_SUPPORT_COLUMNS, CHART_TYPE } from '../../constants';
+import { BaseUtils } from '../../utils';
+import intl from '../../intl';
 class YAxisGroupSettings extends Component {
   constructor(_props) {
     super(_props);
@@ -20,7 +20,7 @@ class YAxisGroupSettings extends Component {
         table_id,
         type
       } = chart.config;
-      this.isMapChart = [CHART_TYPE.MAP, CHART_TYPE.MAP_BUBBLE, CHART_TYPE.WORLD_MAP, CHART_TYPE.WORLD_MAP_BUBBLE].includes(type);
+      this.isMapChart = type === CHART_TYPE.MAP || type === CHART_TYPE.MAP_BUBBLE || type === CHART_TYPE.WORLD_MAP || type === CHART_TYPE.WORLD_MAP_BUBBLE;
       this.selectedTable = getTableById(tables, table_id);
     };
     this.initGroupTypeOptions = () => {

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

@@ -2,7 +2,7 @@ var _class;
 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 } 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 } from '../../constants';
 import { getClientFormulaDisplayString } from '../cell-format-utils';
 import { getKnownCollaboratorByEmail, generateDefaultUser, getUsers } from '../collaborator-utils';
 import { getDateColumnFormat, getColumnByKey } from '../column-utils';
@@ -60,10 +60,6 @@ BaseUtils.isValidExistChart = (tables, chart) => {
   const table = getTableById(tables, table_id);
   if (!table) return false;
   if (config.type === CHART_TYPE.BASIC_NUMBER_CARD) {
-    const {
-      summary_type
-    } = config;
-    if (summary_type === CHART_Y_GROUP_TYPE.COUNT || !summary_type) return true;
     const numericColumnKey = config.numeric_column_key;
     if (!numericColumnKey) return false;
     return getTableColumnByKey(table, numericColumnKey);

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

@@ -1,6 +1,6 @@
 import { CellType, filter2SqlCondition, isNumericColumn, isDateColumn } from 'dtable-utils';
 import { getSqlGroup } from '../column-utils';
-import { CHART_TYPE, DTABLE_DB_SUMMARY_METHOD, CHART_SUMMARY_TYPE, TIME_COLUMN_LIST, Y_AXIS_TYPE_PREFIX, CHART_Y_GROUP_TYPE } from '../../constants';
+import { CHART_TYPE, DTABLE_DB_SUMMARY_METHOD, CHART_SUMMARY_TYPE, TIME_COLUMN_LIST, Y_AXIS_TYPE_PREFIX } from '../../constants';
 import { fixGeoGranularity } from '../map';
 
 /*
@@ -678,10 +678,6 @@ class ChartDataSQL {
       return "SELECT ".concat(groupby_column_name, " FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY ").concat(groupby_column_name, " LIMIT 0, 5000");
     };
     this._basic_number_card_chart_statistic_2_sql = () => {
-      const summary_type = this.chart['summary_type'];
-      if (summary_type === CHART_Y_GROUP_TYPE.COUNT) {
-        return "SELECT COUNT(*) FROM ".concat(this.table_name, " ").concat(this.filter_sql, " LIMIT 0, 5000");
-      }
       const numeric_column_key = this.chart['numeric_column_key'] || '';
       let summary_method = this.chart['summary_method'] || '';
       const numeric_column = this._get_column_by_key(numeric_column_key);

package/dist/view/index.css

@@ -43,10 +43,6 @@
   bottom: 8%;
 }
 
-.sea-chart-formatter .sea-chart-container.plugin-number-card {
-  bottom: 2%;
-}
-
 .sea-chart-formatter .sea-chart-container.show-x-axis-label,
 .sea-chart-formatter .sea-chart-container.show-horizontal-axis-label {
   padding-bottom: 20px;

package/dist/view/wrapper/basic-number-card.js

@@ -54,11 +54,9 @@ class BasicNumericCard extends Component {
         summaryColumn
       } = this.props;
       const {
-        summary_type,
         summary_method
       } = chart.config;
-      // COUNT / SUMMARIZE_A_FIELD
-      if (summary_type !== BASIC_NUMBER_CARD_CALCULATION_METHOD) {
+      if (summary_method !== BASIC_NUMBER_CARD_CALCULATION_METHOD) {
         const formattedContent = BaseUtils.getSummaryValueDisplayString(summaryColumn, data, summary_method);
         return formattedContent;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.28beta",
+  "version": "0.0.28",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",
@@ -22,7 +22,7 @@
   "peerDependencies": {
     "@antv/scale": "0.3.14",
     "babel-plugin-on-demand-loading": "^0.0.9",
-    "dtable-ui-component": "4.4.30",
+    "dtable-ui-component": "~4.4.*",
     "dtable-utils": "~4.4.*",
     "prop-types": "15.8.1",
     "react": "^17.0.0",