sea-chart 1.1.39 → 1.1.41

package/dist/constants/index.js

@@ -121,7 +121,8 @@ export const LABEL_POSITION_TYPE_SHOW = {
   [LABEL_POSITION_TYPE.BOTTOM]: 'Bottom',
   [LABEL_POSITION_TYPE.TOP]: 'Top'
 };
-export const CHART_STYLE_SETTING_KEYS = ['x_axis_show_label', 'x_axis_label_position', 'y_axis_show_label', 'y_axis_label_position', 'y_axis_auto_range', 'y_axis_min', 'y_axis_max', 'y_axis_label_color', 'y_axis_show_value', 'label_font_size', 'increase_display_color', 'display_increase', 'display_increase_percentage', 'show_legend', 'minimum_slice_percent', 'label_format', 'label_position', 'display_label', 'horizontal_axis_label_color', 'display_data', 'name', 'y_axis_left_label_position', 'y_axis_right_label_position', 'show_y_axis_left_label', 'show_y_axis_right_label', 'y_axis_auto_range_left', 'y_axis_min_left', 'y_axis_max_left', 'y_axis_auto_range_right', 'y_axis_min_right', 'y_axis_max_right', 'display_goal_line', 'goal_value', 'goal_label'];
+export const CHART_STYLE_SETTING_KEYS = ['x_axis_show_label', 'x_axis_label_position', 'y_axis_show_label', 'y_axis_label_position', 'y_axis_auto_range', 'y_axis_min', 'y_axis_max', 'y_axis_label_color', 'y_axis_show_value', 'label_font_size', 'increase_display_color', 'display_increase', 'display_increase_percentage', 'show_legend', 'minimum_slice_percent', 'label_format', 'label_position', 'display_label', 'horizontal_axis_label_color', 'display_data', 'name', 'y_axis_left_label_position', 'y_axis_right_label_position', 'show_y_axis_left_label', 'show_y_axis_right_label', 'y_axis_auto_range_left', 'y_axis_min_left', 'y_axis_max_left', 'y_axis_auto_range_right', 'y_axis_min_right', 'y_axis_max_right'];
+export const CHART_STYLE_CONFIG_SETTING_KEYS = ['display_goal_line', 'goal_value', 'goal_label'];
 export const DEFAULT_LABEL_FONT_SIZE = 12;
 export const CHART_Y_GROUP_TYPE = {
   COUNT: 'count',

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

@@ -30,7 +30,7 @@ const MapDataSettings = _ref => {
   } = chart.config;
   const isCountryLevel = map_level === MAP_LEVEL.COUNTRY;
   const selectedTable = getTableById(tables, table_id);
-  const locationColumns = (selectedTable === null || selectedTable === void 0 ? void 0 : selectedTable.columns.filter(column => [CHART_TYPE.WORLD_MAP, CHART_TYPE.WORLD_MAP_BUBBLE].includes(type) ? isWorldMapColumn(column) : isMapColumn(column))) || [];
+  const locationColumns = (selectedTable === null || selectedTable === void 0 ? void 0 : selectedTable.columns.filter(column => [CHART_TYPE.WORLD_MAP, CHART_TYPE.WORLD_MAP_BUBBLE].includes(type) ? isWorldMapColumn(column) : isMapColumn(column, map_level))) || [];
   function handleYAxisGroupSettingsChange(value) {
     const update = {};
     Object.keys(value).forEach(key => {

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

@@ -2,11 +2,10 @@ var _BaseUtils;
 import shallowEqual from 'shallowequal';
 import dayjs from 'dayjs';
 import { CellType, COLLABORATOR_COLUMN_TYPES, FORMULA_COLUMN_TYPES_MAP, FORMULA_RESULT_TYPE, getDateDisplayString, getNumberDisplayString, getOption, getPrecisionNumber, getTableById, getTableColumnByKey, isNumber, isNumericColumn, isDateColumn, sortText, sortNumber, sortDate, sortSingleSelect, sortFormula, getColumnOptions, DateUtils, getGeolocationDisplayString, getFormulaDisplayString, isArchiveView, getViewById, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP } from 'dtable-utils';
-import { PIE_CHART_COLORS, CHART_SUMMARY_TYPE, CHART_SUPPORT_SORT_COLUMNS, CHART_TYPE, CHART_STYLE_SETTING_KEYS, DEFAULT_LABEL_FONT_SIZE, DEFAULT_NUMBER_FORMAT_OBJECT, X_AXIS_IS_GROUPBY_COLUMN_KEY_CHART_TYPES, STYLE_COLORS, CHART_DATA_SORT_TYPE, CHART_Y_GROUP_TYPE, HORIZONTAL_BAR_CHART_TYPES, COMPLTETELESS_CHART_TYPES } from '../../constants';
+import { PIE_CHART_COLORS, CHART_SUMMARY_TYPE, CHART_SUPPORT_SORT_COLUMNS, CHART_TYPE, CHART_STYLE_SETTING_KEYS, DEFAULT_LABEL_FONT_SIZE, DEFAULT_NUMBER_FORMAT_OBJECT, X_AXIS_IS_GROUPBY_COLUMN_KEY_CHART_TYPES, STYLE_COLORS, CHART_DATA_SORT_TYPE, CHART_Y_GROUP_TYPE, HORIZONTAL_BAR_CHART_TYPES, COMPLTETELESS_CHART_TYPES, CHART_STYLE_CONFIG_SETTING_KEYS } from '../../constants';
 import { getClientFormulaDisplayString } from '../cell-format-utils';
 import { getKnownCollaboratorByEmail, generateDefaultUser, getUsers } from '../collaborator-utils';
 import { getDateColumnFormat, getColumnByKey } from '../column-utils';
-import ObjectUtils from '../object-utils';
 import intl from '../../intl';
 import context from '../../context';
 import { isValidCollaboratorEmail } from '../collaborator';
@@ -384,7 +383,11 @@ BaseUtils.isChartStyleChange = (preChartElement, curChartElement) => {
   if ((preChartElement === null || preChartElement === void 0 ? void 0 : (_preChartElement$heig = preChartElement.height) === null || _preChartElement$heig === void 0 ? void 0 : _preChartElement$heig.value) !== (curChartElement === null || curChartElement === void 0 ? void 0 : (_curChartElement$heig = curChartElement.height) === null || _curChartElement$heig === void 0 ? void 0 : _curChartElement$heig.value)) return true;
   if ((preChartElement === null || preChartElement === void 0 ? void 0 : preChartElement.left_in_unit) !== (curChartElement === null || curChartElement === void 0 ? void 0 : curChartElement.left_in_unit)) return true;
   if ((preChartElement === null || preChartElement === void 0 ? void 0 : preChartElement.width_in_unit) !== (curChartElement === null || curChartElement === void 0 ? void 0 : curChartElement.width_in_unit)) return true;
-  if (!ObjectUtils.isSameObject(preChartElement.style_config, curChartElement.style_config)) return true;
+  const hasStyleConfig = preChartElement.style_config && curChartElement.style_config;
+  if (hasStyleConfig) {
+    const chartStyleConfigChanged = CHART_STYLE_CONFIG_SETTING_KEYS.some(key => preChartElement.style_config[key] !== curChartElement.style_config[key]);
+    return chartStyleConfigChanged;
+  }
   return !CHART_STYLE_SETTING_KEYS.every(key => preChartElement.config[key] === curChartElement.config[key]);
 };
 BaseUtils.isChartTypeChange = (preChartElement, curChartElement) => {

package/dist/utils/column-utils.js

@@ -4,10 +4,16 @@ import React from 'react';
 import { MIRROR_COLUMN_LIST, CHART_SUMMARY_TYPE } from '../constants';
 import { getClientFormulaDisplayString } from './cell-format-utils';
 import { BaseUtils } from './chart-utils';
+const UN_SUPPORTED_MAP_CN_COLUMN_TYPES = ['lng_lat', 'country_region', 'map_selection'];
+const MAPLEVEL_SUPPORTED_COLUMN_TYPES = {
+  country: ['province', 'province_city', 'province_city_district', 'geolocation'],
+  province: ['province_city', 'province_city_district', 'geolocation'],
+  city: ['province_city_district', 'geolocation']
+};
 
 // is
-export const isMapColumn = column => {
-  if (!column) return false;
+export const isMapColumn = (column, mapLevel) => {
+  if (!column || !mapLevel) return false;
   const {
     type,
     data
@@ -16,10 +22,10 @@ export const isMapColumn = column => {
     const {
       geo_format
     } = data || {};
-    if (geo_format === 'lng_lat' || geo_format === 'country_region') {
+    if (UN_SUPPORTED_MAP_CN_COLUMN_TYPES.includes(geo_format)) {
       return false;
     }
-    return true;
+    return MAPLEVEL_SUPPORTED_COLUMN_TYPES[mapLevel].includes(geo_format);
   }
   if (FORMULA_COLUMN_TYPES_MAP[type]) {
     const {
@@ -33,10 +39,10 @@ export const isMapColumn = column => {
     const {
       geo_format
     } = array_data || {};
-    if (geo_format === 'lng_lat' || geo_format === 'country_region') {
+    if (UN_SUPPORTED_MAP_CN_COLUMN_TYPES.includes(geo_format)) {
       return false;
     }
-    return true;
+    return MAPLEVEL_SUPPORTED_COLUMN_TYPES[mapLevel].includes(geo_format);
   }
   return false;
 };

package/dist/view/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import shallowEqual from 'shallowequal';
+import { isEqual } from 'lodash-es';
 import context from '../context';
 import intl from '../intl';
 import eventBus from '../utils/event-bus';
@@ -196,7 +196,17 @@ class View extends React.PureComponent {
     }
 
     // version was used to dectect table change in big screen plugin
-    if (shallowEqual(chart, oldChart) && version === nextVersion) return;
+    const {
+      config,
+      style_config
+    } = chart;
+    const {
+      config: oldConfig,
+      style_config: oldStyleConfig
+    } = oldChart;
+    const isConfigUnchange = isEqual(config, oldConfig) && version === nextVersion;
+    const isStyleUnchange = isEqual(style_config, oldStyleConfig);
+    if (isConfigUnchange && isStyleUnchange) return;
     this.setState({
       isCalculated: false
     }, () => {

package/dist/view/wrapper/chart-component.js

@@ -235,7 +235,7 @@ export default class ChartComponent extends Component {
       this.globalTheme === THEME_NAME_MAP.DARK ? textColor = '#fff' : textColor = '#999';
       const xAxisID = "chart-x-axis-label_".concat(chart.id);
       const chartContainer = this.chart.getCanvas().get('container');
-      const xLabel = chartContainer.querySelector("#".concat(xAxisID));
+      const xLabel = chartContainer === null || chartContainer === void 0 ? void 0 : chartContainer.querySelector("#".concat(xAxisID));
       if (!xLabel && x_axis_show_label) {
         const div = document.createElement('div');
         div.id = xAxisID;

package/package.json

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