sea-chart 0.0.84 → 0.0.85

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

@@ -165,9 +165,11 @@ BaseUtils.getSummaryColumn = (table, chart) => {
     case CHART_TYPE.LINE:
     case CHART_TYPE.LINE_GROUP:
     case CHART_TYPE.AREA:
+    case CHART_TYPE.AREA_GROUP:
     case CHART_TYPE.HORIZONTAL_BAR:
     case CHART_TYPE.STACKED_HORIZONTAL_BAR:
     case CHART_TYPE.HORIZONTAL_GROUP_BAR:
+    case CHART_TYPE.BAR_STACK:
       {
         return getTableColumnByKey(table, y_axis_summary_column_key);
       }

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

@@ -253,6 +253,7 @@ async function calculator(chart, value, _ref) {
         results.push({
           name: key,
           value_left: value,
+          group_name: summaryColumn.column_name,
           color: leftSummaryColumn[columnKey].color,
           value_right: value2,
           formatted_value_left: formattedValueLeft,

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

@@ -78,23 +78,27 @@ async function calculator(chart, value, _ref) {
       }
     }
   }
+
+  // normal case
+  const res = Math.abs(currentValues - previousValues) / previousValues;
+  let result = Number.parseFloat(res * 100).toFixed(2) + '%';
+
+  // set result to 0 when currentValues is 0
   if (!currentValues) {
-    return {
-      latest: null,
-      previous: previousValues || null
-    };
+    result = '--';
+    currentValues = 0;
   }
+
+  // set result to -- when previousValues is 0
   if (!previousValues) {
-    return {
-      latest: currentValues,
-      previous: null
-    };
+    result = '--';
+    previousValues = 0;
   }
   return {
     latest: currentValues,
     previous: previousValues,
-    result: Math.abs(previousValues - currentValues) / previousValues,
-    type: currentValues > previousValues ? 'up' : 'down'
+    result,
+    type: currentValues >= previousValues ? 'up' : 'down'
   };
 }
 export default calculator;

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

@@ -1425,11 +1425,27 @@ SQLStatisticsUtils.trendMapChartSQLResult2JavaScript = (chart, sqlRows, chartSQL
       }
     }
   }
+
+  // normal case
+  const res = Math.abs(compareValue - comparedValue) / comparedValue;
+  let result = Number.parseFloat(res * 100).toFixed(2) + '%';
+
+  // set result to 0 when compareValue is 0
+  if (!compareValue) {
+    result = '--';
+    compareValue = 0;
+  }
+
+  // set result to -- when comparedValue is 0
+  if (!comparedValue) {
+    result = '--';
+    comparedValue = 0;
+  }
   return {
     latest: compareValue,
     previous: comparedValue,
-    result: Math.abs(compareValue - comparedValue) / comparedValue,
-    type: compareValue > comparedValue ? 'up' : 'down'
+    result,
+    type: compareValue >= comparedValue ? 'up' : 'down'
   };
 };
 SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables, params) => {
@@ -1818,7 +1834,8 @@ SQLStatisticsUtils.calculateChart = (chart, value, callback, sqlRows) => {
       groupbyColumn,
       columnGroupbyColumn,
       summaryColumn,
-      chartTableColumns
+      chartTableColumns,
+      summaryColumnsWithMethod
     });
     return;
   }
