dtable-statistic 5.0.8-alpha.7 → 5.0.9

package/es/components/dialog/chart-edit-dialog.js

@@ -10,7 +10,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
 var _seaChart = require("sea-chart");
 var _reactstrap = require("reactstrap");
-var _constants = require("../../constants");
 class ChartEditDialog extends _react.Component {
   constructor(props) {
     super(props);
@@ -55,8 +54,7 @@ class ChartEditDialog extends _react.Component {
     const {
       api,
       colorThemeName,
-      theme,
-      eventBus
+      theme
     } = this.props;
     const {
       chart
@@ -82,15 +80,12 @@ class ChartEditDialog extends _react.Component {
       chart: chart,
       config: window.dtable,
       api: api,
-      dtableStoreValue: this.value,
       tables: this.value.tables,
       collaborators: this.value.collaborators,
       dataSources: "view",
       theme: theme,
       chartColorTheme: colorThemeName,
       isCalculateByView: true,
-      integratedEventTypes: _constants.CommonEventTypes,
-      integratedEventBus: eventBus,
       onChange: this.onSettingChange
     })))));
   }

package/es/components/dialog/statistic-record-dialog/index.js

@@ -148,9 +148,9 @@ class StatisticRecordDialog extends _react.default.Component {
       return rowsIds.map(rowId => idRowMap[rowId]).filter(Boolean);
     };
     this.toggle = () => {
-      // if (this.valueChanged) {
-      //   this.props.eventBus.dispatch(CommonEventTypes.REFRESH_CHARTS);
-      // }
+      if (this.valueChanged) {
+        this.props.eventBus.dispatch(_constants.CommonEventTypes.REFRESH_CHARTS);
+      }
       this.props.toggleStatisticRecordsDialog();
     };
     this.expandRowUpdated = _ref => {

package/es/dashboard.js

@@ -66,6 +66,11 @@ class DashBoard extends _react.Component {
         selectedDashboardIdx
       });
     };
