dtable-statistic 4.0.4 → 4.0.6

package/es/assets/icons/switch-icon.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#949494;}
+</style>
+<title>switch</title>
+<g id="switch">
+	<g id="batch-replacement" transform="translate(1.000000, 3.000000)">
+		<path id="形状" class="st0" d="M9.1,11.7V8.9h12.8c1.4,0,2.5,1.2,3,2.3c0.4-0.6,0.7-1.8,0.7-2.7c0-2.1-1.7-4.5-3.8-4.5H9.1V0.7
+			c0-0.5-0.5-0.9-1-0.5L0.2,5.7c-0.3,0.2-0.3,0.8,0,1.1l7.8,5.6C8.6,12.6,9.1,12.3,9.1,11.7z M29.8,20.2l-7.8-5.6
+			c-0.4-0.3-1,0-1,0.5v3.2H8.1c-1.4,0-2.4-1.4-3.1-2.6c-0.4,0.6-0.8,2-0.8,2.9c0,2.1,1.7,4.3,3.8,4.3h12.8v3.2c0,0.5,0.5,0.9,1,0.5
+			l7.8-5.6C30.1,21,30.1,20.5,29.8,20.2L29.8,20.2z"/>
+	</g>
+</g>
+</svg>

package/es/calculator/workers/basic-chart-calculator-worker.js

