sea-chart 0.0.81-alpha2 → 0.0.82-alpha.0

package/dist/settings/table-settings/data-settings.js

@@ -254,16 +254,7 @@ const DataSettings = _ref => {
       summary_type = CHART_SUMMARY_TYPE.ADVANCED;
       column_groupby_multiple_numeric_column = true;
       summary_columns = [];
-      if (numericColumns && numericColumns[0]) {
-        summary_columns.push({
-          column_key: numericColumns[0].key,
-          summary_method: BaseUtils.isDateSummaryColumn(numericColumns[0]) ? CHART_DATE_SUMMARY_CALCULATION_METHOD[0] : CHART_SUMMARY_CALCULATION_METHOD[0]
-        });
-      }
-      // column_groupby_column_key = null;
-      // column_groupby_date_granularity = null;
-      // column_groupby_geolocation_granularity = null;
-      summary_method = summary_method || CHART_SUMMARY_CALCULATION_METHOD[0];
+      summary_method = null;
       summary_column_key = null;
       if (numericColumns && numericColumns[0]) {
         summary_column_key = numericColumns[0].key;

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

@@ -1381,9 +1381,9 @@ BaseUtils.getDateGranularityByType = chart => {
 };
 BaseUtils.recalculateAvg = sqlRows => {
   sqlRows.forEach(item => {
-    const avgItemKey = Object.keys(item).find(jtem => jtem.startsWith('AVG'));
-    const sumItemKey = Object.keys(item).find(jtem => jtem.startsWith('SUM'));
-    const countItemKey = Object.keys(item).find(jtem => jtem.startsWith('COUNT'));
+    const avgItemKey = Object.keys(item).find(item => item.startsWith('AVG'));
+    const sumItemKey = Object.keys(item).find(item => item.startsWith('SUM'));
+    const countItemKey = Object.keys(item).find(item => item.startsWith('COUNT'));
     if (avgItemKey && sumItemKey && countItemKey) {
       item[avgItemKey] = item[sumItemKey] / item[countItemKey];
     }

package/dist/utils/chart-utils/original-data-utils/pivot-table-calculator.js

@@ -5,6 +5,8 @@ import { isArrayCellValue } from '../../cell-value-utils';
 import { getFormattedLabel, isValidRow } from '../../row-utils';
 import BaseUtils from '../base-utils';
 import { summaryMethodColumn2SqlColumn } from '../../sql/column-2-sql-column';
+
+// one
 async function calculateOneDimensionTable(chart, value, _ref) {
   let {
     getViewRows,
@@ -205,6 +207,8 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
     pivot_columns_total
   };
 }
+
+// two
 async function calculateTwoDimensionTable(chart, value, _ref2) {
   let {
     getViewRows,
@@ -528,21 +532,6 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
     total
   });
 }
-function isSameName(prevName, currName) {
-  if (isNumber(prevName) && isNumber(currName)) {
-    return prevName === currName;
-  }
-  if (!prevName && !currName) {
-    return prevName === null && currName === null || prevName === undefined && currName === undefined || isNaN(prevName) && isNaN(currName);
-  }
-  return prevName === currName;
-}
-function isSameGroup(isColumnDataAsAnArray, source, target) {
-  if (isColumnDataAsAnArray) {
-    return (!source || source.length === 0) && !target || source && source.includes(target);
-  }
-  return source === null && target === null || source === undefined && target === undefined || source === target;
-}
 function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formula_rows) {
   let pivot_rows = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
   let pivot_columns = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : [];
@@ -619,6 +608,23 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
     pivot_table_total
   };
 }
+
+// utils
+function isSameName(prevName, currName) {
+  if (isNumber(prevName) && isNumber(currName)) {
+    return prevName === currName;
+  }
+  if (!prevName && !currName) {
+    return prevName === null && currName === null || prevName === undefined && currName === undefined || isNaN(prevName) && isNaN(currName);
+  }
+  return prevName === currName;
+}
+function isSameGroup(isColumnDataAsAnArray, source, target) {
+  if (isColumnDataAsAnArray) {
+    return (!source || source.length === 0) && !target || source && source.includes(target);
+  }
+  return source === null && target === null || source === undefined && target === undefined || source === target;
+}
 function getTotal(summary_column, summary_type, summary_method) {
   let rows = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
   let formula_rows = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
@@ -654,6 +660,7 @@ function getTotal(summary_column, summary_type, summary_method) {
           total++;
         }
       });
+      total = getTotalByType(oldTotal, total);
       return total;
     }
     if (summary_column && isDateColumn(summary_column)) {
@@ -711,22 +718,10 @@ function getTotal(summary_column, summary_type, summary_method) {
               }
             });
             if (summary_method === 'Sum') {
-              if (Array.isArray(oldTotal)) {
-                const newTotal = JSON.parse(JSON.stringify(oldTotal));
-                newTotal[0][1] = Number.parseFloat(sum.toFixed(8));
-                total = newTotal;
-              } else {
-                total = Number.parseFloat(sum.toFixed(8));
-              }
+              total = getTotalByType(oldTotal, Number.parseFloat(sum.toFixed(8)));
             } else if (summary_method === 'Mean') {
-              if (Array.isArray(oldTotal)) {
-                const newTotal = JSON.parse(JSON.stringify(oldTotal));
-                const val = validNumbersCount === 0 ? 0 : Number.parseFloat((sum / validNumbersCount).toFixed(8));
-                newTotal[0][1] = val;
-                total = newTotal;
-              } else {
-                total = validNumbersCount === 0 ? 0 : Number.parseFloat((sum / validNumbersCount).toFixed(8));
-              }
+              const val = validNumbersCount === 0 ? 0 : Number.parseFloat((sum / validNumbersCount).toFixed(8));
+              total = getTotalByType(oldTotal, val);
             }
             break;
           }
