sea-chart 0.0.95 → 0.0.97

package/dist/constants/index.js

@@ -16,7 +16,7 @@ export const ONLY_NEED_NUMBER_OPTIONS_CHART_TYPE = [CHART_TYPE.COMPLETENESS, CHA
 export const COMPLETENESS_GROUPBY_SUPPORTED_COLUMN_TYPE = [CellType.COLLABORATOR, CellType.TEXT, CellType.SINGLE_SELECT];
 export const NUMBERIC_COLUMN_TYPE = [CellType.RATE, CellType.NUMBER];
 export const ZH_CN_SUPPORT_CHARTS = [CHART_TYPE.MAP, CHART_TYPE.MAP_BUBBLE];
-export const SUPPORT_DATA_SORT_CHART_TYPES = [CHART_TYPE.BAR, CHART_TYPE.BAR_STACK, CHART_TYPE.LINE, CHART_TYPE.PIE, CHART_TYPE.RING, CHART_TYPE.HORIZONTAL_BAR, CHART_TYPE.AREA, CHART_TYPE.TREE_MAP];
+export const SUPPORT_DATA_SORT_CHART_TYPES = [CHART_TYPE.BAR, CHART_TYPE.BAR_STACK, CHART_TYPE.LINE, CHART_TYPE.PIE, CHART_TYPE.RING, CHART_TYPE.HORIZONTAL_BAR, CHART_TYPE.STACKED_HORIZONTAL_BAR, CHART_TYPE.AREA, CHART_TYPE.TREE_MAP];
 export const SUPPORT_STACK_VALUE_CHART_TYPES = [CHART_TYPE.BAR_STACK, CHART_TYPE.BAR_CUSTOM];
 export const X_AXIS_IS_GROUPBY_COLUMN_KEY_CHART_TYPES = [CHART_TYPE.TABLE, CHART_TYPE.PIE, CHART_TYPE.RING, CHART_TYPE.TREE_MAP];
 export const CHART_CHART_MAP = {

package/dist/settings/advance-bar-settings/data-settings.js

@@ -6,8 +6,9 @@ import Divider from '../widgets/divider';
 import GroupBy from '../widgets/group-by';
 import YAxisGroupSettings from '../widgets/y-axis-group-settings';
 import { islinkDateFormula } from '../../utils/column-utils';
-import { CHART_SUMMARY_TYPE, GEOLOCATION_FORMAT_CITY, GEOLOCATION_FORMAT_MAP } from '../../constants';
+import { CHART_SUMMARY_TYPE, GEOLOCATION_FORMAT_CITY, GEOLOCATION_FORMAT_MAP, SUPPORT_DATA_SORT_CHART_TYPES } from '../../constants';
 import intl from '../../intl';
+import DataSort from '../widgets/data-sort';
 const DataSettings = _ref => {
   let {
     chart,
@@ -95,6 +96,18 @@ const DataSettings = _ref => {
       x_axis_include_empty_cells: !x_axis_include_empty_cells
     });
   }, [chart, onChange]);
+  const renderDataSort = useCallback(() => {
+    const {
+      config
+    } = chart;
+    if (!SUPPORT_DATA_SORT_CHART_TYPES.includes(config.type)) return null;
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, {
+      className: "mt-4"
+    }), /*#__PURE__*/React.createElement(DataSort, {
+      chart: chart,
+      onChange: onChange
+    }));
+  }, [chart, onChange]);
   const {
     config
   } = chart;
@@ -133,7 +146,7 @@ const DataSettings = _ref => {
     chart: chart,
     tables: tables,
     onChange: onChange
-  }));
+  }), renderDataSort());
 };
 DataSettings.defaultProps = {
   xLabel: 'X_axis',

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

@@ -696,16 +696,14 @@ BaseUtils.sortCharts = (charts, column, sortKey) => {
             // key was used to sort "pivot columns" in pivot chart
             const {
               name: currentName,
-              group_name: currentGroupName,
               key: currentKey
             } = currResult || {};
             const {
               name: nextName,
-              group_name: nextGroupName,
               key: nextKey
             } = nextResult || {};
-            const current = currentGroupName || currentName || currentKey;
-            const next = nextGroupName || nextName || nextKey;
+            const current = currentName || currentKey;
+            const next = nextName || nextKey;
             return sortSingleSelect(current, next, {
               sort_type: sortType,
               option_id_index_map: optionIdIndexMap

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

@@ -763,12 +763,12 @@ SQLStatisticsUtils.basicChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMap
       }
     }
   });
