dtable-statistic 4.2.2 → 4.3.0

package/es/utils/index.js

@@ -1,22 +1,22 @@
-export var isFunction = function isFunction(functionToCheck) {
-  var getType = {};
+export const isFunction = functionToCheck => {
+  const getType = {};
   return functionToCheck && getType.toString.call(functionToCheck) === '[object Function]';
 };
-export var getEventClassName = function getEventClassName(e) {
+export const getEventClassName = e => {
   // svg mouseEvent event.target.className is an object
   if (!e || !e.target) return '';
   return e.target.getAttribute('class') || '';
 };
-export var hexToRgb = function hexToRgb(hex) {
+export const hexToRgb = hex => {
   hex = hex.replace('#', '');
-  var bigint = parseInt(hex, 16);
+  const bigint = parseInt(hex, 16);
   return {
     r: bigint >> 16 & 255,
     g: bigint >> 8 & 255,
     b: bigint & 255
   };
 };
-export var isMobile = typeof window !== 'undefined' && (window.innerWidth < 768 || navigator.userAgent.toLowerCase().match(/(ipod|ipad|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null);
+export const isMobile = typeof window !== 'undefined' && (window.innerWidth < 768 || navigator.userAgent.toLowerCase().match(/(ipod|ipad|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null);
 export { getClientCellValueDisplayString, getClientFormulaDisplayString } from './cell-format';
 export { hasOwnProperty, isEmptyObject, isSameObject } from './object';
 export { isCellValueChanged } from './cell-value';

package/es/utils/map.js

@@ -1,9 +1,9 @@
 import { GEOLOCATION_GRANULARITY, STAT_TYPE } from '../constants';
 import { MAP_LEVEL, MUNICIPALITIES } from '../constants/map';
 import { regions } from '../constants/regions';
-var COUNTY_SCALE_WIDTH = 5.95;
-var COUNTY_SCALE_HEIGHT = 4.37;
-export var getGeoGranularityByLevel = function getGeoGranularityByLevel(mapLevel) {
+const COUNTY_SCALE_WIDTH = 5.95;
+const COUNTY_SCALE_HEIGHT = 4.37;
+export const getGeoGranularityByLevel = mapLevel => {
   switch (mapLevel) {
     case MAP_LEVEL.PROVINCE:
       {
@@ -20,31 +20,31 @@ export var getGeoGranularityByLevel = function getGeoGranularityByLevel(mapLevel
       }
   }
 };
-export var fixGeoGranularity = function fixGeoGranularity(_ref) {
-  var mapLevel = _ref.mapLevel,
-    mapLocation = _ref.mapLocation;
+export const fixGeoGranularity = _ref => {
+  let {
+    mapLevel,
+    mapLocation
+  } = _ref;
   if (!mapLevel || mapLevel === MAP_LEVEL.COUNTRY || !mapLocation) {
     return GEOLOCATION_GRANULARITY.PROVINCE;
   }
 
   // e.g. Beijing
-  var provinceName = mapLocation.province,
-    cityName = mapLocation.city;
+  const {
+    province: provinceName,
+    city: cityName
+  } = mapLocation;
   if (provinceName && MUNICIPALITIES.includes(provinceName)) {
     return GEOLOCATION_GRANULARITY.DISTRICT;
   }
 
   // e.g. HongKong
-  var selectedProvince = provinceName && regions.find(function (province) {
-    return province.name === provinceName;
-  });
+  const selectedProvince = provinceName && regions.find(province => province.name === provinceName);
   if (selectedProvince && selectedProvince.disable_drill_down) {
     return GEOLOCATION_GRANULARITY.PROVINCE;
   }
-  var cities = selectedProvince && selectedProvince.cities;
-  var selectedCity = cities && cityName && cities.find(function (city) {
-    return city.name === cityName;
-  });
+  const cities = selectedProvince && selectedProvince.cities;
+  const selectedCity = cities && cityName && cities.find(city => city.name === cityName);
   if (mapLevel === MAP_LEVEL.CITY && selectedCity && selectedCity.disable_drill_down) {
     return GEOLOCATION_GRANULARITY.CITY;
   }
@@ -52,10 +52,12 @@ export var fixGeoGranularity = function fixGeoGranularity(_ref) {
   // others
   return getGeoGranularityByLevel(mapLevel);
 };
-export var fixMapGeoGranularity = function fixMapGeoGranularity(chart) {
-  var type = chart.type,
-    map_level = chart.map_level,
-    map_location = chart.map_location;
+export const fixMapGeoGranularity = chart => {
+  const {
+    type,
+    map_level,
+    map_location
+  } = chart;
   if (type !== STAT_TYPE.MAP && type !== STAT_TYPE.MAP_BUBBLE) {
     return chart.geolocation_granularity;
   }
@@ -64,18 +66,16 @@ export var fixMapGeoGranularity = function fixMapGeoGranularity(chart) {
     mapLocation: map_location
   });
 };
-export var getRegionScaleOffsets = function getRegionScaleOffsets(mapLevel, mapLocation) {
-  var countryScaleOffsets = {
+export const getRegionScaleOffsets = (mapLevel, mapLocation) => {
+  const countryScaleOffsets = {
     scale_w: COUNTY_SCALE_WIDTH,
     scale_h: COUNTY_SCALE_HEIGHT
   };
   switch (mapLevel) {
     case MAP_LEVEL.PROVINCE:
       {
-        var provinceName = mapLocation && mapLocation.province;
-        var province = provinceName && regions.find(function (province) {
-          return province.name === provinceName;
-        });
+        const provinceName = mapLocation && mapLocation.province;
+        const province = provinceName && regions.find(province => province.name === provinceName);
         if (!province) return countryScaleOffsets;
         return {
           scale_w: province.scale_w,
@@ -84,15 +84,11 @@ export var getRegionScaleOffsets = function getRegionScaleOffsets(mapLevel, mapL
       }
     case MAP_LEVEL.CITY:
       {
-        var _provinceName = mapLocation && mapLocation.province;
-        var _province = _provinceName && regions.find(function (province) {
-          return province.name === _provinceName;
-        });
-        var cities = _province && _province.cities;
-        var cityName = mapLocation.city;
-        var city = cityName && Array.isArray(cities) && cities.find(function (city) {
-          return city.name === cityName;
-        });
+        const provinceName = mapLocation && mapLocation.province;
+        const province = provinceName && regions.find(province => province.name === provinceName);
+        const cities = province && province.cities;
+        const cityName = mapLocation.city;
+        const city = cityName && Array.isArray(cities) && cities.find(city => city.name === cityName);
         if (!city) return countryScaleOffsets;
         return {
           scale_w: city.scale_w,

package/es/utils/model.js

@@ -1,13 +1,11 @@
 import { hasOwnProperty } from './object';
-export var getChartConfigValueFromKey = function getChartConfigValueFromKey(key, object) {
+export const getChartConfigValueFromKey = (key, object) => {
   if (!hasOwnProperty(object, key)) {
     return null;
   }
   return object[key];
 };
-export var getChartConfigValueFromKeys = function getChartConfigValueFromKeys(keys, object) {
-  var existKey = keys.find(function (key) {
-    return hasOwnProperty(object, key);
-  });
+export const getChartConfigValueFromKeys = (keys, object) => {
+  const existKey = keys.find(key => hasOwnProperty(object, key));
   return existKey ? object[existKey] : null;
 };

package/es/utils/object.js

@@ -1,6 +1,6 @@
 import { isValidElement } from 'react';
-export var isSameObject = function isSameObject(a, b) {
-  var k;
+export const isSameObject = (a, b) => {
+  let k;
   for (k in a) {
     if (a.hasOwnProperty(k)) {
       if (typeof a[k] === 'function' && typeof b[k] === 'function' || isValidElement(a[k]) && isValidElement(b[k])) {
@@ -18,9 +18,9 @@ export var isSameObject = function isSameObject(a, b) {
   }
   return true;
 };
-export var isEmptyObject = function isEmptyObject(obj) {
+export const isEmptyObject = obj => {
   return Object.keys(obj).length === 0 && obj.constructor === Object;
 };
-export var hasOwnProperty = function hasOwnProperty(obj, prop) {
+export const hasOwnProperty = (obj, prop) => {
   return Object.prototype.hasOwnProperty.call(obj, prop);
 };

package/es/utils/pivot-table.js

@@ -1,16 +1,16 @@
 import { FORMULA_COLUMN_TYPES_MAP, isNumber } from 'dtable-store';
 import { STATISTICS_COUNT_TYPE, SUMMARY_METHOD_MAP } from '../constants';
-var getCellValueFromRow = function getCellValueFromRow(row, formulaRow, columnType, columnKey, sqlKey, isSqlQuery) {
+const getCellValueFromRow = (row, formulaRow, columnType, columnKey, sqlKey, isSqlQuery) => {
   if (!isSqlQuery) {
     if (FORMULA_COLUMN_TYPES_MAP[columnType]) {
-      var cellValue = formulaRow[columnKey];
+      const cellValue = formulaRow[columnKey];
       return Array.isArray(cellValue) ? cellValue[0] : cellValue;
     }
     return row[columnKey];
   }
   return row[sqlKey];
 };
-export var getPivotTableSummaryTotal = function getPivotTableSummaryTotal(summaryColumnType, summaryColumnKey, sqlKey, summaryType, summaryMethod, rows, formulaRows, isSqlQuery) {
+export const getPivotTableSummaryTotal = (summaryColumnType, summaryColumnKey, sqlKey, summaryType, summaryMethod, rows, formulaRows, isSqlQuery) => {
   if (summaryType === STATISTICS_COUNT_TYPE.COUNT) {
     return rows.length;
   }
@@ -20,11 +20,11 @@ export var getPivotTableSummaryTotal = function getPivotTableSummaryTotal(summar
   switch (summaryMethod) {
     case SUMMARY_METHOD_MAP.Distinct_values:
       {
-        var count = 0;
-        var existMap = {};
-        rows.forEach(function (row) {
-          var formulaRow = formulaRows && formulaRows[row._id];
-          var cellValue = getCellValueFromRow(row, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+        let count = 0;
+        let existMap = {};
+        rows.forEach(row => {
+          const formulaRow = formulaRows && formulaRows[row._id];
+          let cellValue = getCellValueFromRow(row, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
           if (!cellValue) {
             if (cellValue === 0) {
               cellValue = '0';
@@ -42,11 +42,11 @@ export var getPivotTableSummaryTotal = function getPivotTableSummaryTotal(summar
     case SUMMARY_METHOD_MAP.Sum:
     case SUMMARY_METHOD_MAP.Mean:
       {
-        var sum = 0;
-        var validNumbersCount = 0;
-        rows.forEach(function (row) {
-          var formulaRow = formulaRows && formulaRows[row._id];
-          var cellValue = getCellValueFromRow(row, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+        let sum = 0;
+        let validNumbersCount = 0;
+        rows.forEach(row => {
+          const formulaRow = formulaRows && formulaRows[row._id];
+          let cellValue = getCellValueFromRow(row, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
           if (isNumber(cellValue)) {
             validNumbersCount++;
             sum += cellValue;
@@ -65,22 +65,22 @@ export var getPivotTableSummaryTotal = function getPivotTableSummaryTotal(summar
         if (rows.length === 0) {
           return 0;
         }
-        var result = rows.reduce(function (current, next) {
-          var currentFormulaRow = formulaRows && formulaRows[current._id];
-          var nextFormulaRow = formulaRows && formulaRows[next._id];
-          var currentValue = getCellValueFromRow(current, currentFormulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
-          var nextValue = getCellValueFromRow(next, nextFormulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+        let result = rows.reduce((current, next) => {
+          const currentFormulaRow = formulaRows && formulaRows[current._id];
+          const nextFormulaRow = formulaRows && formulaRows[next._id];
+          let currentValue = getCellValueFromRow(current, currentFormulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+          let nextValue = getCellValueFromRow(next, nextFormulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
           if (!nextValue && nextValue !== 0) {
             return current;
           }
-          var isNextGreater = currentValue < nextValue;
+          let isNextGreater = currentValue < nextValue;
           if (summaryMethod === SUMMARY_METHOD_MAP.Min) {
             return isNextGreater ? current : next;
           } else {
             return isNextGreater ? next : current;
           }
         });
-        var formulaRow = formulaRows && formulaRows[result._id];
+        const formulaRow = formulaRows && formulaRows[result._id];
         return getCellValueFromRow(result, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
       }
     default:

package/es/utils/row-utils.js

@@ -1,6 +1,6 @@
 import { CellType, COLLABORATOR_COLUMN_TYPES, FORMULA_COLUMN_TYPES_MAP, FORMULA_RESULT_TYPE, isNumber, getNumberDisplayString } from 'dtable-store';
 import { getClientFormulaDisplayString } from '../utils';
-export var isEmptyGeolocationCell = function isEmptyGeolocationCell(cellValue, format) {
+export const isEmptyGeolocationCell = (cellValue, format) => {
   if (!cellValue) return null;
   if (format === 'lng_lat') {
     return (cellValue.lng || cellValue.lng === 0) && (cellValue.lat || cellValue.lat === 0);
@@ -10,40 +10,47 @@ export var isEmptyGeolocationCell = function isEmptyGeolocationCell(cellValue, f
   }
   return cellValue.province;
 };
-export var isValidRow = function isValidRow(row, formulaRow, column, includeEmpty) {
-  var columnType = column.type,
-    columnKey = column.key;
+export const isValidRow = (row, formulaRow, column, includeEmpty) => {
+  const {
+    type: columnType,
+    key: columnKey
+  } = column;
   if (includeEmpty || columnType === CellType.CHECKBOX) return true;
   if (columnType === CellType.GEOLOCATION) {
-    var geo_format = column.data.geo_format;
+    const {
+      geo_format
+    } = column.data;
     return isEmptyGeolocationCell(row[columnKey], geo_format);
   }
-  var cellValue = row[columnKey];
+  let cellValue = row[columnKey];
   if (FORMULA_COLUMN_TYPES_MAP[columnType] || columnType === CellType.LINK) {
     cellValue = formulaRow ? formulaRow[columnKey] : null;
   }
   return cellValue || cellValue === 0;
 };
-export var getFormattedLabel = function getFormattedLabel(column, name, collaborators) {
-  var columnType = column.type,
-    columnData = column.data;
+export const getFormattedLabel = (column, name, collaborators) => {
+  let {
+    type: columnType,
+    data: columnData
+  } = column;
   if (columnType === CellType.SINGLE_SELECT || columnType === CellType.MULTIPLE_SELECT) {
-    var options = columnData ? columnData.options : [];
-    var selectedOption = options.find(function (o) {
-      var id = name;
+    let options = columnData ? columnData.options : [];
+    let selectedOption = options.find(o => {
+      let id = name;
       if (Array.isArray(name)) {
         id = name[0];
       }
       return o.id === id;
     });
-    var _ref = selectedOption || {},
-      optionName = _ref.name;
+    let {
+      name: optionName
+    } = selectedOption || {};
     if (selectedOption) {
       return optionName;
     }
   } else if (columnType === CellType.COLLABORATOR) {
-    var collaborator = collaborators.find(function (item) {
-      var email = name;
+    let collaborator = collaborators.find(item => {
+      let email = name;
       if (Array.isArray(name)) {
         email = name[0];
       }
@@ -56,26 +63,25 @@ export var getFormattedLabel = function getFormattedLabel(column, name, collabor
     if (name === 'anonymous') {
       return name;
     } else {
-      var _collaborator = collaborators.find(function (item) {
-        return item.email === name;
-      });
-      if (_collaborator) {
-        return _collaborator.name;
+      let collaborator = collaborators.find(item => item.email === name);
+      if (collaborator) {
+        return collaborator.name;
       }
     }
   } else if (columnType === CellType.LINK) {
     return getClientFormulaDisplayString(Array.isArray(name) ? name : [name], columnData, {
-      collaborators: collaborators
+      collaborators
     });
   } else if (columnType === CellType.CHECKBOX) {
     return name == 'true' ? 'Checked' : 'Unchecked';
   } else if (FORMULA_COLUMN_TYPES_MAP[columnType]) {
-    var _ref2 = columnData || {},
-      result_type = _ref2.result_type,
-      array_type = _ref2.array_type;
+    const {
+      result_type,
+      array_type
+    } = columnData || {};
     if (!name && !isNumber(name)) return '';
     if (result_type === FORMULA_RESULT_TYPE.NUMBER) {
-      var valueNumber = parseFloat(name);
+      const valueNumber = parseFloat(name);
       return isNumber(valueNumber) ? getNumberDisplayString(valueNumber, column.data) : name;
     }
     if (result_type === FORMULA_RESULT_TYPE.ARRAY) {
@@ -83,15 +89,15 @@ export var getFormattedLabel = function getFormattedLabel(column, name, collabor
         if ([CellType.CREATOR, CellType.LAST_MODIFIER].includes(array_type) && name === 'anonymous') {
           return name;
         }
-        var _collaborator2 = collaborators.find(function (item) {
-          var email = name;
+        const collaborator = collaborators.find(item => {
+          let email = name;
           if (Array.isArray(name)) {
             email = name[0];
           }
           return item.email === email;
         });
-        if (_collaborator2) {
-          return _collaborator2.name;
+        if (collaborator) {
+          return collaborator.name;
         }
       }
     }
@@ -103,10 +109,12 @@ export var getFormattedLabel = function getFormattedLabel(column, name, collabor
 };
 export function getCellValue(row, formulaRow, column) {
   if (!column) return null;
-  var type = column.type,
-    key = column.key;
+  const {
+    type,
+    key
+  } = column;
   if (FORMULA_COLUMN_TYPES_MAP[type]) {
-    var cellValue = formulaRow && formulaRow[key];
+    const cellValue = formulaRow && formulaRow[key];
     if (Array.isArray(cellValue)) {
       return cellValue[0];
     }

package/es/utils/search.js

@@ -1,43 +1,41 @@
 import dayjs from 'dayjs';
 import { CellType, getNumberDisplayString, getMultipleOptionName, getCollaboratorsName, getGeolocationDisplayString } from 'dtable-store';
 import { getSelectColumnOptions } from './column';
-var SUPPORT_SEARCH_COLUMN_TYPES = [CellType.DATE, CellType.TEXT, CellType.LONG_TEXT, CellType.NUMBER, CellType.URL, CellType.EMAIL, CellType.SINGLE_SELECT, CellType.CTIME, CellType.MTIME, CellType.MULTIPLE_SELECT, CellType.LAST_MODIFIER, CellType.CREATOR, CellType.COLLABORATOR, CellType.LINK, CellType.FORMULA, CellType.LINK_FORMULA, CellType.AUTO_NUMBER, CellType.GEOLOCATION, CellType.DURATION];
-export var searchRows = function searchRows(rows, columns, val, processRow) {
-  var dtableCollaborators = window.app.collaboratorsCache || [];
-  var collaborators = window.app.state.collaborators;
-  var searchResult = [];
-  rows.forEach(function (row) {
-    var column = columns.find(function (column) {
-      var columnType = column.type,
-        columnKey = column.key;
+const SUPPORT_SEARCH_COLUMN_TYPES = [CellType.DATE, CellType.TEXT, CellType.LONG_TEXT, CellType.NUMBER, CellType.URL, CellType.EMAIL, CellType.SINGLE_SELECT, CellType.CTIME, CellType.MTIME, CellType.MULTIPLE_SELECT, CellType.LAST_MODIFIER, CellType.CREATOR, CellType.COLLABORATOR, CellType.LINK, CellType.FORMULA, CellType.LINK_FORMULA, CellType.AUTO_NUMBER, CellType.GEOLOCATION, CellType.DURATION];
+export const searchRows = (rows, columns, val, processRow) => {
+  let dtableCollaborators = window.app.collaboratorsCache || [];
+  let collaborators = window.app.state.collaborators;
+  let searchResult = [];
+  rows.forEach(row => {
+    let column = columns.find(column => {
+      const {
+        type: columnType,
+        key: columnKey
+      } = column;
       if (!SUPPORT_SEARCH_COLUMN_TYPES.includes(columnType)) {
         return false;
       }
-      var cellValue = row[columnKey];
+      const cellValue = row[columnKey];
       if (cellValue) {
-        var text;
+        let text;
         if (columnType === CellType.LONG_TEXT) {
           text = cellValue.text;
         } else if (columnType === CellType.NUMBER || columnType === CellType.DURATION) {
           text = getNumberDisplayString(cellValue, column.data);
         } else if (columnType === CellType.SINGLE_SELECT) {
-          var options = getSelectColumnOptions(column);
-          var option = options.find(function (option) {
-            return option.id === cellValue;
-          });
+          const options = getSelectColumnOptions(column);
+          const option = options.find(option => option.id === cellValue);
           text = option ? option.name : '';
         } else if (columnType === CellType.MULTIPLE_SELECT) {
-          var _options = getSelectColumnOptions(column);
-          text = getMultipleOptionName(_options, cellValue);
+          const options = getSelectColumnOptions(column);
+          text = getMultipleOptionName(options, cellValue);
         } else if (columnType === CellType.COLLABORATOR) {
           text = getCollaboratorsName(collaborators, cellValue);
         } else if (columnType === CellType.LAST_MODIFIER || columnType === CellType.CREATOR) {
           if (cellValue === 'anonymous') {
             text = cellValue;
           } else {
-            var collaborator = collaborators.find(function (collaborator) {
-              return collaborator.email === cellValue;
-            });
+            let collaborator = collaborators.find(collaborator => collaborator.email === cellValue);
             if (!collaborator) {
               collaborator = dtableCollaborators[cellValue];
             }