@@ -759,15 +754,15 @@ function getTotal(summary_column, summary_type, summary_method) {
                 let formulaRow = formula_rows[result._id];
                 if (formulaRow) {
                   if (formulaRow[summary_column_key] && typeof formulaRow[summary_column_key] === 'object') {
-                    total = formulaRow[summary_column_key][0];
+                    total = getTotalByType(oldTotal, formulaRow[summary_column_key][0]);
                   } else {
-                    total = formulaRow[summary_column_key];
+                    getTotalByType(oldTotal, formulaRow[summary_column_key]);
                   }
                 } else {
-                  total = null;
+                  total = getTotalByType(oldTotal, null);
                 }
               } else {
-                total = result[summary_column_key];
+                total = getTotalByType(oldTotal, result[summary_column_key]);
               }
             }
             break;
@@ -781,7 +776,7 @@ function getTotal(summary_column, summary_type, summary_method) {
   }
   // formula_rows result can be '#VALUE!'
   if (total === '#VALUE!') {
-    total = 0;
+    total = getTotalByType(oldTotal, 0);
   }
   return total || 0;
 }
@@ -831,6 +826,18 @@ function getDateMaxOrMinTotal(dateArr, type) {
   dateIndex = list.indexOf(dateValue);
   return dateArr[dateIndex];
 }
