dtable-statistic 4.3.6 → 4.3.8

package/es/calculator/workers/mirror-calculator-worker.js

@@ -5,13 +5,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _utils = require("../../utils");
 var _commonUtils = require("../../utils/common-utils");
 var _rowUtils = require("../../utils/row-utils");
 var _constants = require("../../constants");
 var _statUtils = _interopRequireDefault(require("../../utils/stat-utils"));
-function calculateStatItem(chart, dtableValue, username, userId) {
+async function calculateStatItem(chart, dtableValue, _ref) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref;
   const {
     table_id,
     view_id,
@@ -21,13 +25,13 @@ function calculateStatItem(chart, dtableValue, username, userId) {
     summary_method,
     group_column
   } = chart;
-  const table = _dtableStore.TableUtils.getTableById(dtableValue.tables, table_id);
-  const view = table && _dtableStore.Views.getViewById(table.views, view_id);
-  const columnItem = _dtableStore.TableUtils.getTableColumnByKey(table, column);
-  const rows = _dtableStore.Views.getViewRows(view, table, dtableValue, username, userId);
-  const formulaRows = _dtableStore.Views.getTableFormulaResults(table, rows, dtableValue);
-  const groupColumn = _dtableStore.TableUtils.getTableColumnByKey(table, group_column);
-  const numericColumn = summary_column && _dtableStore.TableUtils.getTableColumnByKey(table, summary_column);
+  const table = (0, _dtableUtils.getTableById)(dtableValue.tables, table_id);
+  const view = table && (0, _dtableUtils.getViewById)(table.views, view_id);
+  const columnItem = (0, _dtableUtils.getTableColumnByKey)(table, column);
+  const rows = await getViewRows(view, table);
+  const formulaRows = await getTableFormulaResults(table, rows);
+  const groupColumn = (0, _dtableUtils.getTableColumnByKey)(table, group_column);
+  const numericColumn = summary_column && (0, _dtableUtils.getTableColumnByKey)(table, summary_column);
   const groupItems = getGroupItems(rows, groupColumn);
   if (groupColumn.length === 0) return;
   let result = {};
@@ -74,7 +78,7 @@ function calculateStatItem(chart, dtableValue, username, userId) {
           const list = result[groupItem][value];
           const formulaRow = formulaRows[row._id];
           let cellValue = (0, _rowUtils.getCellValue)(row, formulaRow, numericColumn);
-          cellValue = (0, _dtableStore.isNumber)(cellValue) ? cellValue : 0;
+          cellValue = (0, _dtableUtils.isNumber)(cellValue) ? cellValue : 0;
           if (groupItem === groupValue) {
             if (!list) {
               result[groupItem][value] = [cellValue];

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

@@ -5,12 +5,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = calculateStatItem;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _constants = require("../../constants");
 var _commonUtils = require("../../utils/common-utils");
 var _rowUtils = require("../../utils/row-utils");
 var _statUtils = _interopRequireDefault(require("../../utils/stat-utils"));
-function calculateStatItem(chart, value, username, userId) {
+function calculateStatItem(chart, value, _ref) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref;
   const {
     groupby_column_key,
     column_groupby_column_key
@@ -19,11 +23,21 @@ function calculateStatItem(chart, value, username, userId) {
     return {};
   }
   if (!column_groupby_column_key) {
-    return calculateOneDimensionTable(chart, value, username, userId);
+    return calculateOneDimensionTable(chart, value, {
+      getViewRows,
+      getTableFormulaResults
+    });
   }
-  return calculateTwoDimensionTable(chart, value, username, userId);
+  return calculateTwoDimensionTable(chart, value, {
+    getViewRows,
+    getTableFormulaResults
+  });
 }
-function calculateOneDimensionTable(chart, value, username, userId) {
+async function calculateOneDimensionTable(chart, value, _ref2) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref2;
   const {
     table_id,
     view_id,
@@ -36,13 +50,13 @@ function calculateOneDimensionTable(chart, value, username, userId) {
     groupby_geolocation_granularity,
     summary_columns_option
   } = chart;
-  const table = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const view = table && _dtableStore.Views.getViewById(table.views, view_id);
-  const column = _dtableStore.TableUtils.getTableColumnByKey(table, groupby_column_key);
+  const table = (0, _dtableUtils.getTableById)(value.tables, table_id);
+  const view = table && (0, _dtableUtils.getViewById)(table.views, view_id);
+  const column = (0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key);
   if (!column) return {};
   const isColumnDataAsAnArray = (0, _commonUtils.isArrayCellValue)(column);
-  const statRows = _dtableStore.Views.getViewRows(view, table, value, username, userId);
-  const formulaRows = _dtableStore.Views.getTableFormulaResults(table, statRows, value);
+  const statRows = await getViewRows(view, table);
+  const formulaRows = await getTableFormulaResults(table, statRows);
   let pivot_rows = [];
   statRows.forEach(row => {
     const {
@@ -74,7 +88,7 @@ function calculateOneDimensionTable(chart, value, username, userId) {
   const statisticColumnKeys = [summary_column_key, ...summary_columns_option_keys];
   const validStatisticColumnKeys = statisticColumnKeys;
   let statisticColumns = validStatisticColumnKeys.map(key => {
-    const column = _dtableStore.TableUtils.getTableColumnByKey(table, key);
+    const column = (0, _dtableUtils.getTableColumnByKey)(table, key);
     return column ? {
       ...column
     } : null;
@@ -96,7 +110,7 @@ function calculateOneDimensionTable(chart, value, username, userId) {
       key: column.key,
       method: column.method
     };
-  }).filter(item => _dtableStore.TableUtils.getTableColumnByKey(table, item.key));
+  }).filter(item => (0, _dtableUtils.getTableColumnByKey)(table, item.key));
   pivot_rows.forEach(row => {
     row.original_name = row.name;
     row.name = (0, _rowUtils.getFormattedLabel)(column, row.name, value.collaborators);
@@ -128,7 +142,7 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
   let dateColumnsTotalArr = {};
   if (Array.isArray(columns) && columns.length > 0) {
     columns.forEach(column => {
-      if (column && (0, _dtableStore.isDateColumn)(column)) {
+      if (column && (0, _dtableUtils.isDateColumn)(column)) {
         dateColumnsTotalArr[column.key] = [];
       }
     });
@@ -153,7 +167,7 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
             method
           } = summaryColumn;
           const total = getTotal(summaryColumn, summary_type, method, rows, formula_rows);
-          if (summaryColumn && (0, _dtableStore.isDateColumn)(summaryColumn)) {
+          if (summaryColumn && (0, _dtableUtils.isDateColumn)(summaryColumn)) {
             if (method === _constants.SUMMARY_METHOD_MAP.Distinct_values) {
               totalMap['total'] = total;
             } else {
@@ -184,7 +198,7 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
             } = column;
             const totalKey = key + method;
             const total = getTotal(column, summary_type, method, rows, formula_rows);
-            if (column && (0, _dtableStore.isDateColumn)(column)) {
+            if (column && (0, _dtableUtils.isDateColumn)(column)) {
               if (method === _constants.SUMMARY_METHOD_MAP.Distinct_values) {
                 totalMap[totalKey] = total;
               } else {
@@ -218,7 +232,11 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
     pivot_columns_total
   };
 }
-function calculateTwoDimensionTable(chart, value, username, userId) {
+async function calculateTwoDimensionTable(chart, value, _ref3) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref3;
   const {
     table_id,
     view_id,
@@ -234,24 +252,24 @@ function calculateTwoDimensionTable(chart, value, username, userId) {
     column_groupby_geolocation_granularity,
     summary_columns_option
   } = chart;
-  const table = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const view = table && _dtableStore.Views.getViewById(table.views, view_id);
+  const table = (0, _dtableUtils.getTableById)(value.tables, table_id);
+  const view = table && (0, _dtableUtils.getViewById)(table.views, view_id);
   if (!view) return;
-  const groupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(table, groupby_column_key);
+  const groupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key);
   if (!groupbyColumn) return;
   const isGroupbyColumnDataAsAnArray = (0, _commonUtils.isArrayCellValue)(groupbyColumn);
-  const rowGroupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(table, column_groupby_column_key);
+  const rowGroupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, column_groupby_column_key);
   if (!rowGroupbyColumn) {
     return calculateOneDimensionTable(chart, value);
   }
   const isRowGroupbyColumnDataAsAnArray = (0, _commonUtils.isArrayCellValue)(rowGroupbyColumn);
-  const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, summary_column_key);
-  const statRows = _dtableStore.Views.getViewRows(view, table, value, username, userId);
-  const formulaRows = _dtableStore.Views.getTableFormulaResults(table, statRows, value);
+  const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column_key);
+  const statRows = await getViewRows(view, table);
+  const formulaRows = await getTableFormulaResults(table, statRows);
   const pivot_summary_multiple_columns = [];
   summary_columns_option.forEach(item => {
-    const column = _dtableStore.TableUtils.getTableColumnByKey(table, item.key);
-    if (column && (0, _dtableStore.isNumericColumn)(column)) {
+    const column = (0, _dtableUtils.getTableColumnByKey)(table, item.key);
+    if (column && (0, _dtableUtils.isNumericColumn)(column)) {
       pivot_summary_multiple_columns.push({
         key: item.key,
         type: column.type,
@@ -420,7 +438,7 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
   }
 }
 function isSameName(prevName, currName) {
-  if ((0, _dtableStore.isNumber)(prevName) && (0, _dtableStore.isNumber)(currName)) {
+  if ((0, _dtableUtils.isNumber)(prevName) && (0, _dtableUtils.isNumber)(currName)) {
     return prevName === currName;
   }
   if (!prevName && !currName) {
@@ -443,7 +461,7 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
   let {
     type: summary_column_type
   } = summaryColumn || {};
-  const isSummaryDateColumn = summaryColumn && (0, _dtableStore.isDateColumn)(summaryColumn);
+  const isSummaryDateColumn = summaryColumn && (0, _dtableUtils.isDateColumn)(summaryColumn);
   let date_summary_column_format = isSummaryDateColumn ? summaryColumn.data.format : '';
   Array.isArray(pivot_rows) && pivot_rows.forEach(pivotRow => {
     let {
@@ -482,7 +500,7 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
       pivot_table_total += total;
     }
   });
-  if (summaryColumn && (0, _dtableStore.isDateColumn)(summaryColumn)) {
+  if (summaryColumn && (0, _dtableUtils.isDateColumn)(summaryColumn)) {
     if (summary_method === _constants.SUMMARY_METHOD_MAP.Distinct_values) {
       pivot_columns_total = Number.parseFloat(pivot_table_total.toFixed(8));
     } else {
@@ -516,7 +534,7 @@ function getTotal(summary_column, summary_type, summary_method) {
       let existMap = {};
       rows.forEach(row => {
         let num;
-        if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+        if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
           const formulaRow = formula_rows[row._id] || {};
           num = formulaRow[summary_column_key];
           num = Array.isArray(num) ? num[0] : num;
@@ -537,14 +555,14 @@ function getTotal(summary_column, summary_type, summary_method) {
       });
       return total;
     }
-    if (summary_column && (0, _dtableStore.isDateColumn)(summary_column)) {
+    if (summary_column && (0, _dtableUtils.isDateColumn)(summary_column)) {
       if (rowsLength === 0) return;
       let dateArr = [];
       rows.forEach(r => {
         let formatDate = {};
         let formatDateData;
         let value = r[summary_column_key];
-        if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+        if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
           let formulaRow = formula_rows[r._id] || {};
           value = formulaRow[summary_column_key];
         }
@@ -575,7 +593,7 @@ function getTotal(summary_column, summary_type, summary_method) {
             let validNumbersCount = 0;
             rows.forEach(r => {
               let num;
-              if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+              if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
                 let formulaRow = formula_rows[r._id] || {};
                 if (formulaRow[summary_column_key] && typeof formulaRow[summary_column_key] === 'object') {
                   num = formulaRow[summary_column_key][0];
@@ -585,7 +603,7 @@ function getTotal(summary_column, summary_type, summary_method) {
               } else {
                 num = r[summary_column_key];
               }
-              if ((0, _dtableStore.isNumber)(num)) {
+              if ((0, _dtableUtils.isNumber)(num)) {
                 validNumbersCount++;
                 sum += num;
               }
@@ -603,7 +621,7 @@ function getTotal(summary_column, summary_type, summary_method) {
             if (rowsLength > 0) {
               let result = rows.reduce((current, next) => {
                 let currentValue, nextValue;
-                if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+                if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
                   let currentFormulaRow = formula_rows[current._id] || {};
                   let nextFormulaRow = formula_rows[next._id] || {};
                   currentValue = currentFormulaRow[summary_column_key];
@@ -622,7 +640,7 @@ function getTotal(summary_column, summary_type, summary_method) {
                   return isNextGreater ? next : current;
                 }
               });
-              if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+              if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
                 let formulaRow = formula_rows[result._id];
                 if (formulaRow) {
                   if (formulaRow[summary_column_key] && typeof formulaRow[summary_column_key] === 'object') {

package/es/calculator/workers/scatter-calculator-worker.js

@@ -5,12 +5,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _statUtils = _interopRequireDefault(require("../../utils/stat-utils"));
 var _commonUtils = require("../../utils/common-utils");
 var _rowUtils = require("../../utils/row-utils");
 var _constants = require("../../constants");
-function calculateResult(chart, value, username, userId) {
+async function calculateResult(chart, value, _ref) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref;
   const {
     table_id,
     view_id,
@@ -18,16 +22,16 @@ function calculateResult(chart, value, username, userId) {
     y_axis_column,
     group_column
   } = chart;
-  const table = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const view = table && _dtableStore.Views.getViewById(table.views, view_id);
+  const table = (0, _dtableUtils.getTableById)(value.tables, table_id);
+  const view = table && (0, _dtableUtils.getViewById)(table.views, view_id);
   if (!view) {
     return [];
   }
-  const selectedXAxisColumn = _dtableStore.TableUtils.getTableColumnByKey(table, x_axis_column);
-  const selectedYAxisColumn = _dtableStore.TableUtils.getTableColumnByKey(table, y_axis_column);
-  const selectedGroupColumn = _dtableStore.TableUtils.getTableColumnByKey(table, group_column);
-  const statRows = _dtableStore.Views.getViewRows(view, table, value, username, userId);
-  const formulaRows = _dtableStore.Views.getTableFormulaResults(table, statRows, value);
+  const selectedXAxisColumn = (0, _dtableUtils.getTableColumnByKey)(table, x_axis_column);
+  const selectedYAxisColumn = (0, _dtableUtils.getTableColumnByKey)(table, y_axis_column);
+  const selectedGroupColumn = (0, _dtableUtils.getTableColumnByKey)(table, group_column);
+  const statRows = await getViewRows(view, table);
+  const formulaRows = await getTableFormulaResults(table, statRows);
   const data = [];
   statRows.forEach(row => {
     const {
@@ -36,8 +40,8 @@ function calculateResult(chart, value, username, userId) {
     const formulaRow = formulaRows[rowId] || {};
     let x_axis = (0, _rowUtils.getCellValue)(row, formulaRow, selectedXAxisColumn);
     let y_axis = (0, _rowUtils.getCellValue)(row, formulaRow, selectedYAxisColumn);
-    x_axis = (0, _dtableStore.isNumber)(x_axis) ? x_axis : 0;
-    y_axis = (0, _dtableStore.isNumber)(y_axis) ? y_axis : 0;
+    x_axis = (0, _dtableUtils.isNumber)(x_axis) ? x_axis : 0;
+    y_axis = (0, _dtableUtils.isNumber)(y_axis) ? y_axis : 0;
     const name = getColumnValue(row, formulaRow, selectedGroupColumn, value);
     const nameIndex = data.findIndex(r => r.name === name && r.x_axis === x_axis && r.y_axis === y_axis);
     const dataItem = {

package/es/calculator/workers/trend-calculator-worker.js

@@ -7,14 +7,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _quarterOfYear = _interopRequireDefault(require("dayjs/plugin/quarterOfYear"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _constants = require("../../constants");
 var _statUtils = _interopRequireDefault(require("../../utils/stat-utils"));
 var _rowUtils = require("../../utils/row-utils");
 var _commonUtils = require("../../utils/common-utils");
 var _trendUtils = require("../../utils/trend-utils");
 _dayjs.default.extend(_quarterOfYear.default);
-function calculateStatItem(chart, value, username, userId) {
+async function calculateStatItem(chart, value, _ref) {
+  let {
+    getViewRows,
+    getTableFormulaResults
+  } = _ref;
   const {
     table_id,
     view_id,
@@ -24,16 +28,16 @@ function calculateStatItem(chart, value, username, userId) {
     summary_type,
     summary_method
   } = chart;
-  const selectedTable = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const selectedView = selectedTable && _dtableStore.Views.getViewById(selectedTable.views, view_id);
-  const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, date_column);
+  const selectedTable = (0, _dtableUtils.getTableById)(value.tables, table_id);
+  const selectedView = selectedTable && (0, _dtableUtils.getViewById)(selectedTable.views, view_id);
+  const selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, date_column);
   const resultMap = new Map();
   let formulaRows = {};
-  const rows = _dtableStore.Views.getViewRows(selectedView, selectedTable, value, username, userId);
-  const numericColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, summary_column);
+  const rows = await getViewRows(selectedView, selectedTable);
+  const numericColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, summary_column);
   if (summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
-    if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[numericColumn.type]) {
-      formulaRows = _dtableStore.Views.getTableFormulaResults(selectedTable, rows, value);
+    if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[numericColumn.type]) {
+      formulaRows = await getTableFormulaResults(selectedTable, rows);
     }
   }
   let granularity = date_granularity;
@@ -51,7 +55,7 @@ function calculateStatItem(chart, value, username, userId) {
         const formulaRow = formulaRows[row._id];
         const numericValue = (0, _rowUtils.getCellValue)(row, formulaRow, numericColumn);
         const currentList = resultMap.get(label) || [];
-        if ((0, _dtableStore.isNumber)(numericValue)) {
+        if ((0, _dtableUtils.isNumber)(numericValue)) {
           currentList.push(numericValue);
         }
         resultMap.set(label, currentList);

package/es/calculator/world-map-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 _constants = require("../constants");
 var _statUtils = _interopRequireDefault(require("../utils/stat-utils"));
 class WorldMapCalculator 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,11 +21,11 @@ class WorldMapCalculator extends _baseCalculator.default {
       summary_column
     } = chart;
     const table = this.getTableById(table_id);
-    const selectedColumn = column && _dtableStore.TableUtils.getTableColumnByKey(table, column);
+    const selectedColumn = column && (0, _dtableUtils.getTableColumnByKey)(table, column);
     if (column && !selectedColumn) {
       return false;
     }
-    if (summary_column && !_dtableStore.TableUtils.getTableColumnByKey(table, summary_column)) {
+    if (summary_column && !(0, _dtableUtils.getTableColumnByKey)(table, summary_column)) {
       return false;
     }
     return true;
@@ -63,17 +49,17 @@ class WorldMapCalculator extends _baseCalculator.default {
     } = chart;
     const selectedTable = this.getTableById(table_id);
     const selectedView = this.getViewById(view_id, selectedTable);
-    const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, column);
+    const selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, column);
     if (!selectedColumn) return [];
     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/components/dialog/chart-addition-edit-dialog.js

@@ -65,7 +65,7 @@ class ChartAdditionEditDialog extends _react.Component {
       zIndex: 1048
     }, /*#__PURE__*/_react.default.createElement(_reactstrap.ModalHeader, {
       toggle: this.props.hideChartAdditionDialog
-    }, _reactIntlUniversal.default.get(editMode ? 'Edit_the_chart' : 'Choose_a_chart')), /*#__PURE__*/_react.default.createElement(_reactstrap.ModalBody, {
+    }, _reactIntlUniversal.default.get(editMode ? 'Edit_the_chart' : 'All_charts')), /*#__PURE__*/_react.default.createElement(_reactstrap.ModalBody, {
       className: "statistic-modal-body"
     }, editMode ? /*#__PURE__*/_react.default.createElement(_statEditor.default, {
       dtableChangedTime: this.props.dtableChangedTime,

package/es/components/dialog/chart-addition-widgets/chart-selector.js

@@ -174,7 +174,7 @@ class ChartSelector extends _react.default.Component {
         image: 'number-card.png'
       }, {
         type: _constants.STAT_TYPE.TREND_CHART,
-        title: _reactIntlUniversal.default.get('Trend_chart'),
+        title: _reactIntlUniversal.default.get('Trend_card'),
         image: 'trend-chart.png'
       }]
     }, {

package/es/components/dialog/statistic-record-dialog/index.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
 var _reactstrap = require("reactstrap");
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _dtableDbApi = _interopRequireDefault(require("../../../api/dtable-db-api"));
 var _index = require("../../index");
 var _utils = require("../../../utils");
@@ -42,16 +42,24 @@ class StatisticRecordDialog extends _react.default.Component {
         view_id
       } = chart;
       this.table = getTableById(table_id);
-      this.view = _dtableStore.Views.getViewById(this.table.views, view_id);
-      this.isArchiveView = _dtableStore.Views.isArchiveView(this.view);
+      this.view = (0, _dtableUtils.getViewById)(this.table.views, view_id);
+      this.isArchiveView = (0, _dtableUtils.isArchiveView)(this.view);
       this.unShowColumnKeyList = this.getUnShowColumnKeyList(this.view);
       this.renderedColumns = this.getRenderedColumns(this.table);
       if (this.isArchiveView || !records) {
+        const {
+          username,
+          userId,
+          userDepartmentIdsMap
+        } = window.dtable || {};
         const sqlString = (0, _sqlUtils.getSqlString)(chart, statisticRecord, {
           isColumn,
           isCurrentView,
           isRow,
-          getTableById
+          getTableById,
+          username,
+          userId,
+          userDepartmentIdsMap
         });
         _dtableDbApi.default.sqlQuery(sqlString).then(res => {
           const {
@@ -86,7 +94,7 @@ class StatisticRecordDialog extends _react.default.Component {
     };
     this.initComputedProperties = drilledRows => {
       if (this.isArchiveView) {
-        const formulaColumns = _dtableStore.Views.getFormulaColumnsContainLinks(this.table);
+        const formulaColumns = (0, _dtableUtils.getFormulaColumnsContainLinks)(this.table);
         if (formulaColumns.length === 0) return {};
         let formulaRows = {};
         drilledRows.forEach(row => {
@@ -131,7 +139,7 @@ class StatisticRecordDialog extends _react.default.Component {
     this.getSearchedRows = (rows, searchVal) => {
       if (!Array.isArray(rows) || rows.length === 0) return [];
       if (searchVal) {
-        return (0, _utils.searchRows)(rows, _dtableStore.Views.getColumns(this.view, this.table), searchVal, row => {
+        return (0, _utils.searchRows)(rows, (0, _dtableUtils.getViewShownColumns)(this.view, this.table.columns), searchVal, row => {
           return row;
         }).map(row => row._id);
       }
@@ -236,11 +244,13 @@ class StatisticRecordDialog extends _react.default.Component {
           formulaRows: view.formula_rows
         };
       }
-      _dtableStore.Views.cacheFormulaResults(table.rows, {
-        targetViewId: view._id,
-        table,
-        value
-      });
+      if (window.app && window.app.cacheFormulaResults) {
+        window.app.cacheFormulaResults(table.rows, {
+          targetViewId: view._id,
+          table,
+          value
+        });
+      }
       return {
         formulaRows: view.formula_rows
       };

package/es/components/dropdown-menu/statistic-dropdown-menu.js

@@ -90,7 +90,7 @@ class StatisticDropdownMenu extends _react.default.Component {
       className: "item-icon dtable-font dtable-icon-copy"
     }), /*#__PURE__*/_react.default.createElement("span", {
       className: "item-text"
-    }, _reactIntlUniversal.default.get('Copy')))), chartType === _constants.STAT_TYPE.PIVOT_TABLE && !isTableReadOnly && /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
+    }, _reactIntlUniversal.default.get('Duplicate')))), chartType === _constants.STAT_TYPE.PIVOT_TABLE && !isTableReadOnly && /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
       onClick: this.props.onNewTableDialogToggle
     }, /*#__PURE__*/_react.default.createElement("i", {
       className: "item-icon dtable-font dtable-icon-export"

package/es/components/popover/color-rules/rule-filters/number-input.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 /**
  * support type number with format
  */
@@ -23,19 +23,19 @@ class NumberInput extends _react.Component {
       if (valueType === 'number') {
         numericValue = value;
       } else if (valueType === 'string') {
-        numericValue = (0, _dtableStore.formatStringToNumber)(value, {});
+        numericValue = (0, _dtableUtils.formatStringToNumber)(value, {});
       }
       if (!numericValue && numericValue !== 0) {
         return '';
       }
-      return (0, _dtableStore.getNumberDisplayString)(numericValue, {}) || '';
+      return (0, _dtableUtils.getNumberDisplayString)(numericValue, {}) || '';
     };
     this.onChange = evt => {
-      const value = (0, _dtableStore.replaceNumberNotAllowInput)(evt.target.value.trim(), _dtableStore.DEFAULT_NUMBER_FORMAT, null);
+      const value = (0, _dtableUtils.replaceNumberNotAllowInput)(evt.target.value.trim(), _dtableUtils.DEFAULT_NUMBER_FORMAT, null);
       this.setState({
         value
       }, () => {
-        this.props.onChange((0, _dtableStore.formatStringToNumber)(value, {}));
+        this.props.onChange((0, _dtableUtils.formatStringToNumber)(value, {}));
       });
     };
     this.onPaste = evt => {

package/es/components/popover/color-rules-popover.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _index = require("../index");
 var _colorRules = _interopRequireDefault(require("./color-rules"));
 var _colorRules2 = require("../../constants/color-rules");
@@ -82,7 +82,7 @@ class ColorRulesPopover extends _react.Component {
       switch (filterType) {
         case _colorRules2.COLOR_RULE_FILTER_TYPE_MAP.NUMERIC_VALUE:
           {
-            return _dtableStore.FILTER_COLUMN_OPTIONS[_dtableStore.CellType.NUMBER];
+            return _dtableUtils.FILTER_COLUMN_OPTIONS[_dtableUtils.CellType.NUMBER];
           }
         default:
           {

package/es/components/select/select.js

@@ -31,7 +31,7 @@ class Select extends _react.Component {
       });
       window.app.eventBus.dispatch(_constants.CommonEventTypes.OPEN_SELECT, !this.state.isShowSelectOptions);
     };
-    this.onClick = event => {
+    this.onMousedown = event => {
       if (this.props.isShowSelected && event.target.className.includes('icon-fork-number')) {
         return;
       }
@@ -84,10 +84,10 @@ class Select extends _react.Component {
     };
   }
   componentDidMount() {
-    document.addEventListener('click', this.onClick);
+    document.addEventListener('mousedown', this.onMousedown);
   }
   componentWillUnmount() {
-    document.removeEventListener('click', this.onClick);
+    document.removeEventListener('mousedown', this.onMousedown);
   }
   render() {
     let {

package/es/components/toast/alert.js

@@ -99,6 +99,8 @@ class Alert extends _react.default.PureComponent {
           }),
           iconClass: 'dtable-font dtable-icon-exclamation-circle'
         };
+      default:
+        return null;
     }
   }
   render() {