dtable-statistic 4.3.5 → 4.3.7

package/es/calculator/map-calculator.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _baseCalculator = _interopRequireDefault(require("./base-calculator"));
 var _commonUtils = require("../utils/common-utils");
 var _sqlUtils = require("../utils/sql-utils");
@@ -13,20 +13,6 @@ var _constants = require("../constants");
 var _map = require("../utils/map");
 var _statUtils = _interopRequireDefault(require("../utils/stat-utils"));
 class MapCalculator extends _baseCalculator.default {
-  constructor(_ref) {
-    let {
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    } = _ref;
-    super({
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    });
-  }
   isValidChart(chart) {
     if (!this.validateBaseConfigs(chart)) {
       return false;
@@ -37,11 +23,11 @@ class MapCalculator extends _baseCalculator.default {
       summary_column
     } = chart;
     const table = this.getTableById(table_id);
-    const selectedColumn = geo_column && _dtableStore.TableUtils.getTableColumnByKey(table, geo_column);
-    if (geo_column && (!selectedColumn || selectedColumn.type !== _dtableStore.CellType.GEOLOCATION)) {
+    const selectedColumn = geo_column && (0, _dtableUtils.getTableColumnByKey)(table, geo_column);
+    if (geo_column && (!selectedColumn || selectedColumn.type !== _dtableUtils.CellType.GEOLOCATION)) {
       return false;
     }
-    if (summary_column && !_dtableStore.TableUtils.getTableColumnByKey(table, summary_column)) {
+    if (summary_column && !(0, _dtableUtils.getTableColumnByKey)(table, summary_column)) {
       return false;
     }
     return true;
@@ -64,19 +50,19 @@ class MapCalculator extends _baseCalculator.default {
     } = chart;
     const selectedTable = this.getTableById(table_id);
     const selectedView = this.getViewById(view_id, selectedTable);
-    const column = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, geo_column);
+    const column = (0, _dtableUtils.getTableColumnByKey)(selectedTable, geo_column);
     if (!column) return [];
     const columnName = column.name;
     const isAdvanced = summary_type === 'advanced';
     const geoGranularity = (0, _map.fixMapGeoGranularity)(chart);
     const method = isAdvanced ? _constants.DTABLE_DB_SUMMARY_METHOD[summary_method] : 'COUNT';
-    const sqlCondition = (0, _dtableStore.filter2SqlCondition)(selectedTable, selectedView);
+    const sqlCondition = this.filter2SqlCondition(selectedTable, selectedView);
     const groupName = (0, _sqlUtils.getSqlGroup)(geoGranularity, column);
     let sqlString = '';
     let summaryColumn;
     let summaryColumnName = '';
     if (isAdvanced) {
-      summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, summary_column);
+      summaryColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, summary_column);
       if (!summaryColumn) {
         return [];
       }

package/es/calculator/mirror-calculator.js

@@ -5,26 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _baseCalculator = _interopRequireDefault(require("./base-calculator"));
 var _commonUtils = require("../utils/common-utils");
 var _statUtils = _interopRequireDefault(require("../utils/stat-utils"));
 var _constants = require("../constants");
 class MirrorCalculator extends _baseCalculator.default {
-  constructor(_ref) {
-    let {
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    } = _ref;
-    super({
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    });
-  }
   isValidChart(chart) {
     if (!this.validateBaseConfigs(chart)) {
       return false;
@@ -36,13 +22,13 @@ class MirrorCalculator extends _baseCalculator.default {
       group_column
     } = chart;
     const table = this.getTableById(table_id);
-    if (!_dtableStore.TableUtils.getTableColumnByKey(table, column)) {
+    if (!(0, _dtableUtils.getTableColumnByKey)(table, column)) {
       return false;
     }
-    if (summary_column && !_dtableStore.TableUtils.getTableColumnByKey(table, summary_column)) {
+    if (summary_column && !(0, _dtableUtils.getTableColumnByKey)(table, summary_column)) {
       return false;
     }
-    const selectedGroupColumn = _dtableStore.TableUtils.getTableColumnByKey(table, group_column);
+    const selectedGroupColumn = (0, _dtableUtils.getTableColumnByKey)(table, group_column);
     if (!selectedGroupColumn) return false;
     const data = selectedGroupColumn.data || {};
     const options = data.options || [];
@@ -69,17 +55,17 @@ class MirrorCalculator extends _baseCalculator.default {
     const selectedTable = this.getTableById(table_id);
     const selectedView = this.getViewById(view_id, selectedTable);
     let sqlString = '';
-    const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, column);
+    const selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, column);
     const columnName = selectedColumn.name;
-    const selectedGroupColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, group_column);
+    const selectedGroupColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, group_column);
     const groupColumnName = selectedGroupColumn.name;
     const isAdvanced = summary_type === 'advanced';
     const method = isAdvanced ? _constants.DTABLE_DB_SUMMARY_METHOD[summary_method] : 'COUNT';
-    const sqlCondition = (0, _dtableStore.filter2SqlCondition)(selectedTable, selectedView);
+    const sqlCondition = this.filter2SqlCondition(selectedTable, selectedView);
     let summaryColumnName = '',
       summaryColumn;
     if (isAdvanced) {
-      summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, summary_column);
+      summaryColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, summary_column);
       if (!summaryColumn) {
         return [];
       }

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

@@ -5,25 +5,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _constants = require("../constants");
 var _commonUtils = require("../utils/common-utils");
 var _baseCalculator = _interopRequireDefault(require("./base-calculator"));
 class NumberCardCalculator extends _baseCalculator.default {
-  constructor(_ref) {
-    let {
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    } = _ref;
-    super({
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    });
-  }
   isValidChart(chart) {
     if (!this.validateBaseConfigs(chart)) {
       return false;
@@ -33,7 +19,7 @@ class NumberCardCalculator extends _baseCalculator.default {
       numeric_column
     } = chart;
     const table = this.getTableById(table_id);
-    if (!_dtableStore.TableUtils.getTableColumnByKey(table, numeric_column)) {
+    if (!(0, _dtableUtils.getTableColumnByKey)(table, numeric_column)) {
       return false;
     }
     return true;
@@ -54,8 +40,8 @@ class NumberCardCalculator extends _baseCalculator.default {
     } = chart;
     const selectedTable = this.getTableById(table_id);
     const selectedView = this.getViewById(view_id, selectedTable);
-    const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, numeric_column);
-    const sqlCondition = (0, _dtableStore.filter2SqlCondition)(selectedTable, selectedView);
+    const selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, numeric_column);
+    const sqlCondition = this.filter2SqlCondition(selectedTable, selectedView);
     const summaryColumnMethod = (0, _commonUtils.getSummaryColumnMethod)(_constants.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);

package/es/calculator/pivot-table-calculator.js

@@ -6,27 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _baseCalculator = _interopRequireDefault(require("./base-calculator"));
 var _constants = require("../constants");
 var _commonUtils = require("../utils/common-utils");
 var _statUtils = _interopRequireDefault(require("../utils/stat-utils"));
 var _rowUtils = require("../utils/row-utils");
 class PivotTableCalculator extends _baseCalculator.default {
-  constructor(_ref) {
-    let {
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    } = _ref;
-    super({
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    });
-  }
   isValidChart(chart) {
     if (!this.validateBaseConfigs(chart)) {
       return false;
@@ -40,10 +26,10 @@ class PivotTableCalculator extends _baseCalculator.default {
       summary_columns_option
     } = chart;
     const table = this.getTableById(table_id);
-    if (!groupby_column_key || !_dtableStore.TableUtils.getTableColumnByKey(table, groupby_column_key)) {
+    if (!groupby_column_key || !(0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key)) {
       return false;
     }
-    if (column_groupby_column_key && !_dtableStore.TableUtils.getTableColumnByKey(table, column_groupby_column_key)) {
+    if (column_groupby_column_key && !(0, _dtableUtils.getTableColumnByKey)(table, column_groupby_column_key)) {
       return false;
     }
     if (summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
@@ -71,9 +57,9 @@ class PivotTableCalculator extends _baseCalculator.default {
     } = chart;
     const table = this.getTableById(table_id);
     const view = this.getViewById(view_id, table);
-    const groupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(table, groupby_column_key);
-    const columnGroupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(table, column_groupby_column_key);
-    const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, summary_column_key);
+    const groupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key);
+    const columnGroupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, column_groupby_column_key);
+    const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column_key);
     const sqlMap = this.generateSqlFromChart(chart, table, view);
     const columnMap = {
       groupbyColumn,
@@ -101,7 +87,7 @@ class PivotTableCalculator extends _baseCalculator.default {
       groupby_column_key
     } = chart;
     if (!groupby_column_key) return '';
-    const condition = (0, _dtableStore.filter2SqlCondition)(table, view);
+    const condition = this.filter2SqlCondition(table, view);
     if (!column_groupby_column_key) {
       return this.oneDimensionStatisticTable2sql(chart, condition);
     }
@@ -120,7 +106,7 @@ class PivotTableCalculator extends _baseCalculator.default {
       summary_columns_option
     } = chart;
     const table = this.getTableById(table_id);
-    const groupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(table, groupby_column_key);
+    const groupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key);
     if (!groupbyColumn) return '';
     const {
       name: sqlGroupbyColumnName,
@@ -146,8 +132,8 @@ class PivotTableCalculator extends _baseCalculator.default {
       let summaries = [];
       let summaryColumnOptions = [];
       const summaryMethod = summary_method;
-      const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, summary_column_key);
-      if (summaryColumn && ((0, _dtableStore.isNumericColumn)(summaryColumn) || (0, _dtableStore.isDateColumn)(summaryColumn))) {
+      const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column_key);
+      if (summaryColumn && ((0, _dtableUtils.isNumericColumn)(summaryColumn) || (0, _dtableUtils.isDateColumn)(summaryColumn))) {
         const {
           name: sqlSummaryMethodColumnName,
           key: sqlSummaryMethodColumnKey
@@ -164,9 +150,9 @@ class PivotTableCalculator extends _baseCalculator.default {
           key,
           method
         } = option;
-        const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, key);
+        const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, key);
         const summaryMethod = method;
-        if (summaryColumn && ((0, _dtableStore.isNumericColumn)(summaryColumn) || (0, _dtableStore.isDateColumn)(summaryColumn))) {
+        if (summaryColumn && ((0, _dtableUtils.isNumericColumn)(summaryColumn) || (0, _dtableUtils.isDateColumn)(summaryColumn))) {
           const {
             name: sqlSummaryMethodColumnName,
             key: sqlSummaryMethodColumnKey
@@ -192,7 +178,7 @@ class PivotTableCalculator extends _baseCalculator.default {
     const validStatisticNumericColumnKeys = [...new Set(statisticNumericColumnKeys)];
     let sqlNumericColumns = [];
     let summaries = [];
-    validStatisticNumericColumnKeys.map(key => _dtableStore.TableUtils.getTableColumnByKey(table, key)).filter(column => column && ((0, _dtableStore.isDateColumn)(column) || (0, _dtableStore.isNumericColumn)(column))).forEach(column => {
+    validStatisticNumericColumnKeys.map(key => (0, _dtableUtils.getTableColumnByKey)(table, key)).filter(column => column && ((0, _dtableUtils.isDateColumn)(column) || (0, _dtableUtils.isNumericColumn)(column))).forEach(column => {
       const {
         name: sqlNumericColumn,
         key: sqlNumericColumnKey
@@ -229,9 +215,9 @@ class PivotTableCalculator extends _baseCalculator.default {
     } = chart;
     const table = this.getTableById(table_id);
     let tableName = "`".concat(table.name, "`");
-    const columnGroupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(table, column_groupby_column_key);
+    const columnGroupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, column_groupby_column_key);
     if (!columnGroupbyColumn) return this.oneDimensionStatisticTable2sql(chart, table, tableName, condition);
-    const groupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(table, groupby_column_key);
+    const groupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key);
     if (!groupbyColumn) return '';
     const {
       name: sqlGroupbyColumnName,
@@ -258,7 +244,7 @@ class PivotTableCalculator extends _baseCalculator.default {
       sqlSummaryColumnKey = key;
     } else {
       const summaryMethod = summary_method;
-      const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, summary_column_key) || {};
+      const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column_key) || {};
       const {
         name,
         key
@@ -267,7 +253,7 @@ class PivotTableCalculator extends _baseCalculator.default {
       sqlSummaryColumnKey = key;
       if (column_groupby_multiple_numeric_column && column_groupby_column_key) {
         const sqlSummaryMultipleNumericColumnName = Array.isArray(summary_columns_option) ? summary_columns_option.forEach(item => {
-          const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, item.key) || {};
+          const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, item.key) || {};
           const {
             name
           } = this.summaryMethodColumn2SqlColumn(item.method, summaryColumn);
@@ -282,9 +268,9 @@ class PivotTableCalculator extends _baseCalculator.default {
             key,
             method
           } = option;
-          const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, key);
+          const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, key);
           const summaryMethod = method;
-          if (summaryColumn && ((0, _dtableStore.isNumericColumn)(summaryColumn) || (0, _dtableStore.isDateColumn)(summaryColumn))) {
+          if (summaryColumn && ((0, _dtableUtils.isNumericColumn)(summaryColumn) || (0, _dtableUtils.isDateColumn)(summaryColumn))) {
             const {
               name: sqlSummaryMethodColumnName
             } = this.summaryMethodColumn2SqlColumn(summaryMethod, summaryColumn);
@@ -396,9 +382,9 @@ class PivotTableCalculator extends _baseCalculator.default {
           summaryColumn,
           summaryMethod
         }, allTotal[totalKey], value);
-        if (summaryColumn && (0, _dtableStore.isDateColumn)(summaryColumn)) {
+        if (summaryColumn && (0, _dtableUtils.isDateColumn)(summaryColumn)) {
           rowTotal[totalKey] = value;
-        } else if (summaryColumn && (0, _dtableStore.isNumericColumn)(summaryColumn)) {
+        } else if (summaryColumn && (0, _dtableUtils.isNumericColumn)(summaryColumn)) {
           rowTotal[totalKey] = rowTotal[totalKey] + value;
         }
       });
@@ -500,11 +486,11 @@ class PivotTableCalculator extends _baseCalculator.default {
         key,
         method
       } = columnOption;
-      const column = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, columnOption.key);
+      const column = (0, _dtableUtils.getTableColumnByKey)(selectedTable, columnOption.key);
       const {
         name
       } = this.summaryMethodColumn2SqlColumn(columnOption.method, column, true);
-      if (column && (0, _dtableStore.isNumericColumn)(column)) {
+      if (column && (0, _dtableUtils.isNumericColumn)(column)) {
         pivot_summary_multiple_columns.push({
           key,
           method,
@@ -535,9 +521,9 @@ class PivotTableCalculator extends _baseCalculator.default {
     } = column;
     const validColumnName = "`".concat(name, "`");
     switch (type) {
-      case _dtableStore.CellType.DATE:
-      case _dtableStore.CellType.MTIME:
-      case _dtableStore.CellType.CTIME:
+      case _dtableUtils.CellType.DATE:
+      case _dtableUtils.CellType.MTIME:
+      case _dtableUtils.CellType.CTIME:
         {
           const validDateGranularity = dateGranularity && dateGranularity.toUpperCase();
           if (validDateGranularity === 'DAY') {
@@ -588,7 +574,7 @@ class PivotTableCalculator extends _baseCalculator.default {
             key: sqlColumnName
           };
         }
-      case _dtableStore.CellType.GEOLOCATION:
+      case _dtableUtils.CellType.GEOLOCATION:
         {
           let sqlColumnName;
           if (geolocationGranularity === 'province') {
@@ -624,7 +610,7 @@ class PivotTableCalculator extends _baseCalculator.default {
   }
   getOriginalLabel(groupColumn, groupName, statRow, groupby_date_granularity, groupby_geolocation_granularity) {
     const isTimeColumn = _constants.TIME_COLUMN_LIST.includes(groupColumn.type);
-    if (isTimeColumn || groupColumn.type === _dtableStore.CellType.GEOLOCATION) {
+    if (isTimeColumn || groupColumn.type === _dtableUtils.CellType.GEOLOCATION) {
       return statRow[groupName];
     }
     const currentGroupLabel = statRow[groupColumn.key];
@@ -632,20 +618,20 @@ class PivotTableCalculator extends _baseCalculator.default {
   }
   getOriginalName(groupColumn, originalLabel) {
     const isTimeColumn = _constants.TIME_COLUMN_LIST.includes(groupColumn.type);
-    if (isTimeColumn || groupColumn.type === _dtableStore.CellType.GEOLOCATION) {
+    if (isTimeColumn || groupColumn.type === _dtableUtils.CellType.GEOLOCATION) {
       return originalLabel;
     }
     let {
       type: columnType
     } = groupColumn;
-    if (columnType === _dtableStore.CellType.MULTIPLE_SELECT || columnType === _dtableStore.CellType.COLLABORATOR) {
+    if (columnType === _dtableUtils.CellType.MULTIPLE_SELECT || columnType === _dtableUtils.CellType.COLLABORATOR) {
       return Array.isArray(originalLabel) ? originalLabel[0] : null;
     }
     return originalLabel;
   }
   getLabel(groupColumn, originalLabel) {
     const isTimeColumn = _constants.TIME_COLUMN_LIST.includes(groupColumn.type);
-    if (isTimeColumn || groupColumn.type === _dtableStore.CellType.GEOLOCATION) {
+    if (isTimeColumn || groupColumn.type === _dtableUtils.CellType.GEOLOCATION) {
       return originalLabel;
     }
     return (0, _rowUtils.getFormattedLabel)(groupColumn, originalLabel, this.value.collaborators);
@@ -654,12 +640,12 @@ class PivotTableCalculator extends _baseCalculator.default {
     if (summaryMethod === 'SUM' || summaryMethod === 'DISTINCT_VALUES') return 0;
     return null;
   }
-  getSummaryValue(_ref2, currentValue, nextValue) {
+  getSummaryValue(_ref, currentValue, nextValue) {
     let {
       summaryMethod,
       summaryColumn
-    } = _ref2;
-    if (summaryColumn && (0, _dtableStore.isDateColumn)(summaryColumn)) {
+    } = _ref;
+    if (summaryColumn && (0, _dtableUtils.isDateColumn)(summaryColumn)) {
       if (summaryMethod === _constants.SUMMARY_METHOD_MAP.Max) {
         if (currentValue && nextValue) {
           return (0, _dayjs.default)(currentValue).isBefore(nextValue) ? nextValue : currentValue;
@@ -694,11 +680,11 @@ class PivotTableCalculator extends _baseCalculator.default {
     if (includeEmpty) return true;
     return cellValue || cellValue === 0;
   }
-  updateTwoDimensionColumns(pivot_columns, key, original_key, _ref3) {
+  updateTwoDimensionColumns(pivot_columns, key, original_key, _ref2) {
     let {
       isIncludeEmpty,
       isCellValueAsAnArray
-    } = _ref3;
+    } = _ref2;
     if (isCellValueAsAnArray && Array.isArray(key)) {
       if (key.length === 0 && isIncludeEmpty) {
         const pivotColumnIndex = pivot_columns.findIndex(r => !r.key);
@@ -732,11 +718,11 @@ class PivotTableCalculator extends _baseCalculator.default {
       });
     }
   }
-  updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, original_name, count, row, isColumnDataAsAnArray, cellValue, _ref4) {
+  updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, original_name, count, row, isColumnDataAsAnArray, cellValue, _ref3) {
     let {
       summaryMethod,
       summaryColumn
-    } = _ref4;
+    } = _ref3;
     if (index > -1) {
       let updatedPivotRow = pivot_rows[index];
       let {
@@ -800,11 +786,11 @@ class PivotTableCalculator extends _baseCalculator.default {
     }
     return source === null && target === null || source === undefined && target === undefined || source === target;
   }
-  getAndUpdateTwoDimensionTotal(pivot_columns_total, pivot_columns, pivot_rows, _ref5) {
+  getAndUpdateTwoDimensionTotal(pivot_columns_total, pivot_columns, pivot_rows, _ref4) {
     let {
       summaryMethod,
       summaryColumn
-    } = _ref5;
+    } = _ref4;
     let pivot_table_total = this.initTotal(summaryMethod);
     pivot_rows.forEach(row => {
       const {

package/es/calculator/scatter-calculator.js

@@ -5,26 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _baseCalculator = _interopRequireDefault(require("./base-calculator"));
 var _rowUtils = require("../utils/row-utils");
 var _statUtils = _interopRequireDefault(require("../utils/stat-utils"));
 var _constants = require("../constants");
 class ScatterCalculator extends _baseCalculator.default {
-  constructor(_ref) {
-    let {
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    } = _ref;
-    super({
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    });
-  }
   isValidChart(chart) {
     if (!this.validateBaseConfigs(chart)) {
       return false;
@@ -36,7 +22,7 @@ class ScatterCalculator extends _baseCalculator.default {
       group_column
     } = chart;
     const table = this.getTableById(table_id);
-    if (!_dtableStore.TableUtils.getTableColumnByKey(table, x_axis_column) || !_dtableStore.TableUtils.getTableColumnByKey(table, y_axis_column) || !_dtableStore.TableUtils.getTableColumnByKey(table, group_column)) {
+    if (!(0, _dtableUtils.getTableColumnByKey)(table, x_axis_column) || !(0, _dtableUtils.getTableColumnByKey)(table, y_axis_column) || !(0, _dtableUtils.getTableColumnByKey)(table, group_column)) {
       return false;
     }
     return true;
@@ -58,10 +44,10 @@ class ScatterCalculator extends _baseCalculator.default {
     } = chart;
     const selectedTable = this.getTableById(table_id);
     const selectedView = this.getViewById(view_id, selectedTable);
-    const selectedXAxisColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, x_axis_column);
-    const selectedYAxisColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, y_axis_column);
-    const selectedGroupColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, group_column);
-    const sqlCondition = (0, _dtableStore.filter2SqlCondition)(selectedTable, selectedView);
+    const selectedXAxisColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, x_axis_column);
+    const selectedYAxisColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, y_axis_column);
+    const selectedGroupColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, group_column);
+    const sqlCondition = this.filter2SqlCondition(selectedTable, selectedView);
     const sqlString = "select `".concat(selectedXAxisColumn.name, "`, `").concat(selectedYAxisColumn.name, "`, `").concat(selectedGroupColumn.name, "` from `").concat(selectedTable.name, "` ").concat(sqlCondition, " limit 5000");
     const result = await this.sqlQuery(sqlString);
     if (result.status === 200 && result.data.success) {

package/es/calculator/trend-calculator.js

@@ -5,27 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _baseCalculator = _interopRequireDefault(require("./base-calculator"));
 var _commonUtils = require("../utils/common-utils");
 var _sqlUtils = require("../utils/sql-utils");
 var _trendUtils = require("../utils/trend-utils");
 var _constants = require("../constants");
 class TrendCalculator extends _baseCalculator.default {
-  constructor(_ref) {
-    let {
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    } = _ref;
-    super({
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    });
-  }
   isValidChart(chart) {
     if (!this.validateBaseConfigs(chart)) {
       return false;
@@ -37,8 +23,8 @@ class TrendCalculator extends _baseCalculator.default {
       summary_type
     } = chart;
     const table = this.getTableById(table_id);
-    if (!_dtableStore.TableUtils.getTableColumnByKey(table, date_column)) return false;
-    if (summary_type === _constants.SUMMARY_TYPE.ADVANCED && !_dtableStore.TableUtils.getTableColumnByKey(table, summary_column)) {
+    if (!(0, _dtableUtils.getTableColumnByKey)(table, date_column)) return false;
+    if (summary_type === _constants.SUMMARY_TYPE.ADVANCED && !(0, _dtableUtils.getTableColumnByKey)(table, summary_column)) {
       return false;
     }
     return true;
@@ -62,10 +48,10 @@ class TrendCalculator extends _baseCalculator.default {
     } = chart;
     const selectedTable = this.getTableById(table_id);
     const selectedView = this.getViewById(view_id, selectedTable);
-    const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, date_column);
+    const selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, date_column);
     if (!selectedColumn) return {};
-    const sqlCondition = (0, _dtableStore.filter2SqlCondition)(selectedTable, selectedView);
-    const numericColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, summary_column);
+    const sqlCondition = this.filter2SqlCondition(selectedTable, selectedView);
+    const numericColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, summary_column);
     const columnName = selectedColumn.name;
     const dateGroupBy = (0, _sqlUtils.getSqlGroup)(date_granularity, selectedColumn);
     let sqlString = '';