sea-chart 1.1.82 → 1.1.83

package/dist/settings/index.js

@@ -2,7 +2,7 @@ import React, { useCallback, useMemo, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import intl from '../intl';
-import { settingsContext, DepartmentsContext, GlobalThemeContext } from '../utils/contexts';
+import { settingsContext, DepartmentsContext, GlobalThemeContext, FirstDayOfWeekContext } from '../utils/contexts';
 import { eventStopPropagation } from '../utils';
 import { BaseUtils } from '../utils';
 import { CHART_SETTINGS_TYPE, CHART_SETTINGS } from '../constants';
@@ -22,7 +22,8 @@ const Settings = _ref => {
     children,
     departments,
     globalTheme,
-    lang
+    lang,
+    firstDayOfWeek
   } = _ref;
   const [type, setType] = useState(CHART_SETTINGS_TYPE.DATA);
   const [labelColorConfigs, setLabelColorConfigs] = useState([]);
@@ -100,7 +101,11 @@ const Settings = _ref => {
   }, /*#__PURE__*/React.createElement("div", {
     id: "sea-chart-settings-content",
     className: "chart-settings-content"
-  }, type === CHART_SETTINGS_TYPE.DATA && /*#__PURE__*/React.createElement(DepartmentsContext.Provider, {
+  }, type === CHART_SETTINGS_TYPE.DATA && /*#__PURE__*/React.createElement(FirstDayOfWeekContext.Provider, {
+    value: {
+      firstDayOfWeek
+    }
+  }, /*#__PURE__*/React.createElement(DepartmentsContext.Provider, {
     value: {
       departments
     }
@@ -109,7 +114,7 @@ const Settings = _ref => {
     chart: chart,
     tables: tables,
     onChange: modifyStatistic
-  })), type === CHART_SETTINGS_TYPE.CHART_STYLE && /*#__PURE__*/React.createElement(StyleSettings, {
+  }))), type === CHART_SETTINGS_TYPE.CHART_STYLE && /*#__PURE__*/React.createElement(StyleSettings, {
     chart: chart,
     tables: tables,
     labelColorConfigs: labelColorConfigs,

package/dist/settings/table-element-settings/components/data-filter.js

@@ -4,7 +4,7 @@ import { getTableById } from 'dtable-utils';
 import { eventStopPropagation, generatorKey } from '../../../utils';
 import intl from '../../../intl';
 import context from '../../../context';
-import { DepartmentsContext } from '../../../utils/contexts';
+import { DepartmentsContext, FirstDayOfWeekContext } from '../../../utils/contexts';
 import { CHART_TYPE } from '../../../constants';
 import './data-filter.css';
 const DataFilter = _ref => {
@@ -18,6 +18,9 @@ const DataFilter = _ref => {
   const {
     departments
   } = useContext(DepartmentsContext);
+  const {
+    firstDayOfWeek
+  } = useContext(FirstDayOfWeekContext);
   const {
     config
   } = chart;
@@ -83,7 +86,8 @@ const DataFilter = _ref => {
     departments: departments,
     collaborators: collaborators,
     hidePopover: toggleFilterPopover,
-    update: updateFilters
+    update: updateFilters,
+    firstDayOfWeek: firstDayOfWeek
   })));
 };
 export default DataFilter;

package/dist/settings/widgets/data-filter/index.js

@@ -5,7 +5,7 @@ import { getTableById } from 'dtable-utils';
 import { eventStopPropagation, generatorKey } from '../../../utils';
 import intl from '../../../intl';
 import context from '../../../context';
-import { DepartmentsContext } from '../../../utils/contexts';
+import { DepartmentsContext, FirstDayOfWeekContext } from '../../../utils/contexts';
 import './index.css';
 const DataFilter = _ref => {
   let {
@@ -17,6 +17,9 @@ const DataFilter = _ref => {
   const {
     departments
   } = useContext(DepartmentsContext);
+  const {
+    firstDayOfWeek
+  } = useContext(FirstDayOfWeekContext);
   const toggleFilterPopover = useCallback(event => {
     eventStopPropagation(event);
     setIsFilterSetterShow(!isFilterSetterShow);
@@ -84,7 +87,8 @@ const DataFilter = _ref => {
     departments: departments,
     collaborators: collaborators,
     hidePopover: toggleFilterPopover,
-    update: updateFilters
+    update: updateFilters,
+    firstDayOfWeek: firstDayOfWeek
   }))) : /*#__PURE__*/React.createElement("div", {
     id: id,
     className: "sea-chart-data-filter disabled"

package/dist/utils/contexts.js

@@ -1,4 +1,7 @@
 import React from 'react';
 export const settingsContext = React.createContext('');
 export const DepartmentsContext = React.createContext([]);
-export const GlobalThemeContext = React.createContext({});
+export const GlobalThemeContext = React.createContext({});
+export const FirstDayOfWeekContext = React.createContext({
+  firstDayOfWeek: 'Sunday'
+});

package/dist/view/wrapper/chart-component.js

@@ -257,7 +257,8 @@ export default class ChartComponent extends Component {
         const div = document.createElement('div');
         div.id = yAxisID;
         div.className = 'chart-axis-label';
-        if (y_axis_summary_type === CHART_SUMMARY_TYPE.COUNT) {
+        // SCATTER always has y_axis_column_key
+        if (y_axis_summary_type === CHART_SUMMARY_TYPE.COUNT && type !== CHART_TYPE.SCATTER) {
           div.innerHTML = intl.get('Amount');
         } else {
           const column = getTableColumnByKey(table, y_axis_column_key) || {};
@@ -297,7 +298,8 @@ export default class ChartComponent extends Component {
         y_axis_auto_range,
         y_axis_min,
         y_axis_max,
-        y_axis_summary_method
+        y_axis_summary_method,
+        type
       } = config;
       if (summaryColumn) {
         valueScaleOptions['formatter'] = value => {
@@ -316,12 +318,18 @@ export default class ChartComponent extends Component {
         // filter the data
         _this.chart.filterData(data);
       }
-      _this.chart.scale({
+      const scaleConfig = {
         name: {
           type: 'cat'
         },
         value: valueScaleOptions
-      });
+      };
+      // scatter chart need to set name as linear type，otherwise point will be displayed ramdomly
+      if (type === CHART_TYPE.SCATTER) {
+        scaleConfig.name.type = 'linear';
+        scaleConfig.value.nice = true;
+      }
+      _this.chart.scale(scaleConfig);
     };
     // set axis label and tooltip
     this.setNameLabelAndTooltip = function () {

package/dist/view/wrapper/scatter.js

@@ -66,17 +66,6 @@ export function Scatter(_ref) {
       currentChart.chart.coordinate('rect');
       currentChart.autoAdjustDataOptions(chart, data);
 
-      // 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
-        }
-      });
-
       // tooltip template
       currentChart.chart.tooltip({
         showTitle: false,

package/package.json

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