sea-chart 0.0.89 → 0.0.90

package/dist/constants/index.js

@@ -6,6 +6,11 @@ import { CHART_TYPE, CHART_TYPE_SHOW, CHART_TYPES } from './type';
 import { CHART_TYPE_IMAGE } from './type-image';
 import { regions } from './regions';
 import { TABLE_DIMENSIONS } from './table';
+export const TREND_TYPES = {
+  UP: 'up',
+  DOWN: 'down',
+  EQUAL: 'equal'
+};
 export const CHART_STYLE_COLORS = ['#5B8FF9', '#5AD8A6', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'];
 export const ONLY_NEED_NUMBER_OPTIONS_CHART_TYPE = [CHART_TYPE.COMPLETENESS, CHART_TYPE.COMPLETENESS_GROUP, CHART_TYPE.SCATTER];
 export const COMPLETENESS_GROUPBY_SUPPORTED_COLUMN_TYPE = [CellType.COLLABORATOR, CellType.TEXT, CellType.SINGLE_SELECT];

package/dist/utils/chart-utils/base-utils.js

@@ -692,6 +692,22 @@ BaseUtils.sortCharts = (charts, column, sortKey) => {
             return sortDate(current, next, sortType);
           }
         case CellType.SINGLE_SELECT:
+          {
+            const {
+              name: currentName,
+              group_name: currentGroupName
+            } = currResult || {};
+            const {
+              name: nextName,
+              group_name: nextGroupName
+            } = nextResult || {};
+            const current = currentGroupName || currentName;
+            const next = nextGroupName || nextName;
+            return sortSingleSelect(current, next, {
+              sort_type: sortType,
+              option_id_index_map: optionIdIndexMap
+            });
+          }
         case CellType.MULTIPLE_SELECT:
           {
             return sortSingleSelect(current, next, {

package/dist/utils/chart-utils/original-data-utils/trend-calculator.js

@@ -1,7 +1,7 @@
 import dayjs from 'dayjs';
 import quarterOfYear from 'dayjs/plugin/quarterOfYear';
 import { FORMULA_COLUMN_TYPES_MAP, isNumber, getTableById, getViewById, getTableColumnByKey } from 'dtable-utils';
-import { CHART_SUMMARY_TYPE } from '../../../constants';
+import { CHART_SUMMARY_TYPE, TREND_TYPES } from '../../../constants';
 import BaseUtils from '../base-utils';
 import { getCellValue } from '../../row-utils';
 import { getCompareDate, summaryDurationResult } from '../../trend-utils';
@@ -94,11 +94,22 @@ async function calculator(chart, value, _ref) {
     result = '--';
     previousValues = 0;
   }
+  let type;
+  if (currentValues > previousValues) {
+    type = TREND_TYPES.UP;
+  } else if (currentValues < previousValues) {
+    type = TREND_TYPES.DOWN;
+  } else if (currentValues === previousValues) {
+    type = TREND_TYPES.EQUAL;
+  }
+  if (currentValues === 0 && previousValues === 0) {
+    result = '0%';
+  }
   return {
     latest: currentValues,
     previous: previousValues,
     result,
-    type: currentValues >= previousValues ? 'up' : 'down'
+    type
   };
 }
 export default calculator;

package/dist/utils/chart-utils/sql-statistics-utils.js

@@ -2,7 +2,7 @@ var _SQLStatisticsUtils;
 import dayjs from 'dayjs';
 import { CellType, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, getFormulaDisplayString, getPrecisionNumber, getTableById, getTableColumnByKey, isNumber, DateUtils } from 'dtable-utils';
 import { isObject } from 'lodash';
-import { CHART_SUMMARY_TYPE, CHART_TYPE, SUPPORT_DATA_SORT_CHART_TYPES, TABLE_DIMENSIONS, Y_AXIS_TYPE_PREFIX, STYLE_COLORS } from '../../constants';
+import { CHART_SUMMARY_TYPE, CHART_TYPE, SUPPORT_DATA_SORT_CHART_TYPES, TABLE_DIMENSIONS, Y_AXIS_TYPE_PREFIX, STYLE_COLORS, TREND_TYPES } from '../../constants';
 import { chartColumn2SqlColumn, summaryMethodColumn2SqlColumn } from '../sql';
 import { getClientLinkDisplayString } from '../cell-format-utils';
 import context from '../../context';
@@ -60,7 +60,7 @@ SQLStatisticsUtils.getGroupLabelFromDB = (cellValue, column, chart) => {
       {
         if (!Array.isArray(collaborators) || collaborators.length === 0) return [];
         if (!Array.isArray(cellValue) || cellValue.length === 0) return [];
-        return cellValue.filter(email => collaborators.find(option => option.email === email));
+        return cellValue;
       }
     case CellType.CREATOR:
     case CellType.LAST_MODIFIER:
@@ -1454,11 +1454,22 @@ SQLStatisticsUtils.trendMapChartSQLResult2JavaScript = (chart, sqlRows, chartSQL
     result = '--';
     comparedValue = 0;
   }
+  let type;
+  if (compareValue > comparedValue) {
+    type = TREND_TYPES.UP;
+  } else if (compareValue < comparedValue) {
+    type = TREND_TYPES.DOWN;
+  } else if (compareValue === comparedValue) {
+    type = TREND_TYPES.EQUAL;
+  }
+  if (compareValue === 0 && comparedValue === 0) {
+    result = '0%';
+  }
   return {
     latest: compareValue,
     previous: comparedValue,
     result,
-    type: compareValue >= comparedValue ? 'up' : 'down'
+    type
   };
 };
 SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables, params) => {

package/dist/view/wrapper/trend.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import classNames from 'classnames';
 import { BaseUtils } from '../../utils';
 import intl from '../../intl';
-import { BASIC_NUMBER_CARD_CALCULATION_METHOD, EMPTY_NAME, CHART_SUMMARY_TYPE, CHART_THEME_COLOR } from '../../constants';
+import { BASIC_NUMBER_CARD_CALCULATION_METHOD, EMPTY_NAME, CHART_SUMMARY_TYPE, CHART_THEME_COLOR, TREND_TYPES } from '../../constants';
 class Trend extends Component {
   constructor() {
     super(...arguments);
@@ -75,12 +75,19 @@ class Trend extends Component {
         type,
         previous
       } = data || {};
-      let color = '#fa5757',
-        icon = 'dtable-icon-down1';
-      if (type === 'up') {
-        color = '#34aa95';
+      let color, icon;
+      if (type === TREND_TYPES.UP) {
+        color = '#fa5757';
         icon = 'dtable-icon-up1';
       }
+      if (type === TREND_TYPES.DOWN) {
+        color = '#34aa95';
+        icon = 'dtable-icon-down1';
+      }
+      if (type === TREND_TYPES.EQUAL) {
+        color = '#666666';
+        icon = 'dtable-icon-narrow';
+      }
       if (labelFontSize <= 12) {
         return /*#__PURE__*/React.createElement("span", {
           style: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.89",
+  "version": "0.0.90",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",