+    this.refreshCharts = () => {
+      this.setState({
+        dtableChangedTime: Date.now()
+      });
+    };
     this.initDashboard = () => {
       const value = this.value;
       this.dashboardService = new _dashboardService.default({
@@ -358,7 +363,8 @@ class DashBoard extends _react.Component {
     } = this.initDashboard();
     this.state = {
       statistics: _statistics,
-      selectedDashboardIdx: _selectedDashboardIdx
+      selectedDashboardIdx: _selectedDashboardIdx,
+      dtableChangedTime: null
     };
     this.isInitDashboard = true;
     this.updatingLocalStatistics = false;
@@ -371,10 +377,12 @@ class DashBoard extends _react.Component {
     } = this.props;
     this.unsubscribeLocalDtableChanged = eventBus.subscribe('local-dtable-changed', this.onLocalDTableChanged);
     this.unsubscribeRemoteDtableChange = eventBus.subscribe('remote-dtable-changed', this.onServerDTableChanged);
+    this.unsubscribeRefreshCharts = eventBus.subscribe(_constants.CommonEventTypes.REFRESH_CHARTS, this.refreshCharts);
   }
   componentWillUnmount() {
     this.unsubscribeLocalDtableChanged();
     this.unsubscribeRemoteDtableChange();
+    this.unsubscribeRefreshCharts();
   }
   render() {
     const {
@@ -382,13 +390,15 @@ class DashBoard extends _react.Component {
     } = this.props;
     const {
       statistics,
-      selectedDashboardIdx
+      selectedDashboardIdx,
+      dtableChangedTime
     } = this.state;
     const isTableReadOnly = this.isTableReadOnly();
     const colorThemeName = this.dashboardService.getColorThemeName();
     return _utils.isMobile ? /*#__PURE__*/_react.default.createElement(_mobileDashboard.default, {
       isTableReadOnly: isTableReadOnly,
       colorThemeName: colorThemeName,
+      dtableChangedTime: dtableChangedTime,
       statistics: statistics,
       selectedDashboardIdx: selectedDashboardIdx,
       eventBus: eventBus,
@@ -403,6 +413,7 @@ class DashBoard extends _react.Component {
     }) : /*#__PURE__*/_react.default.createElement(_desktopDashboard.default, {
       isTableReadOnly: isTableReadOnly,
       colorThemeName: colorThemeName,
+      dtableChangedTime: dtableChangedTime,
       statistics: statistics,
       selectedDashboardIdx: selectedDashboardIdx,
       eventBus: eventBus,

package/es/desktop-dashboard.js

@@ -168,6 +168,7 @@ class DesktopDashboard extends _react.Component {
       getTableById,
       getValue,
       isTableReadOnly,
+      dtableChangedTime,
       colorThemeName,
       statistics,
       selectedDashboardIdx,
@@ -259,6 +260,7 @@ class DesktopDashboard extends _react.Component {
       className: "statistic-main"
     }, /*#__PURE__*/_react.default.createElement(_statList.default, {
       isTableReadOnly: isTableReadOnly,
+      dtableChangedTime: dtableChangedTime,
       theme: theme,
       colorThemeName: colorThemeName,
       statItems: statItems,
@@ -279,7 +281,6 @@ class DesktopDashboard extends _react.Component {
       theme: theme,
       colorThemeName: colorThemeName,
       editingChart: editingChart,
-      eventBus: eventBus,
       api: this.api,
       getValue: getValue,
       statistics: statistics,

package/es/stat-list/chart-preview.js

@@ -75,7 +75,6 @@ class ChartPreview extends _react.Component {
         colorThemeName,
         api,
         value,
-        eventBus,
         getTableById,
         toggleStatisticRecordsDialog
       } = this.props;
@@ -86,7 +85,6 @@ class ChartPreview extends _react.Component {
         statItem: statItem,
         api: api,
         value: value,
-        eventBus: eventBus,
         getTableById: getTableById,
         toggleStatisticRecordsDialog: toggleStatisticRecordsDialog
       });

package/es/stat-list/index.js

@@ -132,7 +132,7 @@ class StatList extends _react.Component {
 
         // refresh charts if has updates
         if (Array.isArray(rowIds) && rowIds.length > 0 || Array.isArray(newRows) && newRows.length > 0) {
-          _seaChart.EventBus.dispatch(_constants.CommonEventTypes.REFRESH_CHARTS);
+          this.props.eventBus.dispatch(_constants.CommonEventTypes.REFRESH_CHARTS);
         }
       }
       this.statisticalResult4Update = null;
@@ -168,8 +168,7 @@ class StatList extends _react.Component {
       theme,
       colorThemeName,
       statItems,
-      api,
-      eventBus
+      api
     } = this.props;
     const {
       layout,
@@ -207,7 +206,6 @@ class StatList extends _react.Component {
         colorThemeName: colorThemeName,
         statItem: item,
         api: api,
-        eventBus: eventBus,
         value: this.value,
         getOtherStatistics: this.props.getOtherStatistics,
         getTableById: this.props.getTableById,

package/es/stat-view/index.js

@@ -8,7 +8,6 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _seaChart = require("sea-chart");
 var _dtableUtils = require("dtable-utils");
-var _constants = require("../constants");
 class StatView extends _react.default.Component {
   constructor(props) {
     super(props);
@@ -46,8 +45,7 @@ class StatView extends _react.default.Component {
       api,
       value,
       theme,
-      colorThemeName,
-      eventBus
+      colorThemeName
     } = this.props;
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "statistic-chart-container"
@@ -55,15 +53,12 @@ class StatView extends _react.default.Component {
       chart: statItem,
       api: api,
       config: window.dtable,
-      dtableStoreValue: value,
       tables: value.tables,
       collaborators: value.collaborators,
       hideTitle: true,
       globalTheme: theme,
       chartColorTheme: colorThemeName,
       isCalculateByView: true,
-      integratedEventTypes: _constants.CommonEventTypes,
-      integratedEventBus: eventBus,
       onViewRef: this.getViewRef
     }));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "5.0.8-alpha.7",
+  "version": "5.0.9",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -18,7 +18,7 @@
     "react-grid-layout": "^1.2.5",
     "react-intl-universal": "^2.4.8",
     "reactstrap": "8.9.0",
-    "sea-chart": "0.0.55-alpha.0"
+    "sea-chart": "^0.0.53"
   },
   "peerDependencies": {
     "dtable-ui-component": "~5.0.*",
@@ -53,7 +53,7 @@
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
     "dtable-store": "4.3.6",
-    "dtable-ui-component": "5.0.5",
+    "dtable-ui-component": "^5.0.7",
     "dtable-utils": "4.4.0",
     "eslint": "^8.3.0",
     "eslint-config-react-app": "^7.0.1",