dtable-statistic 4.3.6 → 4.3.8

package/es/stat-view/trend-chart.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _baseChart = _interopRequireDefault(require("./base-chart"));
 var _customG = require("../custom-g2");
 var _constants = require("../constants");
@@ -18,56 +18,9 @@ const propTypes = {
   chartCalculator: _propTypes.default.object,
   getTableById: _propTypes.default.func
 };
-class BasicNumericCard extends _baseChart.default {
+class TrendChart extends _baseChart.default {
   constructor(props) {
     super(props);
-    this.componentDidMount = async () => {
-      const {
-        statItem,
-        chartCalculator
-      } = this.props;
-      if (this.container) {
-        const data = await chartCalculator.calculate(statItem);
-        this.setState({
-          isCalculatingData: false
-        });
-        this.drawChart(data);
-        this.calculateData = data;
-      }
-    };
-    this.componentDidUpdate = async (preProps, preState) => {
-      const {
-        statItem,
-        chartCalculator
-      } = this.props;
-      const {
-        isCalculatingData
-      } = this.state;
-      if (isCalculatingData !== preState.isCalculatingData) return;
-      if (this.shouldCalculateStatItem(preProps, this.props)) {
-        this.setState({
-          isCalculatingData: true
-        });
-        if (this.container) {
-          const data = await chartCalculator.calculate(statItem);
-          this.calculateData = data;
-          this.setState({
-            isCalculatingData: false
-          });
-          this.chart && this.chart.destroy();
-          this.drawChart(data);
-          if (this.props.isPreview) {
-            this.chart.forceFit();
-          }
-        }
-      } else {
-        this.chart && this.chart.destroy();
-        this.drawChart(this.calculateData);
-        if (this.props.isPreview) {
-          this.chart.forceFit();
-        }
-      }
-    };
     this.drawChart = data => {
       const {
         isPreview,
@@ -114,7 +67,7 @@ class BasicNumericCard extends _baseChart.default {
       } = statItem;
       if (summary_type !== _constants.STATISTICS_COUNT_TYPE.COUNT) {
         const table = getTableById(table_id);
-        const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(table, summary_column);
+        const selectedColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column);
         return this.getNumberDisplayString(data, selectedColumn.data || {});
       }
       let string = data + '';
@@ -223,6 +176,20 @@ class BasicNumericCard extends _baseChart.default {
     };
     this.calculateData = null;
   }
+  async componentDidMount() {
+    const {
+      statItem,
+      chartCalculator
+    } = this.props;
+    if (this.container) {
+      const data = await chartCalculator.calculate(statItem);
+      this.setState({
+        isCalculatingData: false
+      });
+      this.drawChart(data);
+      this.calculateData = data;
+    }
+  }
   shouldComponentUpdate(nextProps, nextState) {
     if (this.canUpdate(this.props, nextProps)) {
       return true;
@@ -232,6 +199,39 @@ class BasicNumericCard extends _baseChart.default {
     }
     return false;
   }
+  async componentDidUpdate(preProps, preState) {
+    const {
+      statItem,
+      chartCalculator
+    } = this.props;
+    const {
+      isCalculatingData
+    } = this.state;
+    if (isCalculatingData !== preState.isCalculatingData) return;
+    if (this.shouldCalculateStatItem(preProps, this.props)) {
+      this.setState({
+        isCalculatingData: true
+      });
+      if (this.container) {
+        const data = await chartCalculator.calculate(statItem);
+        this.calculateData = data;
+        this.setState({
+          isCalculatingData: false
+        });
+        this.chart && this.chart.destroy();
+        this.drawChart(data);
+        if (this.props.isPreview) {
+          this.chart.forceFit();
+        }
+      }
+    } else {
+      this.chart && this.chart.destroy();
+      this.drawChart(this.calculateData);
+      if (this.props.isPreview) {
+        this.chart.forceFit();
+      }
+    }
+  }
   componentWillUnmount() {
     this.container = null;
   }
@@ -245,5 +245,5 @@ class BasicNumericCard extends _baseChart.default {
     }));
   }
 }
