dtable-statistic 4.2.2 → 4.3.0

package/es/calculator/mirror-calculator.js

@@ -1,232 +1,153 @@
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import { filter2SqlCondition, TableUtils } from 'dtable-store';
 import BaseCalculator from './base-calculator';
 import { formatNumericValue, getSummaryColumnMethod } from '../utils/common-utils';
 import StatUtils from '../utils/stat-utils';
 import { DTABLE_DB_SUMMARY_METHOD } from '../constants';
-var MirrorCalculator = /*#__PURE__*/function (_BaseCalculator) {
-  _inherits(MirrorCalculator, _BaseCalculator);
-  var _super = _createSuper(MirrorCalculator);
-  function MirrorCalculator(_ref) {
-    var value = _ref.value,
-      statisticThreadManager = _ref.statisticThreadManager,
-      username = _ref.username,
-      userId = _ref.userId;
-    _classCallCheck(this, MirrorCalculator);
-    return _super.call(this, {
-      value: value,
-      statisticThreadManager: statisticThreadManager,
-      username: username,
-      userId: userId
+class MirrorCalculator extends BaseCalculator {
+  constructor(_ref) {
+    let {
+      value,
+      statisticThreadManager,
+      username,
+      userId
+    } = _ref;
+    super({
+      value,
+      statisticThreadManager,
+      username,
+      userId
     });
   }
-  _createClass(MirrorCalculator, [{
-    key: "isValidChart",
-    value: function isValidChart(chart) {
-      if (!this.validateBaseConfigs(chart)) {
-        return false;
-      }
-      var table_id = chart.table_id,
-        column = chart.column,
-        summary_column = chart.summary_column,
-        group_column = chart.group_column;
-      var table = this.getTableById(table_id);
-      if (!TableUtils.getTableColumnByKey(table, column)) {
-        return false;
-      }
-      if (summary_column && !TableUtils.getTableColumnByKey(table, summary_column)) {
-        return false;
-      }
-      var selectedGroupColumn = TableUtils.getTableColumnByKey(table, group_column);
-      if (!selectedGroupColumn) return false;
-      var data = selectedGroupColumn.data || {};
-      var options = data.options || [];
-      if (options.length < 2) return false;
-      return true;
+  isValidChart(chart) {
+    if (!this.validateBaseConfigs(chart)) {
+      return false;
     }
-  }, {
-    key: "calculate",
-    value: function () {
-      var _calculate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(chart) {
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                if (this.isValidChart(chart)) {
-                  _context.next = 2;
-                  break;
-                }
-                return _context.abrupt("return", []);
-              case 2:
-                if (!this.isCalcByQueryDB(chart)) {
-                  _context.next = 6;
-                  break;
-                }
-                _context.next = 5;
-                return this.queryDb(chart);
-              case 5:
-                return _context.abrupt("return", _context.sent);
-              case 6:
-                _context.next = 8;
-                return this.calculateWithWorker(chart);
-              case 8:
-                return _context.abrupt("return", _context.sent);
-              case 9:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-      function calculate(_x) {
-        return _calculate.apply(this, arguments);
+    const {
+      table_id,
+      column,
+      summary_column,
+      group_column
+    } = chart;
+    const table = this.getTableById(table_id);
+    if (!TableUtils.getTableColumnByKey(table, column)) {
+      return false;
+    }
+    if (summary_column && !TableUtils.getTableColumnByKey(table, summary_column)) {
+      return false;
+    }
+    const selectedGroupColumn = TableUtils.getTableColumnByKey(table, group_column);
+    if (!selectedGroupColumn) return false;
+    const data = selectedGroupColumn.data || {};
+    const options = data.options || [];
+    if (options.length < 2) return false;
+    return true;
+  }
+  async calculate(chart) {
+    if (!this.isValidChart(chart)) return [];
+    if (this.isCalcByQueryDB(chart)) {
+      return await this.queryDb(chart);
+    }
+    return await this.calculateWithWorker(chart);
+  }
+  async queryDb(chart) {
+    const {
+      column,
+      table_id,
+      view_id,
+      summary_type,
+      summary_method,
+      summary_column,
+      group_column
+    } = chart;
+    const selectedTable = this.getTableById(table_id);
+    const selectedView = this.getViewById(view_id, selectedTable);
+    let sqlString = '';
+    const selectedColumn = TableUtils.getTableColumnByKey(selectedTable, column);
+    const columnName = selectedColumn.name;
+    const selectedGroupColumn = TableUtils.getTableColumnByKey(selectedTable, group_column);
+    const groupColumnName = selectedGroupColumn.name;
+    const isAdvanced = summary_type === 'advanced';
+    const method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[summary_method] : 'COUNT';
+    const sqlCondition = filter2SqlCondition(selectedTable, selectedView);
+    let summaryColumnName = '',
+      summaryColumn;
+    if (isAdvanced) {
+      summaryColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
+      if (!summaryColumn) {
+        return [];
       }
-      return calculate;
-    }()
-  }, {
-    key: "queryDb",
-    value: function () {
-      var _queryDb = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(chart) {
-        var _this = this;
-        var column, table_id, view_id, summary_type, summary_method, summary_column, group_column, selectedTable, selectedView, sqlString, selectedColumn, columnName, selectedGroupColumn, groupColumnName, isAdvanced, method, sqlCondition, summaryColumnName, summaryColumn, summaryColumnMethod, result, data, newResult, _summaryColumnMethod, valueKey, groupData, groupData0, groupData1;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                column = chart.column, table_id = chart.table_id, view_id = chart.view_id, summary_type = chart.summary_type, summary_method = chart.summary_method, summary_column = chart.summary_column, group_column = chart.group_column;
-                selectedTable = this.getTableById(table_id);
-                selectedView = this.getViewById(view_id, selectedTable);
-                sqlString = '';
-                selectedColumn = TableUtils.getTableColumnByKey(selectedTable, column);
-                columnName = selectedColumn.name;
-                selectedGroupColumn = TableUtils.getTableColumnByKey(selectedTable, group_column);
-                groupColumnName = selectedGroupColumn.name;
-                isAdvanced = summary_type === 'advanced';
-                method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[summary_method] : 'COUNT';
-                sqlCondition = filter2SqlCondition(selectedTable, selectedView);
-                summaryColumnName = '';
-                if (!isAdvanced) {
-                  _context2.next = 21;
-                  break;
-                }
-                summaryColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
-                if (summaryColumn) {
-                  _context2.next = 16;
-                  break;
-                }
-                return _context2.abrupt("return", []);
-              case 16:
-                summaryColumnName = summaryColumn.name;
-                summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
-                sqlString = "select `".concat(columnName, "`, `").concat(groupColumnName, "`, ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by `").concat(columnName, "`, `").concat(groupColumnName, "` limit 5000");
-                _context2.next = 22;
-                break;
-              case 21:
-                sqlString = "select `".concat(columnName, "`, `").concat(groupColumnName, "`, ").concat(method, "(`").concat(columnName, "`) from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by `").concat(columnName, "`, `").concat(groupColumnName, "` limit 5000");
-              case 22:
-                _context2.next = 24;
-                return this.sqlQuery(sqlString);
-              case 24:
-                result = _context2.sent;
-                if (!(result.status === 200 && result.data.success)) {
-                  _context2.next = 35;
-                  break;
-                }
-                data = result.data;
-                if (data.results) {
-                  _context2.next = 29;
-                  break;
-                }
-                return _context2.abrupt("return", []);
-              case 29:
-                newResult = [];
-                _summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
-                valueKey = isAdvanced ? "".concat(_summaryColumnMethod) : "".concat(method, "(").concat(columnName, ")");
-                groupData = this.getGroupData(data.results, selectedGroupColumn);
-                if (groupData.length > 0) {
-                  groupData0 = groupData[0] || {};
-                  groupData1 = groupData[1] || {};
-                  data.results.forEach(function (item) {
-                    var label = StatUtils.getGroupLabel(item[column], item, selectedColumn, '', '', _this.value);
-                    var groupValue = item[group_column];
-                    var equal2GroupData0 = groupData0.id === groupValue;
-                    var equal2GroupData1 = groupData1.id === groupValue;
-                    if (equal2GroupData0 || equal2GroupData1) {
-                      var value = item[valueKey];
-                      var formattedValue = value;
-                      if (isAdvanced) {
-                        value = formatNumericValue(value, summaryColumn);
-                        formattedValue = StatUtils.getFormattedValue(value, summaryColumn, summary_method);
-                      }
-                      newResult.push({
-                        name: label,
-                        original_name: item[column],
-                        value: equal2GroupData0 ? value : 0,
-                        formatted_value: equal2GroupData0 ? formattedValue : 0,
-                        group_name: groupData[0].name,
-                        color: groupData[0].color
-                      }, {
-                        name: label,
-                        original_name: item[column],
-                        value: equal2GroupData1 ? value : 0,
-                        formatted_value: equal2GroupData1 ? formattedValue : 0,
-                        group_name: groupData[1].name,
-                        color: groupData[1].color
-                      });
-                    }
-                  });
-                }
-                return _context2.abrupt("return", {
-                  data: newResult,
-                  colorSet: [groupData[0] && groupData[0].color, groupData[1] && groupData[1].color]
-                });
-              case 35:
-                return _context2.abrupt("return", []);
-              case 36:
-              case "end":
-                return _context2.stop();
+      summaryColumnName = summaryColumn.name;
+      const summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
+      sqlString = "select `".concat(columnName, "`, `").concat(groupColumnName, "`, ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by `").concat(columnName, "`, `").concat(groupColumnName, "` limit 5000");
+    } else {
+      sqlString = "select `".concat(columnName, "`, `").concat(groupColumnName, "`, ").concat(method, "(`").concat(columnName, "`) from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by `").concat(columnName, "`, `").concat(groupColumnName, "` limit 5000");
+    }
+    const result = await this.sqlQuery(sqlString);
+    if (result.status === 200 && result.data.success) {
+      const data = result.data;
+      if (!data.results) return [];
+      const newResult = [];
+      const summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
+      const valueKey = isAdvanced ? "".concat(summaryColumnMethod) : "".concat(method, "(").concat(columnName, ")");
+      const groupData = this.getGroupData(data.results, selectedGroupColumn);
+      if (groupData.length > 0) {
+        const groupData0 = groupData[0] || {};
+        const groupData1 = groupData[1] || {};
+        data.results.forEach(item => {
+          const label = StatUtils.getGroupLabel(item[column], item, selectedColumn, '', '', this.value);
+          const groupValue = item[group_column];
+          const equal2GroupData0 = groupData0.id === groupValue;
+          const equal2GroupData1 = groupData1.id === groupValue;
+          if (equal2GroupData0 || equal2GroupData1) {
+            let value = item[valueKey];
+            let formattedValue = value;
+            if (isAdvanced) {
+              value = formatNumericValue(value, summaryColumn);
+              formattedValue = StatUtils.getFormattedValue(value, summaryColumn, summary_method);
             }
+            newResult.push({
+              name: label,
+              original_name: item[column],
+              value: equal2GroupData0 ? value : 0,
+              formatted_value: equal2GroupData0 ? formattedValue : 0,
+              group_name: groupData[0].name,
+              color: groupData[0].color
+            }, {
+              name: label,
+              original_name: item[column],
+              value: equal2GroupData1 ? value : 0,
+              formatted_value: equal2GroupData1 ? formattedValue : 0,
+              group_name: groupData[1].name,
+              color: groupData[1].color
+            });
           }
-        }, _callee2, this);
-      }));
-      function queryDb(_x2) {
-        return _queryDb.apply(this, arguments);
-      }
-      return queryDb;
-    }()
-  }, {
-    key: "getGroupData",
-    value: function getGroupData(result, groupColumn) {
-      var _ref2 = groupColumn.data || {},
-        _ref2$options = _ref2.options,
-        options = _ref2$options === void 0 ? {} : _ref2$options;
-      var groupCount = 0;
-      var groupList = [];
-      var cache = {};
-      var _loop = function _loop(i) {
-        var groupValue = result[i][groupColumn.key];
-        var item = options.find(function (optionItem) {
-          return optionItem.id === groupValue;
         });
-        if (!cache[groupValue] && groupValue) {
-          groupList.push(item);
-          cache[groupValue] = true;
-          groupCount++;
-        }
-        if (groupCount === 2) return "break";
+      }
+      return {
+        data: newResult,
+        colorSet: [groupData[0] && groupData[0].color, groupData[1] && groupData[1].color]
       };
-      for (var i = 0; i < result.length; i++) {
-        var _ret = _loop(i);
-        if (_ret === "break") break;
+    }
+    return [];
+  }
+  getGroupData(result, groupColumn) {
+    const {
+      options = {}
+    } = groupColumn.data || {};
+    let groupCount = 0;
+    let groupList = [];
+    let cache = {};
+    for (let i = 0; i < result.length; i++) {
+      const groupValue = result[i][groupColumn.key];
+      const item = options.find(optionItem => optionItem.id === groupValue);
+      if (!cache[groupValue] && groupValue) {
+        groupList.push(item);
+        cache[groupValue] = true;
+        groupCount++;
       }
-      return groupList;
+      if (groupCount === 2) break;
     }
-  }]);
-  return MirrorCalculator;
-}(BaseCalculator);
+    return groupList;
+  }
+}
 export default MirrorCalculator;

package/es/calculator/number-card-calculator.js

@@ -1,135 +1,67 @@
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import { filter2SqlCondition, TableUtils } from 'dtable-store';
 import { DTABLE_DB_SUMMARY_METHOD } from '../constants';
 import { getSummaryColumnMethod } from '../utils/common-utils';
 import BaseCalculator from './base-calculator';
-var NumberCardCalculator = /*#__PURE__*/function (_BaseCalculator) {
-  _inherits(NumberCardCalculator, _BaseCalculator);
-  var _super = _createSuper(NumberCardCalculator);
-  function NumberCardCalculator(_ref) {
-    var value = _ref.value,
-      statisticThreadManager = _ref.statisticThreadManager,
-      username = _ref.username,
-      userId = _ref.userId;
-    _classCallCheck(this, NumberCardCalculator);
-    return _super.call(this, {
-      value: value,
-      statisticThreadManager: statisticThreadManager,
-      username: username,
-      userId: userId
+class NumberCardCalculator extends BaseCalculator {
+  constructor(_ref) {
+    let {
+      value,
+      statisticThreadManager,
+      username,
+      userId
+    } = _ref;
+    super({
+      value,
+      statisticThreadManager,
+      username,
+      userId
     });
   }
-  _createClass(NumberCardCalculator, [{
-    key: "isValidChart",
-    value: function isValidChart(chart) {
-      if (!this.validateBaseConfigs(chart)) {
-        return false;
-      }
-      var table_id = chart.table_id,
-        numeric_column = chart.numeric_column;
-      var table = this.getTableById(table_id);
-      if (!TableUtils.getTableColumnByKey(table, numeric_column)) {
-        return false;
-      }
-      return true;
+  isValidChart(chart) {
+    if (!this.validateBaseConfigs(chart)) {
+      return false;
     }
-  }, {
-    key: "calculate",
-    value: function () {
-      var _calculate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(chart) {
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                if (this.isValidChart(chart)) {
-                  _context.next = 2;
-                  break;
-                }
-                return _context.abrupt("return", 0);
-              case 2:
-                if (!this.isCalcByQueryDB(chart)) {
-                  _context.next = 6;
-                  break;
-                }
-                _context.next = 5;
-                return this.queryDb(chart);
-              case 5:
-                return _context.abrupt("return", _context.sent);
-              case 6:
-                _context.next = 8;
-                return this.calculateWithWorker(chart);
-              case 8:
-                return _context.abrupt("return", _context.sent);
-              case 9:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-      function calculate(_x) {
-        return _calculate.apply(this, arguments);
-      }
-      return calculate;
-    }()
-  }, {
-    key: "queryDb",
-    value: function () {
-      var _queryDb = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(chart) {
-        var table_id, view_id, numeric_column, summary_method, selectedTable, selectedView, selectedColumn, sqlCondition, summaryColumnMethod, sqlString, result, data, summaryResult, key;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                table_id = chart.table_id, view_id = chart.view_id, numeric_column = chart.numeric_column, summary_method = chart.summary_method;
-                selectedTable = this.getTableById(table_id);
-                selectedView = this.getViewById(view_id, selectedTable);
-                selectedColumn = TableUtils.getTableColumnByKey(selectedTable, numeric_column);
-                sqlCondition = filter2SqlCondition(selectedTable, selectedView);
-                summaryColumnMethod = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[summary_method], selectedColumn.name);
-                sqlString = "select ".concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " limit 5000");
-                _context2.next = 9;
-                return this.sqlQuery(sqlString);
-              case 9:
-                result = _context2.sent;
-                if (!(result.status === 200 && result.data.success)) {
-                  _context2.next = 18;
-                  break;
-                }
-                data = result.data.results;
-                if (data) {
-                  _context2.next = 14;
-                  break;
-                }
-                return _context2.abrupt("return", 0);
-              case 14:
-                if (!(data.length > 0)) {
-                  _context2.next = 18;
-                  break;
-                }
-                summaryResult = data[0];
-                key = Object.keys(summaryResult)[0];
-                return _context2.abrupt("return", summaryResult[key]);
-              case 18:
-                return _context2.abrupt("return", 0);
-              case 19:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-      function queryDb(_x2) {
-        return _queryDb.apply(this, arguments);
+    const {
+      table_id,
+      numeric_column
+    } = chart;
+    const table = this.getTableById(table_id);
+    if (!TableUtils.getTableColumnByKey(table, numeric_column)) {
+      return false;
+    }
+    return true;
+  }
+  async calculate(chart) {
+    if (!this.isValidChart(chart)) return 0;
+    if (this.isCalcByQueryDB(chart)) {
+      return await this.queryDb(chart);
+    }
+    return await this.calculateWithWorker(chart);
+  }
+  async queryDb(chart) {
+    const {
+      table_id,
+      view_id,
+      numeric_column,
+      summary_method
+    } = chart;
+    const selectedTable = this.getTableById(table_id);
+    const selectedView = this.getViewById(view_id, selectedTable);
+    const selectedColumn = TableUtils.getTableColumnByKey(selectedTable, numeric_column);
+    const sqlCondition = filter2SqlCondition(selectedTable, selectedView);
+    const summaryColumnMethod = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[summary_method], selectedColumn.name);
+    const sqlString = "select ".concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " limit 5000");
+    const result = await this.sqlQuery(sqlString);
+    if (result.status === 200 && result.data.success) {
+      const data = result.data.results;
+      if (!data) return 0;
+      if (data.length > 0) {
+        const summaryResult = data[0];
+        const key = Object.keys(summaryResult)[0];
+        return summaryResult[key];
       }
-      return queryDb;
-    }()
-  }]);
-  return NumberCardCalculator;
-}(BaseCalculator);
+    }
+    return 0;
+  }
+}
 export default NumberCardCalculator;