dtable-statistic 4.3.5 → 4.3.7

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

package/es/utils/stat-utils.js

@@ -4,16 +4,11 @@ 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 _collaborator = require("./collaborator");
 var _constants = require("../constants");
-const SUPPORT_SORT_COLUMNS = [_dtableStore.CellType.TEXT, _dtableStore.CellType.NUMBER, _dtableStore.CellType.DATE, _dtableStore.CellType.SINGLE_SELECT, _dtableStore.CellType.FORMULA, _dtableStore.CellType.LINK_FORMULA, _dtableStore.CellType.CTIME, _dtableStore.CellType.MTIME, _dtableStore.CellType.RATE];
-const getValidCollaborators = (collaborators, emails) => {
-  if (!Array.isArray(emails)) {
-    return [];
-  }
-  return emails.filter(e => collaborators.findIndex(c => c.email === e) > -1);
-};
+const SUPPORT_SORT_COLUMNS = [_dtableUtils.CellType.TEXT, _dtableUtils.CellType.NUMBER, _dtableUtils.CellType.DATE, _dtableUtils.CellType.SINGLE_SELECT, _dtableUtils.CellType.FORMULA, _dtableUtils.CellType.LINK_FORMULA, _dtableUtils.CellType.CTIME, _dtableUtils.CellType.MTIME, _dtableUtils.CellType.RATE];
 class StatUtils {
   static getGroupLabel(cellValue, formulaRow, column, dateGranularity, geoGranularity, value) {
     let {
@@ -22,20 +17,20 @@ class StatUtils {
       data
     } = column;
     switch (type) {
-      case _dtableStore.CellType.TEXT:
+      case _dtableUtils.CellType.TEXT:
         {
           return cellValue || null;
         }
-      case _dtableStore.CellType.NUMBER:
+      case _dtableUtils.CellType.NUMBER:
         {
           if (!cellValue && cellValue !== 0) {
             return null;
           }
-          const number = (0, _dtableStore.getPrecisionNumber)(cellValue, data);
+          const number = (0, _dtableUtils.getPrecisionNumber)(cellValue, data);
           let valueNumber = parseFloat(number);
-          return (0, _dtableStore.isNumber)(valueNumber) ? (0, _dtableStore.getNumberDisplayString)(valueNumber, column.data) : valueNumber;
+          return (0, _dtableUtils.isNumber)(valueNumber) ? (0, _dtableUtils.getNumberDisplayString)(valueNumber, column.data) : valueNumber;
         }
-      case _dtableStore.CellType.SINGLE_SELECT:
+      case _dtableUtils.CellType.SINGLE_SELECT:
         {
           let isInvalidValue = data && data.options.findIndex(opt => opt.id === cellValue) < 0;
           if (isInvalidValue) {
@@ -43,20 +38,20 @@ class StatUtils {
           }
           return cellValue;
         }
-      case _dtableStore.CellType.DATE:
-      case _dtableStore.CellType.CTIME:
-      case _dtableStore.CellType.MTIME:
+      case _dtableUtils.CellType.DATE:
+      case _dtableUtils.CellType.CTIME:
+      case _dtableUtils.CellType.MTIME:
         {
           if (!dateGranularity) {
-            return (0, _dtableStore.getDateDisplayString)(cellValue);
+            return (0, _dtableUtils.getDateDisplayString)(cellValue);
           }
           if (dateGranularity.toUpperCase() === 'QUARTER') {
             // TODO: fix the unknown word 'QUARTAR'
-            return _dtableStore.DateUtils.getDateByGranularity(cellValue, 'QUARTAR');
+            return _dtableUtils.DateUtils.getDateByGranularity(cellValue, 'QUARTAR');
           }
-          return _dtableStore.DateUtils.getDateByGranularity(cellValue, dateGranularity);
+          return _dtableUtils.DateUtils.getDateByGranularity(cellValue, dateGranularity);
         }
-      case _dtableStore.CellType.MULTIPLE_SELECT:
+      case _dtableUtils.CellType.MULTIPLE_SELECT:
         {
           let options = data && data.options;
           if (!Array.isArray(cellValue)) {
@@ -64,44 +59,45 @@ class StatUtils {
           }
           return cellValue.filter(id => options.findIndex(o => o.id === id) > -1);
         }
-      case _dtableStore.CellType.COLLABORATOR:
+      case _dtableUtils.CellType.COLLABORATOR:
         {
-          return getValidCollaborators(value.collaborators, cellValue);
+          if (!Array.isArray(cellValue)) return [];
+          return cellValue.filter(email => (0, _collaborator.isValidCollaboratorEmail)(email));
         }
-      case _dtableStore.CellType.CREATOR:
-      case _dtableStore.CellType.LAST_MODIFIER:
+      case _dtableUtils.CellType.CREATOR:
+      case _dtableUtils.CellType.LAST_MODIFIER:
         {
           return cellValue ? cellValue : null;
         }
-      case _dtableStore.CellType.LINK_FORMULA:
-      case _dtableStore.CellType.FORMULA:
+      case _dtableUtils.CellType.LINK_FORMULA:
+      case _dtableUtils.CellType.FORMULA:
         {
           if (!formulaRow) return '';
           let formulaCellValue = formulaRow[key];
           let {
             result_type
           } = data || {};
-          if (result_type === _dtableStore.FORMULA_RESULT_TYPE.ARRAY) {
-            return (0, _dtableStore.getFormulaDisplayString)(formulaCellValue, data, {
+          if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.ARRAY) {
+            return (0, _dtableUtils.getFormulaDisplayString)(formulaCellValue, data, {
               tables: value.tables
             }) || null;
           }
-          if (result_type === _dtableStore.FORMULA_RESULT_TYPE.NUMBER) {
-            return (0, _dtableStore.getPrecisionNumber)(formulaCellValue, data);
+          if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.NUMBER) {
+            return (0, _dtableUtils.getPrecisionNumber)(formulaCellValue, data);
           }
           return formulaCellValue ? formulaCellValue + '' : null;
         }
-      case _dtableStore.CellType.GEOLOCATION:
+      case _dtableUtils.CellType.GEOLOCATION:
         {
           const {
             geo_format
           } = data || {};
           if (geo_format === 'country_region' || geo_format === 'lng_lat' || !geoGranularity) {
-            return (0, _dtableStore.getGeolocationDisplayString)(cellValue, data);
+            return (0, _dtableUtils.getGeolocationDisplayString)(cellValue, data);
           }
           return cellValue ? cellValue[geoGranularity] : null;
         }
-      case _dtableStore.CellType.LINK:
+      case _dtableUtils.CellType.LINK:
         {
           const linkCellValue = formulaRow && formulaRow[key];
           if (!Array.isArray(linkCellValue)) {
@@ -109,11 +105,11 @@ class StatUtils {
           }
           return linkCellValue.map(linkVal => linkVal.display_value);
         }
-      case _dtableStore.CellType.CHECKBOX:
+      case _dtableUtils.CellType.CHECKBOX:
         {
           return String(!!cellValue);
         }
-      case _dtableStore.CellType.RATE:
+      case _dtableUtils.CellType.RATE:
         {
           if (!cellValue) return null;
           return cellValue + '';
@@ -131,7 +127,7 @@ class StatUtils {
     } = column;
     let sortType = 'up';
     let option_id_index_map = {};
-    if (column_type === _dtableStore.CellType.SINGLE_SELECT) {
+    if (column_type === _dtableUtils.CellType.SINGLE_SELECT) {
       const {
         options
       } = data || {};
@@ -154,7 +150,7 @@ class StatUtils {
       }
       if (SUPPORT_SORT_COLUMNS.includes(column_type)) {
         switch (column_type) {
-          case _dtableStore.CellType.NUMBER:
+          case _dtableUtils.CellType.NUMBER:
             {
               if (current) {
                 current = current - 0;
@@ -162,42 +158,42 @@ class StatUtils {
               if (next) {
                 next = next - 0;
               }
-              return (0, _dtableStore.sortNumber)(current, next, sortType);
+              return (0, _dtableUtils.sortNumber)(current, next, sortType);
             }
-          case _dtableStore.CellType.DATE:
-          case _dtableStore.CellType.CTIME:
-          case _dtableStore.CellType.MTIME:
+          case _dtableUtils.CellType.DATE:
+          case _dtableUtils.CellType.CTIME:
+          case _dtableUtils.CellType.MTIME:
             {
-              return (0, _dtableStore.sortDate)(current, next, sortType);
+              return (0, _dtableUtils.sortDate)(current, next, sortType);
             }
-          case _dtableStore.CellType.SINGLE_SELECT:
-          case _dtableStore.CellType.MULTIPLE_SELECT:
+          case _dtableUtils.CellType.SINGLE_SELECT:
+          case _dtableUtils.CellType.MULTIPLE_SELECT:
             {
-              return (0, _dtableStore.sortSingleSelect)(current, next, {
+              return (0, _dtableUtils.sortSingleSelect)(current, next, {
                 sort_type: sortType,
                 option_id_index_map
               });
             }
-          case _dtableStore.CellType.FORMULA:
-          case _dtableStore.CellType.LINK_FORMULA:
+          case _dtableUtils.CellType.FORMULA:
+          case _dtableUtils.CellType.LINK_FORMULA:
             {
               let {
                 result_type
               } = data || {};
-              if (result_type === _dtableStore.FORMULA_RESULT_TYPE.NUMBER) {
+              if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.NUMBER) {
                 if (current) {
                   current = current - 0;
                 }
                 if (next) {
                   next = next - 0;
                 }
-                return (0, _dtableStore.sortNumber)(current, next, sortType);
+                return (0, _dtableUtils.sortNumber)(current, next, sortType);
               }
-              return (0, _dtableStore.sortText)(result_type, current, next, sortType);
+              return (0, _dtableUtils.sortText)(result_type, current, next, sortType);
             }
           default:
             {
-              return (0, _dtableStore.sortText)(current, next, sortType);
+              return (0, _dtableUtils.sortText)(current, next, sortType);
             }
         }
       }
@@ -239,7 +235,7 @@ class StatUtils {
             let existMap = {};
             rows.forEach(r => {
               let num;
-              if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+              if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
                 const formulaRow = formula_rows[r._id] || {};
                 num = formulaRow[summary_column_key];
                 num = Array.isArray(num) ? num[0] : num;
@@ -268,14 +264,14 @@ class StatUtils {
             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] || {};
                 num = formulaRow[summary_column_key];
                 num = Array.isArray(num) ? num[0] : num;
               } else {
                 num = r[summary_column_key];
               }
-              if ((0, _dtableStore.isNumber)(num)) {
+              if ((0, _dtableUtils.isNumber)(num)) {
                 validNumbersCount++;
                 sum += num;
               }
@@ -293,7 +289,7 @@ class StatUtils {
             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 && currentFormulaRow[summary_column_key];
@@ -314,7 +310,7 @@ class StatUtils {
                   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];
                 total = formulaRow && formulaRow[summary_column_key];
                 total = Array.isArray(total) ? total[0] : total;
@@ -343,10 +339,10 @@ class StatUtils {
       type,
       data
     } = column;
-    if ((0, _dtableStore.isNumericColumn)(column)) {
-      return (0, _dtableStore.getNumberDisplayString)(value, data);
+    if ((0, _dtableUtils.isNumericColumn)(column)) {
+      return (0, _dtableUtils.getNumberDisplayString)(value, data);
     }
-    if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[type]) {
+    if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[type]) {
       return (0, _utils.getClientFormulaDisplayString)(value, data);
     }
     return value;

package/es/utils/trend-utils.js

@@ -103,6 +103,7 @@ function summaryDurationResult(result, duration, summaryType, summaryMethod, use
       }
     }
   } else {
+    // eslint-disable-next-line
     for (let item of result) {
       const key = item[0];
       if (key >= startDate && key < middleDate) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.3.5",
+  "version": "4.3.7",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -12,7 +12,7 @@
     "@seafile/seafile-calendar": "0.0.24",
     "comlink": "^4.3.1",
     "dayjs": "1.10.7",
-    "dtable-store": "4.3.6",
+    "dtable-utils": "4.3.3",
     "dtable-web-api": "4.3.5",
     "glamor": "^2.20.40",
     "html2canvas": "^1.4.1",
@@ -55,6 +55,7 @@
     "css-minimizer-webpack-plugin": "^3.2.0",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
+    "dtable-store": "4.3.6",
     "eslint": "^8.3.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-webpack-plugin": "^3.1.1",