-BasicNumericCard.propTypes = propTypes;
-var _default = exports.default = BasicNumericCard;
+TrendChart.propTypes = propTypes;
+var _default = exports.default = TrendChart;

package/es/stat-view/world-map.js

@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _index = _interopRequireDefault(require("@antv/data-set/lib/index"));
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _baseChart = _interopRequireDefault(require("./base-chart"));
 var _customG = require("../custom-g2");
 var _constants = require("../constants");
@@ -90,7 +90,7 @@ class WorldMap extends _baseChart.default {
       let summaryColumnData = _constants.DEFAULT_NUMBER_FORMAT_OBJECT;
       if (summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
         const table = getTableById(table_id);
-        const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, summary_column) || {};
+        const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column) || {};
         summaryColumnData = summaryColumn.data || _constants.DEFAULT_NUMBER_FORMAT_OBJECT;
       }
       this.statisticView = this.chart.createView();
@@ -159,7 +159,7 @@ class WorldMap extends _baseChart.default {
       let summaryColumnData = _constants.DEFAULT_NUMBER_FORMAT_OBJECT;
       if (summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
         const table = getTableById(table_id);
-        const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, summary_column) || {};
+        const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column) || {};
         summaryColumnData = summaryColumn.data || _constants.DEFAULT_NUMBER_FORMAT_OBJECT;
       }
       this.statisticView = this.chart.createView();