+function getTotalByType(oldTotal, value) {
+  let newTotal = '';
+  if (Array.isArray(oldTotal)) {
+    newTotal = JSON.parse(JSON.stringify(oldTotal));
+    newTotal[0][1] = value;
+  } else {
+    newTotal = value;
+  }
+  return newTotal;
+}
+
+// index
 function calculator(chart, value, _ref3) {
   let {
     getViewRows,

package/dist/view/wrapper/area.js

@@ -128,18 +128,17 @@ class Area extends ChartComponent {
 
       // point
       let point;
-      if (y_axis_show_value) {
-        point = this.chart.point().animate({
-          appear: {
-            animation: 'fadeIn',
-            duration: 1000,
-            easing: 'easeLinear'
-          }
-        }).position('name*value').color(chartBarColor, colorCallBack).shape('circle').size(4).style({
-          stroke: 0,
-          fillOpacity: 1
-        });
-      }
+      point = this.chart.point().animate({
+        appear: {
+          animation: 'fadeIn',
+          duration: 1000,
+          easing: 'easeLinear'
+        }
+      }).position('name*value').color(chartBarColor, colorCallBack).shape('circle').size(4).style({
+        stroke: 0,
+        fillOpacity: 1,
+        opacity: y_axis_show_value ? 1 : 0
+      });
       const area = this.chart.area().position('name*value').animate({
         appear: {
           animation: 'fadeIn',
@@ -166,7 +165,8 @@ class Area extends ChartComponent {
         });
         if (point) point.style({
           fillOpacity: 0.3,
-          stroke: 0
+          stroke: 0,
+          opacity: 1
         });
         this.chart.render();
       });
@@ -181,7 +181,8 @@ class Area extends ChartComponent {
         });
         if (point) point.style({
           fillOpacity: 1,
-          stroke: 0
+          stroke: 0,
+          opacity: 0
         });
         this.chart.render();
       });

package/dist/view/wrapper/completeness.js

@@ -5,8 +5,17 @@ import { BaseUtils, isBoolean } from '../../utils';
 import intl from '../../intl';
 import { CHART_TYPE, CHART_THEME_COLOR } from '../../constants';
 import ChartComponent from './chart-component';
