sea-chart 1.1.78 → 1.1.79

package/dist/components/statistic-record-dialog/index.js

@@ -14,6 +14,7 @@ import { getFilterConditions } from '../../utils/row-record-utils';
 import RowCard from '../row-card/row-card';
 import { CommonEventTypes } from '../../constants/common-constants';
 import { getErrorMessage } from '../../utils';
+import { CHART_TYPE } from '../../constants';
 import './index.css';
 class StatisticRecordDialog extends React.Component {
   constructor(_props) {
@@ -56,7 +57,11 @@ class StatisticRecordDialog extends React.Component {
           // if more then 2 filters, use 'Or' conjunction to get them all
           // if the statistic record is '_Others', use 'Or' conjunction to get them all
           if ((detailFilterConditions === null || detailFilterConditions === void 0 ? void 0 : detailFilterConditions.filters.length) > 2 || statisticRecord.name === '_Others') {
-            detailFilterConditions.filter_conjunction = 'Or';
+            if (chart.config.type === CHART_TYPE.SCATTER) {
+              detailFilterConditions.filter_conjunction = 'And';
+            } else {
+              detailFilterConditions.filter_conjunction = 'Or';
+            }
           }
           context.api.customQueryRows(currentElementId, detailFilterConditions).then(res => {
             const {

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

@@ -543,7 +543,7 @@ BaseUtils.formatEmptyName = (dataList, column_groupby_column_key, emptyName) =>
   for (let i = 0; i < dataList.length; i++) {
     let item = dataList[i];
     // let updated = {};
-    if (!item.name) {
+    if (!item.name && item.name !== 0) {
       item.name = emptyName;
     }
     if (column_groupby_column_key && !item.group_name) {

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

@@ -67,6 +67,7 @@ async function calculator(chart, value, _ref) {
     };
     updateBasicChartRows(data, nameIndex, name, dataItem, row);
   });
+  BaseUtils.sortCharts(data, selectedXAxisColumn, 'name');
   return data;
 }
 export default calculator;

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

@@ -1935,8 +1935,8 @@ SQLStatisticsUtils.scatterSQLResult2JavaScript = async (chart, sqlRows, chartSQL
   if (sqlColumnGroupbyColumnKey) await BaseUtils.updateTableViewList(sqlRows, columnGroupbyColumn, sqlColumnGroupbyColumnKey, 'color', isScatter, false);
   const res = [];
   sqlRows.forEach((row, index) => {
-    const xValue = row[sqlXColumnKey] ? '' + row[sqlXColumnKey] : intl.get('Empty');
-    const yValue = row[sqlYColumnKey] ? '' + row[sqlYColumnKey] : intl.get('Empty');
+    const xValue = row[sqlXColumnKey];
+    const yValue = row[sqlYColumnKey];
     const groupby = row[sqlColumnGroupbyColumnKey] ? '' + row[sqlColumnGroupbyColumnKey] : null;
     const originalSqlRow = originalSqlRows[index];
     const originalXValue = originalSqlRow[sqlXColumnKey];
@@ -1944,16 +1944,17 @@ SQLStatisticsUtils.scatterSQLResult2JavaScript = async (chart, sqlRows, chartSQL
     const originalGroupby = originalSqlRow[sqlColumnGroupbyColumnKey];
     res.push({
       name: xValue,
-      value: yValue,
+      value: yValue !== null ? Number(yValue) : yValue,
       groupby,
+      rows: [originalSqlRow],
       original_value: {
-        rows: [originalSqlRow],
         name: originalXValue,
         value: originalYValue,
         groupby: originalGroupby
       }
     });
   });
+  BaseUtils.sortCharts(res, groupbyColumn, 'name');
   return res;
 };
 SQLStatisticsUtils.mapSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {

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

@@ -13,6 +13,7 @@ import DigitalSignUtils from '../utils/digital-sign-utils';
 import { getColumnByKey } from '../utils/column-utils';
 import context from '../context';
 import { xAxisMap, groupAxisMap } from '../constants';
+import { CHART_TYPE } from '../constants/type';
 import { chartColumn2SqlColumn } from './sql';
 import { BaseUtils } from './chart-utils';
 export const UNSHOW_COLUMN_TYPE = [CellType.LINK, CellType.LONG_TEXT, CellType.FORMULA, CellType.LINK_FORMULA];
@@ -612,7 +613,9 @@ export const getFilterConditions = (statisticRecord, chart, table) => {
   const chartSQLMap = chartColumn2SqlColumn(chart, table);
   const {
     sqlColumnGroupbyColumnKey,
-    sqlGroupbyColumnKey
+    sqlGroupbyColumnKey,
+    sqlXColumnKey,
+    sqlYColumnKey
   } = chartSQLMap;
   if (isPivot && rows.length) {
     const xValueList = [];
@@ -637,19 +640,23 @@ export const getFilterConditions = (statisticRecord, chart, table) => {
     });
   } else {
     if (name === '_Others') {
-      const columnFilters = rows.map(row => getFilterByColumnType(config[columnKey], columns, [row], sqlGroupbyColumnKey));
-      filters.push(...columnFilters);
+      const flters = rows.map(row => getFilterByColumnType(config[columnKey], columns, [row], sqlGroupbyColumnKey));
+      filters.push(...flters);
     } else {
-      let columnFilter;
       if (['map', 'map_bubble'].includes(type)) {
-        columnFilter = {
+        const filter = {
           column_key: config[columnKey],
           value: name
         };
+        filters.push(filter);
+      } else if (type === CHART_TYPE.SCATTER) {
+        const filterX = getFilterByColumnType(config['x_axis_column_key'], columns, rows, sqlXColumnKey);
+        const filterY = getFilterByColumnType(config['y_axis_column_key'], columns, rows, sqlYColumnKey);
+        filters.push(filterX, filterY);
       } else {
-        columnFilter = getFilterByColumnType(config[columnKey], columns, rows, sqlGroupbyColumnKey);
+        const filter = getFilterByColumnType(config[columnKey], columns, rows, sqlGroupbyColumnKey);
+        filters.push(filter);
       }
-      filters.push(columnFilter);
     }
     if (sqlColumnGroupbyColumnKey) {
       const groupColumnFilter = getFilterByColumnType(config[groupColumnKey], columns, rows, sqlColumnGroupbyColumnKey);

package/dist/view/wrapper/scatter.js

@@ -29,7 +29,7 @@ export function Scatter(_ref) {
         appendPadding
       });
       currentChart.chart.on('element:click', e => {
-        toggleRecords(e.data.data.original_value);
+        toggleRecords(e.data.data);
       });
     }
     function drawChart() {
@@ -66,9 +66,13 @@ export function Scatter(_ref) {
       currentChart.chart.coordinate('rect');
       currentChart.autoAdjustDataOptions(chart, data);
 
-      // need to set name as nice too , otherwise chart value will be wrong
+      // scatter chart need to set name as linear type，otherwise point will be ramdomly
       currentChart.chart.scale({
         name: {
+          type: 'linear',
+          nice: true
+        },
+        value: {
           nice: true
         }
       });

package/package.json

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