@@ -1841,7 +1858,8 @@ SQLStatisticsUtils.calculateChart = (chart, value, callback, sqlRows) => {
     groupbyColumn,
     columnGroupbyColumn,
     summaryColumn,
-    chartTableColumns
+    chartTableColumns,
+    summaryColumnsWithMethod
   });
 };
 SQLStatisticsUtils.calculateStaticChart = (chart, value, statisticalResult, callback) => {

package/dist/utils/row-record-utils.js

@@ -1,8 +1,7 @@
 import _ButtonFormatter from "dtable-ui-component/lib/ButtonFormatter";
 import _RateFormatter from "dtable-ui-component/lib/RateFormatter";
 import React from 'react';
-import { CellType, FORMULA_RESULT_TYPE, getNumberDisplayString, getDateDisplayString, getCellValueStringResult, isNumber, isDateColumn } from 'dtable-utils';
-import { LinksUtils } from 'dtable-store';
+import { CellType, FORMULA_RESULT_TYPE, getNumberDisplayString, getDateDisplayString, getCellValueStringResult, isNumber, isDateColumn, isValidLink } from 'dtable-utils';
 import dayjs from 'dayjs';
 import cellFormatterFactory from '../components/cell-factory/cell-formatter-factory';
 import SimpleCellFormatter from '../components/cell-factory/SimpleCellFormatter';
@@ -200,7 +199,7 @@ export const getFormattedCell = function (column, row) {
         const {
           data
         } = column;
-        if (!LinksUtils.isValidLink(data)) break;
+        if (!isValidLink(data)) break;
 
         // is default view: row data can get from formula row
         // is archive view: row data can get form rowdata

package/dist/utils/trend-utils.js

@@ -1,7 +1,7 @@
 import dayjs from 'dayjs';
 import quarterOfYear from 'dayjs/plugin/quarterOfYear';
-import { BaseUtils } from './chart-utils';
 import { CHART_SUMMARY_TYPE } from '../constants';
+import { BaseUtils } from './chart-utils';
 dayjs.extend(quarterOfYear);
 export function getCompareDate(dateGranularity) {
   const currentDate = dayjs();

package/dist/view/wrapper/area.js

@@ -138,7 +138,7 @@ class Area extends ChartComponent {
         stroke: 0,
         fillOpacity: 1,
         opacity: y_axis_show_value ? 1 : 0
-      });
+      }).tooltip(false);
       const area = this.chart.area().position('name*value').animate({
         appear: {
           animation: 'fadeIn',

package/dist/view/wrapper/bar-group.js

@@ -156,9 +156,6 @@ class BarGroup extends ChartComponent {
           easing: 'easeLinear'
         }
       }).label(y_axis_show_value ? 'value' : false, {
-        content: data => {
-          return data.value;
-        },
         style: {
           fontSize: BaseUtils.getLabelFontSize(label_font_size),
           fill: theme.labelColor,

package/dist/view/wrapper/basic-number-card.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import { isNumber } from 'dtable-utils';
-// import { Chart } from '../../utils/custom-g2';
-import { BaseUtils, isFunction } from '../../utils';
+import { BaseUtils } from '../../utils';
 import intl from '../../intl';
 import { BASIC_NUMBER_CARD_CALCULATION_METHOD, EMPTY_NAME, CHART_THEME_COLOR } from '../../constants';
 class BasicNumericCard extends Component {

package/dist/view/wrapper/combination.js

@@ -268,12 +268,6 @@ class Combination extends ChartComponent {
         stroke: 0,
         fillOpacity: 1
       }).label(display_data ? 'value_right' : false, {
-        content: data => {
-          if (this.currentName) {
-            return data.name === this.currentName ? data.value_right : '';
-          }
-          return data.value_right;
-        },
         style: {
           fontSize: BaseUtils.getLabelFontSize(label_font_size),
           fill: theme.labelColor,

package/dist/view/wrapper/horizontal-bar-group.js

@@ -25,7 +25,7 @@ class HorizontalBarGroup extends HorizontalComponent {
         display_data
       } = chart.config;
       this.chartTopPadding = display_data ? 17 : 0;
-      const appendPadding = [this.chartTopPadding, 0, 0, 0];
+      const appendPadding = [this.chartTopPadding, 30, 0, 0];
       this.initChart(this.container, {
         appendPadding
       });
@@ -108,9 +108,6 @@ class HorizontalBarGroup extends HorizontalComponent {
           easing: 'easeLinear'
         }
       }).label(display_data ? 'value' : false, {
-        content: data => {
-          return data.value;
-        },
         style: {
           fontSize: BaseUtils.getLabelFontSize(label_font_size),
           fill: theme.labelColor,

package/dist/view/wrapper/index.js

@@ -58,6 +58,7 @@ const Wrapper = _ref => {
       groupbyColumn,
       columnGroupbyColumn,
       summaryColumn,
+      summaryColumnsWithMethod,
       chartTableColumns
     } = data;
     const {
@@ -73,6 +74,7 @@ const Wrapper = _ref => {
       groupbyColumn,
       columnGroupbyColumn,
       summaryColumn,
+      summaryColumnsWithMethod,
       globalTheme,
       chartColorTheme,
       toggleRecords: toggleStatisticRecordsDialog

package/dist/view/wrapper/line-group.js

@@ -108,7 +108,7 @@ class LineGroup extends ChartComponent {
         stroke: 0,
         fillOpacity: 1,
         opacity: y_axis_show_value ? 1 : 0
-      });
+      }).tooltip(false);
 
       // this.chart.on('tooltip:show', () => {
       //   if (line.styleOption.cfg.opacity === 0.3) return;

package/dist/view/wrapper/line.js

@@ -110,7 +110,7 @@ class Line extends ChartComponent {
         stroke: 0,
         fillOpacity: 1,
         opacity: y_axis_show_value ? 1 : 0
-      });
+      }).tooltip(false);
 
       // this.chart.on('tooltip:show', () => {
       //   if (line.styleOption.cfg.opacity === 0.3) return;

package/dist/view/wrapper/trend.js

@@ -81,19 +81,7 @@ class Trend extends Component {
         color = '#34aa95';
         icon = '\u2191';
       }
-      let resultText = "".concat(Number.parseFloat(result * 100).toFixed(2), "%•").concat(conjunctions).concat(previous);
-      if (!previous) {
-        resultText = intl.get('Can_not_compare_with_{var}').replace('{var}', intl.get(conjunctions));
-      }
-      if (!previous) {
-        return /*#__PURE__*/React.createElement("span", {
-          style: {
-            fontSize: "".concat(labelFontSize, "px")
-          }
-        }, resultText);
-      }
       if (labelFontSize <= 12) {
-        if (!result && result !== 0) return '';
         return /*#__PURE__*/React.createElement("span", {
           style: {
             fontSize: "".concat(labelFontSize, "px"),
@@ -116,7 +104,7 @@ class Trend extends Component {
           style: {
             color: "".concat(color)
           }
-        }, result || result === 0 ? Number.parseFloat(result * 100).toFixed(2) : '', "%"));
+        }, result));
       }
       const resultContent = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
         style: {
@@ -131,7 +119,7 @@ class Trend extends Component {
           whiteSpace: 'nowrap',
           marginRight: '16px'
         }
-      }, !result && result !== 0 ? '' : /*#__PURE__*/React.createElement("i", {
+      }, /*#__PURE__*/React.createElement("i", {
         style: {
           flexShrink: '0',
           flexBasis: 'auto',
@@ -151,7 +139,7 @@ class Trend extends Component {
           color: color,
           marginRight: '0px'
         }
-      }, result || result === 0 ? Number.parseFloat(result * 100).toFixed(2) + '%' : '')), /*#__PURE__*/React.createElement("span", {
+      }, result)), /*#__PURE__*/React.createElement("span", {
         style: {
           color: labelFontColor,
           fontWeight: labelFontWeight,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.84",
+  "version": "0.0.85",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",
@@ -8,7 +8,6 @@
     "@seafile/seafile-calendar": "^0.0.24",
     "classnames": "^2.3.2",
     "dayjs": "1.10.7",
-    "dtable-store": "^4.3.18",
     "is-hotkey": "0.2.0",
     "lodash-es": "^4.17.21",
     "rc-slider": "^10.5.0",
@@ -100,6 +99,7 @@
     "css-minimizer-webpack-plugin": "5.0.1",
     "dotenv": "6.2.0",
     "dotenv-expand": "5.1.0",
+    "dtable-store": "~4.3.18",
     "ejs": "3.1.8",
     "eslint": "^6.8.0",
     "eslint-config-react-app": "^5.0.2",