sea-chart 2.0.57 → 2.0.58-alpha.1

package/dist/view/index.js

@@ -146,7 +146,10 @@ class View extends _react.default.PureComponent {
       isCalculateByView,
       autoRefresh,
       refreshInterval,
-      pageId
+      pageId,
+      hasUnSaved,
+      chart,
+      tables
     } = this.props;
     this.unsubscribeReFreshChart = _eventBus.default.subscribe(_commonConstants.CommonEventTypes.REFRESH_CHARTS, this.refreshChart);
 
@@ -167,10 +170,7 @@ class View extends _react.default.PureComponent {
         this.calculateStatistic();
       }, refreshInterval * 60000);
     }
-    const {
-      hasUnSaved
-    } = this.props;
-    if (!hasUnSaved) {
+    if (!hasUnSaved || !_chartUtils.BaseUtils.isValidExistChart(tables, chart)) {
       this.calculateStatistic();
     }
   }
@@ -178,20 +178,20 @@ class View extends _react.default.PureComponent {
     this.unsubscribeReFreshChart();
     this.refreshTimer && clearInterval(this.refreshTimer);
   }
-  componentDidUpdate(nextProps) {
-    const {
-      chart: oldChart,
-      hasUnSaved,
-      version
-    } = this.props;
+  componentDidUpdate(prevProps) {
     const {
       chart,
-      hasUnSaved: nextUnSaved,
-      version: nextVersion,
+      hasUnSaved,
+      version,
       autoRefresh,
       refreshInterval,
       pageId
-    } = nextProps;
+    } = this.props;
+    const {
+      chart: oldChart,
+      hasUnSaved: prevHasUnSaved,
+      version: prevVersion
+    } = prevProps;
     const {
       data
     } = this.state;
@@ -216,32 +216,32 @@ class View extends _react.default.PureComponent {
 
     // universal-apps will not trigger calculation of the chart before the chart config saved
     // after saving, hasUnSaved was set to false, then start calculation
-    const needCalc = hasUnSaved === true && nextUnSaved === false;
+    const needCalc = prevHasUnSaved === true && hasUnSaved === false;
     if (needCalc && !data) {
       this.calculateStatistic();
       return;
     }
 
     // version was used to dectect table change in big screen plugin
-    if ((0, _shallowequal.default)(chart, oldChart) && version === nextVersion) return;
+    if ((0, _shallowequal.default)(chart, oldChart) && version === prevVersion) return;
     this.setState({
       isCalculated: false
     }, () => {
-      if (_chartUtils.BaseUtils.isChartTypeChange(chart, oldChart)) {
+      if (_chartUtils.BaseUtils.isChartTypeChange(oldChart, chart)) {
         this.calculateStatistic();
         return;
       }
-      if (_chartUtils.BaseUtils.isChartViewChange(chart, oldChart)) {
+      if (_chartUtils.BaseUtils.isChartViewChange(oldChart, chart)) {
         this.calculateStatistic();
         return;
       }
-      if (_chartUtils.BaseUtils.isChartStyleChange(chart, oldChart)) {
+      if (_chartUtils.BaseUtils.isChartStyleChange(oldChart, chart)) {
         this.setState({
           isCalculated: true
         });
         return;
       }
-      if (_chartUtils.BaseUtils.isChartSortChange(chart, oldChart)) {
+      if (_chartUtils.BaseUtils.isChartSortChange(oldChart, chart)) {
         this.calculateStatistic(false);
         return;
       }
@@ -365,6 +365,11 @@ const propTypes = exports.propTypes = {
   departments: _propTypes.default.array,
   dtableStoreValue: _propTypes.default.object,
   isCalculateByView: _propTypes.default.bool,
+  hasUnSaved: _propTypes.default.bool,
+  pageId: _propTypes.default.string,
+  version: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  autoRefresh: _propTypes.default.bool,
+  refreshInterval: _propTypes.default.number,
   // event
   integratedEventTypes: _propTypes.default.object,
   integratedEventBus: _propTypes.default.object,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "2.0.57",
+  "version": "2.0.58-alpha.1",
   "main": "./dist/index.js",
   "dependencies": {
     "@dnd-kit/core": "^6.1.0",
@@ -158,10 +158,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "overrides": {
-    "slugid": {
-      "uuid": "11.1.1"
-    }
   }
 }