dtable-statistic 4.3.6 → 4.3.8

package/es/model/trend.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _baseModel = _interopRequireDefault(require("./base-model"));
 var _columnUtils = require("../utils/column-utils");
 var _constants = require("../constants");
@@ -15,7 +15,7 @@ class Trend extends _baseModel.default {
     this.date_column = object.x_axis_column_key;
     this.date_granularity = object.x_axis_date_granularity || _constants.DATE_GRANULARITY.MONTH;
     if (this.date_column) {
-      const column = _dtableStore.TableUtils.getTableColumnByKey(table, this.date_column);
+      const column = (0, _dtableUtils.getTableColumnByKey)(table, this.date_column);
       if (!(0, _columnUtils.isStatisticDateColumn)(column)) {
         this.date_column = null;
         this.date_granularity = null;

package/es/model/world-map.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _baseModel = _interopRequireDefault(require("./base-model"));
 var _columnUtils = require("../utils/column-utils");
 var _constants = require("../constants");
@@ -14,7 +14,7 @@ class WorldMap extends _baseModel.default {
     super(object);
     this.column = object.x_axis_column_key;
     if (this.column) {
-      const column = _dtableStore.TableUtils.getTableColumnByKey(table, this.column);
+      const column = (0, _dtableUtils.getTableColumnByKey)(table, this.column);
       if (!(0, _columnUtils.isWorldMapColumn)(column)) {
         this.column = null;
       }
@@ -26,7 +26,7 @@ class WorldMap extends _baseModel.default {
       this.summary_method = _constants.SUMMARY_METHOD_MAP.Max;
     }
     this.legend_direction = object.legend_direction || _constants.LEGEND_DIRECTION_MAP.VERTICAL;
-    this.legend_size = (0, _dtableStore.isNumber)(object.legend_size) ? object.legend_size : 1;
+    this.legend_size = (0, _dtableUtils.isNumber)(object.legend_size) ? object.legend_size : 1;
     this.data_color = object.data_color;
     this.bubble_color = object.bubble_color;
   }

package/es/stat-editor/stat-settings/advance-chart-settings/combination-settings.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactstrap = require("reactstrap");
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _components = require("../../../components");
 var _columnSettings = _interopRequireDefault(require("../public-setting/column-settings"));
 var _baseSettings = _interopRequireDefault(require("../public-setting/base-settings"));
@@ -109,12 +109,12 @@ class CombinationSettings extends _react.Component {
         type,
         key
       } = option.value;
-      if (type === _dtableStore.CellType.DATE) {
+      if (type === _dtableUtils.CellType.DATE) {
         x_axis_date_granularity = this.dateGranularityOptions[2].value;
       } else {
         x_axis_date_granularity = null;
       }
-      if (type === _dtableStore.CellType.GEOLOCATION) {
+      if (type === _dtableUtils.CellType.GEOLOCATION) {
         const selectedTable = getTableById(selectedTableId);
         const geoColumn = selectedTable.columns.find(column => column.key === key) || {};
         const {
@@ -359,7 +359,7 @@ class CombinationSettings extends _react.Component {
       y_axis_right_summary_column
     } = statItem;
     const selectedTable = getTableById(selectedTableId);
-    let groupbyColumn = x_axis_column_key && _dtableStore.TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
+    let groupbyColumn = x_axis_column_key && (0, _dtableUtils.getTableColumnByKey)(selectedTable, x_axis_column_key);
     let {
       type: groupbyColumnType
     } = groupbyColumn || {};
@@ -388,10 +388,10 @@ class CombinationSettings extends _react.Component {
       columnsOptions: this.columnsOptions,
       selectedColumnOption: selectedColumnOption,
       onChangeSelectedColumn: this.onSelectStatColumn
-    }), DATE_COLUMN_OPTIONS.includes(groupbyColumnType) && this.renderGroupbyDateGranularity(), groupbyColumnType === _dtableStore.CellType.GEOLOCATION && this.renderGroupbyGeolocationGranularity(), this.renderIncludeEmpty()), /*#__PURE__*/_react.default.createElement(_summarySettings.default, {
+    }), DATE_COLUMN_OPTIONS.includes(groupbyColumnType) && this.renderGroupbyDateGranularity(), groupbyColumnType === _dtableUtils.CellType.GEOLOCATION && this.renderGroupbyGeolocationGranularity(), this.renderIncludeEmpty()), /*#__PURE__*/_react.default.createElement(_summarySettings.default, {
       useMultipleSummaryColumns: true,
       chartType: 'combination_chart',
-      label: _reactIntlUniversal.default.get('Y-axis(left side)'),
+      label: _reactIntlUniversal.default.get('Y-axis(primary)'),
       statItem: statItem,
       selectedTableId: selectedTableId,
       summaryType: y_axis_left_summary_type,
@@ -405,7 +405,7 @@ class CombinationSettings extends _react.Component {
       updateStatItem: updateStatItem
     }), /*#__PURE__*/_react.default.createElement(_summarySettings.default, {
       chartType: 'combination_chart',
-      label: _reactIntlUniversal.default.get('Y-axis(right side)'),
+      label: _reactIntlUniversal.default.get('Y-axis(secondary)'),
       statItem: statItem,
       selectedTableId: selectedTableId,
       summaryType: y_axis_right_summary_type,

package/es/stat-editor/stat-settings/advance-chart-settings/index.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _mapSettings = _interopRequireDefault(require("./map-settings"));
 var _worldMapSettings = _interopRequireDefault(require("./world-map-settings"));
 var _heatMapSettings = _interopRequireDefault(require("./heat-map-settings"));
@@ -28,7 +28,7 @@ class AdvancedChartSettings extends _react.default.Component {
     super(props);
     this.getNumericColumns = columns => {
       if (!columns) return [];
-      return columns.filter(column => column && (0, _dtableStore.isNumericColumn)(column));
+      return columns.filter(column => column && (0, _dtableUtils.isNumericColumn)(column));
     };
     this.getSettingsByType = () => {
       const {

package/es/stat-editor/stat-settings/advance-chart-settings/style-setting/combination-style-setting.js

@@ -212,13 +212,13 @@ class CombinationChartStyle extends _react.Component {
       className: "statistic-chart-parameter-divider"
     }), /*#__PURE__*/_react.default.createElement("div", {
       className: "statistic-chart-parameter-item"
-    }, /*#__PURE__*/_react.default.createElement("label", null, _reactIntlUniversal.default.get('Y-axis(left side)')), this.renderShowAxisLabel('y', 'left'), show_y_axis_left_label && /*#__PURE__*/_react.default.createElement(_axisLabelPositionSetting.default, {
+    }, /*#__PURE__*/_react.default.createElement("label", null, _reactIntlUniversal.default.get('Y-axis(primary)')), this.renderShowAxisLabel('y', 'left'), show_y_axis_left_label && /*#__PURE__*/_react.default.createElement(_axisLabelPositionSetting.default, {
       statItem: statItem,
       axisType: 'y_left',
       onSelectAxisLabelPosition: (type, option) => this.onSelectAxisLabelPosition(type, option, 'left')
     }), this.renderLeftAutoRange()), /*#__PURE__*/_react.default.createElement("div", {
       className: "statistic-chart-parameter-item"
-    }, /*#__PURE__*/_react.default.createElement("label", null, _reactIntlUniversal.default.get('Y-axis(right side)')), this.renderShowAxisLabel('y', 'right'), show_y_axis_right_label && /*#__PURE__*/_react.default.createElement(_axisLabelPositionSetting.default, {
+    }, /*#__PURE__*/_react.default.createElement("label", null, _reactIntlUniversal.default.get('Y-axis(secondary)')), this.renderShowAxisLabel('y', 'right'), show_y_axis_right_label && /*#__PURE__*/_react.default.createElement(_axisLabelPositionSetting.default, {
       statItem: statItem,
       axisType: 'y_right',
       onSelectAxisLabelPosition: (type, option) => this.onSelectAxisLabelPosition(type, option, 'right')

package/es/stat-editor/stat-settings/advance-chart-settings/summary-settings.js

@@ -148,7 +148,7 @@ class SummarySettings extends _react.Component {
         value: selectedColumnOption,
         onChange: this.onSelectSummaryColumn,
         options: this.numericColumnsOptions,
-        placeholder: _reactIntlUniversal.default.get('Select_a_column'),
+        placeholder: _reactIntlUniversal.default.get('Select_column'),
         noOptionsMessage: () => {
           return /*#__PURE__*/_react.default.createElement("span", null, _reactIntlUniversal.default.get('No_options'));
         }

package/es/stat-editor/stat-settings/basic-chart-settings/bar-settings.js

@@ -111,7 +111,7 @@ class BarSettings extends _react.Component {
       dateGranularityOptions: dateGranularityOptions,
       geolocationGranularityOptions: geolocationGranularityOptions,
       label: _reactIntlUniversal.default.get('X-axis'),
-      placeholder: _reactIntlUniversal.default.get('Select_a_column'),
+      placeholder: _reactIntlUniversal.default.get('Select_column'),
       groupbyColumnKey: x_axis_column_key,
       groupbyDateGranularity: x_axis_date_granularity,
       groupbyGeolocationGranularity: x_axis_geolocation_granularity,

package/es/stat-editor/stat-settings/basic-chart-settings/completeness-chart-settings.js

@@ -8,14 +8,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _components = require("../../../components");
 var _completenessStyle = _interopRequireDefault(require("./style-setting/completeness-style"));
 var _groupbySettings = _interopRequireDefault(require("./groupby-settings"));
 var _baseSettings = _interopRequireDefault(require("../public-setting/base-settings"));
 var _dataSortSetting = _interopRequireDefault(require("../public-setting/data-sort-setting"));
 var _constants = require("../../../constants");
-const COLUMN_TYPES = [_dtableStore.CellType.TEXT, _dtableStore.CellType.COLLABORATOR, _dtableStore.CellType.SINGLE_SELECT];
+const COLUMN_TYPES = [_dtableUtils.CellType.TEXT, _dtableUtils.CellType.COLLABORATOR, _dtableUtils.CellType.SINGLE_SELECT];
 class CompletenessSetting extends _react.Component {
   constructor(props) {
     super(props);
@@ -31,7 +31,7 @@ class CompletenessSetting extends _react.Component {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: "statistic-chart-parameter-item"
       }, /*#__PURE__*/_react.default.createElement("label", null, _reactIntlUniversal.default.get('Name_field')), /*#__PURE__*/_react.default.createElement(_components.DTableSelect, {
-        placeholder: _reactIntlUniversal.default.get('Select_a_column'),
+        placeholder: _reactIntlUniversal.default.get('Select_column'),
         value: selectedItem,
         onChange: this.onSelectGroupColumn,
         options: this.columnOptions
@@ -57,7 +57,7 @@ class CompletenessSetting extends _react.Component {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: "statistic-chart-parameter-item"
       }, /*#__PURE__*/_react.default.createElement("label", null, _reactIntlUniversal.default.get('Completion_value_field')), /*#__PURE__*/_react.default.createElement(_components.DTableSelect, {
-        placeholder: _reactIntlUniversal.default.get('Select_a_column'),
+        placeholder: _reactIntlUniversal.default.get('Select_column'),
         value: selectedItem,
         onChange: this.onSelectCompletionColumn,
         options: this.props.numericColumnsOptions
@@ -98,12 +98,12 @@ class CompletenessSetting extends _react.Component {
         selectedTable
       } = this.props;
       if (key === statItem.group_column) return;
-      const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, key);
+      const selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, key);
       const newStatItem = {};
       if (selectedColumn && _constants.TIME_COLUMN_LIST.includes(selectedColumn.type)) {
         newStatItem.date_granularity = 'month';
       }
-      if (selectedColumn.type === _dtableStore.CellType.GEOLOCATION) {
+      if (selectedColumn.type === _dtableUtils.CellType.GEOLOCATION) {
         newStatItem.geolocation_granularity = 'district';
       }
       newStatItem.group_column = key;
@@ -147,7 +147,7 @@ class CompletenessSetting extends _react.Component {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: "statistic-chart-parameter-item"
       }, /*#__PURE__*/_react.default.createElement("label", null, _reactIntlUniversal.default.get('Total_value_field')), /*#__PURE__*/_react.default.createElement(_components.DTableSelect, {
-        placeholder: _reactIntlUniversal.default.get('Select_a_column'),
+        placeholder: _reactIntlUniversal.default.get('Select_column'),
         value: selectedItem,
         onChange: this.onSelectTotalColumn,
         options: this.props.numericColumnsOptions

package/es/stat-editor/stat-settings/basic-chart-settings/groupby-settings.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _components = require("../../../components");
 class GroupbySettings extends _react.Component {
   constructor() {
@@ -28,7 +28,7 @@ class GroupbySettings extends _react.Component {
       const selectedColumnOption = this.props.getSelectedColumnOption(groupbyColumnKey, columnsOptions);
       return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement("label", null, label), /*#__PURE__*/_react.default.createElement(_components.DTableSelect, {
         isSearchable: true,
-        placeholder: _reactIntlUniversal.default.get('Select_a_column'),
+        placeholder: _reactIntlUniversal.default.get('Select_column'),
         value: selectedColumnOption,
         onChange: this.onSelectGroupbyColumn,
         options: columnsOptions,
@@ -118,10 +118,10 @@ class GroupbySettings extends _react.Component {
       }
       if (key !== 'Groupby_null') {
         groupbyColumnKey = key;
-        if (type === _dtableStore.CellType.DATE) {
+        if (type === _dtableUtils.CellType.DATE) {
           groupbyDateGranularity = dateGranularityOptions[2].value;
         }
-        if (type === _dtableStore.CellType.GEOLOCATION) {
+        if (type === _dtableUtils.CellType.GEOLOCATION) {
           const geoColumn = selectedTable.columns.find(column => column.key === key) || {};
           const {
             geo_format
@@ -160,13 +160,13 @@ class GroupbySettings extends _react.Component {
       groupbyColumnKey,
       renderIncludeEmpty
     } = this.props;
-    const groupbyColumn = groupbyColumnKey && _dtableStore.TableUtils.getTableColumnByKey(selectedTable, groupbyColumnKey);
+    const groupbyColumn = groupbyColumnKey && (0, _dtableUtils.getTableColumnByKey)(selectedTable, groupbyColumnKey);
     const {
       type: groupbyColumnType
     } = groupbyColumn || {};
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "statistic-chart-parameter-item"
-    }, this.renderGroupby(), _dtableStore.DATE_COLUMN_OPTIONS.includes(groupbyColumnType) && this.renderGroupbyDateGranularity(), groupbyColumnType === _dtableStore.CellType.GEOLOCATION && this.renderGroupbyGeolocationGranularity(), renderIncludeEmpty && renderIncludeEmpty());
+    }, this.renderGroupby(), _dtableUtils.DATE_COLUMN_OPTIONS.includes(groupbyColumnType) && this.renderGroupbyDateGranularity(), groupbyColumnType === _dtableUtils.CellType.GEOLOCATION && this.renderGroupbyGeolocationGranularity(), renderIncludeEmpty && renderIncludeEmpty());
   }
 }
 var _default = exports.default = GroupbySettings;

package/es/stat-editor/stat-settings/basic-chart-settings/index.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _toggleSetting = _interopRequireDefault(require("../public-setting/toggle-setting"));
 var _pieSettings = _interopRequireDefault(require("./pie-settings"));
 var _scatterSettings = _interopRequireDefault(require("./scatter-settings"));
@@ -68,14 +68,14 @@ class BasicChartSettings extends _react.Component {
     };
     this.getPivotTableSummaryColumnOptions = columns => {
       const summaryColumns = columns.filter(column => {
-        return column && ((0, _dtableStore.isNumericColumn)(column) || _constants.TIME_COLUMN_LIST.includes(column.type));
+        return column && ((0, _dtableUtils.isNumericColumn)(column) || _constants.TIME_COLUMN_LIST.includes(column.type));
       });
       return this.getColumnsOptions(summaryColumns);
     };
     this.getColumnsOptions = columns => {
       if (!Array.isArray(columns)) return [];
       return columns.map(column => {
-        let option = _dtableStore.COLUMN_OPTIONS.find(o => o.type === column.type) || {};
+        let option = _dtableUtils.COLUMN_OPTIONS.find(o => o.type === column.type) || {};
         const {
           name,
           key,
@@ -126,7 +126,7 @@ class BasicChartSettings extends _react.Component {
     };
     this.getNumericColumns = columns => {
       if (!columns) return [];
-      return columns.filter(column => column && (0, _dtableStore.isNumericColumn)(column));
+      return columns.filter(column => column && (0, _dtableUtils.isNumericColumn)(column));
     };
     this.getSelectedColumnOption = (key, columnsOptions) => {
       if (!key || !Array.isArray(columnsOptions) || columnsOptions.length === 0) {

package/es/stat-editor/stat-settings/basic-chart-settings/pivot-table-settings.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _components = require("../../../components");
 var _baseSettings = _interopRequireDefault(require("../public-setting/base-settings"));
 var _groupbySettings = _interopRequireDefault(require("./groupby-settings"));
@@ -221,8 +221,8 @@ class PivotSettings extends _react.Component {
       if (!table) return [];
       const newPivotTableSummaryColumnOptions = [];
       pivotTableSummaryColumnOptions.forEach(item => {
-        const column = _dtableStore.TableUtils.getTableColumnByKey(table, item.value.key) || {};
-        if ((0, _dtableStore.isNumericColumn)(column)) {
+        const column = (0, _dtableUtils.getTableColumnByKey)(table, item.value.key) || {};
+        if ((0, _dtableUtils.isNumericColumn)(column)) {
           newPivotTableSummaryColumnOptions.push(item);
         }
       });
@@ -474,7 +474,7 @@ class PivotSettings extends _react.Component {
       dateGranularityOptions: dateGranularityOptions,
       geolocationGranularityOptions: geolocationGranularityOptions,
       label: _reactIntlUniversal.default.get('Row_grouping_field'),
-      placeholder: _reactIntlUniversal.default.get('Select_a_column'),
+      placeholder: _reactIntlUniversal.default.get('Select_column'),
       groupbyColumnKey: groupby_column_key,
       groupbyDateGranularity: groupby_date_granularity,
       groupbyGeolocationGranularity: groupby_geolocation_granularity,
@@ -489,7 +489,7 @@ class PivotSettings extends _react.Component {
       dateGranularityOptions: dateGranularityOptions,
       geolocationGranularityOptions: geolocationGranularityOptions,
       label: _reactIntlUniversal.default.get('Column_grouping_field'),
-      placeholder: _reactIntlUniversal.default.get('Select_a_column'),
+      placeholder: _reactIntlUniversal.default.get('Select_column'),
       groupbyColumnKey: column_groupby_column_key,
       groupbyDateGranularity: column_groupby_date_granularity,
       groupbyGeolocationGranularity: column_groupby_geolocation_granularity,

package/es/stat-editor/stat-settings/basic-chart-settings/style-setting/bar-chart-style-setting.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _toggleSetting = _interopRequireDefault(require("../../public-setting/toggle-setting"));
 var _indToggleSetting = _interopRequireDefault(require("../../public-setting/ind-toggle-setting"));
 var _axisLabelPositionSetting = _interopRequireDefault(require("../../public-setting/axis-label-position-setting"));
@@ -194,11 +194,11 @@ class BarChartStyle extends _react.Component {
         return false;
       }
       const table = getTableById(table_id);
-      const groupByColumn = _dtableStore.TableUtils.getTableColumnByKey(table, column_groupby_column_key);
+      const groupByColumn = (0, _dtableUtils.getTableColumnByKey)(table, column_groupby_column_key);
       const {
         type: columnType
       } = groupByColumn;
-      if (columnType === _dtableStore.CellType.SINGLE_SELECT) {
+      if (columnType === _dtableUtils.CellType.SINGLE_SELECT) {
         return true;
       }
       return false;

package/es/stat-editor/stat-settings/basic-chart-settings/style-setting/horizontal-bar-chart-style.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _toggleSetting = _interopRequireDefault(require("../../public-setting/toggle-setting"));
 var _indToggleSetting = _interopRequireDefault(require("../../public-setting/ind-toggle-setting"));
 var _axisLabelPositionSetting = _interopRequireDefault(require("../../public-setting/axis-label-position-setting"));
@@ -179,11 +179,11 @@ class HorizontalBarChartStyle extends _react.Component {
           return false;
         }
         const table = getTableById(table_id);
-        const groupByColumn = _dtableStore.TableUtils.getTableColumnByKey(table, column_groupby_column_key);
+        const groupByColumn = (0, _dtableUtils.getTableColumnByKey)(table, column_groupby_column_key);
         const {
           type: columnType
         } = groupByColumn;
-        if (columnType === _dtableStore.CellType.SINGLE_SELECT) {
+        if (columnType === _dtableUtils.CellType.SINGLE_SELECT) {
           return true;
         }
         return false;

package/es/stat-editor/stat-settings/basic-chart-settings/style-setting/pie-chart-style-settings.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactstrap = require("reactstrap");
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _components = require("../../../../components");
 var _toggleSetting = _interopRequireDefault(require("../../public-setting/toggle-setting"));
 var _colorUseTypeSelector = _interopRequireDefault(require("../../color-setting/color-use-type-selector"));
@@ -265,11 +265,11 @@ class PieStyleSettings extends _react.Component {
         return false;
       }
       const table = getTableById(table_id);
-      const groupByColumn = _dtableStore.TableUtils.getTableColumnByKey(table, groupby_column_key);
+      const groupByColumn = (0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key);
       const {
         type: columnType
       } = groupByColumn;
-      if (columnType === _dtableStore.CellType.SINGLE_SELECT) {
+      if (columnType === _dtableUtils.CellType.SINGLE_SELECT) {
         return true;
       }
       return false;

package/es/stat-editor/stat-settings/basic-chart-settings/summary-method-setting.js

@@ -27,7 +27,7 @@ class SummaryMethodSettings extends _react.Component {
         value: selectedColumnOption,
         onChange: this.onSelectNumericColumn,
         options: numericColumnsOptions,
-        placeholder: _reactIntlUniversal.default.get('Select_a_column'),
+        placeholder: _reactIntlUniversal.default.get('Select_column'),
         noOptionsMessage: () => {
           return /*#__PURE__*/_react.default.createElement("span", null, _reactIntlUniversal.default.get('No_options'));
         }

package/es/stat-editor/stat-settings/basic-chart-settings/summary-settings.js

@@ -78,7 +78,7 @@ class SummarySettings extends _react.Component {
         value: selectedColumnOption,
         onChange: this.onSelectNumericColumn,
         options: numericColumnsOptions,
-        placeholder: _reactIntlUniversal.default.get('Select_a_column'),
+        placeholder: _reactIntlUniversal.default.get('Select_column'),
         noOptionsMessage: () => {
           return /*#__PURE__*/_react.default.createElement("span", null, _reactIntlUniversal.default.get('No_options'));
         }

package/es/stat-editor/stat-settings/basic-chart-settings/time-comparison-settings.js

@@ -24,9 +24,10 @@ class TimeComparisonSettings extends _react.Component {
     this.renderGroupbyDateGranularity = () => {
       let {
         dateGranularityOptions,
-        groupbyDateGranularity
+        statItem
       } = this.props;
-      let selectedDateGranularity = this.getSelectedDateGranularity(groupbyDateGranularity);
+      dateGranularityOptions = dateGranularityOptions.filter(item => item.value !== 'year');
+      let selectedDateGranularity = this.getSelectedDateGranularity(statItem.x_axis_date_granularity);
       return /*#__PURE__*/_react.default.createElement("div", {
         className: "statistic-chart-parameter-item"
       }, /*#__PURE__*/_react.default.createElement(_components.DTableSelect, {
@@ -46,27 +47,12 @@ class TimeComparisonSettings extends _react.Component {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: "statistic-chart-parameter-item"
       }, /*#__PURE__*/_react.default.createElement("label", null, _reactIntlUniversal.default.get('X-axis')), /*#__PURE__*/_react.default.createElement(_components.DTableSelect, {
-        placeholder: _reactIntlUniversal.default.get('Select_a_column'),
+        placeholder: _reactIntlUniversal.default.get('Select_column'),
         value: selectedColumnOption,
         onChange: this.onSelectGroupbyColumn,
         options: this.columnsOptions
       }));
     };
-    this.renderGroupbyDateGranularity = () => {
-      let {
-        dateGranularityOptions,
-        statItem
-      } = this.props;
-      dateGranularityOptions = dateGranularityOptions.filter(item => item.value !== 'year');
-      let selectedDateGranularity = this.getSelectedDateGranularity(statItem.x_axis_date_granularity);
-      return /*#__PURE__*/_react.default.createElement("div", {
-        className: "statistic-chart-parameter-item"
-      }, /*#__PURE__*/_react.default.createElement(_components.DTableSelect, {
-        value: selectedDateGranularity,
-        onChange: this.onSelectGroupbyDateGranularity,
-        options: dateGranularityOptions
-      }));
-    };
     this.onSelectGroupbyDateGranularity = dateGranularity => {
       let updated = {
         x_axis_date_granularity: dateGranularity.value

package/es/stat-editor/stat-settings/color-setting/color-picker.js

@@ -21,6 +21,7 @@ class ColorPicker extends _react.default.PureComponent {
     this.onInputChanged = event => {
       const value = event.target.value;
       if (value === this.state.activeColor) return;
+
       // todo valid color
       this.updateColor(value);
       this.setState({

package/es/stat-editor/stat-settings/public-setting/column-settings.js

@@ -17,7 +17,7 @@ function ColumnSettings(props) {
   return /*#__PURE__*/_react.default.createElement(_components.DTableSelect, {
     value: selectedColumnOption,
     options: columnsOptions,
-    placeholder: _reactIntlUniversal.default.get('Select_a_column'),
+    placeholder: _reactIntlUniversal.default.get('Select_column'),
     onChange: onChangeSelectedColumn
   });
 }

package/es/stat-editor/stat-settings/public-setting/numeric-summary-item.js

@@ -108,7 +108,7 @@ class NumericSummaryItem extends _react.Component {
     }, /*#__PURE__*/_react.default.createElement(_components.DTableSelect, {
       className: 'number-column-selector',
       value: selectedColumnOption,
-      placeholder: _reactIntlUniversal.default.get('Select_a_column'),
+      placeholder: _reactIntlUniversal.default.get('Select_column'),
       onChange: onChangeColumnOption.bind(this, index),
       options: numericColumnsOptions
     })), /*#__PURE__*/_react.default.createElement("div", {

package/es/stat-view/area-chart.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _baseChart = _interopRequireDefault(require("./base-chart"));
 var _customG = require("../custom-g2");
 var _commonUtils = require("../utils/common-utils");
@@ -54,7 +54,7 @@ class AreaChart extends _baseChart.default {
       let summaryColumnData = _constants.DEFAULT_NUMBER_FORMAT_OBJECT;
       if (y_axis_summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
         const table = getTableById(table_id);
-        const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, y_axis_column_key) || {};
+        const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, y_axis_column_key) || {};
         summaryColumnData = summaryColumn.data || _constants.DEFAULT_NUMBER_FORMAT_OBJECT;
       }
       let groupColorMapping = null;
@@ -394,7 +394,7 @@ class AreaChart extends _baseChart.default {
         const div = document.createElement('div');
         div.id = xAxisID;
         div.className = 'statistic-chart-axis-label';
-        const column = _dtableStore.TableUtils.getTableColumnByKey(table, x_axis_column_key);
+        const column = (0, _dtableUtils.getTableColumnByKey)(table, x_axis_column_key);
         div.innerHTML = "".concat(column ? column.name : '');
         div.setAttribute('style', "color:".concat(textColor, "; width: 100%; padding-left: ").concat(autoPadding.left, "px; text-align: ").concat(x_axis_label_position, "; bottom: -20px"));
         chartContainer.appendChild(div);
@@ -415,7 +415,7 @@ class AreaChart extends _baseChart.default {
         if (y_axis_summary_type === _constants.SUMMARY_TYPE.COUNT) {
           div.innerHTML = _reactIntlUniversal.default.get(_constants.TITLE_AMOUNT);
         } else {
-          const column = _dtableStore.TableUtils.getTableColumnByKey(table, y_axis_column_key) || {};
+          const column = (0, _dtableUtils.getTableColumnByKey)(table, y_axis_column_key) || {};
           div.innerHTML = column.name || '';
         }
         const containerHeight = chartContainer.offsetHeight;

package/es/stat-view/bar-chart.js

@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _dataSet = _interopRequireDefault(require("@antv/data-set"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _baseChart = _interopRequireDefault(require("./base-chart"));
 var _customG = require("../custom-g2");
 var _commonUtils = require("../utils/common-utils");
@@ -62,7 +62,7 @@ class BarChart extends _baseChart.default {
       let summaryMethod = summary_method;
       if (y_axis_summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
         const table = getTableById(table_id);
-        const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, y_axis_column_key) || {};
+        const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, y_axis_column_key) || {};
         summaryColumnData = summaryColumn.data || _constants.DEFAULT_NUMBER_FORMAT_OBJECT;
       }
       if (!summaryType && y_axis_summary_type) {
@@ -419,7 +419,7 @@ class BarChart extends _baseChart.default {
         const div = document.createElement('div');
         div.id = xAxisID;
         div.className = 'statistic-chart-axis-label';
-        const column = _dtableStore.TableUtils.getTableColumnByKey(table, x_axis_column_key);
+        const column = (0, _dtableUtils.getTableColumnByKey)(table, x_axis_column_key);
         div.innerHTML = "".concat(column ? column.name : '');
         div.setAttribute('style', "color:".concat(textColor, "; width: 100%; padding-left: ").concat(autoPadding.left, "px; text-align: ").concat(x_axis_label_position, "; bottom: -20px"));
         chartContainer.appendChild(div);
@@ -440,7 +440,7 @@ class BarChart extends _baseChart.default {
         if (y_axis_summary_type === _constants.SUMMARY_TYPE.COUNT) {
           div.innerHTML = _reactIntlUniversal.default.get(_constants.TITLE_AMOUNT);
         } else {
-          const column = _dtableStore.TableUtils.getTableColumnByKey(table, y_axis_column_key) || {};
+          const column = (0, _dtableUtils.getTableColumnByKey)(table, y_axis_column_key) || {};
           div.innerHTML = column.name || '';
           if (type === _constants.STAT_TYPE.BAR_STACK) {
             div.innerHTML = title_name || '';

package/es/stat-view/base-chart.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _components = require("../components");
 var _commonUtils = require("../utils/common-utils");
 var _basicChartUtils = require("../utils/basic-chart-utils");
@@ -115,7 +115,7 @@ class BaseChart extends _react.Component {
       if (summaryMethod === _constants.SUMMARY_METHOD_MAP.Distinct_values) {
         return value;
       }
-      return (0, _dtableStore.getNumberDisplayString)(value, columnData);
+      return (0, _dtableUtils.getNumberDisplayString)(value, columnData);
     };
     this.renderLoading = () => {
       return /*#__PURE__*/_react.default.createElement("div", {