sea-chart 1.1.30 → 1.1.32

package/dist/context.js

@@ -19,6 +19,8 @@ class Context {
           onFail
         });
       }
+
+      // use default api to get chart result data
       const table = getTableById(tables, chart.config.table_id);
       const currentView = table.views.find(view => view._id === chart.config.view_id);
       // use default view

package/dist/settings/index.js

@@ -6,6 +6,7 @@ import { settingsContext, DepartmentsContext, GlobalThemeContext } from '../util
 import { eventStopPropagation } from '../utils';
 import { BaseUtils } from '../utils';
 import { CHART_SETTINGS_TYPE, CHART_SETTINGS } from '../constants';
+import useForceUpdate from '../components/types-dialog/use-force-update';
 import Divider from './widgets/divider';
 import DataSettings from './data-settings';
 import StyleSettings from './style-settings';
@@ -20,10 +21,19 @@ const Settings = _ref => {
     onChange,
     children,
     departments,
-    globalTheme
+    globalTheme,
+    lang
   } = _ref;
   const [type, setType] = useState(CHART_SETTINGS_TYPE.DATA);
   const [labelColorConfigs, setLabelColorConfigs] = useState([]);
+  const forceUpdate = useForceUpdate();
+  useEffect(() => {
+    if (lang) {
+      intl.setLang(lang);
+      forceUpdate();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   useEffect(() => {
     var _window$dtable;
     const systemCustomColors = ((_window$dtable = window.dtable) === null || _window$dtable === void 0 ? void 0 : _window$dtable.customColors) || [];

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

@@ -1,41 +1,51 @@
+import { uniqueId } from 'lodash-es';
 import context from '../../context';
 import { getErrorMessage } from '..';
 import intl from '../../intl';
+import concurrencyManager from '../concurrency-manager';
 import BaseUtils from './base-utils';
 import SQLStatisticsUtils from './sql-statistics-utils';
 import OriginalDataUtils from './original-data-utils';
 class ChartUtils {}
-ChartUtils.calculateChart = (chart, value, callback) => {
+ChartUtils.calculateChart = async (chart, value, callback) => {
   if (!BaseUtils.isValidExistChart(value.tables, chart)) {
     const tip_message = 'Please_complete_the_chart_configuration_first';
     return callback && callback('', tip_message, null);
   }
-  context.queryChartResult({
-    chart,
-    tables: value.tables,
-    onSuccess: async function (res) {
-      var _res$data;
-      let dataSources = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : SQLStatisticsUtils.dataSources;
-      const {
-        success,
-        error_message
-      } = res.data;
-      if (!success) {
-        const errMsg = intl.get(error_message);
-        callback && callback(errMsg, '', null);
-        return;
+  const id = uniqueId();
+  const requestData = () => {
+    context.queryChartResult({
+      chart,
+      tables: value.tables,
+      onSuccess: async function (res) {
+        var _res$data;
+        let dataSources = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : SQLStatisticsUtils.dataSources;
+        // reolve request and start next request
+        concurrencyManager.removeRequest(id);
+        const {
+          success,
+          error_message
+        } = res.data;
+        if (!success) {
+          const errMsg = intl.get(error_message);
+          callback && callback(errMsg, '', null);
+          return;
+        }
+        if (dataSources === OriginalDataUtils.dataSources) {
+          OriginalDataUtils.calculateChart(chart, value, callback);
+          return;
+        }
+        await SQLStatisticsUtils.calculateChart(chart, value, callback, (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.results) || []);
+      },
+      onFail: err => {
+        concurrencyManager.removeRequest(id);
+        let errorMessage = getErrorMessage(err);
+        callback && callback(errorMessage, '', null);
       }
-      if (dataSources === OriginalDataUtils.dataSources) {
-        OriginalDataUtils.calculateChart(chart, value, callback);
-        return;
-      }
-      await SQLStatisticsUtils.calculateChart(chart, value, callback, (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.results) || []);
-    },
-    onFail: err => {
-      let errorMessage = getErrorMessage(err);
-      callback && callback(errorMessage, '', null);
-    }
-  });
+    });
+  };
+  requestData.id = id;
+  concurrencyManager.applyRequest(requestData);
 };
 ChartUtils.calculateStaticChart = (chart, value, statisticalResult, callback) => {
   if (!BaseUtils.isValidExistChart(value.tables, chart)) {

package/dist/utils/concurrency-manager.js

@@ -0,0 +1,33 @@
+class ConcurrencyManager {
+  constructor(concurrentCount) {
+    this.concurrentCount = concurrentCount;
+    this.requestList = [];
+    this.queue = [];
+  }
+  applyRequest(req) {
+    if (this.requestList.length < this.concurrentCount) {
+      this.requestList.push(req);
+      req();
+    } else {
+      this.queue.push({
+        req
+      });
+    }
+  }
+  removeRequest(id) {
+    const index = this.requestList.findIndex(req => req.id === id);
+    if (index > -1) {
+      this.requestList.splice(index, 1);
+    }
+    if (this.queue.length > 0) {
+      const {
+        req
+      } = this.queue.shift();
+      this.requestList.push(req);
+      req();
+    }
+  }
+}
+// request once a time
+const concurrencyManager = new ConcurrencyManager(1);
+export default concurrencyManager;

package/dist/view/index.js

@@ -132,13 +132,22 @@ class View extends React.PureComponent {
   componentDidMount() {
     var _window$app;
     const {
-      isCalculateByView
+      isCalculateByView,
+      autoRefresh,
+      refreshInterval
     } = this.props;
     this.unsubscribeReFreshChart = eventBus.subscribe(CommonEventTypes.REFRESH_CHARTS, this.refreshChart);
     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);
     }
+
+    // refreshInterval is minutes
+    if (autoRefresh && refreshInterval) {
+      this.refreshTimer = setInterval(() => {
+        this.calculateStatistic();
+      }, refreshInterval * 60000);
+    }
     const {
       hasUnSaved
     } = this.props;
@@ -148,19 +157,34 @@ class View extends React.PureComponent {
   }
   componentWillUnmount() {
     this.unsubscribeReFreshChart();
+    this.refreshTimer && clearInterval(this.refreshTimer);
   }
   UNSAFE_componentWillReceiveProps(nextProps) {
     const {
       chart: oldChart,
-      hasUnSaved
+      hasUnSaved,
+      version
     } = this.props;
     const {
       chart,
-      hasUnSaved: nextUnSaved
+      hasUnSaved: nextUnSaved,
+      version: nextVersion,
+      autoRefresh,
+      refreshInterval
     } = nextProps;
     const {
       data
     } = this.state;
+
+    // after auto_refresh config changed, reset the timer
+    if (autoRefresh && refreshInterval) {
+      this.refreshTimer && clearInterval(this.refreshTimer);
+      this.refreshTimer = setInterval(() => {
+        this.calculateStatistic();
+      }, refreshInterval * 60000);
+    } else {
+      this.refreshTimer && clearInterval(this.refreshTimer);
+    }
     context.api = this.props.api;
 
     // universal-apps will not trigger calculation of the chart before the chart config saved
@@ -170,7 +194,9 @@ class View extends React.PureComponent {
       this.calculateStatistic();
       return;
     }
-    if (shallowEqual(chart, oldChart)) return;
+
+    // version was used to dectect table change in big screen plugin
+    if (shallowEqual(chart, oldChart) && version === nextVersion) return;
     this.setState({
       isCalculated: false
     }, () => {

package/package.json

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