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

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/es/service/chart-service.js

@@ -58,17 +58,5 @@ class ChartService {
     newStatItem.layout = null;
     return newStatItem;
   }
-  getConvertedChart(_ref4) {
-    let {
-      originalStatistic,
-      targetStatisticType,
-      activeTable
-    } = _ref4;
-    if (targetStatisticType === originalStatistic.type) return originalStatistic;
-    return this.generatorChart({
-      ...originalStatistic,
-      type: targetStatisticType
-    }, activeTable);
-  }
 }
 var _default = exports.default = ChartService;

package/package.json

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

package/es/constants/color-rules.js

@@ -1,17 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.FILTER_TYPE_2_CELL_TYPE = exports.EMPTY_PREDICATE = exports.DISPLAY_COLOR_RULE_FILTER_TYPE = exports.COLOR_RULE_FILTER_TYPE_MAP = void 0;
-var _dtableUtils = require("dtable-utils");
-const COLOR_RULE_FILTER_TYPE_MAP = exports.COLOR_RULE_FILTER_TYPE_MAP = {
-  NUMERIC_VALUE: 'numeric_value'
-};
-const DISPLAY_COLOR_RULE_FILTER_TYPE = exports.DISPLAY_COLOR_RULE_FILTER_TYPE = {
-  [COLOR_RULE_FILTER_TYPE_MAP.NUMERIC_VALUE]: 'Numeric_value'
-};
-const FILTER_TYPE_2_CELL_TYPE = exports.FILTER_TYPE_2_CELL_TYPE = {
-  [COLOR_RULE_FILTER_TYPE_MAP.NUMERIC_VALUE]: _dtableUtils.CellType.NUMBER
-};
-const EMPTY_PREDICATE = exports.EMPTY_PREDICATE = [_dtableUtils.FILTER_PREDICATE_TYPE.EMPTY, _dtableUtils.FILTER_PREDICATE_TYPE.NOT_EMPTY];

package/es/constants/map.js

@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.MUNICIPALITIES = exports.MAP_LEVEL = void 0;
-const MAP_LEVEL = exports.MAP_LEVEL = {
-  WORLD: 'world',
-  COUNTRY: 'country',
-  PROVINCE: 'province',
-  CITY: 'city'
-};
-const MUNICIPALITIES = exports.MUNICIPALITIES = ['北京市', '天津市', '上海市', '重庆市'];

package/es/constants/model.js

@@ -1,26 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Y_SUMMARY_TYPE_KEYS = exports.Y_SUMMARY_METHOD_KEYS = exports.Y_SUMMARY_BY_KEYS = exports.Y_SHOW_AXIS_LABEL_KEYS = exports.Y_LABEL_POSITION_KEYS = exports.Y_LABEL_COLOR_RULES_KEYS = exports.Y_LABEL_COLOR_KEYS = exports.Y_AUTO_RANGE_MIN_KEYS = exports.Y_AUTO_RANGE_MAX_KEYS = exports.Y_AUTO_RANGE_KEYS = exports.X_SHOW_AXIS_LABEL = exports.X_LABEL_POSITION_KEYS = exports.X_INCLUDE_EMPTY_KEYS = exports.X_GROUPBY_KEYS = exports.X_GEO_GRANULARITY_KEYS = exports.X_DATE_GRANULARITY_KEYS = exports.LABEL_FRONT_SIZE_KEYS = exports.COLUMN_GROUPBY_KEYS = exports.COLUMN_GEO_GRANULARITY_KEYS = exports.COLUMN_DATE_GRANULARITY_KEYS = void 0;
-const X_GROUPBY_KEYS = exports.X_GROUPBY_KEYS = ['x_axis_column_key', 'groupby_column_key', 'vertical_axis_column_key', 'date_column', 'time_column', 'column', 'geo_column', 'x_axis_column', 'numeric_column', 'name_column'];
-const X_GEO_GRANULARITY_KEYS = exports.X_GEO_GRANULARITY_KEYS = ['x_axis_geolocation_granularity', 'groupby_geolocation_granularity', 'vertical_geolocation_granularity', 'geolocation_granularity'];
-const X_DATE_GRANULARITY_KEYS = exports.X_DATE_GRANULARITY_KEYS = ['x_axis_date_granularity', 'groupby_date_granularity', 'vertical_date_granularity', 'date_granularity'];
-const X_INCLUDE_EMPTY_KEYS = exports.X_INCLUDE_EMPTY_KEYS = ['x_axis_include_empty', 'groupby_include_empty_cells', 'vertical_axis_include_empty'];
-const X_SHOW_AXIS_LABEL = exports.X_SHOW_AXIS_LABEL = ['show_x_axis_label', 'show_vertical_axis_label'];
-const X_LABEL_POSITION_KEYS = exports.X_LABEL_POSITION_KEYS = ['x_axis_label_position', 'vertical_axis_label_position'];
-const Y_SUMMARY_BY_KEYS = exports.Y_SUMMARY_BY_KEYS = ['y_axis_column_key', 'y_axis_column', 'y_axis_summary_column', 'summary_column_key', 'horizontal_axis_column_key'];
-const Y_SUMMARY_METHOD_KEYS = exports.Y_SUMMARY_METHOD_KEYS = ['y_axis_summary_method', 'horizontal_axis_summary_method', 'summary_method'];
-const Y_SUMMARY_TYPE_KEYS = exports.Y_SUMMARY_TYPE_KEYS = ['y_axis_summary_type', 'horizontal_axis_summary_type', 'summary_type'];
-const Y_LABEL_COLOR_KEYS = exports.Y_LABEL_COLOR_KEYS = ['y_axis_label_color', 'horizontal_axis_label_color'];
-const Y_LABEL_COLOR_RULES_KEYS = exports.Y_LABEL_COLOR_RULES_KEYS = ['y_axis_label_color_rules', 'horizontal_axis_label_color_rules'];
-const Y_SHOW_AXIS_LABEL_KEYS = exports.Y_SHOW_AXIS_LABEL_KEYS = ['show_y_axis_label', 'show_horizontal_axis_label'];
-const Y_LABEL_POSITION_KEYS = exports.Y_LABEL_POSITION_KEYS = ['y_axis_label_position', 'horizontal_axis_label_position'];
-const Y_AUTO_RANGE_KEYS = exports.Y_AUTO_RANGE_KEYS = ['y_axis_auto_range', 'h_axis_auto_range'];
-const Y_AUTO_RANGE_MIN_KEYS = exports.Y_AUTO_RANGE_MIN_KEYS = ['y_axis_min', 'h_axis_min'];
-const Y_AUTO_RANGE_MAX_KEYS = exports.Y_AUTO_RANGE_MAX_KEYS = ['y_axis_max', 'h_axis_max'];
-const COLUMN_GROUPBY_KEYS = exports.COLUMN_GROUPBY_KEYS = ['column_groupby_column_key', 'group_column'];
-const COLUMN_DATE_GRANULARITY_KEYS = exports.COLUMN_DATE_GRANULARITY_KEYS = ['column_groupby_date_granularity', 'date_granularity'];
-const COLUMN_GEO_GRANULARITY_KEYS = exports.COLUMN_GEO_GRANULARITY_KEYS = ['column_groupby_geolocation_granularity', 'geolocation_granularity'];
-const LABEL_FRONT_SIZE_KEYS = exports.LABEL_FRONT_SIZE_KEYS = ['label_font_size', 'annotation_font_size'];