sea-chart 1.1.40 → 1.1.42

package/dist/utils/column-utils.js

@@ -13,7 +13,7 @@ const MAPLEVEL_SUPPORTED_COLUMN_TYPES = {
 
 // is
 export const isMapColumn = (column, mapLevel) => {
-  if (!column) return false;
+  if (!column || !mapLevel) return false;
   const {
     type,
     data

package/dist/utils/concurrency-manager.js

@@ -3,6 +3,14 @@ class ConcurrencyManager {
     this.concurrentCount = concurrentCount;
     this.requestList = [];
     this.queue = [];
+    this.currentPageId = null;
+  }
+  setCurrentPageId(pageId) {
+    this.currentPageId = pageId;
+  }
+  clearPendingRequests() {
+    this.requestList = [];
+    this.queue = [];
   }
   applyRequest(req) {
     if (this.requestList.length < this.concurrentCount) {

package/dist/view/index.js

@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { isEqual } from 'lodash-es';
+import shallowEqual from 'shallowequal';
 import context from '../context';
 import intl from '../intl';
 import eventBus from '../utils/event-bus';
@@ -9,6 +10,7 @@ import { Loading } from '../components';
 import { ChartUtils, BaseUtils } from '../utils/chart-utils';
 import { DEFAULT_LANG, THEME_NAME_MAP } from '../constants';
 import { CommonEventTypes } from '../constants/common-constants';
+import concurrencyManager from '../utils/concurrency-manager';
 import Wrapper from './wrapper';
 import Title from './title';
 import './index.css';
@@ -134,9 +136,17 @@ class View extends React.PureComponent {
     const {
       isCalculateByView,
       autoRefresh,
-      refreshInterval
+      refreshInterval,
+      pageId
     } = this.props;
     this.unsubscribeReFreshChart = eventBus.subscribe(CommonEventTypes.REFRESH_CHARTS, this.refreshChart);
+
+    // pageId was used to determine whether the page has changed
+    // cancel all the cached request if pageId changed
+    if (pageId && concurrencyManager.currentPageId !== pageId) {
+      concurrencyManager.clearPendingRequests();
+      concurrencyManager.setCurrentPageId(pageId);
+    }
     if (((_window$app = window.app) === null || _window$app === void 0 ? void 0 : _window$app.eventBus) && isCalculateByView) {
       window.app.eventBus.subscribe(CommonEventTypes.EXPAND_ROW_UPDATED, this.handleModifyRecord);
       window.app.eventBus.subscribe(CommonEventTypes.EXPAND_ROW_DELETED, this.handleDeleteRecord);
@@ -170,7 +180,8 @@ class View extends React.PureComponent {
       hasUnSaved: nextUnSaved,
       version: nextVersion,
       autoRefresh,
-      refreshInterval
+      refreshInterval,
+      pageId
     } = nextProps;
     const {
       data
@@ -187,6 +198,13 @@ class View extends React.PureComponent {
     }
     context.api = this.props.api;
 
+    // pageId was used to determine whether the page has changed
+    // cancel all the cached request if pageId changed
+    if (pageId && concurrencyManager.currentPageId !== pageId) {
+      concurrencyManager.clearPendingRequests();
+      concurrencyManager.setCurrentPageId(pageId);
+    }
+
     // universal-apps will not trigger calculation of the chart before the chart config saved
     // after saved, hasUnSaved was set to false, then trigger calculation
     const needCalc = hasUnSaved === true && nextUnSaved === false;
@@ -196,17 +214,7 @@ class View extends React.PureComponent {
     }
 
     // version was used to dectect table change in big screen plugin
-    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;
+    if (shallowEqual(chart, oldChart) && version === nextVersion) return;
     this.setState({
       isCalculated: false
     }, () => {

package/package.json

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