sea-chart 2.0.0 → 2.0.1-alpha.1

package/dist/settings/index.js

@@ -42,7 +42,7 @@ const Settings = _ref => {
     departments,
     globalTheme,
     lang,
-    isRenderByD3
+    hideTypeToggle
   } = _ref;
   const [type, setType] = (0, _react.useState)(_constants.CHART_SETTINGS_TYPE.DATA);
   const [labelColorConfigs, setLabelColorConfigs] = (0, _react.useState)([]);
@@ -99,7 +99,7 @@ const Settings = _ref => {
   }, /*#__PURE__*/_react.default.createElement(_contexts.settingsContext.Provider, {
     value: {
       hideTitleStyleSetting,
-      isRenderByD3
+      hideTypeToggle
     }
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "sea-chart-settings"
@@ -145,6 +145,6 @@ const settingsPropTypes = exports.settingsPropTypes = {
   hideTitleStyleSetting: _propTypes.default.bool,
   children: _propTypes.default.any,
   onChange: _propTypes.default.func.isRequired,
-  isRenderByD3: _propTypes.default.bool
+  hideTypeToggle: _propTypes.default.bool
 };
 var _default = exports.default = Settings;

package/dist/settings/widgets/chart-type/index.js

@@ -22,7 +22,7 @@ const ChartType = _ref => {
     dataSources
   } = _ref;
   const {
-    isRenderByD3
+    hideTypeToggle
   } = (0, _react.useContext)(_contexts.settingsContext);
   const [isDialogShow, setDialogShow] = (0, _react.useState)(false);
   const openTypesDialog = (0, _react.useCallback)(event => {
@@ -62,9 +62,9 @@ const ChartType = _ref => {
   }, /*#__PURE__*/_react.default.createElement(_reactstrap.Label, null, _intl.default.get('Chart_type')), /*#__PURE__*/_react.default.createElement("div", {
     className: "sea-chart-selected-type-container d-flex align-items-center",
     style: {
-      backgroundColor: isRenderByD3 ? '#f5f5f5' : '#fff'
+      backgroundColor: hideTypeToggle ? '#f5f5f5' : '#fff'
     }
-  }, /*#__PURE__*/_react.default.createElement("span", null, _intl.default.get(_constants.CHART_TYPE_SHOW[type])), !isRenderByD3 && /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement("span", null, _intl.default.get(_constants.CHART_TYPE_SHOW[type])), !hideTypeToggle && /*#__PURE__*/_react.default.createElement("div", {
     className: "sea-chart-type-icon-container",
     onClick: openTypesDialog
   }, /*#__PURE__*/_react.default.createElement(_components.Icon, {

package/dist/view/index.js

@@ -257,7 +257,6 @@ class View extends _react.default.PureComponent {
       globalTheme,
       chartColorTheme,
       isCalculateByView,
-      isRenderByD3,
       dtableStoreValue,
       integratedEventTypes,
       integratedEventBus,
@@ -326,7 +325,6 @@ class View extends _react.default.PureComponent {
       customRender: render,
       globalTheme: globalTheme ? globalTheme : _constants.THEME_NAME_MAP.LIGHT,
       isCalculateByView: isCalculateByView,
-      isRenderByD3: isRenderByD3,
       isBigScreenPlugin: isBigScreenPlugin,
       chartColorTheme: chartColorTheme,
       integratedEventTypes: integratedEventTypes,
@@ -355,7 +353,6 @@ const propTypes = exports.propTypes = {
   departments: _propTypes.default.array,
   dtableStoreValue: _propTypes.default.object,
   isCalculateByView: _propTypes.default.bool,
-  isRenderByD3: _propTypes.default.bool,
   // event
   integratedEventTypes: _propTypes.default.object,
   integratedEventBus: _propTypes.default.object,

package/dist/view/wrapper/bar.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -8,7 +9,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _lodashEs = require("lodash-es");
-var _classnames = _interopRequireDefault(require("classnames"));
+var d3 = _interopRequireWildcard(require("d3"));
 var _constants = require("../../constants");
 var _utils = require("../../utils");
 var _colorUtils = require("../../utils/color-utils");
@@ -18,124 +19,202 @@ class Bar extends _chartComponent.default {
   constructor(props) {
     super(props);
     this.handleResize = () => {
-      this.chart && this.chart.destroy();
+      this.chart.node() && this.chart.node().remove();
       this.createChart();
       this.drawChart();
     };
     this.createChart = () => {
+      this.initChart(this.container);
+    };
+    this.drawChart = () => {
       const {
-        chart
+        customRender
+      } = this.props;
+      let {
+        result: data
+      } = this.props;
+      data = _utils.BaseUtils.formatEmptyName(data, '', _intl.default.get('Empty'));
+      if (!Array.isArray(data)) return;
+      this.draw(data);
+      this.renderAxisLabel(this.props.chart, this.props.tables, this.container);
+      (0, _utils.isFunction)(customRender) && customRender(this.chart);
+    };
+    this.getFillColor = data => {
+      const {
+        chart,
+        chartColorTheme
       } = this.props;
       const {
-        y_axis_show_value
+        y_axis_label_color,
+        color_option,
+        y_axis_label_color_rules
       } = chart.config;
-      const appendPadding = [y_axis_show_value ? 17 : 0, 0, 0, 0]; // used to display value on the top
-      this.initChart(this.container, {
-        appendPadding
+      let chartBarColor = y_axis_label_color || _constants.CHART_STYLE_COLORS[0];
+      if (chartColorTheme) {
+        chartBarColor = _utils.BaseUtils.getCurrentTheme(chartColorTheme).colors[0];
+      }
+      const colorRules = color_option === _constants.TYPE_COLOR_USING.USE_RULES && y_axis_label_color_rules && (0, _colorUtils.getConvertedColorRules)(y_axis_label_color_rules);
+      const color = (0, _colorUtils.getLabelColor)({
+        chart: chart.config,
+        colorRules,
+        value: data.value
+      });
+      return color || chartBarColor;
+    };
+    this.showTooltip = (event, data, title) => {
+      const {
+        offsetX,
+        offsetY
+      } = event;
+      const newTooltipData = {
+        title: title,
+        items: [{
+          color: this.getFillColor(data),
+          name: data.name,
+          value: data.value
+        }]
+      };
+      this.setState({
+        tooltipData: newTooltipData
+      });
+      this.setState({
+        toolTipPosition: {
+          offsetX,
+          offsetY
+        }
       });
-      this.chart.on('interval:click', e => {
-        this.props.toggleRecords(e.data.data);
+    };
+    this.moveTooltip = event => {
+      const {
+        offsetX,
+        offsetY
+      } = event;
+      this.setState({
+        toolTipPosition: {
+          offsetX,
+          offsetY
+        }
       });
     };
-    this.clearChart = () => {
-      this.chart.annotation().clear(true);
-      this.chart.clear(true);
+    this.hiddenTooltip = event => {
+      this.setState({
+        toolTipPosition: null
+      });
     };
-    this.drawChart = () => {
-      let {
-        result: data
+    this.setActiveAndInActiveState = (state, data) => {
+      const {
+        chart
       } = this.props;
-      data = _utils.BaseUtils.formatEmptyName(data, '', _intl.default.get('Empty'));
-      if (!Array.isArray(data)) return;
-      this.loadData(data);
-      this.draw(data);
-      requestAnimationFrame(() => {
-        this.chart.render();
-        this.renderAxisLabel(this.props.chart, this.props.tables);
+      const paths = d3.selectAll(".rects-wrapper-".concat(chart === null || chart === void 0 ? void 0 : chart.id, " path"));
+      if (state === 'active') {
+        paths.nodes().forEach(path => {
+          d3.select(path).attr('opacity', 1);
+        });
+        return;
+      }
+      paths.nodes().forEach(path => {
+        if (path.id !== data.slugId) {
+          d3.select(path).attr('opacity', 0.3);
+        }
       });
     };
     this.draw = data => {
       const {
         chart,
-        summaryColumn,
         globalTheme,
-        customRender,
-        chartColorTheme,
         tables
       } = this.props;
       const theme = _constants.CHART_THEME_COLOR[globalTheme];
+      const {
+        display_goal_line,
+        goal_value,
+        goal_label
+      } = chart.style_config || {};
       const {
         y_axis_summary_type,
         y_axis_summary_column_key,
         y_axis_column_key,
-        y_axis_summary_method,
-        y_axis_label_color,
         y_axis_show_value,
         label_font_size,
-        color_option,
-        y_axis_label_color_rules,
-        table_id
+        table_id,
+        y_axis_max,
+        y_axis_min,
+        y_axis_auto_range
       } = chart.config;
+      const tooltipTitle = this.getTitle(tables, table_id, y_axis_summary_type, y_axis_column_key || y_axis_summary_column_key);
       const {
-        display_goal_line,
-        goal_value,
-        goal_label
-      } = chart.style_config || {};
-      // y-axis label width：6 + 10
-      const chartWidth = this.chart.width - 6 - 10; // 10 is y-axis number width and 6 is gap between number and y axis line
-      const singleBarWidth = Math.round(chartWidth / (2 * data.length));
-      const singleBarRadius = Math.min(singleBarWidth / 5, 10);
-      let chartBarColor = y_axis_label_color || _constants.CHART_STYLE_COLORS[0];
-      if (chartColorTheme) {
-        chartBarColor = _utils.BaseUtils.getCurrentTheme(chartColorTheme).colors[0];
-      }
-      const colorRules = color_option === _constants.TYPE_COLOR_USING.USE_RULES && y_axis_label_color_rules && (0, _colorUtils.getConvertedColorRules)(y_axis_label_color_rules);
-      const title = this.getTitle(tables, table_id, y_axis_summary_type, y_axis_column_key || y_axis_summary_column_key);
-      this.drawLabels(data);
-      // set Coord type
-      this.chart.coordinate('rect');
-      this.autoAdjustDataOptions(chart, data, summaryColumn);
-      this.chart.interval().label(y_axis_show_value ? 'value' : false, {
-        style: {
-          fontSize: _utils.BaseUtils.getLabelFontSize(label_font_size),
-          fill: theme.labelColor,
-          ...this.labelStroke
+        width: chartWidth,
+        height: chartHeight
+      } = this.chartBoundingClientRect;
+      const insertPadding = 30;
+      const borderRadius = 10;
+      const x = d3.scaleBand().domain(data.map(item => item.name)).range([insertPadding, chartWidth - insertPadding]).paddingInner(0.4).paddingOuter(0.1);
+      const y = d3.scaleLinear().domain(y_axis_auto_range ? [0, d3.max(data, d => d.value)] : [y_axis_min, y_axis_max]).range([chartHeight - insertPadding, insertPadding]);
+      this.chart.append('g').attr('transform', "translate(0, ".concat(chartHeight - insertPadding, ")")).call(d3.axisBottom(x).tickSizeOuter(0).tickSizeInner(5)).call(g => {
+        g.selectAll('.domain').attr('stroke', theme.XAxisColor);
+        g.selectAll('.tick line').attr('stroke', theme.XAxisColor);
+        g.selectAll('text').attr('font-size', theme.fontSize);
+        g.selectAll('text').attr('fill', theme.textColor);
+      });
+      this.chart.append('g').attr('transform', "translate(".concat(insertPadding, ", 0)")).call(d3.axisLeft(y).tickSizeInner(0).ticks(5).tickFormat(d => d)).call(g => {
+        g.select('.domain').remove();
+        g.selectAll('line').node().remove(); // delete the first line
+        g.selectAll('.tick line').clone().attr('x2', chartWidth - insertPadding * 2).attr('stroke', theme.gridColor).attr('stroke-dasharray', '8,3');
+        g.selectAll('text').attr('font-size', theme.fontSize);
+        g.selectAll('text').attr('fill', theme.textColor);
+      });
+      this.chart.append('g').attr('class', "rects-wrapper-".concat(chart === null || chart === void 0 ? void 0 : chart.id)).selectAll().data(data).join('path').attr('fill', d => d3.color(this.getFillColor(d))).attr('data-x', d => x(d.name)).attr('data-y', d => y(d.value)).attr('data-width', x.bandwidth()).attr('data-value', d => d.value).attr('id', (d, index) => d.slugId).attr('d', d => {
+        // Do not draw if the range is smaller than the minimum
+        if (!y_axis_auto_range && d.value <= y_axis_min) {
+          return '';
         }
-      }).position('name*value').size(singleBarWidth).color('value', value => {
-        const color = (0, _colorUtils.getLabelColor)({
-          chart: chart.config,
-          colorRules,
-          value
-        });
-        return color || chartBarColor;
-      }).tooltip('name*value', (name, value) => {
-        return {
-          title,
-          value: _utils.BaseUtils.getSummaryValueDisplayString(summaryColumn, value, y_axis_summary_method),
-          name
-        };
-      }).state({
-        active: {
-          style: {
-            stroke: null
+        const path = d3.path();
+        const startX = x(d.name);
+        const startY = y(d.value);
+        path.moveTo(startX, startY + borderRadius);
+        path.quadraticCurveTo(startX, startY, startX + borderRadius, startY);
+        path.lineTo(startX + x.bandwidth() - borderRadius, startY);
+        path.quadraticCurveTo(startX + x.bandwidth(), startY, startX + x.bandwidth(), startY + borderRadius);
+        path.lineTo(startX + x.bandwidth(), y_axis_auto_range ? y(0) : y(y_axis_min));
+        path.lineTo(startX, y_axis_auto_range ? y(0) : y(y_axis_min));
+        path.closePath();
+        return path.toString();
+      }).call(g => {
+        const parentNode = d3.select('.rects-wrapper');
+        g.nodes().forEach(path => {
+          // Add label
+          if (y_axis_show_value) {
+            parentNode.append('text').attr('y', Number(path.dataset.y) - 10).attr('fill', theme.labelColor).attr('font-size', _utils.BaseUtils.getLabelFontSize(label_font_size)).text(path.dataset.value).call(g => {
+              const {
+                width
+              } = g.node().getBoundingClientRect();
+              g.attr('x', Number(path.dataset.x) + Number(path.dataset.width) / 2 - width);
+            });
           }
-        }
-      }).style('value', value => {
-        return {
-          radius: [singleBarRadius, singleBarRadius, 0, 0]
-        };
+        });
+      }).on('click', (event, data) => {
+        this.props.toggleRecords(data);
+      }).on('mouseover', (event, data) => {
+        this.showTooltip(event, data, tooltipTitle);
+        this.setActiveAndInActiveState('inActive', data);
+      }).on('mousemove', event => {
+        this.moveTooltip(event);
+      }).on('mouseleave', (event, data) => {
+        this.hiddenTooltip();
+        this.setActiveAndInActiveState('active', data);
       });
-      if (display_goal_line && goal_label && goal_value) {
-        this.setDispalyGoalLine(goal_label, goal_value, chartWidth);
+      if (display_goal_line) {
+        this.chart.append('g').attr('class', 'annotation-wrapper').append('line').attr('stroke', '#aaa').attr('x1', insertPadding).attr('y1', y(goal_value)).attr('x2', chartWidth - insertPadding).attr('y2', y(goal_value)).call(g => {
+          const parentNode = d3.select('.annotation-wrapper');
+          parentNode.append('text').attr('x', chartWidth - insertPadding - 30).attr('y', y(goal_value) - 10).attr('fill', '#666').text(goal_label);
+        });
       }
-      this.chart.legend(false);
-      this.setToolTip();
-      (0, _utils.isFunction)(customRender) && customRender(this.chart);
-      this.setNameLabelAndTooltip(theme, this.labelCount);
-      this.setValueLabel(theme);
-      this.chart.interaction('element-highlight');
     };
     this.chart = null;
+    this.state = {
+      tooltipData: null,
+      toolTipPosition: null
+    };
   }
   componentDidMount() {
     this.createChart();
@@ -153,22 +232,18 @@ class Bar extends _chartComponent.default {
     }
   }
   componentWillUnmount() {
-    var _this$chart2;
-    // chart doesn't have autoPadding before they were rendered
-    ((_this$chart2 = this.chart) === null || _this$chart2 === void 0 ? void 0 : _this$chart2.autoPadding) && this.chart.destroy();
+    this.chart.node() && this.chart.node().remove();
     window.removeEventListener('resize', this.debouncedHandleResize);
   }
   render() {
     const {
-      chart
-    } = this.props;
+      tooltipData,
+      toolTipPosition
+    } = this.state;
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _classnames.default)('sea-chart-container', {
-        'show-x-axis-label': this.isShowXAxisLabel(chart),
-        'show-y-axis-label': this.isShowYAxisLabel(chart)
-      }),
+      className: "sea-chart-container",
       ref: ref => this.container = ref
-    });
+    }, this.getToolTipContainer(tooltipData, toolTipPosition));
   }
 }
 Bar.propTypes = {

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

@@ -7,10 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _dtableUtils = require("dtable-utils");
 var d3 = _interopRequireWildcard(require("d3"));
 var _lodashEs = require("lodash-es");
-var _customG = require("../../utils/custom-g2");
+var _dtableUtils = require("dtable-utils");
 var _utils = require("../../utils");
 var _constants = require("../../constants");
 var _intl = _interopRequireDefault(require("../../intl"));
@@ -49,25 +48,7 @@ class ChartComponent extends _react.Component {
       const column = this.getColumn(tables, tableId, columnKey);
       return column.name || '';
     };
-    this.initChart = (container, _ref) => {
-      let {
-        appendPadding,
-        autoFit = true,
-        height = '100%',
-        width = '100%'
-      } = _ref;
-      let config = {
-        container: container,
-        autoFit: autoFit,
-        width,
-        height
-      };
-      if (appendPadding) {
-        config.appendPadding = appendPadding;
-      }
-      this.chart = new _customG.Chart(config);
-    };
-    this.initD3Chart = container => {
+    this.initChart = container => {
       const {
         width,
         height
@@ -76,14 +57,6 @@ class ChartComponent extends _react.Component {
       this.container.appendChild(this.chart.node());
       this.chartBoundingClientRect = this.chart.node().getBoundingClientRect();
     };
-    this.loadData = data => {
-      this.chart.data(data, {
-        'name': {
-          type: 'cat',
-          nice: false
-        }
-      });
-    };
     this.getChartDisplayLabels = (containerWidth, minItemWidth, charts) => {
       let labels = [];
       let labelCount = Math.floor(containerWidth / minItemWidth);