+  BaseUtils.sortCharts(result, groupbyColumn, 'name');
   BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color');
   if (SUPPORT_DATA_SORT_CHART_TYPES.includes(type) && sort_type) {
     BaseUtils.sortChartData(result, sort_type);
     return result;
   }
-  BaseUtils.sortCharts(result, groupbyColumn, 'name');
   return result;
 };
 SQLStatisticsUtils.basicNumberCardSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
@@ -876,8 +876,8 @@ SQLStatisticsUtils.customChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMa
     });
     result = assembled;
   }
-  BaseUtils.updateTableViewList(result, groupbyColumn, 'name', '');
   BaseUtils.sortCharts(result, groupbyColumn, 'name');
+  BaseUtils.updateTableViewList(result, groupbyColumn, 'name', '');
   return result;
 };
 SQLStatisticsUtils.compareSQLResult2Javascript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
@@ -1234,12 +1234,13 @@ SQLStatisticsUtils.updateGroupingChartRow = (results, name, groupName, row, coun
     updatedResult.value = updatedResult.value + count;
     results[updatedIndex] = updatedResult;
   } else {
-    results.push({
+    const obj = {
       name,
       rows: [row],
       group_name: groupName,
       value: count
-    });
+    };
+    results.push(obj);
   }
 };
 SQLStatisticsUtils.updateGroupingChartRows = (results, name, row, count, isColumnGroupbyColumnDataAsAnArray, groupName) => {
@@ -1291,9 +1292,9 @@ SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript = (chart, sqlRo
       }
     }
   });
+  BaseUtils.sortCharts(result, groupbyColumn, 'name');
   BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color');
   BaseUtils.updateTableViewList(result, columnGroupbyColumn, 'group_name', 'group_color');
-  BaseUtils.sortCharts(result, groupbyColumn, 'name');
   return result;
 };
 SQLStatisticsUtils.groupingChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
@@ -1347,8 +1348,8 @@ SQLStatisticsUtils.groupingChartSQLResult2JavaScript = (chart, sqlRows, chartSQL
         });
       }
     });
-    BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color');
     BaseUtils.sortCharts(result, groupbyColumn, 'name');
