dtable-statistic 4.3.6 → 4.3.8

package/es/utils/export-table-utils.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.updateStatisticToTable = exports.exportStatisticToTable = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _cellValue = require("./cell-value");
 var _column = require("./column");
 var _collaborator = require("./collaborator");
@@ -21,7 +21,7 @@ const isSummaryDateColumn = summaryColumn => {
   const {
     type
   } = summaryColumn;
-  return type !== _dtableStore.CellType.LINK && (0, _dtableStore.isDateColumn)(summaryColumn);
+  return type !== _dtableUtils.CellType.LINK && (0, _dtableUtils.isDateColumn)(summaryColumn);
 };
 
 // eslint-disable-next-line
@@ -34,31 +34,31 @@ const getTableValueDisplayName = (value, column) => {
     collaborators
   } = window.app.state;
   switch (type) {
-    case _dtableStore.CellType.SINGLE_SELECT:
-    case _dtableStore.CellType.MULTIPLE_SELECT:
+    case _dtableUtils.CellType.SINGLE_SELECT:
+    case _dtableUtils.CellType.MULTIPLE_SELECT:
       {
         let options = (0, _column.getSelectColumnOptions)(column);
-        let option = (0, _dtableStore.getOption)(options, value) || {};
+        let option = (0, _dtableUtils.getOption)(options, value) || {};
         return option.name;
       }
-    case _dtableStore.CellType.COLLABORATOR:
+    case _dtableUtils.CellType.COLLABORATOR:
       {
-        let collaborator = (0, _dtableStore.getCollaborator)(collaborators, value) || {};
+        let collaborator = (0, _dtableUtils.getCollaborator)(collaborators, value) || {};
         return collaborator.name;
       }
-    case _dtableStore.CellType.CREATOR:
-    case _dtableStore.CellType.LAST_MODIFIER:
+    case _dtableUtils.CellType.CREATOR:
+    case _dtableUtils.CellType.LAST_MODIFIER:
       {
         let collaborator = (0, _collaborator.getKnownCreatorByEmail)(collaborators, value) || {};
         return collaborator.name;
       }
-    case _dtableStore.CellType.NUMBER:
+    case _dtableUtils.CellType.NUMBER:
       {
         let valueNumber = parseFloat(value);
-        let displayValue = (0, _dtableStore.isNumber)(valueNumber) ? (0, _dtableStore.getNumberDisplayString)(valueNumber, data) : value;
+        let displayValue = (0, _dtableUtils.isNumber)(valueNumber) ? (0, _dtableUtils.getNumberDisplayString)(valueNumber, data) : value;
         return displayValue;
       }
-    case _dtableStore.CellType.DATE:
+    case _dtableUtils.CellType.DATE:
       {
         let displayValue = value;
         if (value && value.split('-').length === 3) {
@@ -71,16 +71,16 @@ const getTableValueDisplayName = (value, column) => {
         }
         return displayValue;
       }
-    case _dtableStore.CellType.FORMULA:
-    case _dtableStore.CellType.LINK_FORMULA:
+    case _dtableUtils.CellType.FORMULA:
+    case _dtableUtils.CellType.LINK_FORMULA:
       {
         let displayValue = value;
         let {
           result_type
         } = data || {};
-        if (result_type === _dtableStore.FORMULA_RESULT_TYPE.NUMBER) {
+        if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.NUMBER) {
           let valueNumber = parseFloat(value);
-          displayValue = (0, _dtableStore.isNumber)(valueNumber) ? (0, _dtableStore.getNumberDisplayString)(valueNumber, data) : value;
+          displayValue = (0, _dtableUtils.isNumber)(valueNumber) ? (0, _dtableUtils.getNumberDisplayString)(valueNumber, data) : value;
         }
         return displayValue;
       }
@@ -96,19 +96,19 @@ const getValidValueForColumn = (column, value) => {
     type,
     data
   } = column;
-  if (_dtableStore.FORMULA_COLUMN_TYPES.includes(type)) return '';
-  if (type === _dtableStore.CellType.NUMBER) {
+  if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[type]) return '';
+  if (type === _dtableUtils.CellType.NUMBER) {
     if (!value && value !== 0) return '';
     if (typeof value === 'number') return value;
     return '';
   }
-  if (type === _dtableStore.CellType.DATE) {
+  if (type === _dtableUtils.CellType.DATE) {
     if (!value) return '';
     if (typeof value !== 'string') return '';
     const validValueFormat = data && data.format && data.format.indexOf('HH:mm') > -1 ? 'YYYY-MM-DD HH:mm' : 'YYYY-MM-DD';
     return (0, _dayjs.default)(value).format(validValueFormat);
   }
-  if (type === _dtableStore.CellType.TEXT) return value ? value : '';
+  if (type === _dtableUtils.CellType.TEXT) return value ? value : '';
   return '';
 };
 const exportOneDimensionToTable = _ref => {
@@ -132,7 +132,7 @@ const exportOneDimensionToTable = _ref => {
   let columns = [{
     // first column
     key: '0000',
-    type: _dtableStore.CellType.TEXT,
+    type: _dtableUtils.CellType.TEXT,
     name: groupbyColumn.name,
     data: null
   }];
@@ -179,7 +179,7 @@ const exportOneDimensionToTable = _ref => {
 
     // total column
     const totalColumn = {
-      type: _isDateSummaryColumn ? _dtableStore.CellType.DATE : _dtableStore.CellType.NUMBER,
+      type: _isDateSummaryColumn ? _dtableUtils.CellType.DATE : _dtableUtils.CellType.NUMBER,
       name: _reactIntlUniversal.default.get('Total'),
       data: columnData
     };
@@ -218,9 +218,9 @@ const exportOneDimensionToTable = _ref => {
     if (column) {
       const columnName = column.name;
       let columnData;
-      let columnType = _dtableStore.CellType.NUMBER;
+      let columnType = _dtableUtils.CellType.NUMBER;
       if (isSummaryDateColumn(column)) {
-        columnType = _dtableStore.CellType.DATE;
+        columnType = _dtableUtils.CellType.DATE;
         const {
           format
         } = column.data || {};
@@ -282,7 +282,7 @@ const exportOneDimensionToTable = _ref => {
         data
       } = column;
       let cellValue = total[cellValueKey];
-      if (type === _dtableStore.CellType.DATE && cellValue) {
+      if (type === _dtableUtils.CellType.DATE && cellValue) {
         const dateFormat = data && data.format && data.format.indexOf('HH:mm') > -1 ? 'YYYY-MM-DD HH:mm' : 'YYYY-MM-DD';
         cellValue = (0, _dayjs.default)(cellValue).format(dateFormat);
       }
@@ -315,7 +315,7 @@ const exportTwoDimensionToTable = _ref2 => {
   let columns = [{
     // first column
     key: '0000',
-    type: _dtableStore.CellType.TEXT,
+    type: _dtableUtils.CellType.TEXT,
     name: groupbyColumn.name,
     data: null
   }];
@@ -363,7 +363,7 @@ const exportTwoDimensionToTable = _ref2 => {
     } = item;
     const columnName = isEmptyName(original_key) ? _reactIntlUniversal.default.get(_constants.EMPTY_NAME) : key;
     const newColumn = {
-      type: _isDateSummaryColumn ? _dtableStore.CellType.DATE : _dtableStore.CellType.NUMBER,
+      type: _isDateSummaryColumn ? _dtableUtils.CellType.DATE : _dtableUtils.CellType.NUMBER,
       name: columnName,
       data: columnData
     };
@@ -373,7 +373,7 @@ const exportTwoDimensionToTable = _ref2 => {
 
   // total column
   const totalColumn = {
-    type: _isDateSummaryColumn ? _dtableStore.CellType.DATE : _dtableStore.CellType.NUMBER,
+    type: _isDateSummaryColumn ? _dtableUtils.CellType.DATE : _dtableUtils.CellType.NUMBER,
     name: _reactIntlUniversal.default.get('Total'),
     data: columnData
   };
@@ -435,7 +435,7 @@ const getTwoDimensionWithSummaryColumns = _ref3 => {
   let columns = [{
     // name column
     key: '0000',
-    type: _dtableStore.CellType.TEXT,
+    type: _dtableUtils.CellType.TEXT,
     name: groupbyColumnName,
     data: null
   }];
@@ -458,7 +458,7 @@ const getTwoDimensionWithSummaryColumns = _ref3 => {
       const newColumnName = "".concat(pivotColumnColumnName, "-").concat(column_name);
       columns.push({
         // just support number column
-        type: _dtableStore.CellType.NUMBER,
+        type: _dtableUtils.CellType.NUMBER,
         name: newColumnName,
         data
       });
@@ -473,7 +473,7 @@ const getTwoDimensionWithSummaryColumns = _ref3 => {
     });
   });
   columns.push({
-    type: _dtableStore.CellType.NUMBER,
+    type: _dtableUtils.CellType.NUMBER,
     name: _reactIntlUniversal.default.get('Total'),
     data: firstSummaryColumn.data
   });
@@ -537,7 +537,7 @@ const updatedOneDimensionToTable = _ref5 => {
     statisticTableColumns
   } = statisticalResult;
   if (!groupbyColumn) return {};
-  const nameColumn = _dtableStore.TableUtils.getTableColumnByName(updateTable, groupbyColumn.name);
+  const nameColumn = (0, _dtableUtils.getTableColumnByName)(updateTable, groupbyColumn.name);
   if (!nameColumn) return {};
   const {
     pivot_rows,
@@ -554,7 +554,7 @@ const updatedOneDimensionToTable = _ref5 => {
 
   // one dimension table no summary columns
   if (pivot_columns.length < 2) {
-    columnMap['total'] = _dtableStore.TableUtils.getTableColumnByName(updateTable, _reactIntlUniversal.default.get('Total'));
+    columnMap['total'] = (0, _dtableUtils.getTableColumnByName)(updateTable, _reactIntlUniversal.default.get('Total'));
 
     // updated rows
     pivot_rows.forEach(item => {
@@ -606,7 +606,7 @@ const updatedOneDimensionToTable = _ref5 => {
     } = item;
     const column = statisticTableColumns.find(column => column.key === key);
     if (column) {
-      columnMap[key] = _dtableStore.TableUtils.getTableColumnByName(updateTable, column.name);
+      columnMap[key] = (0, _dtableUtils.getTableColumnByName)(updateTable, column.name);
     }
   });
 
@@ -679,7 +679,7 @@ const updateTwoDimensionToTable = _ref6 => {
     pivotResult,
     groupbyColumn
   } = statisticalResult;
-  const nameColumn = _dtableStore.TableUtils.getTableColumnByName(updateTable, groupbyColumn.name);
+  const nameColumn = (0, _dtableUtils.getTableColumnByName)(updateTable, groupbyColumn.name);
   if (!nameColumn) return {};
   const {
     pivot_rows,
@@ -702,11 +702,11 @@ const updateTwoDimensionToTable = _ref6 => {
       original_key
     } = item;
     const columnName = isEmptyName(original_key) ? _reactIntlUniversal.default.get(_constants.EMPTY_NAME) : key;
-    const column = _dtableStore.TableUtils.getTableColumnByName(updateTable, columnName);
+    const column = (0, _dtableUtils.getTableColumnByName)(updateTable, columnName);
     columnMap[columnName] = column;
     updateColumns.push(column);
   });
-  const totalColumn = _dtableStore.TableUtils.getTableColumnByName(updateTable, _reactIntlUniversal.default.get('Total'));
+  const totalColumn = (0, _dtableUtils.getTableColumnByName)(updateTable, _reactIntlUniversal.default.get('Total'));
   columnMap['total'] = totalColumn;
   updateColumns.push(totalColumn);
 
@@ -800,7 +800,7 @@ const updateTwoDimensionWithSummaryColumnsToTable = _ref7 => {
   const {
     groupbyColumn
   } = statisticalResult;
-  const nameColumn = groupbyColumn && _dtableStore.TableUtils.getTableColumnByName(updateTable, groupbyColumn.name);
+  const nameColumn = groupbyColumn && (0, _dtableUtils.getTableColumnByName)(updateTable, groupbyColumn.name);
   if (!nameColumn) return {};
   const {
     columns: exportingColumns,

package/es/utils/object.js

@@ -8,17 +8,17 @@ var _react = require("react");
 const isSameObject = (a, b) => {
   let k;
   for (k in a) {
-    if (a.hasOwnProperty(k)) {
+    if (hasOwnProperty(a, k)) {
       if (typeof a[k] === 'function' && typeof b[k] === 'function' || /*#__PURE__*/(0, _react.isValidElement)(a[k]) && /*#__PURE__*/(0, _react.isValidElement)(b[k])) {
         continue;
       }
-      if (!b.hasOwnProperty(k) || a[k] !== b[k]) {
+      if (!hasOwnProperty(b, k) || a[k] !== b[k]) {
         return false;
       }
     }
   }
   for (k in b) {
-    if (b.hasOwnProperty(k) && !a.hasOwnProperty(k)) {
+    if (hasOwnProperty(b, k) && !hasOwnProperty(a, k)) {
       return false;
     }
   }

package/es/utils/pivot-table.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getPivotTableSummaryTotal = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _constants = require("../constants");
 const getCellValueFromRow = (row, formulaRow, columnType, columnKey, sqlKey, isSqlQuery) => {
   if (!isSqlQuery) {
-    if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[columnType]) {
+    if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[columnType]) {
       const cellValue = formulaRow[columnKey];
       return Array.isArray(cellValue) ? cellValue[0] : cellValue;
     }
@@ -53,7 +53,7 @@ const getPivotTableSummaryTotal = (summaryColumnType, summaryColumnKey, sqlKey,
         rows.forEach(row => {
           const formulaRow = formulaRows && formulaRows[row._id];
           let cellValue = getCellValueFromRow(row, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
-          if ((0, _dtableStore.isNumber)(cellValue)) {
+          if ((0, _dtableUtils.isNumber)(cellValue)) {
             validNumbersCount++;
             sum += cellValue;
           }

package/es/utils/row-utils.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getCellValue = getCellValue;
 exports.isValidRow = exports.isEmptyGeolocationCell = exports.getFormattedLabel = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _utils = require("../utils");
 const isEmptyGeolocationCell = (cellValue, format) => {
   if (!cellValue) return null;
@@ -23,15 +23,15 @@ const isValidRow = (row, formulaRow, column, includeEmpty) => {
     type: columnType,
     key: columnKey
   } = column;
-  if (includeEmpty || columnType === _dtableStore.CellType.CHECKBOX) return true;
-  if (columnType === _dtableStore.CellType.GEOLOCATION) {
+  if (includeEmpty || columnType === _dtableUtils.CellType.CHECKBOX) return true;
+  if (columnType === _dtableUtils.CellType.GEOLOCATION) {
     const {
       geo_format
     } = column.data;
     return isEmptyGeolocationCell(row[columnKey], geo_format);
   }
   let cellValue = row[columnKey];
-  if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[columnType] || columnType === _dtableStore.CellType.LINK) {
+  if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[columnType] || columnType === _dtableUtils.CellType.LINK) {
     cellValue = formulaRow ? formulaRow[columnKey] : null;
   }
   return cellValue || cellValue === 0;
@@ -42,7 +42,7 @@ const getFormattedLabel = (column, name, collaborators) => {
     type: columnType,
     data: columnData
   } = column;
-  if (columnType === _dtableStore.CellType.SINGLE_SELECT || columnType === _dtableStore.CellType.MULTIPLE_SELECT) {
+  if (columnType === _dtableUtils.CellType.SINGLE_SELECT || columnType === _dtableUtils.CellType.MULTIPLE_SELECT) {
     let options = columnData ? columnData.options : [];
     let selectedOption = options.find(o => {
       let id = name;
@@ -57,7 +57,7 @@ const getFormattedLabel = (column, name, collaborators) => {
     if (selectedOption) {
       return optionName;
     }
-  } else if (columnType === _dtableStore.CellType.COLLABORATOR) {
+  } else if (columnType === _dtableUtils.CellType.COLLABORATOR) {
     let collaborator = collaborators.find(item => {
       let email = name;
       if (Array.isArray(name)) {
@@ -68,7 +68,7 @@ const getFormattedLabel = (column, name, collaborators) => {
     if (collaborator) {
       return collaborator.name;
     }
-  } else if (columnType === _dtableStore.CellType.CREATOR || columnType === _dtableStore.CellType.LAST_MODIFIER) {
+  } else if (columnType === _dtableUtils.CellType.CREATOR || columnType === _dtableUtils.CellType.LAST_MODIFIER) {
     if (name === 'anonymous') {
       return name;
     } else {
@@ -77,25 +77,25 @@ const getFormattedLabel = (column, name, collaborators) => {
         return collaborator.name;
       }
     }
-  } else if (columnType === _dtableStore.CellType.LINK) {
+  } else if (columnType === _dtableUtils.CellType.LINK) {
     return (0, _utils.getClientFormulaDisplayString)(Array.isArray(name) ? name : [name], columnData, {
       collaborators
     });
-  } else if (columnType === _dtableStore.CellType.CHECKBOX) {
+  } else if (columnType === _dtableUtils.CellType.CHECKBOX) {
     return name === 'true' ? 'Checked' : 'Unchecked';
-  } else if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[columnType]) {
+  } else if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[columnType]) {
     const {
       result_type,
       array_type
     } = columnData || {};
-    if (!name && !(0, _dtableStore.isNumber)(name)) return '';
-    if (result_type === _dtableStore.FORMULA_RESULT_TYPE.NUMBER) {
+    if (!name && !(0, _dtableUtils.isNumber)(name)) return '';
+    if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.NUMBER) {
       const valueNumber = parseFloat(name);
-      return (0, _dtableStore.isNumber)(valueNumber) ? (0, _dtableStore.getNumberDisplayString)(valueNumber, column.data) : name;
+      return (0, _dtableUtils.isNumber)(valueNumber) ? (0, _dtableUtils.getNumberDisplayString)(valueNumber, column.data) : name;
     }
-    if (result_type === _dtableStore.FORMULA_RESULT_TYPE.ARRAY) {
-      if (_dtableStore.COLLABORATOR_COLUMN_TYPES.includes(array_type)) {
-        if ([_dtableStore.CellType.CREATOR, _dtableStore.CellType.LAST_MODIFIER].includes(array_type) && name === 'anonymous') {
+    if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.ARRAY) {
+      if (_dtableUtils.COLLABORATOR_COLUMN_TYPES.includes(array_type)) {
+        if ([_dtableUtils.CellType.CREATOR, _dtableUtils.CellType.LAST_MODIFIER].includes(array_type) && name === 'anonymous') {
           return name;
         }
         const collaborator = collaborators.find(item => {
@@ -123,7 +123,7 @@ function getCellValue(row, formulaRow, column) {
     type,
     key
   } = column;
-  if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[type]) {
+  if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[type]) {
     const cellValue = formulaRow && formulaRow[key];
     if (Array.isArray(cellValue)) {
       return cellValue[0];

package/es/utils/search.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.searchRows = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _column = require("./column");
-const SUPPORT_SEARCH_COLUMN_TYPES = [_dtableStore.CellType.DATE, _dtableStore.CellType.TEXT, _dtableStore.CellType.LONG_TEXT, _dtableStore.CellType.NUMBER, _dtableStore.CellType.URL, _dtableStore.CellType.EMAIL, _dtableStore.CellType.SINGLE_SELECT, _dtableStore.CellType.CTIME, _dtableStore.CellType.MTIME, _dtableStore.CellType.MULTIPLE_SELECT, _dtableStore.CellType.LAST_MODIFIER, _dtableStore.CellType.CREATOR, _dtableStore.CellType.COLLABORATOR, _dtableStore.CellType.LINK, _dtableStore.CellType.FORMULA, _dtableStore.CellType.LINK_FORMULA, _dtableStore.CellType.AUTO_NUMBER, _dtableStore.CellType.GEOLOCATION, _dtableStore.CellType.DURATION];
+const SUPPORT_SEARCH_COLUMN_TYPES = [_dtableUtils.CellType.DATE, _dtableUtils.CellType.TEXT, _dtableUtils.CellType.LONG_TEXT, _dtableUtils.CellType.NUMBER, _dtableUtils.CellType.URL, _dtableUtils.CellType.EMAIL, _dtableUtils.CellType.SINGLE_SELECT, _dtableUtils.CellType.CTIME, _dtableUtils.CellType.MTIME, _dtableUtils.CellType.MULTIPLE_SELECT, _dtableUtils.CellType.LAST_MODIFIER, _dtableUtils.CellType.CREATOR, _dtableUtils.CellType.COLLABORATOR, _dtableUtils.CellType.LINK, _dtableUtils.CellType.FORMULA, _dtableUtils.CellType.LINK_FORMULA, _dtableUtils.CellType.AUTO_NUMBER, _dtableUtils.CellType.GEOLOCATION, _dtableUtils.CellType.DURATION];
 const searchRows = (rows, columns, val, processRow) => {
   let dtableCollaborators = window.app.collaboratorsCache || [];
   let collaborators = window.app.state.collaborators;
@@ -25,20 +25,20 @@ const searchRows = (rows, columns, val, processRow) => {
       const cellValue = row[columnKey];
       if (cellValue) {
         let text;
-        if (columnType === _dtableStore.CellType.LONG_TEXT) {
+        if (columnType === _dtableUtils.CellType.LONG_TEXT) {
           text = cellValue.text;
-        } else if (columnType === _dtableStore.CellType.NUMBER || columnType === _dtableStore.CellType.DURATION) {
-          text = (0, _dtableStore.getNumberDisplayString)(cellValue, column.data);
-        } else if (columnType === _dtableStore.CellType.SINGLE_SELECT) {
+        } else if (columnType === _dtableUtils.CellType.NUMBER || columnType === _dtableUtils.CellType.DURATION) {
+          text = (0, _dtableUtils.getNumberDisplayString)(cellValue, column.data);
+        } else if (columnType === _dtableUtils.CellType.SINGLE_SELECT) {
           const options = (0, _column.getSelectColumnOptions)(column);
           const option = options.find(option => option.id === cellValue);
           text = option ? option.name : '';
-        } else if (columnType === _dtableStore.CellType.MULTIPLE_SELECT) {
+        } else if (columnType === _dtableUtils.CellType.MULTIPLE_SELECT) {
           const options = (0, _column.getSelectColumnOptions)(column);
-          text = (0, _dtableStore.getMultipleOptionName)(options, cellValue);
-        } else if (columnType === _dtableStore.CellType.COLLABORATOR) {
-          text = (0, _dtableStore.getCollaboratorsName)(collaborators, cellValue);
-        } else if (columnType === _dtableStore.CellType.LAST_MODIFIER || columnType === _dtableStore.CellType.CREATOR) {
+          text = (0, _dtableUtils.getMultipleOptionName)(options, cellValue);
+        } else if (columnType === _dtableUtils.CellType.COLLABORATOR) {
+          text = (0, _dtableUtils.getCollaboratorsName)(collaborators, cellValue);
+        } else if (columnType === _dtableUtils.CellType.LAST_MODIFIER || columnType === _dtableUtils.CellType.CREATOR) {
           if (cellValue === 'anonymous') {
             text = cellValue;
           } else {
@@ -50,9 +50,9 @@ const searchRows = (rows, columns, val, processRow) => {
               text = collaborator.name;
             }
           }
-        } else if (columnType === _dtableStore.CellType.GEOLOCATION) {
-          text = (0, _dtableStore.getGeolocationDisplayString)(cellValue, column.data);
-        } else if (columnType === _dtableStore.CellType.CTIME || columnType === _dtableStore.CellType.MTIME) {
+        } else if (columnType === _dtableUtils.CellType.GEOLOCATION) {
+          text = (0, _dtableUtils.getGeolocationDisplayString)(cellValue, column.data);
+        } else if (columnType === _dtableUtils.CellType.CTIME || columnType === _dtableUtils.CellType.MTIME) {
           text = (0, _dayjs.default)(cellValue).format('YYYY-MM-DD HH:mm:ss');
         } else {
           text = cellValue;

package/es/utils/sql-utils.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getSqlString = exports.getSqlOrder = exports.getSqlGroup = exports.getPieChartSqlGroupName = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _constants = require("../constants");
 const getSqlOrder = (sortType, groupName) => {
   if (!sortType) {
@@ -33,7 +33,7 @@ const getSqlGroup = (granularity, column) => {
       return "CONCATENATE(year(".concat(columnName, "), \"-Q\", quarter(").concat(columnName, "))");
     }
     return "YEAR(".concat(columnName, ")");
-  } else if (type === _dtableStore.CellType.GEOLOCATION) {
+  } else if (type === _dtableUtils.CellType.GEOLOCATION) {
     if (granularity === _constants.STATISTICS_COUNT_TYPE.PROVINCE) {
       return "PROVINCE(".concat(columnName, ")");
     }
@@ -70,7 +70,10 @@ const getSqlString = (statItem, statisticRecord, _ref) => {
     isColumn,
     isCurrentView,
     isRow,
-    getTableById
+    getTableById,
+    username,
+    userId,
+    userDepartmentIdsMap
   } = _ref;
   const {
     table_id,
@@ -80,7 +83,7 @@ const getSqlString = (statItem, statisticRecord, _ref) => {
     type
   } = statItem;
   const selectedTable = getTableById(table_id);
-  const selectedView = _dtableStore.Views.getViewById(selectedTable.views, view_id);
+  const selectedView = (0, _dtableUtils.getViewById)(selectedTable.views, view_id);
   const {
     groupName,
     selectedColumn,
@@ -89,7 +92,7 @@ const getSqlString = (statItem, statisticRecord, _ref) => {
   } = getDatabaseGroupName(statItem, selectedTable, {
     isCurrentView
   });
-  const sqlCondition = (0, _dtableStore.filter2SqlCondition)(selectedTable, selectedView);
+  const sqlCondition = (0, _dtableUtils.filter2SqlCondition)(selectedTable, selectedView, username, userId, userDepartmentIdsMap);
   const isGroup = column_groupby_column_key && !column_groupby_multiple_numeric_column;
   const {
     name,
@@ -143,7 +146,7 @@ const getSqlGroupName = (name, original_name, column) => {
   const {
     type
   } = column || {};
-  if (type === _dtableStore.CellType.SINGLE_SELECT || type === _dtableStore.CellType.MULTIPLE_SELECT) {
+  if (type === _dtableUtils.CellType.SINGLE_SELECT || type === _dtableUtils.CellType.MULTIPLE_SELECT) {
     return "'".concat(name, "'");
   }
   const newName = original_name ? original_name : name;
@@ -161,7 +164,7 @@ const getGroupName = (selectedColumn, _ref2) => {
   const isTimeColumn = _constants.TIME_COLUMN_LIST.includes(selectedColumn.type);
   if (isTimeColumn) {
     groupName = getSqlGroup(groupby_date_granularity, selectedColumn);
-  } else if (selectedColumn.type === _dtableStore.CellType.GEOLOCATION) {
+  } else if (selectedColumn.type === _dtableUtils.CellType.GEOLOCATION) {
     groupName = getSqlGroup(groupby_geolocation_granularity, selectedColumn);
   }
   return groupName;
@@ -209,13 +212,13 @@ const getDatabaseGroupName = (statItem, selectedTable, _ref3) => {
           groupby_geolocation_granularity = statItem.x_axis_geolocation_granularity;
         }
         if (!column_groupby_multiple_numeric_column && column_groupby_column_key) {
-          columnSelectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, column_groupby_column_key);
+          columnSelectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, column_groupby_column_key);
           columnGroupName = getGroupName(columnSelectedColumn, {
             groupby_date_granularity: column_groupby_date_granularity,
             groupby_geolocation_granularity: column_groupby_geolocation_granularity
           });
         }
-        selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, groupby_column_key);
+        selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, groupby_column_key);
         groupName = getGroupName(selectedColumn, {
           groupby_date_granularity,
           groupby_geolocation_granularity
@@ -229,7 +232,7 @@ const getDatabaseGroupName = (statItem, selectedTable, _ref3) => {
           geolocation_granularity,
           geo_column
         } = statItem;
-        selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, geo_column);
+        selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, geo_column);
         groupName = getSqlGroup(geolocation_granularity, selectedColumn);
         break;
       }
@@ -240,7 +243,7 @@ const getDatabaseGroupName = (statItem, selectedTable, _ref3) => {
         const {
           column
         } = statItem;
-        selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, column);
+        selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, column);
         groupName = selectedColumn.name;
         break;
       }
@@ -249,7 +252,7 @@ const getDatabaseGroupName = (statItem, selectedTable, _ref3) => {
         const {
           time_column
         } = statItem;
-        selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, time_column);
+        selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, time_column);
         groupName = "ISODATE(".concat(selectedColumn.name, ")");
         break;
       }
@@ -258,7 +261,7 @@ const getDatabaseGroupName = (statItem, selectedTable, _ref3) => {
         const {
           group_column
         } = statItem;
-        selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, group_column);
+        selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, group_column);
         groupName = selectedColumn.name;
         break;
       }
@@ -273,7 +276,7 @@ const getDatabaseGroupName = (statItem, selectedTable, _ref3) => {
           x_axis_column_key,
           x_axis_date_granularity
         } = statItem;
-        selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
+        selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, x_axis_column_key);
         groupName = getSqlGroup(x_axis_date_granularity, selectedColumn);
         break;
       }
@@ -284,12 +287,12 @@ const getDatabaseGroupName = (statItem, selectedTable, _ref3) => {
           x_axis_date_granularity: groupby_date_granularity,
           x_axis_geolocation_granularity: groupby_geolocation_granularity
         } = statItem;
-        selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
+        selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, x_axis_column_key);
         if (!selectedColumn) return [];
         groupName = "`".concat(selectedColumn.name, "`");
         if (_constants.TIME_COLUMN_LIST.includes(selectedColumn.type)) {
           groupName = getSqlGroup(groupby_date_granularity, selectedColumn);
-        } else if (selectedColumn.type === _dtableStore.CellType.GEOLOCATION) {
+        } else if (selectedColumn.type === _dtableUtils.CellType.GEOLOCATION) {
           groupName = getSqlGroup(groupby_geolocation_granularity, selectedColumn);
         }
         break;
@@ -300,7 +303,7 @@ const getDatabaseGroupName = (statItem, selectedTable, _ref3) => {
           date_column,
           date_granularity
         } = statItem;
-        selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, date_column);
+        selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, date_column);
         groupName = getSqlGroup(date_granularity, selectedColumn);
         break;
       }
@@ -310,7 +313,7 @@ const getDatabaseGroupName = (statItem, selectedTable, _ref3) => {
         const {
           name_column
         } = statItem;
-        selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, name_column);
+        selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, name_column);
         groupName = "`".concat(selectedColumn.name, "`");
         break;
       }
@@ -331,13 +334,13 @@ const getDatabaseGroupName = (statItem, selectedTable, _ref3) => {
           column_groupby_multiple_numeric_column
         } = statItem;
         if (!column_groupby_multiple_numeric_column && column_groupby_column_key) {
-          columnSelectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, column_groupby_column_key);
+          columnSelectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, column_groupby_column_key);
           columnGroupName = getGroupName(columnSelectedColumn, {
             groupby_date_granularity: column_groupby_date_granularity,
             groupby_geolocation_granularity: column_groupby_geolocation_granularity
           });
         }
-        selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, groupby_column_key);
+        selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, groupby_column_key);
         groupName = getGroupName(selectedColumn, {
           groupby_date_granularity,
           groupby_geolocation_granularity