dtable-statistic 4.4.24-alpha.12 → 4.4.24-alpha.13

package/es/dashboard.js

@@ -453,6 +453,8 @@ class DashBoard extends _react.Component {
       labelColorConfigs: this.labelColorConfigs,
       eventBus: eventBus,
       onCloseDashboard: this.props.onCloseStatistic,
+      getViewRows: this.props.getViewRows,
+      getTableFormulaResults: this.props.getTableFormulaResults,
       selectDashboard: this.selectDashboard,
       addDashboard: this.addDashboard,
       renameDashboard: this.renameDashboard,
@@ -471,6 +473,8 @@ class DashBoard extends _react.Component {
       getActiveTable: this.getActiveTable,
       getActiveView: this.getActiveView,
       onCloseDashboard: this.props.onCloseStatistic,
+      getViewRows: this.props.getViewRows,
+      getTableFormulaResults: this.props.getTableFormulaResults,
       selectDashboard: this.selectDashboard,
       modifyColorTheme: this.modifyColorTheme,
       addDashboard: this.addDashboard,

package/es/desktop-dashboard.js

@@ -10,7 +10,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactstrap = require("reactstrap");
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
 var _seaChart = require("sea-chart");
 var _tabs = _interopRequireDefault(require("./tabs"));
 var _statList = _interopRequireDefault(require("./stat-list"));
@@ -156,37 +155,14 @@ class DesktopDashboard extends _react.Component {
     };
     this.api = {
       sqlQuery: this.sqlQuery,
-      getViewRows: this.getViewRows,
-      getTableFormulaResults: this.getTableFormulaResults,
+      getViewRows: this.props.getViewRows,
+      getTableFormulaResults: this.props.getTableFormulaResults,
       queryUsers: window.app.queryUsers || (() => {})
     };
   }
   async sqlQuery(sql) {
     return _dtableDbApi.default.sqlQuery(sql);
   }
-  async getViewRows(view, table) {
-    console.log('getViewRows');
-    const {
-      username = null,
-      userId = null,
-      userDepartmentIdsMap = null
-    } = this.dtableStore.dtableSettings;
-    return _dtableStore.Views.getViewRows(view, table, this.dtableStore.value, username, userId, userDepartmentIdsMap);
-  }
-  async getTableFormulaResults(table, rows) {
-    console.log('getTableFormulaResults');
-    const {
-      username = null,
-      userId = null,
-      userDepartmentIdsMap = null
-    } = this.dtableStore.dtableSettings;
-    const formulaColumns = _dtableStore.Views.getFormulaColumnsContainLinks(table);
-    return _dtableStore.Views.getTableFormulaResults(table, rows, this.dtableStore.value, formulaColumns, {
-      username,
-      userId,
-      userDepartmentIdsMap
-    });
-  }
   render() {
     const {
       getTableById,

package/es/index.js

@@ -2,7 +2,9 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _react = _interopRequireDefault(require("react"));
+var _dtableStore = require("dtable-store");
 var _dashboard = _interopRequireDefault(require("./dashboard"));
+var _converStatItem = require("./model/conver-statItem");
 class Statistic {
   static getInitProps() {
     if (!window || !window.app) {
@@ -17,15 +19,68 @@ class Statistic {
       selectedTableIdx,
       selectedViewId
     } = state;
+    const convertedValue = this.convertStatistics(value);
     return {
-      value,
+      value: convertedValue,
       eventBus: dtableStore.eventBus,
       activeTableIdx: selectedTableIdx,
       activeViewId: selectedViewId,
+      getViewRows: this.getViewRows,
+      getTableFormulaResults: this.getTableFormulaResults,
       updateStatistics: this.updateStatistics.bind(this, dtableStore),
       deletePluginSettings: this.deletePluginSettings.bind(this, dtableStore)
     };
   }
+
+  // Compatible with old statistics
+  static convertStatistics(value) {
+    value.statistics.forEach(dashboard => {
+      const new_stat_items = dashboard.stat_items.map(item => {
+        if (!item.config) {
+          const newItem = {
+            config: {
+              ...item,
+              ...(0, _converStatItem.convertByType)(item)
+            },
+            layout: item.layout,
+            style_config: {
+              border: {},
+              title: {
+                text: item.name
+              }
+            }
+          };
+          return newItem;
+        }
+        return item;
+      });
+      dashboard.stat_items = new_stat_items;
+    });
+    return value;
+  }
+  static getViewRows(view, table) {
+    const dtableStore = window.app.dtableStore || {};
+    const {
+      username = null,
+      userId = null,
+      userDepartmentIdsMap = null
+    } = dtableStore.dtableSettings;
+    return _dtableStore.Views.getViewRows(view, table, dtableStore.value, username, userId, userDepartmentIdsMap);
+  }
+  static getTableFormulaResults(table, rows) {
+    const dtableStore = window.app.dtableStore || {};
+    const {
+      username = null,
+      userId = null,
+      userDepartmentIdsMap = null
+    } = dtableStore.dtableSettings;
+    const formulaColumns = _dtableStore.Views.getFormulaColumnsContainLinks(table);
+    return _dtableStore.Views.getTableFormulaResults(table, rows, dtableStore.value, formulaColumns, {
+      username,
+      userId,
+      userDepartmentIdsMap
+    });
+  }
   static updateStatistics(dtableStore, statistics) {
     dtableStore.updateStatisticsList(statistics);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.4.24-alpha.12",
+  "version": "4.4.24-alpha.13",
   "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.42-alpha.7"
+    "sea-chart": "0.0.43-alpha.0"
   },
   "peerDependencies": {
     "dtable-ui-component": "~4.4.*",