dtable-statistic 4.3.6 → 4.3.8

package/es/calculator/base-calculator.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var ComLink = _interopRequireWildcard(require("comlink"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _dtableDbApi = _interopRequireDefault(require("../api/dtable-db-api"));
 var _calculatorWorker = _interopRequireDefault(require("./workers/calculator.worker.js"));
 var _copyValue = _interopRequireDefault(require("./copy-value"));
@@ -16,11 +16,13 @@ class BaseCalculator {
     let {
       username,
       userId,
+      userDepartmentIdsMap,
       value,
       statisticThreadManager
     } = _ref;
     this.username = username;
     this.userId = userId;
+    this.userDepartmentIdsMap = userDepartmentIdsMap;
     this.value = value;
     this.statisticThreadManager = statisticThreadManager;
   }
@@ -43,13 +45,22 @@ class BaseCalculator {
     } = chart;
     const table = this.getTableById(table_id);
     const view = this.getViewById(view_id, table);
-    return _dtableStore.Views.isArchiveView(view);
+    return (0, _dtableUtils.isArchiveView)(view);
   }
   getTableById(tableId) {
-    return _dtableStore.TableUtils.getTableById(this.value.tables, tableId);
+    return (0, _dtableUtils.getTableById)(this.value.tables, tableId);
   }
   getViewById(viewId, table) {
-    return table && _dtableStore.Views.getViewById(table.views, viewId);
+    return table && (0, _dtableUtils.getViewById)(table.views, viewId);
+  }
+  getViewRows(view, table) {
+    return window.dtableSDK.getViewRows(view, table);
+  }
+  getTableFormulaResults(table, rows) {
+    return window.dtableSDK.getTableFormulaResults(table, rows);
+  }
+  filter2SqlCondition(table, view) {
+    return (0, _dtableUtils.filter2SqlCondition)(table, view, this.username, this.userId, this.userDepartmentIdsMap);
   }
   async calculateWithWorker(chart) {
     const {
@@ -58,7 +69,7 @@ class BaseCalculator {
     const calculatorWorker = await this.statisticThreadManager.applyThread(chartId, _calculatorWorker.default);
     const calculateChart = ComLink.wrap(calculatorWorker);
     const newValue = (0, _copyValue.default)(this.value);
-    const result = await calculateChart(chart, newValue, this.username, this.userId);
+    const result = await calculateChart(chart, newValue, ComLink.proxy(this.getViewRows), ComLink.proxy(this.getTableFormulaResults));
     this.statisticThreadManager.removeThread(chartId);
     return result;
   }

package/es/calculator/basic-chart-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 _constants = require("../constants");
 var _sqlUtils = require("../utils/sql-utils");
@@ -14,20 +14,6 @@ var _statUtils = _interopRequireDefault(require("../utils/stat-utils"));
 var _columnUtils = require("../utils/column-utils");
 var _rowUtils = require("../utils/row-utils");
 class BasicChartCalculator extends _baseCalculator.default {
-  constructor(_ref) {
-    let {
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    } = _ref;
-    super({
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    });
-  }
   isValidChart(chart) {
     if (!this.validateBaseConfigs(chart)) {
       return false;
@@ -44,11 +30,11 @@ class BasicChartCalculator extends _baseCalculator.default {
     } = chart;
     const table = this.getTableById(table_id);
     const groupbyColumnKey = groupby_column_key || x_axis_column_key;
-    if (!groupbyColumnKey || !_dtableStore.TableUtils.getTableColumnByKey(table, groupbyColumnKey)) {
+    if (!groupbyColumnKey || !(0, _dtableUtils.getTableColumnByKey)(table, groupbyColumnKey)) {
       return false;
     }
     const summaryColumnKey = summary_column_key || y_axis_column_key;
-    if (summaryColumnKey && !_dtableStore.TableUtils.getTableColumnByKey(table, summaryColumnKey)) {
+    if (summaryColumnKey && !(0, _dtableUtils.getTableColumnByKey)(table, summaryColumnKey)) {
       return false;
     }
     return true;
@@ -107,13 +93,13 @@ class BasicChartCalculator extends _baseCalculator.default {
     if (!selectedView) {
       return [];
     }
-    const groupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, groupby_column_key);
-    const sqlCondition = (0, _dtableStore.filter2SqlCondition)(selectedTable, selectedView);
+    const groupbyColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, groupby_column_key);
+    const sqlCondition = this.filter2SqlCondition(selectedTable, selectedView);
     let groupbyName = "`".concat(groupbyColumn.name, "`");
     const isTimeColumn = _constants.TIME_COLUMN_LIST.includes(groupbyColumn.type);
     if (isTimeColumn) {
       groupbyName = (0, _sqlUtils.getSqlGroup)(groupby_date_granularity, groupbyColumn);
-    } else if (groupbyColumn.type === _dtableStore.CellType.GEOLOCATION) {
+    } else if (groupbyColumn.type === _dtableUtils.CellType.GEOLOCATION) {
       groupbyName = (0, _sqlUtils.getSqlGroup)(groupby_geolocation_granularity, groupbyColumn);
     }
     let results;
@@ -123,7 +109,7 @@ class BasicChartCalculator extends _baseCalculator.default {
       const {
         column_groupby_numeric_columns
       } = chart;
-      const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, summary_column_key);
+      const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, summary_column_key);
       if (!summaryColumn) return [];
       results = await this.getGroupbyMultipleNumericColumnsResults(groupbyName, groupbyColumn, groupby_date_granularity, groupby_geolocation_granularity, include_empty, summary_type, summaryColumn, summary_method, column_groupby_numeric_columns, sqlCondition, selectedTable, yAxisType);
     } else {
@@ -152,16 +138,16 @@ class BasicChartCalculator extends _baseCalculator.default {
     if (!selectedView || !x_axis_column_key || !Array.isArray(y_axises) || y_axises.length === 0) {
       return [];
     }
-    const groupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
+    const groupbyColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, x_axis_column_key);
     if (!groupbyColumn) {
       return [];
     }
-    const sqlCondition = (0, _dtableStore.filter2SqlCondition)(selectedTable, selectedView);
+    const sqlCondition = this.filter2SqlCondition(selectedTable, selectedView);
     const isTimeColumn = _constants.TIME_COLUMN_LIST.includes(groupbyColumn.type);
     let groupbyName = "`".concat(groupbyColumn.name, "`");
     if (isTimeColumn) {
       groupbyName = (0, _sqlUtils.getSqlGroup)(x_axis_date_granularity, groupbyColumn);
-    } else if (groupbyColumn.type === _dtableStore.CellType.GEOLOCATION) {
+    } else if (groupbyColumn.type === _dtableUtils.CellType.GEOLOCATION) {
       groupbyName = (0, _sqlUtils.getSqlGroup)(x_axis_geolocation_granularity, groupbyColumn);
     }
     const summaryType = _constants.SUMMARY_TYPE.ADVANCED;
@@ -192,7 +178,7 @@ class BasicChartCalculator extends _baseCalculator.default {
     let selectedSummaryColumn;
     let summaryColumnName = "`".concat(groupbyColumn.name, "`");
     if (isAdvanced) {
-      selectedSummaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, summaryColumnKey);
+      selectedSummaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summaryColumnKey);
       if (!selectedSummaryColumn) return [];
       summaryColumnName = selectedSummaryColumn.name;
     }
@@ -234,15 +220,15 @@ class BasicChartCalculator extends _baseCalculator.default {
     let selectedSummaryColumn;
     let summaryColumnName = "`".concat(groupbyColumn.name, "`");
     if (isAdvanced) {
-      selectedSummaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, summaryColumnKey);
+      selectedSummaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summaryColumnKey);
       if (!selectedSummaryColumn) return [];
       summaryColumnName = selectedSummaryColumn.name;
     }
-    const columnGroupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(table, columnGroupbyColumnKey);
+    const columnGroupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, columnGroupbyColumnKey);
     let columnGroupbyColumnName = "`".concat(columnGroupbyColumn.name, "`");
     if (_constants.TIME_COLUMN_LIST.includes(columnGroupbyColumn.type)) {
       columnGroupbyColumnName = (0, _sqlUtils.getSqlGroup)(columnGroupbyDateGranularity, columnGroupbyColumn);
-    } else if (columnGroupbyColumn.type === _dtableStore.CellType.GEOLOCATION) {
+    } else if (columnGroupbyColumn.type === _dtableUtils.CellType.GEOLOCATION) {
       columnGroupbyColumnName = (0, _sqlUtils.getSqlGroup)(columnGroupbyGeolocationGranularity, columnGroupbyColumn);
     }
     const method = isAdvanced ? _constants.DTABLE_DB_SUMMARY_METHOD[summaryMethod] : 'COUNT';
@@ -268,7 +254,7 @@ class BasicChartCalculator extends _baseCalculator.default {
         formatted_value = _statUtils.default.getFormattedValue(value, selectedSummaryColumn, summaryMethod);
       }
       let color;
-      if (columnGroupbyColumn.type === _dtableStore.CellType.SINGLE_SELECT) {
+      if (columnGroupbyColumn.type === _dtableUtils.CellType.SINGLE_SELECT) {
         const tempValue = _statUtils.default.getGroupLabel(item[columnGroupbyColumn.key], item, columnGroupbyColumn, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, this.value);
         color = (0, _columnUtils.getColorFromSingleSelectColumn)(columnGroupbyColumn, tempValue);
       }
@@ -302,7 +288,7 @@ class BasicChartCalculator extends _baseCalculator.default {
       originalMethods.push(summaryMethod);
     }
     columnGroupbyNumericColumns.forEach(item => {
-      const numericColumn = _dtableStore.TableUtils.getTableColumnByKey(table, item.column_key);
+      const numericColumn = (0, _dtableUtils.getTableColumnByKey)(table, item.column_key);
       const groupColumnName = numericColumn.name;
       numericColumns.push(numericColumn);
       groupColumnNames.push(groupColumnName);
@@ -347,7 +333,7 @@ class BasicChartCalculator extends _baseCalculator.default {
   getLabel(groupColumn, groupName, item, groupby_date_granularity, groupby_geolocation_granularity) {
     const isTimeColumn = _constants.TIME_COLUMN_LIST.includes(groupColumn.type);
     let label;
-    if (isTimeColumn || groupColumn.type === _dtableStore.CellType.GEOLOCATION) {
+    if (isTimeColumn || groupColumn.type === _dtableUtils.CellType.GEOLOCATION) {
       label = item[groupName];
     } else {
       const currentGroupLabel = item[groupColumn.key];

package/es/calculator/combination-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 _statUtils = _interopRequireDefault(require("../utils/stat-utils"));
 var _commonUtils = require("../utils/common-utils");
@@ -13,23 +13,6 @@ var _rowUtils = require("../utils/row-utils");
 var _sqlUtils = require("../utils/sql-utils");
 var _constants = require("../constants");
 class CombinationCalculator extends _baseCalculator.default {
-  constructor(_ref) {
-    let {
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    } = _ref;
-    super({
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    });
-    this.isEmptyLabel = label => {
-      return !label;
-    };
-  }
   isValidChart(chart) {
     if (!this.validateBaseConfigs(chart)) {
       return false;
@@ -45,14 +28,14 @@ class CombinationCalculator extends _baseCalculator.default {
       y_axis_left_summary_type
     } = chart;
     const table = this.getTableById(table_id);
-    if (x_axis_column_key && !_dtableStore.TableUtils.getTableColumnByKey(table, x_axis_column_key)) {
+    if (x_axis_column_key && !(0, _dtableUtils.getTableColumnByKey)(table, x_axis_column_key)) {
       return false;
     }
     if (!y_axis_left_summary_type || !y_axis_right_summary_type) return false;
-    if (y_axis_left_summary_type === _constants.SUMMARY_TYPE.ADVANCED && y_axis_left_summary_method && !_dtableStore.TableUtils.getTableColumnByKey(table, y_axis_left_summary_column)) {
+    if (y_axis_left_summary_type === _constants.SUMMARY_TYPE.ADVANCED && y_axis_left_summary_method && !(0, _dtableUtils.getTableColumnByKey)(table, y_axis_left_summary_column)) {
       return false;
     }
-    if (y_axis_right_summary_type === _constants.SUMMARY_TYPE.ADVANCED && y_axis_right_summary_method && !_dtableStore.TableUtils.getTableColumnByKey(table, y_axis_right_summary_column)) {
+    if (y_axis_right_summary_type === _constants.SUMMARY_TYPE.ADVANCED && y_axis_right_summary_method && !(0, _dtableUtils.getTableColumnByKey)(table, y_axis_right_summary_column)) {
       return false;
     }
     return true;
@@ -81,12 +64,12 @@ class CombinationCalculator extends _baseCalculator.default {
       y_axis_left_group_by_numeric_columns
     } = chart;
     const selectedTable = this.getTableById(table_id);
-    const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
+    const selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, x_axis_column_key);
     if (!selectedColumn) return [];
     let groupName = "`".concat(selectedColumn.name, "`");
     if (_constants.TIME_COLUMN_LIST.includes(selectedColumn.type)) {
       groupName = (0, _sqlUtils.getSqlGroup)(groupby_date_granularity, selectedColumn);
-    } else if (selectedColumn.type === _dtableStore.CellType.GEOLOCATION) {
+    } else if (selectedColumn.type === _dtableUtils.CellType.GEOLOCATION) {
       groupName = (0, _sqlUtils.getSqlGroup)(groupby_geolocation_granularity, selectedColumn);
     }
     let sqlString = this.getSqlString(chart, groupName);
@@ -101,12 +84,12 @@ class CombinationCalculator extends _baseCalculator.default {
         let value1Key = "COUNT(".concat(selectedColumn.name, ")");
         let leftSummaryColumn, rightSummaryColumn;
         if (y_axis_left_summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
-          leftSummaryColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, y_axis_left_summary_column);
+          leftSummaryColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, y_axis_left_summary_column);
           value1Key = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[y_axis_left_summary_method], leftSummaryColumn.name);
         }
         let value2Key = "COUNT(".concat(selectedColumn.name, ")");
         if (y_axis_right_summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
-          rightSummaryColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, y_axis_right_summary_column);
+          rightSummaryColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, y_axis_right_summary_column);
           value2Key = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[y_axis_right_summary_method], rightSummaryColumn.name);
         }
         data.forEach(item => {
@@ -138,12 +121,12 @@ class CombinationCalculator extends _baseCalculator.default {
         let rightSummaryColumn;
         let value2Key = "COUNT(".concat(selectedColumn.name, ")");
         if (y_axis_right_summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
-          rightSummaryColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, y_axis_right_summary_column);
+          rightSummaryColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, y_axis_right_summary_column);
           value2Key = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[y_axis_right_summary_method], rightSummaryColumn.name);
         }
         const groupItems = [];
         let summaries = [];
-        let leftSummaryColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, y_axis_left_summary_column);
+        let leftSummaryColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, y_axis_left_summary_column);
         const groupItem = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[y_axis_left_summary_method], leftSummaryColumn.name);
         if (leftSummaryColumn && !groupItems.includes(groupItem)) {
           groupItems.push(groupItem);
@@ -153,7 +136,7 @@ class CombinationCalculator extends _baseCalculator.default {
           });
         }
         y_axis_left_group_by_numeric_columns.forEach((item, index) => {
-          const column = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, item.column_key);
+          const column = (0, _dtableUtils.getTableColumnByKey)(selectedTable, item.column_key);
           if (column) {
             const method = item.summary_method;
             const groupItem = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[method], column.name);
@@ -215,11 +198,11 @@ class CombinationCalculator extends _baseCalculator.default {
     } = chart;
     const selectedTable = this.getTableById(table_id);
     let selectedView = this.getViewById(view_id, selectedTable);
-    const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
-    const column1 = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, y_axis_left_summary_column);
-    const column2 = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, y_axis_right_summary_column);
+    const selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, x_axis_column_key);
+    const column1 = (0, _dtableUtils.getTableColumnByKey)(selectedTable, y_axis_left_summary_column);
+    const column2 = (0, _dtableUtils.getTableColumnByKey)(selectedTable, y_axis_right_summary_column);
     if (!selectedColumn) return [];
-    const sqlCondition = (0, _dtableStore.filter2SqlCondition)(selectedTable, selectedView);
+    const sqlCondition = this.filter2SqlCondition(selectedTable, selectedView);
     const sqlItems = [];
     if (y_axis_left_summary_type === _constants.SUMMARY_TYPE.COUNT || y_axis_right_summary_type === _constants.SUMMARY_TYPE.COUNT) {
       sqlItems.push("COUNT(`".concat(selectedColumn.name, "`)"));
@@ -233,7 +216,7 @@ class CombinationCalculator extends _baseCalculator.default {
       !sqlItems.includes(groupItem) && sqlItems.push(groupItem);
       if (y_axis_left_group_by_multiple_numeric_column) {
         y_axis_left_group_by_numeric_columns.forEach((item, index) => {
-          const column = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, item.column_key);
+          const column = (0, _dtableUtils.getTableColumnByKey)(selectedTable, item.column_key);
           if (column) {
             groupItem = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[item.summary_method], column.name);
             !sqlItems.includes(groupItem) && sqlItems.push(groupItem);
@@ -247,7 +230,7 @@ class CombinationCalculator extends _baseCalculator.default {
   getLabel(groupColumn, groupName, item, groupby_date_granularity, groupby_geolocation_granularity) {
     const isTimeColumn = _constants.TIME_COLUMN_LIST.includes(groupColumn.type);
     let label;
-    if (isTimeColumn || groupColumn.type === _dtableStore.CellType.GEOLOCATION) {
+    if (isTimeColumn || groupColumn.type === _dtableUtils.CellType.GEOLOCATION) {
       label = item[groupName];
     } else {
       const currentGroupLabel = item[groupColumn.key];
@@ -256,5 +239,8 @@ class CombinationCalculator extends _baseCalculator.default {
     }
     return label;
   }
+  isEmptyLabel(label) {
+    return !label;
+  }
 }
 var _default = exports.default = CombinationCalculator;

package/es/calculator/compare-bar-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 _sqlUtils = require("../utils/sql-utils");
 var _statUtils = _interopRequireDefault(require("../utils/stat-utils"));
 var _commonUtils = require("../utils/common-utils");
 var _constants = require("../constants");
 class CompareBarCalculator extends _baseCalculator.default {
-  constructor(_ref) {
-    let {
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    } = _ref;
-    super({
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    });
-  }
   isValidChart(chart) {
     if (!this.validateBaseConfigs(chart)) {
       return false;
@@ -42,9 +28,9 @@ class CompareBarCalculator extends _baseCalculator.default {
       x_axis_compared_date_range_end
     } = chart;
     const table = this.getTableById(table_id);
-    if (!_dtableStore.TableUtils.getTableColumnByKey(table, x_axis_column_key)) return false;
+    if (!(0, _dtableUtils.getTableColumnByKey)(table, x_axis_column_key)) return false;
     const summaryColumnKey = summary_column_key || y_axis_column_key;
-    if (summaryColumnKey && !_dtableStore.TableUtils.getTableColumnByKey(table, summaryColumnKey)) return false;
+    if (summaryColumnKey && !(0, _dtableUtils.getTableColumnByKey)(table, summaryColumnKey)) return false;
     if (!x_axis_date_range_start || !x_axis_date_range_end || !x_axis_compared_date_range_start || !x_axis_compared_date_range_end) {
       return false;
     }
@@ -77,7 +63,7 @@ class CompareBarCalculator extends _baseCalculator.default {
     } = chart;
     const selectedTable = this.getTableById(table_id);
     const selectedView = this.getViewById(view_id, selectedTable);
-    const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
+    const selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, x_axis_column_key);
     const isAdvanced = y_axis_summary_type === _constants.SUMMARY_TYPE.ADVANCED;
     const method = isAdvanced ? _constants.DTABLE_DB_SUMMARY_METHOD[y_axis_summary_method] : _constants.DTABLE_DB_SUMMARY_METHOD.Count;
     let sqlString = '';
@@ -86,12 +72,12 @@ class CompareBarCalculator extends _baseCalculator.default {
     let summaryColumnName = "".concat(selectedColumn.name);
     let selectedSummaryColumn = {};
     if (isAdvanced) {
-      selectedSummaryColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, y_axis_column_key);
+      selectedSummaryColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, y_axis_column_key);
       if (!selectedSummaryColumn) return [];
       summaryColumnName = "".concat(selectedSummaryColumn.name);
     }
     const summaryColumnMethod = (0, _commonUtils.getSummaryColumnMethod)(method, summaryColumnName);
-    let sqlCondition = (0, _dtableStore.filter2SqlCondition)(selectedTable, selectedView);
+    let sqlCondition = this.filter2SqlCondition(selectedTable, selectedView);
     sqlCondition = this.getStatItemSqlCondition(chart, sqlCondition, "`".concat(selectedColumn.name, "`"));
     sqlString = "select ".concat(groupName, ", ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by ").concat(groupName, " ").concat(sqlOrder, " limit 5000");
     const result = await this.sqlQuery(sqlString);
@@ -140,6 +126,8 @@ class CompareBarCalculator extends _baseCalculator.default {
       let comparedResult = [];
       let rangeResult = [];
       const data = selectedSummaryColumn.data || {};
+
+      // eslint-disable-next-line
       for (let item of dateRangeResult) {
         let value = item[1];
         let formatted_value = value;
@@ -156,6 +144,7 @@ class CompareBarCalculator extends _baseCalculator.default {
         });
       }
       let index = 0;
+      // eslint-disable-next-line
       for (let item of dateComparedResult) {
         let dateRangeItem = rangeResult[index];
         if (!dateRangeItem) {

package/es/calculator/completeness-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 _sqlUtils = require("../utils/sql-utils");
 var _constants = require("../constants");
@@ -13,20 +13,6 @@ var _commonUtils = require("../utils/common-utils");
 var _statUtils = _interopRequireDefault(require("../utils/stat-utils"));
 var _rowUtils = require("../utils/row-utils");
 class CompletenessCalculator 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,16 +26,16 @@ class CompletenessCalculator extends _baseCalculator.default {
       group_column
     } = chart;
     const table = this.getTableById(table_id);
-    if (!_dtableStore.TableUtils.getTableColumnByKey(table, name_column)) {
+    if (!(0, _dtableUtils.getTableColumnByKey)(table, name_column)) {
       return false;
     }
-    if (!_dtableStore.TableUtils.getTableColumnByKey(table, completed_column)) {
+    if (!(0, _dtableUtils.getTableColumnByKey)(table, completed_column)) {
       return false;
     }
-    if (!_dtableStore.TableUtils.getTableColumnByKey(table, target_column)) {
+    if (!(0, _dtableUtils.getTableColumnByKey)(table, target_column)) {
       return false;
     }
-    if (type === _constants.STAT_TYPE.GROUP_COMPLETENESS_CHART && (!group_column || !_dtableStore.TableUtils.getTableColumnByKey(table, group_column))) {
+    if (type === _constants.STAT_TYPE.GROUP_COMPLETENESS_CHART && (!group_column || !(0, _dtableUtils.getTableColumnByKey)(table, group_column))) {
       return false;
     }
     return true;
@@ -76,12 +62,12 @@ class CompletenessCalculator extends _baseCalculator.default {
     if (!selectedView) {
       return [];
     }
-    const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, name_column);
+    const selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, name_column);
     const groupName = "`".concat(selectedColumn.name, "`");
-    const sqlCondition = (0, _dtableStore.filter2SqlCondition)(selectedTable, selectedView);
-    const completedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, completed_column);
-    const targetColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, target_column);
-    const groupColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, group_column);
+    const sqlCondition = this.filter2SqlCondition(selectedTable, selectedView);
+    const completedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, completed_column);
+    const targetColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, target_column);
+    const groupColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, group_column);
     const sqlOrder = (0, _sqlUtils.getSqlOrder)(null, groupName);
     const isColumnDataAsAnArray = (0, _commonUtils.isArrayCellValue)(selectedColumn);
     const memo = new Map();

package/es/calculator/dashboard-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 DashboardCalculator extends _baseCalculator.default {
-  constructor(_ref) {
-    let {
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    } = _ref;
-    super({
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    });
-  }
   isValidChart(chart) {
     if (!this.validateBaseConfigs(chart)) {
       return false;
@@ -34,8 +20,8 @@ class DashboardCalculator extends _baseCalculator.default {
       total_value_column
     } = chart;
     const table = this.getTableById(table_id);
-    const selectedColumn1 = _dtableStore.TableUtils.getTableColumnByKey(table, target_value_column);
-    const selectedColumn2 = _dtableStore.TableUtils.getTableColumnByKey(table, total_value_column);
+    const selectedColumn1 = (0, _dtableUtils.getTableColumnByKey)(table, target_value_column);
+    const selectedColumn2 = (0, _dtableUtils.getTableColumnByKey)(table, total_value_column);
     if (!selectedColumn1 || !selectedColumn2) {
       return false;
     }
@@ -59,9 +45,9 @@ class DashboardCalculator extends _baseCalculator.default {
     } = chart;
     const selectedTable = this.getTableById(table_id);
     const selectedView = this.getViewById(view_id, selectedTable);
-    const selectedColumn1 = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, target_value_column);
-    const selectedColumn2 = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, total_value_column);
-    const sqlCondition = (0, _dtableStore.filter2SqlCondition)(selectedTable, selectedView);
+    const selectedColumn1 = (0, _dtableUtils.getTableColumnByKey)(selectedTable, target_value_column);
+    const selectedColumn2 = (0, _dtableUtils.getTableColumnByKey)(selectedTable, total_value_column);
+    const sqlCondition = this.filter2SqlCondition(selectedTable, selectedView);
     const key1 = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[target_value_column_summary_method], selectedColumn1.name);
     const key2 = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[total_value_column_summary_method], selectedColumn2.name);
     const sqlString = "select ".concat(key1, ", ").concat(key2, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " limit 5000");

package/es/calculator/heat-map-calculator.js

@@ -6,25 +6,11 @@ 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 _commonUtils = require("../utils/common-utils");
 var _constants = require("../constants");
 class HeatMapCalculator extends _baseCalculator.default {
-  constructor(_ref) {
-    let {
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    } = _ref;
-    super({
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    });
-  }
   isValidChart(chart) {
     if (!this.validateBaseConfigs(chart)) {
       return false;
@@ -35,10 +21,10 @@ class HeatMapCalculator extends _baseCalculator.default {
       summary_column
     } = chart;
     const table = this.getTableById(table_id);
-    if (!_dtableStore.TableUtils.getTableColumnByKey(table, time_column)) {
+    if (!(0, _dtableUtils.getTableColumnByKey)(table, time_column)) {
       return false;
     }
-    if (summary_column && !_dtableStore.TableUtils.getTableColumnByKey(table, summary_column)) {
+    if (summary_column && !(0, _dtableUtils.getTableColumnByKey)(table, summary_column)) {
       return false;
     }
     return true;
@@ -82,16 +68,16 @@ class HeatMapCalculator extends _baseCalculator.default {
     } = chart;
     const selectedTable = this.getTableById(table_id);
     const selectedView = this.getViewById(view_id, selectedTable);
-    const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, time_column);
+    const selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, time_column);
     const columnName = selectedColumn.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 = '';
     let summaryColumn;
     let sqlString = '';
     if (isAdvanced) {
-      summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, summary_column);
+      summaryColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, summary_column);
       if (!summaryColumn) {
         return [];
       }

package/es/calculator/horizontal-bar-calculator.js

@@ -8,19 +8,8 @@ exports.default = void 0;
 var _basicChartCalculator = _interopRequireDefault(require("./basic-chart-calculator"));
 var _constants = require("../constants");
 class HorizontalBarCalculator {
-  constructor(_ref) {
-    let {
-      value,
-      statisticThreadManager,
-      username,
-      userId
-    } = _ref;
-    this.basicChartCalculator = new _basicChartCalculator.default({
-      value,
-      username,
-      userId,
-      statisticThreadManager
-    });
+  constructor(props) {
+    this.basicChartCalculator = new _basicChartCalculator.default(props);
   }
   isValidChart(chart) {
     const convertedChart = this.convertChart(chart);

package/es/calculator/index.js

@@ -26,12 +26,14 @@ class ChartCalculator {
     let {
       username,
       userId,
+      userDepartmentIdsMap,
       value,
       statisticThreadManager
     } = _ref;
     const configs = {
       username,
       userId,
+      userDepartmentIdsMap,
       value,
       statisticThreadManager
     };