@@ -179,7 +179,7 @@ function updateBasicChartRows(results, index, name, row, yAxisType) {
 }
 function groupChartRows(results, name, row, isColumnGroupbyColumnDataAsAnArray, groupName, include_empty, yAxisType) {
   if (isColumnGroupbyColumnDataAsAnArray) {
-    if (groupName.length === 0) {
+    if (!groupName || groupName.length === 0) {
       updateGroupingChartRows(results, name, null, row, yAxisType);
     } else {
       groupName.forEach(function (v) {

package/es/components/dialog/chart-addition-edit-dialog.js

@@ -76,6 +76,7 @@ var ChartAdditionEditDialog = /*#__PURE__*/function (_Component) {
         getTables: this.props.getTables,
         getViews: this.props.getViews,
         getTableById: getTableById,
+        getConvertedChart: this.props.getConvertedChart,
         modifyChartName: this.modifyChartName,
         modifyChart: this.modifyChart,
         toggleStatisticRecordsDialog: this.props.toggleStatisticRecordsDialog

package/es/components/dialog/chart-addition-widgets/chart-selector.js

@@ -209,6 +209,7 @@ var ChartSelector = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this2 = this;
+      var selectedType = this.props.selectedType;
       var currentCatIndex = this.state.currentCatIndex;
       return /*#__PURE__*/React.createElement("div", {
         className: "".concat(styles['statistic-types-container'], " d-flex flex-column h-100")
@@ -242,7 +243,7 @@ var ChartSelector = /*#__PURE__*/function (_React$Component) {
           return /*#__PURE__*/React.createElement("div", {
             key: index,
             onClick: _this2.props.addEditingChart.bind(_this2, chart.type),
-            className: "".concat(styles['statistic-type-item'], " ").concat(chart.hide ? 'd-none' : '')
+            className: "".concat(styles['statistic-type-item'], " ").concat(selectedType === chart.type ? styles['statistic-type-item-selected'] : '', " ").concat(chart.hide ? 'd-none' : '')
           }, /*#__PURE__*/React.createElement("p", {
             className: "".concat(styles['statistic-type-description'])
           }, chart.title), /*#__PURE__*/React.createElement("div", {

package/es/components/dialog/chart-addition-widgets/statistic-chart-selector.module.css

@@ -52,6 +52,15 @@
   margin: 20px 17px 0 0;
 }
 
+.statistic-type-item:hover {
+  border-color: #FFBF7F;
+}
+
+.statistic-type-item-selected,
+.statistic-type-item-selected:hover {
+  border-color: #FF8000;
+}
+
 .statistic-type-description {
   font-weight: 500;
   font-size: 14px;

package/es/components/dialog/statistic-types-dialog/index.css

@@ -0,0 +1,14 @@
+.statistic-types-dialog {
+  max-width: 1102px;
+  width: 1102px;
+  height: calc(100% - 56px);
+}
+
+.statistic-types-dialog .modal-content {
+  height: 100%;
+}
+
+.statistic-types-dialog .statistic-types-body {
+  padding: 0;
+  overflow: hidden;
+}

package/es/components/dialog/statistic-types-dialog/index.js

@@ -0,0 +1,63 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
+import _createSuper from "@babel/runtime/helpers/esm/createSuper";
+import React, { Component } from 'react';
+import intl from 'react-intl-universal';
+import { Modal, ModalHeader, ModalBody, ModalFooter, Button } from 'reactstrap';
+import ChartSelector from '../chart-addition-widgets/chart-selector';
+import './index.css';
+var StatisticTypesDialog = /*#__PURE__*/function (_Component) {
+  _inherits(StatisticTypesDialog, _Component);
+  var _super = _createSuper(StatisticTypesDialog);
+  function StatisticTypesDialog(props) {
+    var _this;
+    _classCallCheck(this, StatisticTypesDialog);
+    _this = _super.call(this, props);
+    _this.onToggle = function () {
+      _this.props.onToggle();
+    };
+    _this.onSelectStatisticType = function (type) {
+      if (type === _this.state.selectedType) return;
+      _this.setState({
+        selectedType: type
+      });
+    };
+    _this.onSubmit = function () {
+      var selectedType = _this.state.selectedType;
+      _this.props.onChange(selectedType);
+      _this.onToggle();
+    };
+    _this.state = {
+      selectedType: props.type
+    };
+    return _this;
+  }
+  _createClass(StatisticTypesDialog, [{
+    key: "render",
+    value: function render() {
+      var selectedType = this.state.selectedType;
+      return /*#__PURE__*/React.createElement(Modal, {
+        isOpen: true,
+        toggle: this.onToggle,
+        className: "statistic-types-dialog",
+        zIndex: 1048
+      }, /*#__PURE__*/React.createElement(ModalHeader, {
+        toggle: this.onToggle
+      }, intl.get('Edit_type')), /*#__PURE__*/React.createElement(ModalBody, {
+        className: "statistic-types-body"
+      }, /*#__PURE__*/React.createElement(ChartSelector, {
+        selectedType: selectedType,
+        addEditingChart: this.onSelectStatisticType
+      })), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
+        color: "secondary",
+        onClick: this.onToggle
+      }, intl.get('Cancel')), /*#__PURE__*/React.createElement(Button, {
+        color: "primary",
+        onClick: this.onSubmit
+      }, intl.get('Submit'))));
+    }
+  }]);
+  return StatisticTypesDialog;
+}(Component);
+export default StatisticTypesDialog;

package/es/components/icon.js

@@ -0,0 +1,12 @@
+import React from 'react';
+function Icon(props) {
+  var className = props.className,
+    symbol = props.symbol;
+  var iconClass = "multicolor-icon multicolor-icon-".concat(symbol, " ").concat(className || '');
+  return /*#__PURE__*/React.createElement("svg", {
+    className: iconClass
+  }, /*#__PURE__*/React.createElement("use", {
+    xlinkHref: "#".concat(symbol)
+  }));
+}
+export default Icon;

package/es/constants/index.js

@@ -1,5 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _INIT_STAT_ITEM, _MULTIPLE_CELL_VALUE_, _DATA_SORT_TYPE_LABEL, _TYPE_DISPLAY_COLOR_U;
+var _INIT_STAT_ITEM, _MULTIPLE_CELL_VALUE_, _DATA_SORT_TYPE_LABEL, _TYPE_DISPLAY_COLOR_U, _STATISTIC_TYPE_SHOW;
 import { CellType } from 'dtable-store';
 import KeyCodes from './key-codes';
 import { MenuSelectStyle, UserSelectStyle } from './dtable-select-style';
@@ -92,7 +92,8 @@ export var SUMMARY_METHOD_MAP = {
   Max: 'Max',
   Min: 'Min',
   Mean: 'Mean',
-  Distinct_values: 'Distinct_values'
+  Distinct_values: 'Distinct_values',
+  Row_count: 'Row_count'
 };
 export var SUMMARY_METHOD = [SUMMARY_METHOD_MAP.Sum, SUMMARY_METHOD_MAP.Max, SUMMARY_METHOD_MAP.Min, SUMMARY_METHOD_MAP.Mean, SUMMARY_METHOD_MAP.Distinct_values];
 export var MONTH_MIRROR = {
@@ -117,6 +118,7 @@ export var GEOLOCATION_GRANULARITY = {
   CITY: 'city',
   DISTRICT: 'district'
 };
+export var GEOLOCATION_GRANULARITY_LIST = [GEOLOCATION_GRANULARITY.PROVINCE, GEOLOCATION_GRANULARITY.CITY, GEOLOCATION_GRANULARITY.DISTRICT];
 export var DATE_GRANULARITY = {
   DAY: 'day',
   WEEK: 'week',
@@ -124,6 +126,7 @@ export var DATE_GRANULARITY = {
   QUARTER: 'quarter',
   YEAR: 'year'
 };
+export var DATE_GRANULARITY_LIST = [DATE_GRANULARITY.DAY, DATE_GRANULARITY.WEEK, DATE_GRANULARITY.MONTH, DATE_GRANULARITY.QUARTER, DATE_GRANULARITY.YEAR];
 export var LABEL_COLORS = ['#2a67d1', '#4ecccb', '#59cb74', '#fbd44a', '#f4667c', '#9860e5', '#9f8cf1', '#dc82d2', '#eaa775', '#addf84', '#85e0be', '#89d2ea'];
 export var GROUPBY_TYPE = {
   ROW: 'row',
@@ -248,7 +251,7 @@ export var INIT_STAT_ITEM = (_INIT_STAT_ITEM = {}, _defineProperty(_INIT_STAT_IT
   show_y_axis_label: false
 }), _defineProperty(_INIT_STAT_ITEM, STAT_TYPE.BASIC_NUMBER_CARD, {
   numeric_column: null,
-  summary_method: 'Row_count'
+  summary_method: SUMMARY_METHOD_MAP.Row_count
 }), _defineProperty(_INIT_STAT_ITEM, STAT_TYPE.COMBINATION_CHART, {
   x_axis_column_key: null,
   x_axis_geolocation_granularity: null,
@@ -283,9 +286,9 @@ export var INIT_STAT_ITEM = (_INIT_STAT_ITEM = {}, _defineProperty(_INIT_STAT_IT
   target_column: null
 }), _defineProperty(_INIT_STAT_ITEM, STAT_TYPE.DASHBOARD, {
   target_value_column: null,
-  target_value_column_summary_method: 'Row_count',
+  target_value_column_summary_method: SUMMARY_METHOD_MAP.Row_count,
   total_value_column: null,
-  total_value_column_summary_method: 'Row_count'
+  total_value_column_summary_method: SUMMARY_METHOD_MAP.Row_count
 }), _defineProperty(_INIT_STAT_ITEM, STAT_TYPE.GROUP_COMPLETENESS_CHART, {
   completed_column: null,
   target_column: null,
@@ -466,6 +469,13 @@ export var LABEL_FORMATS_MAP = {
   Percent: 'Percent',
   Value_percent: 'Numeric_value_and_percent'
 };
+export var LABEL_POSITION = {
+  TOP: 'top',
+  RIGHT: 'right',
+  BOTTOM: 'bottom',
+  LEFT: 'left',
+  CENTER: 'center'
+};
 
 // label positions for pie, ring charts
 export var LABEL_POSITIONS = ['inside', 'outside'];
@@ -498,4 +508,5 @@ export var DEFAULT_GRID_DISTANCE = 4;
 export var LEGEND_DIRECTION_MAP = {
   VERTICAL: 'vertical'
 };
-export var Y_AXIS_TYPE_PREFIX = '__y_axis__';
+export var Y_AXIS_TYPE_PREFIX = '__y_axis__';
+export var STATISTIC_TYPE_SHOW = (_STATISTIC_TYPE_SHOW = {}, _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.BAR, 'Basic_histogram'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.BAR_GROUP, 'Grouped_histogram'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.BAR_STACK, 'Stacked_histogram'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.COMPARE_BAR, 'Time_comparison_histogram'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.CUSTOM_BAR, 'Custom_histogram'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.HORIZONTAL_BAR, 'Basic_bar_chart'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.HORIZONTAL_GROUP_BAR, 'Grouped_bar_chart'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.STACKED_HORIZONTAL_BAR, 'Stacked_bar_chart'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.COMPLETENESS_CHART, 'Completeness_chart'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.GROUP_COMPLETENESS_CHART, 'Grouped_completeness_chart'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.LINE, 'Basic_line_chart'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.GROUP_LINE, 'Grouped_line_chart'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.AREA_CHART, 'Area_chart'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.AREA_GROUP_CHART, 'Grouped_area_chart'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.PIE, 'Basic_pie_chart'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.RING, 'Ring_chart'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.SCATTER, 'Scatter_chart'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.COMBINATION_CHART, 'Combination_chart'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.MAP, '中国地图'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.MAP_BUBBLE, '中国地图(气泡图)'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.WORLD_MAP, 'World_map'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.WORLD_MAP_BUBBLE, 'World_map_bubble'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.HEAT_MAP, 'Heat_map'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.MIRROR, 'Mirror_chart'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.BASIC_NUMBER_CARD, 'Basic_number_card'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.TREND_CHART, 'Trend_chart'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.DASHBOARD, 'Gauge'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.TREEMAP, 'Treemap'), _defineProperty(_STATISTIC_TYPE_SHOW, STAT_TYPE.PIVOT_TABLE, 'Pivot_table'), _STATISTIC_TYPE_SHOW);

package/es/constants/model.js

@@ -0,0 +1,20 @@
+export var X_GROUPBY_KEYS = ['x_axis_column_key', 'groupby_column_key', 'vertical_axis_column_key', 'date_column', 'time_column', 'column', 'geo_column', 'x_axis_column', 'numeric_column', 'name_column'];
+export var X_GEO_GRANULARITY_KEYS = ['x_axis_geolocation_granularity', 'groupby_geolocation_granularity', 'vertical_geolocation_granularity', 'geolocation_granularity'];
+export var X_DATE_GRANULARITY_KEYS = ['x_axis_date_granularity', 'groupby_date_granularity', 'vertical_date_granularity', 'date_granularity'];
+export var X_INCLUDE_EMPTY_KEYS = ['x_axis_include_empty', 'groupby_include_empty_cells', 'vertical_axis_include_empty'];
+export var X_SHOW_AXIS_LABEL = ['show_x_axis_label', 'show_vertical_axis_label'];
+export var X_LABEL_POSITION_KEYS = ['x_axis_label_position', 'vertical_axis_label_position'];
+export var Y_SUMMARY_BY_KEYS = ['y_axis_column_key', 'y_axis_column', 'y_axis_summary_column', 'summary_column_key', 'horizontal_axis_column_key'];
+export var Y_SUMMARY_METHOD_KEYS = ['y_axis_summary_method', 'horizontal_axis_summary_method', 'summary_method'];
+export var Y_SUMMARY_TYPE_KEYS = ['y_axis_summary_type', 'horizontal_axis_summary_type', 'summary_type'];
+export var Y_LABEL_COLOR_KEYS = ['y_axis_label_color', 'horizontal_axis_label_color'];
+export var Y_LABEL_COLOR_RULES_KEYS = ['y_axis_label_color_rules', 'horizontal_axis_label_color_rules'];
+export var Y_SHOW_AXIS_LABEL_KEYS = ['show_y_axis_label', 'show_horizontal_axis_label'];
+export var Y_LABEL_POSITION_KEYS = ['y_axis_label_position', 'horizontal_axis_label_position'];
+export var Y_AUTO_RANGE_KEYS = ['y_axis_auto_range', 'h_axis_auto_range'];
+export var Y_AUTO_RANGE_MIN_KEYS = ['y_axis_min', 'h_axis_min'];
+export var Y_AUTO_RANGE_MAX_KEYS = ['y_axis_max', 'h_axis_max'];
+export var COLUMN_GROUPBY_KEYS = ['column_groupby_column_key', 'group_column'];
+export var COLUMN_DATE_GRANULARITY_KEYS = ['column_groupby_date_granularity', 'date_granularity'];
+export var COLUMN_GEO_GRANULARITY_KEYS = ['column_groupby_geolocation_granularity', 'geolocation_granularity'];
+export var LABEL_FRONT_SIZE_KEYS = ['label_font_size', 'annotation_font_size'];

package/es/dashboard.js

@@ -8,8 +8,8 @@ import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import { TableUtils, Views } from 'dtable-store';
 import StatisticDashBoard from './model/statistic-dashboard';
-import StatItem from './model/stat-item';
 import DashBoardService from './service/dashboard-service';
+import ChartService from './service/chart-service';
 import DesktopDashboard from './desktop-dashboard';
 import MobileDashboard from './mobile-dashboard';
 import ThreadManager from './calculator/thread-manager';
@@ -28,6 +28,17 @@ var DashBoard = /*#__PURE__*/function (_Component) {
     var _this;
     _classCallCheck(this, DashBoard);
     _this = _super.call(this, props);
+    _this.loadSvg = function () {
+      var importAll = function importAll(requireContext) {
+        requireContext.keys().forEach(requireContext);
+      };
+      try {
+        importAll(require.context('./assets/icons', true, /\.svg$/));
+      } catch (error) {
+        // eslint-disable-next-line no-console
+        console.log(error);
+      }
+    };
     _this.onDTableDataChange = function (value) {
       _this.clearCalculations();
       var _this$initDashboard = _this.initDashboard({
@@ -62,6 +73,7 @@ var DashBoard = /*#__PURE__*/function (_Component) {
         value: value,
         defaultDashboardName: _this.defaultDashboardName,
         chartCalculator: _this.chartCalculator,
+        chartService: _this.chartService,
         updateStatistics: _this.props.updateStatistics,
         deletePluginSettings: _this.props.deletePluginSettings
       });
@@ -126,6 +138,28 @@ var DashBoard = /*#__PURE__*/function (_Component) {
       if (!activeViewId) return selectedTable.views[0];
       return Views.getViewById(selectedTable.views, activeViewId);
     };
+    _this.getInitChart = function (_ref2) {
+      var chartType = _ref2.chartType,
+        dashboard = _ref2.dashboard,
+        activeTable = _ref2.activeTable,
+        activeView = _ref2.activeView;
+      return _this.chartService.getInitChart({
+        type: chartType,
+        dashboard: dashboard,
+        activeTable: activeTable,
+        activeView: activeView
+      });
+    };
+    _this.getConvertedChart = function (_ref3) {
+      var originalStatistic = _ref3.originalStatistic,
+        targetStatisticType = _ref3.targetStatisticType,
+        activeTable = _ref3.activeTable;
+      return _this.chartService.getConvertedChart({
+        originalStatistic: originalStatistic,
+        targetStatisticType: targetStatisticType,
+        activeTable: activeTable
+      });
+    };
     _this.selectDashboard = function (selectedDashboardIdx) {
       _this.isInitDashboard = true;
       _this.setSelectedDashboardIdx(selectedDashboardIdx);
@@ -244,14 +278,11 @@ var DashBoard = /*#__PURE__*/function (_Component) {
       var fromChart = dashboard && dashboard.stat_items.find(function (chart) {
         return chart._id === chartId;
       });
-      if (!fromChart) {
-        return;
-      }
-      var newChartId = generatorUniqueId(dashboard.stat_items);
-      var newChart = new StatItem(Object.assign({}, fromChart, {
-        _id: newChartId,
-        name: fromChart.name + '(copy)'
-      }));
+      if (!fromChart) return;
+      var newChart = _this.chartService.getCopiedChart({
+        dashboard: dashboard,
+        originalStatItem: fromChart
+      });
       _this.addChart(newChart);
     };
     _this.deleteChart = function (chartId) {
@@ -320,7 +351,11 @@ var DashBoard = /*#__PURE__*/function (_Component) {
       return permission === 'r' || permission.slice(0, 2) === 'c-';
     };
     var _value = props.value;
+    var defaultChartTitle = intl.get('Untitled');
     _this.defaultDashboardName = intl.get('Default_dashboard');
+    _this.chartService = new ChartService({
+      defaultChartTitle: defaultChartTitle
+    });
     _this.statisticThreadManager = new ThreadManager((navigator.hardwareConcurrency || 4) - 1);
     var _this$initDashboard2 = _this.initDashboard({
         value: _value
@@ -333,6 +368,7 @@ var DashBoard = /*#__PURE__*/function (_Component) {
       refresh: false
     };
     _this.isInitDashboard = true;
+    _this.loadSvg();
     return _this;
   }
   _createClass(DashBoard, [{
@@ -395,6 +431,8 @@ var DashBoard = /*#__PURE__*/function (_Component) {
         getTableById: this.getTableById,
         getTables: this.getTables,
         getViews: this.getViews,
+        getInitChart: this.getInitChart,
+        getConvertedChart: this.getConvertedChart,
         copyChart: this.copyChart,
         deleteChart: this.deleteChart,
         modifyDashboardLayout: this.modifyDashboardLayout,

package/es/desktop-dashboard.js

@@ -142,8 +142,8 @@ var DesktopDashboard = /*#__PURE__*/function (_Component) {
       var dashboard = statistics[selectedDashboardIdx];
       var activeTable = _this.props.getActiveTable();
       var activeView = _this.props.getActiveView();
-      return _this.charService.generateChart({
-        type: chartType,
+      return _this.props.getInitChart({
+        chartType: chartType,
         dashboard: dashboard,
         activeTable: activeTable,
         activeView: activeView
@@ -277,6 +277,7 @@ var DesktopDashboard = /*#__PURE__*/function (_Component) {
         getTableById: this.props.getTableById,
         generateChart: this.generateChart,
         hideChartAdditionDialog: this.onToggleChartAddition,
+        getConvertedChart: this.props.getConvertedChart,
         addChart: this.props.addChart,
         modifyChart: this.props.modifyChart,
         toggleStatisticRecordsDialog: this.toggleStatisticRecordsDialog

package/es/locale/lang/de.js

@@ -232,6 +232,8 @@ var de = {
   'Display_total': 'Gesamtwert anzeigen',
   'Line_color': 'Linienfarbe',
   'Stack': 'Stapel',
-  'Add_new_stack': 'Neuen Stapel hinzufügen'
+  'Add_new_stack': 'Neuen Stapel hinzufügen',
+  'Chart_type': 'Chart type',
+  'Edit_type': 'Edit type'
 };
 export default de;

package/es/locale/lang/en.js

@@ -232,6 +232,8 @@ var en = {
   'Display_total': 'Display total',
   'Line_color': 'Line color',
   'Stack': 'Stack',
-  'Add_new_stack': 'Add new stack'
+  'Add_new_stack': 'Add new stack',
+  'Chart_type': 'Chart type',
+  'Edit_type': 'Edit type'
 };
 export default en;

package/es/locale/lang/fr.js

@@ -232,6 +232,8 @@ var fr = {
   'Display_total': 'Afficher le total',
   'Line_color': 'Couleur de courbe',
   'Stack': 'Pile',
-  'Add_new_stack': 'Ajouter une nouvelle pile'
+  'Add_new_stack': 'Ajouter une nouvelle pile',
+  'Chart_type': 'Chart type',
+  'Edit_type': 'Edit type'
 };
 export default fr;

package/es/locale/lang/zh_CN.js

@@ -232,6 +232,8 @@ var zh_CN = {
   'Display_total': '显示总计',
   'Line_color': '线条颜色',
   'Stack': '堆叠',
-  'Add_new_stack': '添加新的堆叠'
+  'Add_new_stack': '添加新的堆叠',
+  'Chart_type': '图表类型',
+  'Edit_type': '编辑类型'
 };
 export default zh_CN;

package/es/model/bar-group.js

@@ -0,0 +1,60 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
+import _createSuper from "@babel/runtime/helpers/esm/createSuper";
+import BaseModel from './base-model';
+import { isBoolean } from '../utils/common-utils';
+import { STAT_TYPE, SUMMARY_METHOD_MAP, SUMMARY_TYPE } from '../constants';
+var BarGroup = /*#__PURE__*/function (_BaseModel) {
+  _inherits(BarGroup, _BaseModel);
+  var _super = _createSuper(BarGroup);
+  function BarGroup(object) {
+    var _this;
+    _classCallCheck(this, BarGroup);
+    _this = _super.call(this, object);
+
+    // x data
+    _this.x_axis_column_key = object.x_axis_column_key;
+    _this.x_axis_date_granularity = object.x_axis_date_granularity;
+    _this.x_axis_geolocation_granularity = object.x_axis_geolocation_granularity;
+    _this.x_axis_include_empty = object.x_axis_include_empty;
+
+    // x style
+    _this.show_x_axis_label = isBoolean(object.show_x_axis_label) ? object.show_x_axis_label : false;
+    _this.x_axis_label_position = object.x_axis_label_position;
+
+    // y data
+    _this.y_axis_summary_type = object.y_axis_summary_type || SUMMARY_TYPE.COUNT;
+    _this.y_axis_column_key = object.y_axis_column_key;
+    _this.y_axis_summary_method = object.y_axis_summary_method;
+    if (_this.y_axis_summary_method === SUMMARY_METHOD_MAP.Row_count) {
+      _this.y_axis_summary_method = SUMMARY_METHOD_MAP.Max;
+    }
+
+    // y style
+    _this.y_axis_label_position = isBoolean(object.y_axis_label_position) ? object.y_axis_label_position : false;
+    _this.show_y_axis_label = object.show_y_axis_label;
+    _this.y_axis_label_color = object.y_axis_label_color;
+    _this.y_axis_use_stack = object.y_axis_use_stack;
+    if (_this.type === STAT_TYPE.BAR_STACK) {
+      _this.y_axis_use_stack = true;
+    }
+    _this.y_axis_auto_range = object.y_axis_auto_range;
+    _this.y_axis_max = object.y_axis_max;
+    _this.y_axis_min = object.y_axis_min;
+
+    // group
+    _this.column_groupby_column_key = object.column_groupby_column_key;
+    _this.column_groupby_date_granularity = object.column_groupby_date_granularity;
+    _this.column_groupby_geolocation_granularity = object.column_groupby_geolocation_granularity;
+    _this.column_groupby_multiple_numeric_column = object.column_groupby_multiple_numeric_column;
+    _this.column_groupby_numeric_columns = object.column_groupby_numeric_columns;
+    _this.display_each_block_data = object.display_each_block_data;
+    _this.title_name = object.title_name;
+    _this.label_font_size = object.label_font_size;
+    _this.display_data = object.display_data;
+    _this.sort_type = object.sort_type;
+    return _this;
+  }
+  return BarGroup;
+}(BaseModel);
+export { BarGroup as default };

package/es/model/bar.js

@@ -0,0 +1,49 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
+import _createSuper from "@babel/runtime/helpers/esm/createSuper";
+import BaseModel from './base-model';
+import { isBoolean } from '../utils/common-utils';
+import { SUMMARY_METHOD_MAP, SUMMARY_TYPE } from '../constants';
+var Bar = /*#__PURE__*/function (_BaseModel) {
+  _inherits(Bar, _BaseModel);
+  var _super = _createSuper(Bar);
+  function Bar(object) {
+    var _this;
+    _classCallCheck(this, Bar);
+    _this = _super.call(this, object);
+
+    // x data
+    _this.x_axis_column_key = object.x_axis_column_key;
+    _this.x_axis_date_granularity = object.x_axis_date_granularity;
+    _this.x_axis_geolocation_granularity = object.x_axis_geolocation_granularity;
+    _this.x_axis_include_empty = object.x_axis_include_empty;
+
+    // x style
+    _this.show_x_axis_label = isBoolean(object.show_x_axis_label) ? object.show_x_axis_label : false;
+    _this.x_axis_label_position = object.x_axis_label_position;
+
+    // y data
+    _this.y_axis_summary_type = object.y_axis_summary_type || SUMMARY_TYPE.COUNT;
+    _this.y_axis_column_key = object.y_axis_column_key;
+    _this.y_axis_summary_method = object.y_axis_summary_method;
+    if (_this.y_axis_summary_method === SUMMARY_METHOD_MAP.Row_count) {
+      _this.y_axis_summary_method = SUMMARY_METHOD_MAP.Max;
+    }
+
+    // y style
+    _this.color_option = object.color_option;
+    _this.y_axis_label_color = object.y_axis_label_color;
+    _this.y_axis_label_color_rules = object.y_axis_label_color_rules;
+    _this.show_y_axis_label = isBoolean(object.show_y_axis_label) ? object.show_y_axis_label : false;
+    _this.y_axis_label_position = object.y_axis_label_position;
+    _this.y_axis_auto_range = object.y_axis_auto_range;
+    _this.y_axis_min = object.y_axis_min;
+    _this.y_axis_max = object.y_axis_max;
+    _this.sort_type = object.sort_type;
+    _this.label_font_size = object.label_font_size;
+    _this.display_data = object.display_data;
+    return _this;
+  }
+  return Bar;
+}(BaseModel);
+export { Bar as default };

package/es/model/base-model.js

@@ -0,0 +1,12 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+var BaseModel = function BaseModel(object) {
+  _classCallCheck(this, BaseModel);
+  this._id = object._id || null;
+  this.name = object.name || null;
+  this.type = object.type || null;
+  this.table_id = object.table_id || null;
+  this.view_id = object.view_id || null;
+  this.layout = object.layout;
+  this.chart_color_theme = object.chart_color_theme || 'theme0';
+};
+export { BaseModel as default };

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

@@ -0,0 +1,27 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
+import _createSuper from "@babel/runtime/helpers/esm/createSuper";
+import { isNumericColumn, TableUtils } from 'dtable-store';
+import BaseModel from './base-model';
+import { SUMMARY_METHOD_MAP } from '../constants';
+var BasicNumberCard = /*#__PURE__*/function (_BaseModel) {
+  _inherits(BasicNumberCard, _BaseModel);
+  var _super = _createSuper(BasicNumberCard);
+  function BasicNumberCard(object, table) {
+    var _this;
+    _classCallCheck(this, BasicNumberCard);
+    _this = _super.call(this, object);
+    _this.name = null;
+    _this.numeric_column = object.x_axis_column_key;
+    if (_this.numeric_column) {
+      var column = TableUtils.getTableColumnByKey(table, _this.numeric_column);
+      if (!isNumericColumn(column)) {
+        _this.numeric_column = null;
+      }
+    }
+    _this.summary_method = object.y_axis_summary_method || SUMMARY_METHOD_MAP.Row_count;
+    return _this;
+  }
+  return BasicNumberCard;
+}(BaseModel);
+export { BasicNumberCard as default };

package/es/model/combination.js

@@ -0,0 +1,50 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
+import _createSuper from "@babel/runtime/helpers/esm/createSuper";
+import BaseModel from './base-model';
+import { isBoolean } from '../utils/common-utils';
+import { LABEL_COLORS, STATISTICS_COUNT_TYPE } from '../constants';
+var Combination = /*#__PURE__*/function (_BaseModel) {
+  _inherits(Combination, _BaseModel);
+  var _super = _createSuper(Combination);
+  function Combination(object) {
+    var _this;
+    _classCallCheck(this, Combination);
+    _this = _super.call(this, object);
+
+    // x data
+    _this.x_axis_column_key = object.x_axis_column_key;
+    _this.x_axis_geolocation_granularity = object.x_axis_geolocation_granularity;
+    _this.x_axis_date_granularity = object.x_axis_date_granularity;
+    _this.x_axis_include_empty = object.x_axis_include_empty;
+
+    // y left/right data/style
+    _this.y_axis_left_summary_type = object.y_axis_left_summary_type || STATISTICS_COUNT_TYPE.COUNT;
+    _this.y_axis_right_summary_type = object.y_axis_right_summary_type || STATISTICS_COUNT_TYPE.COUNT;
+    _this.y_axis_left_summary_method = object.y_axis_left_summary_method;
+    _this.y_axis_right_summary_method = object.y_axis_right_summary_method;
+    _this.y_axis_left_summary_column = object.y_axis_left__summary_column;
+    _this.y_axis_right_summary_column = object.y_axis_right_summary_column;
+    _this.y_axis_left_group_by_multiple_numeric_column = isBoolean(object.y_axis_left_group_by_multiple_numeric_column) ? object.y_axis_left_group_by_multiple_numeric_column : false;
+    _this.y_axis_left_group_by_numeric_columns = object.y_axis_left_group_by_numeric_columns;
+    _this.y_axis_left_color = object.y_axis_left_color || LABEL_COLORS[0];
+    _this.y_axis_right_color = object.y_axis_right_color || LABEL_COLORS[1];
+    _this.show_x_axis_label = object.show_x_axis_label;
+    _this.x_axis_label_position = object.x_axis_label_position;
+    _this.show_y_axis_left_label = isBoolean(object.show_y_axis_left_label) ? object.show_y_axis_left_label : false;
+    _this.show_y_axis_right_label = isBoolean(object.show_y_axis_right_label) ? object.show_y_axis_right_label : false;
+    _this.y_axis_left_label_position = object.y_axis_left_label_position;
+    _this.y_axis_right_label_position = object.y_axis_right_label_position;
+    _this.y_axis_auto_range_left = object.y_axis_auto_range_left;
+    _this.y_axis_min_left = object.y_axis_min_left;
+    _this.y_axis_max_left = object.y_axis_max_left;
+    _this.y_axis_auto_range_right = object.y_axis_auto_range_right;
+    _this.y_axis_min_right = object.y_axis_min_right;
+    _this.y_axis_max_right = object.y_axis_max_right;
+    _this.display_data = object.display_data;
+    _this.label_font_size = object.label_font_size;
+    return _this;
+  }
+  return Combination;
+}(BaseModel);
+export { Combination as default };