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

package/es/dashboard.js

@@ -453,8 +453,6 @@ 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,
@@ -473,8 +471,6 @@ 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,6 +10,7 @@ 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"));
@@ -155,14 +156,37 @@ class DesktopDashboard extends _react.Component {
     };
     this.api = {
       sqlQuery: this.sqlQuery,
-      getViewRows: this.props.getViewRows,
-      getTableFormulaResults: this.props.getTableFormulaResults,
+      getViewRows: this.getViewRows,
+      getTableFormulaResults: this.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.4.24-alpha.11",
+  "version": "4.4.24-alpha.12",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",