package/es/utils/cell-format.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getClientFormulaDisplayString = exports.getClientCellValueDisplayString = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
+var _object = require("./object");
 const getClientFormulaDisplayString = function (value, columnData) {
   let {
-    tables = [],
     collaborators = []
   } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (!columnData || !value && value !== 0) return '';
@@ -17,19 +17,16 @@ const getClientFormulaDisplayString = function (value, columnData) {
     result_type,
     array_type
   } = columnData;
-  if (result_type === _dtableStore.FORMULA_RESULT_TYPE.ARRAY) {
-    if (_dtableStore.COLLABORATOR_COLUMN_TYPES.includes(array_type)) {
+  if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.ARRAY) {
+    if (_dtableUtils.COLLABORATOR_COLUMN_TYPES.includes(array_type)) {
       if (!value) {
         return null;
       }
       const collaboratorList = Array.isArray(value) ? value : [value];
-      return (0, _dtableStore.getCollaboratorsName)(collaborators, collaboratorList);
+      return (0, _dtableUtils.getCollaboratorsName)(collaborators, collaboratorList);
     }
   }
-  return (0, _dtableStore.getFormulaDisplayString)(value, columnData, {
-    tables,
-    collaborators
-  });
+  return (0, _dtableUtils.getFormulaDisplayString)(value, columnData);
 };
 
 /**
@@ -52,8 +49,8 @@ const getClientLinkDisplayString = function (links, columnData) {
   let formulaData = {
     ...columnData
   };
-  if (!columnData.hasOwnProperty('result_type')) {
-    formulaData.result_type = _dtableStore.FORMULA_RESULT_TYPE.ARRAY;
+  if (!(0, _object.hasOwnProperty)(columnData, 'result_type')) {
+    formulaData.result_type = _dtableUtils.FORMULA_RESULT_TYPE.ARRAY;
   }
   const displayValue = links.map(link => link.display_value);
   return getClientFormulaDisplayString(displayValue, formulaData, {
@@ -88,24 +85,27 @@ const getClientCellValueDisplayString = function (row, type, key) {
     collaborators = [],
     tables = []
   } = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-  if (_dtableStore.FORMULA_COLUMN_TYPES.includes(type)) {
+  if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[type]) {
     const formulaRow = formulaRows[row._id] || {};
     return getClientFormulaDisplayString(formulaRow[key], data, {
       tables,
       collaborators
     });
-  } else if (type === _dtableStore.CellType.LINK) {
+  }
+  if (type === _dtableUtils.CellType.LINK) {
     const formulaRow = formulaRows[row._id] || {};
     return getClientLinkDisplayString(formulaRow[key], data, {
       tables,
       collaborators
     });
-  } else if (type === _dtableStore.CellType.CTIME || type === _dtableStore.CellType.MTIME) {
+  }
+  if (type === _dtableUtils.CellType.CTIME || type === _dtableUtils.CellType.MTIME) {
     return getAutoTimeDisplayString(row, key);
-  } else if (type === _dtableStore.CellType.FILE) {
+  }
+  if (type === _dtableUtils.CellType.FILE) {
     return getFileDisplayString(row, key);
   }
-  return (0, _dtableStore.getCellValueDisplayString)(row, type, key, {
+  return (0, _dtableUtils.getCellValueDisplayString)(row, type, key, {
     formulaRows,
     data,
     collaborators,

package/es/utils/cell-value.js

@@ -4,17 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isCellValueChanged = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _object = require("./object");
 const isCellValueChanged = (oldVal, newVal, columnType) => {
   if (oldVal === newVal) {
     return false;
   }
   if (oldVal === undefined || oldVal === null) {
-    if ((columnType === _dtableStore.CellType.GEOLOCATION || columnType === _dtableStore.CellType.DIGITAL_SIGN) && (0, _object.isEmptyObject)(newVal)) {
+    if ((columnType === _dtableUtils.CellType.GEOLOCATION || columnType === _dtableUtils.CellType.DIGITAL_SIGN) && (0, _object.isEmptyObject)(newVal)) {
       return false;
     }
-    if ((columnType === _dtableStore.CellType.DATE || columnType === _dtableStore.CellType.NUMBER || columnType === _dtableStore.CellType.DURATION) && newVal === null) {
+    if ((columnType === _dtableUtils.CellType.DATE || columnType === _dtableUtils.CellType.NUMBER || columnType === _dtableUtils.CellType.DURATION) && newVal === null) {
       return false;
     }
     if (Array.isArray(newVal)) {

package/es/utils/color-utils.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getValidColorRules = exports.getLabelColorFromSpecificColor = exports.getLabelColorFromColorRules = exports.getLabelColor = exports.getConvertedColorRules = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _constants = require("../constants");
 var _colorRules = require("../constants/color-rules");
 const getValidColorRules = colorRules => {
@@ -36,7 +36,7 @@ const getValidColorRules = colorRules => {
         column_key: filter.filter_type
       };
     });
-    const validFilters = (0, _dtableStore.getValidFilters)(convertedFilters, columns);
+    const validFilters = (0, _dtableUtils.getValidFilters)(convertedFilters, columns);
     if (validFilters.length === 0) {
       return null;
     }
@@ -102,7 +102,7 @@ const getLabelColorFromColorRules = (colorRules, value) => {
       filter_conjunction,
       filters
     } = colorRule;
-    if ((0, _dtableStore.filterRow)(row, filter_conjunction, filters)) {
+    if ((0, _dtableUtils.filterRow)(row, filter_conjunction, filters)) {
       matchedRuleColor = color;
       break;
     }

package/es/utils/column-utils.js

@@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getColorFromSingleSelectColumn = getColorFromSingleSelectColumn;
 exports.isWorldMapColumn = exports.isStatisticDateColumn = exports.isMirrorColumn = exports.isMapColumn = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _constants = require("../constants");
 function getColorFromSingleSelectColumn(column, target) {
   let {
     type: columnType,
     data: columnData
   } = column;
-  if (columnType !== _dtableStore.CellType.SINGLE_SELECT) {
+  if (columnType !== _dtableUtils.CellType.SINGLE_SELECT) {
     return null;
   }
   const options = columnData ? columnData.options : [];
@@ -28,7 +28,7 @@ function getColorFromSingleSelectColumn(column, target) {
 }
 const isStatisticDateColumn = column => {
   if (!column) return false;
-  return (0, _dtableStore.isDateColumn)(column);
+  return (0, _dtableUtils.isDateColumn)(column);
 };
 exports.isStatisticDateColumn = isStatisticDateColumn;
 const isMapColumn = column => {
@@ -37,7 +37,7 @@ const isMapColumn = column => {
     type,
     data
   } = column;
-  if (type === _dtableStore.CellType.GEOLOCATION) {
+  if (type === _dtableUtils.CellType.GEOLOCATION) {
     const {
       geo_format
     } = data || {};
@@ -46,13 +46,13 @@ const isMapColumn = column => {
     }
     return true;
   }
-  if (_dtableStore.FORMULA_COLUMN_TYPES.includes(type)) {
+  if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[type]) {
     const {
       result_type,
       array_type,
       array_data
     } = data || {};
-    if (result_type !== _dtableStore.FORMULA_RESULT_TYPE.ARRAY || array_type !== _dtableStore.CellType.GEOLOCATION) {
+    if (result_type !== _dtableUtils.FORMULA_RESULT_TYPE.ARRAY || array_type !== _dtableUtils.CellType.GEOLOCATION) {
       return false;
     }
     const {
@@ -77,8 +77,8 @@ const isWorldMapColumn = column => {
     type,
     data
   } = column;
-  if (type === _dtableStore.CellType.TEXT) return true;
-  if (type === _dtableStore.CellType.GEOLOCATION) {
+  if (type === _dtableUtils.CellType.TEXT) return true;
+  if (type === _dtableUtils.CellType.GEOLOCATION) {
     const {
       geo_format
     } = data || {};
@@ -86,7 +86,7 @@ const isWorldMapColumn = column => {
       return true;
     }
   }
-  if (_dtableStore.FORMULA_COLUMN_TYPES.includes(type)) {
+  if (_dtableUtils.FORMULA_COLUMN_TYPES_MAP[type]) {
     const {
       data
     } = column;
@@ -95,7 +95,7 @@ const isWorldMapColumn = column => {
       array_type,
       array_data
     } = data || {};
-    if (result_type !== _dtableStore.FORMULA_RESULT_TYPE.ARRAY || array_type !== _dtableStore.CellType.GEOLOCATION) {
+    if (result_type !== _dtableUtils.FORMULA_RESULT_TYPE.ARRAY || array_type !== _dtableUtils.CellType.GEOLOCATION) {
       return false;
     }
     const {

package/es/utils/column.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getDateColumnFormat = getDateColumnFormat;
 exports.getSelectColumnOptions = getSelectColumnOptions;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 function getSelectColumnOptions(column) {
   if (!column || !column.data || !Array.isArray(column.data.options)) {
     return [];
@@ -13,7 +13,7 @@ function getSelectColumnOptions(column) {
   return column.data.options;
 }
 function getDateColumnFormat(column) {
-  let format = column && column.data && column.data.format ? column.data.format : _dtableStore.DEFAULT_DATE_FORMAT;
+  let format = column && column.data && column.data.format ? column.data.format : _dtableUtils.DEFAULT_DATE_FORMAT;
   // Old Europe format is D/M/YYYY new format is DD/MM/YYYY
   format = format.replace(/D\/M\/YYYY/, 'DD/MM/YYYY');
   return format;

package/es/utils/common-utils.js

@@ -11,7 +11,7 @@ exports.isShapeEqual = exports.isBoolean = exports.isArrayCellValue = exports.ge
 exports.isStatItemEqual = isStatItemEqual;
 exports.shallowEqual = shallowEqual;
 exports.sortDataByGroupSum = exports.shouldCalculateStatItem = void 0;
-var _dtableStore = require("dtable-store");
+var _dtableUtils = require("dtable-utils");
 var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
 var _constants = require("../constants");
 var _statUtils = _interopRequireDefault(require("./stat-utils"));
@@ -19,12 +19,14 @@ const generatorUniqueId = list => {
   let uniqueId;
   let isUnique = false;
   while (!isUnique) {
-    uniqueId = (0, _dtableStore.generatorBase64Code)();
+    uniqueId = (0, _dtableUtils.generatorBase64Code)();
 
     // eslint-disable-next-line
     if (!Array.isArray(list) || list.length === 0) {
       break;
     }
+
+    // eslint-disable-next-line
     isUnique = list.every(item => item._id !== uniqueId);
     if (isUnique) {
       break;
@@ -152,13 +154,13 @@ const isArrayCellValue = column => {
     type,
     data
   } = column;
-  return _constants.MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[type] || _dtableStore.FORMULA_COLUMN_TYPES_MAP[type] && data && data.result_type === _dtableStore.FORMULA_RESULT_TYPE.ARRAY && _dtableStore.COLLABORATOR_COLUMN_TYPES.includes(data.array_type) // the collaborator lookup is not formatted
+  return _constants.MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[type] || _dtableUtils.FORMULA_COLUMN_TYPES_MAP[type] && data && data.result_type === _dtableUtils.FORMULA_RESULT_TYPE.ARRAY && _dtableUtils.COLLABORATOR_COLUMN_TYPES.includes(data.array_type) // the collaborator lookup is not formatted
   ;
 };
 exports.isArrayCellValue = isArrayCellValue;
 const getSummaryResult = function (results, summaryMethod) {
   let precision = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 8;
-  const numericResults = Array.isArray(results) && results.length > 0 ? results.filter(res => (0, _dtableStore.isNumber)(res)) : [];
+  const numericResults = Array.isArray(results) && results.length > 0 ? results.filter(res => (0, _dtableUtils.isNumber)(res)) : [];
   switch (summaryMethod) {
     case _constants.SUMMARY_METHOD_MAP.Max:
       {
@@ -233,7 +235,7 @@ const getPieColor = (color_option, column, index, data, currentTheme) => {
   const {
     colors
   } = currentTheme;
-  if (color_option === _constants.PIE_COLOR_OPTIONS[1] && (columnType === _dtableStore.CellType.SINGLE_SELECT || columnType === _dtableStore.CellType.MULTIPLE_SELECT)) {
+  if (color_option === _constants.PIE_COLOR_OPTIONS[1] && (columnType === _dtableUtils.CellType.SINGLE_SELECT || columnType === _dtableUtils.CellType.MULTIPLE_SELECT)) {
     if (columnData && columnData.options) {
       const selectedItem = columnData.options.find(item => item.name === data.name) || {};
       return selectedItem.color || '#dbdbdb';
@@ -253,7 +255,7 @@ function formatPieChartData(data, statItem, table, currentTheme) {
     summary_type
   } = statItem;
   const isAdvanced = summary_type === 'advanced';
-  const column = _dtableStore.TableUtils.getTableColumnByKey(table, groupby_column_key);
+  const column = (0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key);
   let sum = data.reduce((total, currentValue) => {
     return total += currentValue.value;
   }, 0);
@@ -284,7 +286,7 @@ function formatPieChartData(data, statItem, table, currentTheme) {
     }, 0);
     let formattedValueSum = filteredSum;
     if (isAdvanced) {
-      const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, summary_column_key);
+      const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column_key);
       formattedValueSum = _statUtils.default.getFormattedValue(filteredSum, summaryColumn, summaryMethod);
     }
     let original_name_list = [];
@@ -329,7 +331,7 @@ const formatNumericValue = function (value) {
 };
 exports.formatNumericValue = formatNumericValue;
 const getLabelFontSize = label_font_size => {
-  return (0, _dtableStore.isNumber)(label_font_size) ? label_font_size : _constants.DEFAULT_LABEL_FONT_SIZE;
+  return (0, _dtableUtils.isNumber)(label_font_size) ? label_font_size : _constants.DEFAULT_LABEL_FONT_SIZE;
 };
 exports.getLabelFontSize = getLabelFontSize;
 const getSummaryColumnMethod = function (method, summaryColumnName) {