sea-chart 1.1.49 → 1.1.51

package/dist/constants/index.js

@@ -1,4 +1,4 @@
-import { CellType, DEFAULT_NUMBER_FORMAT, FORMULA_RESULT_TYPE } from 'dtable-utils';
+import { CellType, DEFAULT_NUMBER_FORMAT } from 'dtable-utils';
 import { GEOLOCATION_FORMAT_CITY, GEOLOCATION_FORMAT_MAP, GEOLOCATION_GRANULARITY, GEOLOCATION_GRANULARITY_LIST, MAP_LEVEL, MUNICIPALITIES } from './geolocation';
 import { CHART_KEY, GENERIC_KEY, GENERIC_KEY_2_SIMILAR_KEYS } from './model';
 import { STYLE_COLORS, HORIZONTAL_ALIGN, HORIZONTAL_ALIGNS, HORIZONTAL_ALIGN_SHOW } from './style';
@@ -6,6 +6,12 @@ import { CHART_TYPE, CHART_TYPE_SHOW, CHART_TYPES } from './type';
 import { CHART_TYPE_IMAGE } from './type-image';
 import { regions } from './regions';
 import { TABLE_DIMENSIONS } from './table';
+export const COMBINATION_DISPLAY_FIELDS = {
+  LEFT: 'Y_axis_(lift_side)',
+  RIGHT: 'Y_axis_(right_side)',
+  ALL: 'All'
+};
+export const COMBINATION_DISPLAY_FIELDS_LIST = [COMBINATION_DISPLAY_FIELDS.RIGHT, COMBINATION_DISPLAY_FIELDS.LEFT, COMBINATION_DISPLAY_FIELDS.ALL];
 export const SETTING_DEFAULT_FONT_SIZE = 12;
 export const DEFAULT_LANG = 'en';
 export const FUNNEL_LABEL_FORMAT = {
@@ -85,7 +91,7 @@ export const CHART_SUMMARY_CALCULATION_METHOD = ['Sum', 'Max', 'Min', 'Mean', 'D
 export const BASIC_NUMBER_CARD_CALCULATION_METHOD = 'Row_count';
 export const CHART_DATE_SUMMARY_CALCULATION_METHOD = ['Max', 'Min', 'Distinct_values'];
 export const CHART_SUPPORT_COLUMNS = [CellType.DATE, CellType.SINGLE_SELECT, CellType.MULTIPLE_SELECT, CellType.COLLABORATOR, CellType.TEXT, CellType.NUMBER, CellType.FORMULA, CellType.LINK_FORMULA, CellType.GEOLOCATION, CellType.LINK, CellType.MTIME, CellType.CTIME, CellType.CREATOR, CellType.LAST_MODIFIER, CellType.CHECKBOX, CellType.RATE, CellType.DURATION];
-export const CHART_SUPPORT_SORT_COLUMNS = [CellType.TEXT, CellType.NUMBER, CellType.DATE, CellType.SINGLE_SELECT, CellType.FORMULA, CellType.LINK_FORMULA, CellType.CTIME, CellType.MTIME, CellType.RATE, CellType.DURATION];
+export const CHART_SUPPORT_SORT_COLUMNS = [CellType.TEXT, CellType.NUMBER, CellType.DATE, CellType.SINGLE_SELECT, CellType.FORMULA, CellType.LINK_FORMULA, CellType.CTIME, CellType.MTIME, CellType.RATE, CellType.DURATION, CellType.COLLABORATOR];
 export const LABEL_COLORS = ['#2a67d1', '#4ecccb', '#59cb74', '#fbd44a', '#f4667c', '#9860e5', '#9f8cf1', '#dc82d2', '#eaa775', '#addf84', '#85e0be', '#89d2ea'];
 export const TIME_COLUMN_LIST = [CellType.CTIME, CellType.MTIME, CellType.DATE];
 export const DATE_GRANULATES = [CHART_SUMMARY_TYPE.DAY, CHART_SUMMARY_TYPE.WEEK, CHART_SUMMARY_TYPE.MONTH, CHART_SUMMARY_TYPE.QUARTER, CHART_SUMMARY_TYPE.YEAR];

package/dist/locale/lang/de.js

@@ -42,7 +42,7 @@ const de = {
   "Label": "Beschriftung",
   "Y-axis(left side)": "Y-Achse (primär)",
   "Y-axis(right side)": "Y-Achse (sekundär)",
-  "Display_title": "Anzeigetitel",
+  "Display_title": "Titel anzeigen",
   "Current_value_field": "Feld für aktuellen Wert",
   "Total_value_field": "Feld für Gesamtwert",
   "Group_by": "Gruppieren nach",
@@ -146,7 +146,7 @@ const de = {
   "Permission_denied": "Zugriff verweigert",
   "Execution_time_of_the_query_exceeds_the_limit": "Le temps d'exécution de la requête dépasse la limite. Les données ne peuvent pas être chargées.",
   "There_are_some_problems_with_the_filters": "Die Filterbedingungen sind abnormal. Bitte setzen sie die Filterbedingungen in den Ansichtseinstellungen zurück.",
-  "Please_complete_the_chart_configuration_first": "Schließen Sie die Konfiguration des Diagramms ab.",
+  "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
   "Not_used": "Nicht verwendet",
   "Select_field": "Feld auswählen",
   "Display_total": "Gesamtwert anzeigen",
@@ -265,30 +265,34 @@ const de = {
   "Show_overall_rate": "Gesamtpreisbeschriftung anzeigen",
   "Percentage": "Prozentsatz",
   "Number_and_percentage": "Anzahl und Prozentsatz",
-  "No_record": "Keine Aufzeichnung",
+  "No_record": "Kein Eintrag",
   "Drill_down_settings": "Drilldown-Einstellungen",
   "Enable_drill_down_feature": "Aktivieren Sie die Drilldown-Funktion",
   "Field_settings": "Feldeinstellungen",
   "Select_all": "Alles auswählen",
   "Visible": "Sichtbar",
-  "Goal_line": "Torlinie",
-  "Display_goal_line": "Torlinie anzeigen",
-  "Goal_value": "Zielwert",
-  "Goal_label": "Zielbezeichnung",
-  "Table_element": "Tableau",
-  "Sort": "Trier",
-  "1_Sort": "1 Sorte",
-  "Sorts": "sortiert",
-  "hide_columns": "Spalten ausblenden",
-  "Hidden_columns": "Versteckte Spalten",
-  "1_hidden_column": "1 ausgeblendete Spalte",
-  "No_sorts": "Keine Sorten",
-  "Add_sort": "Sortierung hinzufügen",
-  "Search_column": "Suchspalte",
-  "up": "Hoch",
-  "down": "Runter",
-  "Equal": "Gleich",
-  "Hide_all": "Alles ausblenden",
-  "Show_all": "Alle anzeigen"
+  "Goal_line": "Horizontale Linie",
+  "Display_goal_line": "Horizontale Linie anzeigen",
+  "Goal_value": "Wert",
+  "Goal_label": "Bezeichnung",
+  "Table_element": "Table",
+  "Sort": "Sort",
+  "1_Sort": "1 sort",
+  "Sorts": "sorts",
+  "hide_columns": "Hide columns",
+  "Hidden_columns": "Hidden columns",
+  "1_hidden_column": "1 Hidden column",
+  "No_sorts": "No sorts",
+  "Add_sort": "Add sort",
+  "Search_column": "Search column",
+  "up": "Up",
+  "down": "Down",
+  "Equal": "Equal",
+  "Hide_all": "Hide all",
+  "Show_all": "Show all",
+  "Y_axis_(lift_side)": "Y-Achse (linke Seite)",
+  "Y_axis_(right_side)": "Y-Achse (rechte Seite)",
+  "All": "Alle",
+  "Label_value": "Etikettenwert"
 };
 export default de;

package/dist/locale/lang/en.js

@@ -146,7 +146,7 @@ const en = {
   "Permission_denied": "Permission denied",
   "Execution_time_of_the_query_exceeds_the_limit": "Execution time of the query exceeds the limit. Data cannot be loaded.",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
-  "Please_complete_the_chart_configuration_first": "Please complete the chart configuration first",
+  "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
   "Not_used": "Not used",
   "Select_field": "Select field",
   "Display_total": "Display total",
@@ -289,6 +289,10 @@ const en = {
   "down": "Down",
   "Equal": "Equal",
   "Hide_all": "Hide all",
-  "Show_all": "Show all"
+  "Show_all": "Show all",
+  "Y_axis_(lift_side)": "Y axis (left side)",
+  "Y_axis_(right_side)": "Y axis (right side)",
+  "All": "All",
+  "Label_value": "Label value"
 };
 export default en;

package/dist/locale/lang/es.js

@@ -146,7 +146,7 @@ const es = {
   "Permission_denied": "Permission denied",
   "Execution_time_of_the_query_exceeds_the_limit": "Execution time of the query exceeds the limit. Data cannot be loaded.",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
-  "Please_complete_the_chart_configuration_first": "Please complete the chart configuration first",
+  "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
   "Not_used": "Not used",
   "Select_field": "Select field",
   "Display_total": "Display total",
@@ -289,6 +289,10 @@ const es = {
   "down": "Down",
   "Equal": "Equal",
   "Hide_all": "Hide all",
-  "Show_all": "Show all"
+  "Show_all": "Show all",
+  "Y_axis_(lift_side)": "Y axis (left side)",
+  "Y_axis_(right_side)": "Y axis (right side)",
+  "All": "All",
+  "Label_value": "Label value"
 };
 export default es;

package/dist/locale/lang/fr.js

@@ -42,7 +42,7 @@ const fr = {
   "Label": "Étiquette",
   "Y-axis(left side)": "Axe des y (primaire)",
   "Y-axis(right side)": "Axe des y (secondaire)",
-  "Display_title": "Titre à afficher",
+  "Display_title": "Afficher le titre",
   "Current_value_field": "Champ de valeur actuel",
   "Total_value_field": "Champ de valeur total",
   "Group_by": "Groupé par",
@@ -146,7 +146,7 @@ const fr = {
   "Permission_denied": "Permission refusée",
   "Execution_time_of_the_query_exceeds_the_limit": "Le temps d'exécution de la requête dépasse la limite. Les données ne peuvent pas être chargées.",
   "There_are_some_problems_with_the_filters": "Les conditions de filtrage sont anormales. Veuillez réinitialiser les conditions de filtrage dans les paramètres de vue.",
-  "Please_complete_the_chart_configuration_first": "Compléter la configuration du diagramme",
+  "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
   "Not_used": "Ne pas utilisé",
   "Select_field": "Sélectionner un champ",
   "Display_total": "Afficher le total",
@@ -271,24 +271,28 @@ const fr = {
   "Field_settings": "Paramètres de champ",
   "Select_all": "Tout sélectionner",
   "Visible": "Visible",
-  "Goal_line": "Ligne de but",
-  "Display_goal_line": "Afficher la ligne de but",
-  "Goal_value": "Valeur de l'objectif",
-  "Goal_label": "Étiquette d'objectif",
-  "Table_element": "Tabelle",
-  "Sort": "Trier",
-  "1_Sort": "1 sorte",
-  "Sorts": "sortes",
-  "hide_columns": "Masquer les colonnes",
-  "Hidden_columns": "Colonnes masquées",
-  "1_hidden_column": "1 colonne masquée",
-  "No_sorts": "Aucune sorte",
-  "Add_sort": "Ajouter un tri",
-  "Search_column": "Colonne de recherche",
-  "up": "En haut",
-  "down": "Vers le bas",
-  "Equal": "Égal",
-  "Hide_all": "cacher",
-  "Show_all": "Afficher tout"
+  "Goal_line": "Ligne horizontale",
+  "Display_goal_line": "Afficher la ligne horizontale",
+  "Goal_value": "Valeur",
+  "Goal_label": "Étiquette",
+  "Table_element": "Table",
+  "Sort": "Sort",
+  "1_Sort": "1 sort",
+  "Sorts": "sorts",
+  "hide_columns": "Hide columns",
+  "Hidden_columns": "Hidden columns",
+  "1_hidden_column": "1 Hidden column",
+  "No_sorts": "No sorts",
+  "Add_sort": "Add sort",
+  "Search_column": "Search column",
+  "up": "Up",
+  "down": "Down",
+  "Equal": "Equal",
+  "Hide_all": "Hide all",
+  "Show_all": "Show all",
+  "Y_axis_(lift_side)": "Y axis (left side)",
+  "Y_axis_(right_side)": "Y axis (right side)",
+  "All": "All",
+  "Label_value": "Label value"
 };
 export default fr;

package/dist/locale/lang/pt.js

@@ -146,7 +146,7 @@ const pt = {
   "Permission_denied": "Permission denied",
   "Execution_time_of_the_query_exceeds_the_limit": "Execution time of the query exceeds the limit. Data cannot be loaded.",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
-  "Please_complete_the_chart_configuration_first": "Please complete the chart configuration first",
+  "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
   "Not_used": "Not used",
   "Select_field": "Select field",
   "Display_total": "Display total",
@@ -289,6 +289,10 @@ const pt = {
   "down": "Down",
   "Equal": "Equal",
   "Hide_all": "Hide all",
-  "Show_all": "Show all"
+  "Show_all": "Show all",
+  "Y_axis_(lift_side)": "Y axis (left side)",
+  "Y_axis_(right_side)": "Y axis (right side)",
+  "All": "All",
+  "Label_value": "Label value"
 };
 export default pt;

package/dist/locale/lang/ru.js

@@ -146,7 +146,7 @@ const ru = {
   "Permission_denied": "Permission denied",
   "Execution_time_of_the_query_exceeds_the_limit": "Execution time of the query exceeds the limit. Data cannot be loaded.",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
-  "Please_complete_the_chart_configuration_first": "Please complete the chart configuration first",
+  "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
   "Not_used": "Not used",
   "Select_field": "Select field",
   "Display_total": "Display total",
@@ -289,6 +289,10 @@ const ru = {
   "down": "Down",
   "Equal": "Equal",
   "Hide_all": "Hide all",
-  "Show_all": "Show all"
+  "Show_all": "Show all",
+  "Y_axis_(lift_side)": "Y axis (left side)",
+  "Y_axis_(right_side)": "Y axis (right side)",
+  "All": "All",
+  "Label_value": "Label value"
 };
 export default ru;

package/dist/locale/lang/zh_CN.js

@@ -146,7 +146,7 @@ const zh_CN = {
   "Permission_denied": "权限错误",
   "Execution_time_of_the_query_exceeds_the_limit": "查询的执行时间超出限制。无法加载数据。",
   "There_are_some_problems_with_the_filters": "过滤器有一些问题。",
-  "Please_complete_the_chart_configuration_first": "请先完成图表配置",
+  "Please_complete_the_chart_configuration_first": "在元素设置中配置图表",
   "Not_used": "不使用",
   "Select_field": "选择字段",
   "Display_total": "显示总计",
@@ -275,20 +275,24 @@ const zh_CN = {
   "Display_goal_line": "显示目标线",
   "Goal_value": "目标值",
   "Goal_label": "目标值标签",
-  "Table_element": "表格",
+  "Table_element": "子表",
   "Sort": "排序",
   "1_Sort": "1 个排序",
-  "Sorts": "个排序",
+  "Sorts": "排序",
   "hide_columns": "隐藏列",
   "Hidden_columns": "个隐藏列",
   "1_hidden_column": "1 个隐藏列",
   "No_sorts": "没有排序",
-  "Add_sort": "添加排序",
+  "Add_sort": "增加排序",
   "Search_column": "搜索列",
   "up": "升序",
   "down": "降序",
   "Equal": "相等",
   "Hide_all": "隐藏全部",
-  "Show_all": "展示全部"
+  "Show_all": "显示全部",
+  "Y_axis_(lift_side)": "Y轴（主轴）",
+  "Y_axis_(right_side)": "Y轴（次轴）",
+  "All": "全部",
+  "Label_value": "显示标签值"
 };
 export default zh_CN;

package/dist/model/combination.js

@@ -1,5 +1,5 @@
 import { isBoolean } from '../utils';
-import { CHART_TYPE, CHART_SUMMARY_TYPE, CHART_LINE_TYPES } from '../constants';
+import { CHART_TYPE, CHART_SUMMARY_TYPE, CHART_LINE_TYPES, COMBINATION_DISPLAY_FIELDS } from '../constants';
 import BaseModel from './base-model';
 class Combination extends BaseModel {
   constructor(options) {
@@ -31,6 +31,7 @@ class Combination extends BaseModel {
     this.y_axis_auto_range_right = options.y_axis_auto_range_right;
     this.y_axis_min_right = options.y_axis_min_right;
     this.y_axis_max_right = options.y_axis_max_right;
+    this.display_data_field = options.display_data_field || COMBINATION_DISPLAY_FIELDS.RIGHT;
     this.display_data = isBoolean(options.y_axis_show_value) ? options.y_axis_show_value : false;
     this.label_font_size = options.label_font_size;
     this.line_type = options.line_type || CHART_LINE_TYPES[1];

package/dist/settings/combination-settings/style-settings.js

@@ -1,15 +1,16 @@
+import _DTableCustomizeSelect from "dtable-ui-component/lib/DTableCustomizeSelect";
 import _CollapsibleSettingLayout from "dtable-ui-component/lib/CollapsibleSettingLayout";
 import _DTableRadioGroup from "dtable-ui-component/lib/DTableRadioGroup";
 import _DTableSwitch from "dtable-ui-component/lib/DTableSwitch";
 import React, { useCallback } from 'react';
-import { Label, Row } from 'reactstrap';
+import { FormGroup, Label, Row } from 'reactstrap';
 import Divider from '../widgets/divider';
 import MinMaxSetting from '../widgets/min-max-setting';
-import DisplayValuesSettings from '../widgets/display-values-settings';
-import { X_LABEL_POSITIONS, Y_LABEL_POSITIONS, LABEL_POSITION_TYPE_SHOW, SUPPORT_GOAL_LINE_CHART_TYPES } from '../../constants';
+import { X_LABEL_POSITIONS, Y_LABEL_POSITIONS, LABEL_POSITION_TYPE_SHOW, SUPPORT_GOAL_LINE_CHART_TYPES, COMBINATION_DISPLAY_FIELDS_LIST } from '../../constants';
 import intl from '../../intl';
 import SelectLineType from '../widgets/select-line-type';
 import GoalLineSetting from '../../components/goal-line-setting';
+import { FontSizeSettings } from '../widgets/font-settings';
 const StyleSettings = _ref => {
   let {
     chart,
@@ -19,6 +20,12 @@ const StyleSettings = _ref => {
   } = _ref;
   const xAxisLabelOptions = X_LABEL_POSITIONS;
   const yAxisLabelOptions = Y_LABEL_POSITIONS;
+  const displayFieldOptions = COMBINATION_DISPLAY_FIELDS_LIST.map(field => {
+    return {
+      label: /*#__PURE__*/React.createElement("span", null, intl.get(field)),
+      value: field
+    };
+  });
   const onAxisLabelShowChange = useCallback(labelKey => {
     const {
       config
@@ -63,8 +70,21 @@ const StyleSettings = _ref => {
     };
     onChange && onChange(update);
   }, [onChange]);
-  const onDisplayValueChange = useCallback(update => {
-    onChange && onChange(update);
+  const onDisplayValueChange = useCallback(() => {
+    var _chart$config;
+    onChange && onChange({
+      display_data: !((_chart$config = chart.config) === null || _chart$config === void 0 ? void 0 : _chart$config.display_data)
+    });
+  }, [chart.config.display_data, onChange]);
+  const onFontSizeChange = useCallback(value => {
+    onChange && onChange({
+      label_font_size: value
+    });
+  }, [onChange]);
+  const onDisplayFieldChange = useCallback(value => {
+    onChange && onChange({
+      display_data_field: value
+    });
   }, [onChange]);
   const getLabelOptionsDisplay = options => {
     return options.reduce((optionDisplayMap, position) => {
@@ -97,10 +117,12 @@ const StyleSettings = _ref => {
     y_axis_min_right,
     y_axis_max_right,
     display_data,
+    display_data_field,
     label_font_size,
     line_type,
     type
   } = config;
+  const selectedDisplayFieldOption = displayFieldOptions.find(option => option.value === display_data_field) || displayFieldOptions[0];
   const xAxisLabelPosition = x_axis_label_position || xAxisLabelOptions[0];
   const yLeftAxisLabelPosition = y_axis_left_label_position || yAxisLabelOptions[0];
   const yRightAxisLabelPosition = y_axis_right_label_position || yAxisLabelOptions[0];
@@ -183,13 +205,28 @@ const StyleSettings = _ref => {
     goalLabel: goal_label,
     goalValue: goal_value,
     onChange: onStyleChange
-  }), /*#__PURE__*/React.createElement(Divider, null)), /*#__PURE__*/React.createElement(DisplayValuesSettings, {
-    isShowValueKey: "display_data",
-    isShowValue: display_data,
-    fontSizeKey: "label_font_size",
-    fontSize: label_font_size,
+  }), /*#__PURE__*/React.createElement(Divider, null)), /*#__PURE__*/React.createElement(_CollapsibleSettingLayout, {
+    title: intl.get('Label')
+  }, /*#__PURE__*/React.createElement(FormGroup, {
+    className: "sea-chart-parameter-item"
+  }, /*#__PURE__*/React.createElement(_DTableSwitch, {
+    switchClassName: "display-value-settings",
+    checked: display_data,
+    disabled: false,
+    placeholder: intl.get('Display_value'),
     onChange: onDisplayValueChange
-  }));
+  }), display_data && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "combination-label-value-setting"
+  }, /*#__PURE__*/React.createElement(Label, null, intl.get('Label_value')), /*#__PURE__*/React.createElement(_DTableCustomizeSelect, {
+    value: selectedDisplayFieldOption,
+    options: displayFieldOptions,
+    onSelectOption: onDisplayFieldChange
+  })), /*#__PURE__*/React.createElement(FontSizeSettings, {
+    title: intl.get('Label_font_size'),
+    fontSize: label_font_size,
+    defaultFontSize: 12,
+    modifyFontSize: onFontSizeChange
+  })))));
 };
 StyleSettings.defaultProps = {
   xLabel: 'X_axis'

package/dist/settings/index.css

@@ -154,3 +154,7 @@
 .sea-chart-settings .chart-settings-container .custom-switch .custom-switch-input:checked ~ .custom-switch-indicator:before {
   left: 12px;
 }
+
+.sea-chart-settings .combination-label-value-setting {
+  margin-bottom: 12px;
+}

package/dist/settings/widgets/time-picker.js

@@ -39,9 +39,7 @@ class TimePicker extends Component {
       }, 1);
     };
     this.onOpenChange = open => {
-      if (open) {
-        this.toggleCalendar(open);
-      }
+      this.toggleCalendar(open);
     };
     this.onClear = () => {
       this.setState({

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

@@ -27,6 +27,33 @@ export function findIfColumnDataIsArray(column) {
 }
 class BaseUtils {}
 _BaseUtils = BaseUtils;
+BaseUtils.updateSummaryValuePrecision = (result, summaryColumn, summaryValueKey) => {
+  if (!result || !summaryColumn) return;
+  const {
+    data
+  } = summaryColumn;
+  if (!data) return;
+  const {
+    enable_precision,
+    precision,
+    format
+  } = data;
+  if (enable_precision) {
+    result.forEach(item => {
+      if (format === 'percent') {
+        item[summaryValueKey] = parseFloat(getPrecisionNumber(item[summaryValueKey] * 100, {
+          enable_precision,
+          precision
+        })) / 100;
+      } else {
+        item[summaryValueKey] = parseFloat(getPrecisionNumber(item[summaryValueKey], {
+          enable_precision,
+          precision
+        }));
+      }
+    });
+  }
+};
 BaseUtils.isCollaborator = column => {
   return column.type === CellType.COLLABORATOR;
 };
@@ -226,6 +253,15 @@ BaseUtils.getSummaryColumn = (table, chart) => {
       {
         return getTableColumnByKey(table, config.y_axis_column_key);
       }
+    case CHART_TYPE.COMBINATION:
+      {
+        const summaryColumnLeft = getTableColumnByKey(table, config.y_axis_left_summary_column);
+        const summaryColumnRight = getTableColumnByKey(table, config.y_axis_right_summary_column);
+        return {
+          summaryColumnLeft,
+          summaryColumnRight
+        };
+      }
     default:
       {
         return getTableColumnByKey(table, summary_column_key);

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

@@ -649,7 +649,8 @@ SQLStatisticsUtils.basicChartSQLResult2JavaScript = async (chart, sqlRows, chart
     groupby_include_empty_cells
   } = config;
   const {
-    groupbyColumn
+    groupbyColumn,
+    summaryColumn
   } = columnMap;
   const isGroupbyColumnDataAsAnArray = findIfColumnDataIsArray(groupbyColumn);
   const {
@@ -724,6 +725,7 @@ SQLStatisticsUtils.basicChartSQLResult2JavaScript = async (chart, sqlRows, chart
   }
   BaseUtils.sortCharts(result, groupbyColumn, 'name');
   BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
+  BaseUtils.updateSummaryValuePrecision(result, summaryColumn, 'value');
   if (SUPPORT_DATA_SORT_CHART_TYPES.includes(type) && sort_type) {
     BaseUtils.sortChartData(result, sort_type);
     return result;
@@ -751,7 +753,8 @@ SQLStatisticsUtils.customChartSQLResult2JavaScript = async (chart, sqlRows, char
     y_axises
   } = chart.config;
   const {
-    groupbyColumn
+    groupbyColumn,
+    summaryColumn
   } = columnMap;
   const table = getTableById(tables, table_id);
   const stack = y_axises[index];
@@ -844,6 +847,7 @@ SQLStatisticsUtils.customChartSQLResult2JavaScript = async (chart, sqlRows, char
   }
   BaseUtils.sortCharts(result, groupbyColumn, 'name');
   BaseUtils.updateTableViewList(result, groupbyColumn, 'name', '', false, true);
+  BaseUtils.updateSummaryValuePrecision(result, summaryColumn, 'value');
   return result;
 };
 SQLStatisticsUtils.compareSQLResult2Javascript = async (chart, sqlRows, chartSQLMap, columnMap, tables) => {
@@ -973,6 +977,8 @@ SQLStatisticsUtils.compareSQLResult2Javascript = async (chart, sqlRows, chartSQL
   if (comparedResult.length > rangeResult.length) {
     comparedResult = comparedResult.slice(0, rangeResult.length);
   }
+  BaseUtils.updateSummaryValuePrecision(comparedResult, summaryColumn, 'value');
+  BaseUtils.updateSummaryValuePrecision(rangeResult, summaryColumn, 'value');
   return [...comparedResult, ...rangeResult];
 };
 SQLStatisticsUtils.combinationSQLResult2Javascript = async (chart, sqlRows, chartSQLMap, columnMap, tables) => {
@@ -991,8 +997,13 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = async (chart, sqlRows, char
   } = config;
   const table = getTableById(tables, table_id);
   const {
-    groupbyColumn
+    groupbyColumn,
+    summaryColumn
   } = columnMap;
+  const {
+    summaryColumnLeft,
+    summaryColumnRight
+  } = summaryColumn;
   const {
     sqlGroupbyColumnKey,
     sqlRightSummaryColumnKey,
@@ -1169,6 +1180,8 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = async (chart, sqlRows, char
   }
   BaseUtils.updateTableViewList(result, groupbyColumn, 'name', '', false, true);
   BaseUtils.sortCharts(result, groupbyColumn, 'name');
+  BaseUtils.updateSummaryValuePrecision(result, summaryColumnLeft, 'value_left');
+  BaseUtils.updateSummaryValuePrecision(result, summaryColumnRight, 'value_right');
   return result;
 };
 SQLStatisticsUtils.dashboardSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
@@ -1237,7 +1250,8 @@ SQLStatisticsUtils.updateGroupingChartRows = (results, name, row, count, isColum
 SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript = async (chart, sqlRows, chartSQLMap, columnMap, tables) => {
   const {
     groupbyColumn,
-    columnGroupbyColumn
+    columnGroupbyColumn,
+    summaryColumn
   } = columnMap;
   const {
     x_axis_include_empty_cells: includeEmpty
@@ -1273,6 +1287,7 @@ SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript = async (chart,
   BaseUtils.sortCharts(result, groupbyColumn, 'name');
   BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
   BaseUtils.updateTableViewList(result, columnGroupbyColumn, 'group_name', 'group_color', false, false);
+  BaseUtils.updateSummaryValuePrecision(result, summaryColumn, 'value');
   return result;
 };
 SQLStatisticsUtils.groupingChartSQLResult2JavaScript = async (chart, sqlRows, chartSQLMap, columnMap, tables) => {
@@ -1287,7 +1302,9 @@ SQLStatisticsUtils.groupingChartSQLResult2JavaScript = async (chart, sqlRows, ch
   }
   const {
     groupbyColumn,
-    columnGroupbyColumn
+    columnGroupbyColumn,
+    summaryColumn,
+    summaryColumnsWithMethod
   } = columnMap;
   if (y_axis_summary_type === CHART_SUMMARY_TYPE.COUNT) {
     if (!columnGroupbyColumn) return await _SQLStatisticsUtils.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
@@ -1328,6 +1345,20 @@ SQLStatisticsUtils.groupingChartSQLResult2JavaScript = async (chart, sqlRows, ch
     }
     BaseUtils.sortCharts(result, groupbyColumn, 'name');
     BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
+    const allSummaryColumns = [summaryColumn].concat(summaryColumnsWithMethod.map(item => item.column));
+
+    // format precision of enabled precision columns
+    let columnNameResultMap = {};
+    result.forEach(item => {
+      if (!columnNameResultMap[item.group_name]) {
+        columnNameResultMap[item.group_name] = [];
+      }
+      columnNameResultMap[item.group_name].push(item);
+    });
+    Object.values(columnNameResultMap).forEach(items => {
+      const targetColumn = allSummaryColumns.find(column => column.name === items[0].group_name);
+      BaseUtils.updateSummaryValuePrecision(items, targetColumn, 'value');
+    });
     return result;
   }
   if (!columnGroupbyColumn) {

package/dist/view/wrapper/combination.js

@@ -8,6 +8,10 @@ import { BaseUtils, isFunction } from '../../utils';
 import { CHART_SUMMARY_TYPE, CHART_SUMMARY_SHOW, LABEL_POSITION_TYPE, EMPTY_NAME, CHART_LINE_TYPES, CHART_STYLE_COLORS, CHART_THEME_COLOR } from '../../constants';
 import intl from '../../intl';
 import ChartComponent from './chart-component';
+const valueFieldMap = {
+  value_left: ['Y_axis_(lift_side)', 'All'],
+  value_right: ['Y_axis_(right_side)', 'All']
+};
 class Combination extends ChartComponent {
   constructor(props) {
     super(props);
@@ -48,6 +52,7 @@ class Combination extends ChartComponent {
         y_axis_min_right,
         y_axis_max_right,
         display_data,
+        display_data_field,
         label_font_size,
         line_type
       } = chart.config;
@@ -64,6 +69,12 @@ class Combination extends ChartComponent {
         appendPadding: [display_data ? 17 : 0, 0, 0, 0]
       });
       const isSmooth = line_type === CHART_LINE_TYPES[1] || !line_type;
+      const showLeftValue = display_data && valueFieldMap['value_left'].includes(display_data_field);
+      let showRightValue = display_data && valueFieldMap['value_right'].includes(display_data_field);
+      // if display_data is open, default show right value
+      if (display_data && !display_data_field) {
+        showRightValue = true;
+      }
 
       // y-axis label width：6 + 10
       const chartWidth = this.chart.width - 6 - 10; // 10 is y-axis number width and 6 is gap between number and y axis line
@@ -253,6 +264,13 @@ class Combination extends ChartComponent {
       }).style({
         fillOpacity: 1,
         radius: [singleBarRadius, singleBarRadius, 0, 0]
+      }).label(showLeftValue ? 'value_left' : false, {
+        style: {
+          fontSize: BaseUtils.getLabelFontSize(label_font_size),
+          fill: theme.labelColor,
+          stroke: '#fff',
+          lineWidth: 1
+        }
       });
       this.formatDataByName(data);
       if (!y_axis_left_group_by_multiple_numeric_column) {
@@ -273,7 +291,7 @@ class Combination extends ChartComponent {
       }).shape('circle').size(3).style({
         stroke: 0,
         fillOpacity: 1
-      }).label(display_data ? 'value_right' : false, {
+      }).label(showRightValue ? 'value_right' : false, {
         style: {
           fontSize: BaseUtils.getLabelFontSize(label_font_size),
           fill: theme.labelColor,

package/package.json

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