-export default function Completeness(props) {
+export default function Completeness(_ref) {
   var _chartRef$current, _chartRef$current2;
+  let {
+    chart,
+    toggleRecords,
+    result: data,
+    tables,
+    summaryColumn,
+    globalTheme,
+    chartColorTheme
+  } = _ref;
   const chartRef = useRef(null);
   const chartContainerRef = useRef(null);
   useEffect(() => {
@@ -20,11 +29,9 @@ export default function Completeness(props) {
     function createChart() {
       var _style_config$title;
       let {
-        chart: {
-          style_config,
-          config
-        }
-      } = props;
+        style_config,
+        config
+      } = chart;
       chartPaddingTop = ((_style_config$title = style_config.title) === null || _style_config$title === void 0 ? void 0 : _style_config$title.text) ? 17 : 0;
       const chartPaddingRight = (config === null || config === void 0 ? void 0 : config.show_percentage) ? 45 : 0;
       const appendPadding = [chartPaddingTop, chartPaddingRight, 0, 0];
@@ -32,29 +39,18 @@ export default function Completeness(props) {
         appendPadding
       });
       currentChart.chart.on('interval:click', e => {
-        props.toggleRecords(e.data.data);
+        toggleRecords(e.data.data);
       });
     }
     function drawChart() {
-      let {
-        result: data,
-        chart,
-        tables
-      } = props;
-      data = BaseUtils.formatEmptyName(data, '', intl.get('Empty'));
-      if (!Array.isArray(data)) return;
-      currentChart.loadData(data);
-      draw(data);
+      const currentData = BaseUtils.formatEmptyName(data, '', intl.get('Empty'));
+      if (!Array.isArray(currentData)) return;
+      currentChart.loadData(currentData);
+      draw(currentData);
       currentChart.chart.render();
       currentChart.renderAxisLabel(chart, tables);
     }
     function draw(data) {
-      const {
-        chart,
-        summaryColumn,
-        globalTheme,
-        chartColorTheme
-      } = props;
       const theme = CHART_THEME_COLOR[globalTheme];
       const {
         label_font_size,
@@ -156,10 +152,7 @@ export default function Completeness(props) {
     return () => {
       currentChart.chart.destroy();
     };
-  }, [props]);
-  const {
-    chart
-  } = props;
+  }, [chart, chartColorTheme, data, globalTheme, summaryColumn, tables, toggleRecords]);
   return /*#__PURE__*/React.createElement("div", {
     className: classnames('sea-chart-completeness-chart sea-chart-container', {
       'show-x-axis-label': (_chartRef$current = chartRef.current) === null || _chartRef$current === void 0 ? void 0 : _chartRef$current.isShowXAxisLabel(chart),

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

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { BaseUtils, isFunction } from '../../utils';
 import intl from '../../intl';
-import { CHART_LINE_TYPES, CHART_SUMMARY_SHOW, CHART_SUMMARY_TYPE, CHART_THEME_COLOR, CHART_TYPE, EMPTY_NAME } from '../../constants';
+import { CHART_LINE_TYPES, CHART_THEME_COLOR, EMPTY_NAME } from '../../constants';
 import ChartComponent from './chart-component';
 class LineGroup extends ChartComponent {
   constructor(props) {
@@ -19,6 +19,9 @@ class LineGroup extends ChartComponent {
       this.initChart(this.container, {
         appendPadding
       });
+      this.chart.on('point:click', e => {
+        this.props.toggleRecords(e.data.data);
+      });
     };
     this.clearChart = () => {
       this.chart.annotation().clear(true);
@@ -93,23 +96,19 @@ class LineGroup extends ChartComponent {
         };
       });
       let point;
-      if (y_axis_show_value) {
-        point = this.chart.point().position('name*value').color(chartBarColor, group_name => {
-          return this.colorMap[group_name];
-        }).animate({
-          appear: {
-            animation: 'fadeIn',
-            duration: 1000,
-            easing: 'easeLinear'
-          }
-        }).shape('circle').size(3).style({
-          stroke: 0,
-          fillOpacity: 1
-        });
-        this.chart.on('point:click', e => {
-          this.props.toggleRecords(e.data.data);
-        });
-      }
+      point = this.chart.point().position('name*value').color(chartBarColor, group_name => {
+        return this.colorMap[group_name];
+      }).animate({
+        appear: {
+          animation: 'fadeIn',
+          duration: 1000,
+          easing: 'easeLinear'
+        }
+      }).shape('circle').size(3).style({
+        stroke: 0,
+        fillOpacity: 1,
+        opacity: y_axis_show_value ? 1 : 0
+      });
 
       // this.chart.on('tooltip:show', () => {
       //   if (line.styleOption.cfg.opacity === 0.3) return;

package/dist/view/wrapper/line.js

@@ -19,6 +19,9 @@ class Line extends ChartComponent {
       this.initChart(this.container, {
         appendPadding
       });
+      this.chart.on('point:click', e => {
+        this.props.toggleRecords(e.data.data);
+      });
     };
     this.clearChart = () => {
       this.chart.annotation().clear(true);
@@ -97,21 +100,17 @@ class Line extends ChartComponent {
         };
       });
       let point;
-      if (y_axis_show_value) {
-        point = this.chart.point().position('name*value').color(chartBarColor).animate({
-          appear: {
-            animation: 'fadeIn',
-            duration: 1000,
-            easing: 'easeLinear'
-          }
-        }).shape('circle').size(3).style({
-          stroke: 0,
-          fillOpacity: 1
-        });
-        this.chart.on('point:click', e => {
-          this.props.toggleRecords(e.data.data);
-        });
-      }
+      point = this.chart.point().position('name*value').color(chartBarColor).animate({
+        appear: {
+          animation: 'fadeIn',
+          duration: 1000,
+          easing: 'easeLinear'
+        }
+      }).shape('circle').size(3).style({
+        stroke: 0,
+        fillOpacity: 1,
+        opacity: y_axis_show_value ? 1 : 0
+      });
 
       // this.chart.on('tooltip:show', () => {
       //   if (line.styleOption.cfg.opacity === 0.3) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.81-alpha2",
+  "version": "0.0.82-alpha.0",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",