+    BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color');
     return result;
   }
   if (!columnGroupbyColumn) {

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

@@ -507,7 +507,7 @@ const getFilterByColumnType = (columnKey, columns, value) => {
     column_key: columnKey || ''
   };
   const column = getColumnByKey(columnKey, columns);
-  if (isDateColumn(column) || (column === null || column === void 0 ? void 0 : column.type) === CellType.GEOLOCATION) {
+  if (column && (isDateColumn(column) || (column === null || column === void 0 ? void 0 : column.type) === CellType.GEOLOCATION)) {
     filter['value'] = value;
     return filter;
   }
@@ -569,7 +569,7 @@ export const getFilterConditions = function (statisticRecord, chart) {
   } else {
     const columnFilter = getFilterByColumnType(config[columnKey], columns, name);
     filters.push(columnFilter);
-    if (config[groupColumnKey]) {
+    if (groupColumnKey && config[groupColumnKey]) {
       const groupColumnFilter = getFilterByColumnType(config[groupColumnKey], columns, group_name || groupby);
       filters.push(groupColumnFilter);
     }

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

@@ -1,12 +1,13 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { debounce, maxBy, throttle } from 'lodash-es';
+import { debounce, maxBy } from 'lodash-es';
 import classNames from 'classnames';
 import { CellType } from 'dtable-ui-component/lib/constants';
 import { CHART_TYPE, EMPTY_NAME, CHART_THEME_COLOR, CHART_STYLE_COLORS } from '../../constants';
 import { BaseUtils, isFunction } from '../../utils';
 import intl from '../../intl';
 import { STACK_AND_PIE_CHART_THEMES_OPTIONS } from '../../constants/color-rules';
+import { sortDataByGroupSum } from '../../utils/column-utils';
 import HorizontalComponent from './horizontal-component';
 class HorizontalBarGroup extends HorizontalComponent {
   constructor(props) {
@@ -40,13 +41,21 @@ class HorizontalBarGroup extends HorizontalComponent {
     this.drawChart = () => {
       let {
         result: data,
-        customRender
+        customRender,
+        chart
       } = this.props;
       data = BaseUtils.formatEmptyName(data, '', intl.get('Empty'));
       if (!Array.isArray(data)) return;
       this.chart.scale(this.groupName, {
         type: 'cat'
       });
+      const {
+        sort_type,
+        type
+      } = chart.config;
+      if (type === CHART_TYPE.STACKED_HORIZONTAL_BAR && sort_type) {
+        data = sortDataByGroupSum(data, sort_type);
+      }
       this.loadData(data);
       this.draw(data);
       isFunction(customRender) && customRender(this.chart);

package/dist/view/wrapper/table/pivot-table-display-name.js

@@ -1,7 +1,7 @@
 import React, { Fragment } from 'react';
 import shallowEqual from 'shallowequal';
 import dayjs from 'dayjs';
-import { CellType, COLLABORATOR_COLUMN_TYPES, FORMULA_RESULT_TYPE, getOption, getCollaborator, getNumberDisplayString, isNumber } from 'dtable-utils';
+import { CellType, COLLABORATOR_COLUMN_TYPES, FORMULA_RESULT_TYPE, getOption, getCollaborator, getNumberDisplayString, isNumber, isValidEmail } from 'dtable-utils';
 import { getClientFormulaDisplayString, getKnownCollaboratorByEmail, getColumnOptions, getDateColumnFormat, generateDefaultUser } from '../../../utils';
 import { Collaborator } from '../../../components';
 import intl from '../../../intl';
@@ -10,7 +10,21 @@ import { CHART_THEME_COLOR } from '../../../constants';
 class PivotTableDisplayName extends React.Component {
   constructor(props) {
     super(props);
-    this.updateCreator = email => {
+    this.getType = column => {
+      let type = column.type;
+      if (type === CellType.LINK_FORMULA) {
+        var _column$data;
+        type = column === null || column === void 0 ? void 0 : (_column$data = column.data) === null || _column$data === void 0 ? void 0 : _column$data.array_type;
+      }
+      return type;
+    };
+    this.updateCreator = (email, rowData) => {
+      if (!isValidEmail(email)) {
+        const {
+          original_name
+        } = rowData;
+        email = original_name;
+      }
       let creator = getKnownCollaboratorByEmail(email);
       if (creator) {
         this.setState({
@@ -100,14 +114,10 @@ class PivotTableDisplayName extends React.Component {
         type,
         data
       } = column;
+      type = this.getType(column);
       const {
         collaborators
       } = this.state;
-
-      // link formula column is collaborator
-      if (type === CellType.LINK_FORMULA && (data === null || data === void 0 ? void 0 : data.array_type) === CellType.COLLABORATOR) {
-        type = CellType.COLLABORATOR;
-      }
       let displayName;
       switch (type) {
         case CellType.SINGLE_SELECT:
@@ -295,22 +305,23 @@ class PivotTableDisplayName extends React.Component {
   componentDidMount() {
     let {
       column,
-      value
+      value,
+      rowData
     } = this.props;
-    if (column.type !== CellType.CREATOR && column.type !== CellType.LAST_MODIFIER) return;
-    this.updateCreator(value);
+    const type = this.getType(column);
+    if (type !== CellType.CREATOR && type !== CellType.LAST_MODIFIER) return;
+    this.updateCreator(value, rowData);
   }
   UNSAFE_componentWillReceiveProps(nextProps) {
     let {
       column,
-      value
+      value,
+      rowData
     } = nextProps;
-    let {
-      type
-    } = column;
+    const type = this.getType(column);
     if (type !== CellType.CREATOR && type !== CellType.LAST_MODIFIER) return;
     if (value !== this.props.value || shallowEqual(nextProps.column, this.props.column)) {
-      this.updateCreator(value);
+      this.updateCreator(value, rowData);
     }
   }
   render() {

package/package.json

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