sea-chart 0.0.74-alpha.1 → 0.0.74-alpha.2

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 } from '../utils/contexts';
+import { settingsContext, DepartmentsContext } from '../utils/contexts';
 import { eventStopPropagation } from '../utils';
 import { BaseUtils } from '../utils';
 import { CHART_SETTINGS_TYPE, CHART_SETTINGS } from '../constants';
@@ -18,7 +18,8 @@ const Settings = _ref => {
     hideTitleStyleSetting,
     tables,
     onChange,
-    children
+    children,
+    departments
   } = _ref;
   const [type, setType] = useState(CHART_SETTINGS_TYPE.DATA);
   const [labelColorConfigs, setLabelColorConfigs] = useState([]);
@@ -83,12 +84,16 @@ const Settings = _ref => {
   }, /*#__PURE__*/React.createElement("div", {
     id: "sea-chart-settings-content",
     className: "chart-settings-content"
-  }, type === CHART_SETTINGS_TYPE.DATA && /*#__PURE__*/React.createElement(DataSettings, {
+  }, type === CHART_SETTINGS_TYPE.DATA && /*#__PURE__*/React.createElement(DepartmentsContext.Provider, {
+    value: {
+      departments
+    }
+  }, /*#__PURE__*/React.createElement(DataSettings, {
     dataSources: dataSources,
     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,
     labelColorConfigs: labelColorConfigs,
     onChange: modifyStyle

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

@@ -1,10 +1,11 @@
 import _DTableFiltersPopover from "dtable-ui-component/lib/DTableFiltersPopover";
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useContext, useMemo, useState } from 'react';
 import { Label, FormGroup } from 'reactstrap';
 import { getTableById } from 'dtable-utils';
 import { eventStopPropagation, generatorKey } from '../../../utils';
 import intl from '../../../intl';
 import context from '../../../context';
+import { DepartmentsContext } from '../../../utils/contexts';
 import './index.css';
 const DataFilter = _ref => {
   let {
@@ -13,6 +14,9 @@ const DataFilter = _ref => {
     onChange
   } = _ref;
   const [isFilterSetterShow, setIsFilterSetterShow] = useState(false);
+  const {
+    departments
+  } = useContext(DepartmentsContext);
   const toggleFilterPopover = useCallback(event => {
     eventStopPropagation(event);
     setIsFilterSetterShow(!isFilterSetterShow);
@@ -78,6 +82,7 @@ const DataFilter = _ref => {
     filterConjunction: filterConjunction,
     columns: table.columns,
     collaborators: collaborators,
+    departments: departments,
     hidePopover: toggleFilterPopover,
     update: updateFilters
   }))) : /*#__PURE__*/React.createElement("div", {

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

@@ -73,36 +73,27 @@ async function calculator(chart, value, _ref) {
           targetValue,
           rows
         } = labelCountMap[label];
-        let completedRate;
-        if (!targetValue && targetValue) {
-          completedRate = 100;
-        } else if (!targetValue && !targetValue) {
-          completedRate = 'empty';
-        } else {
-          completedRate = (targetValue / targetValue * 100).toFixed(0);
-        }
         if (currentValue < targetValue) {
           result.unshift({
             name: label,
             value: currentValue,
-            group_name: 'completed',
+            type: 'completed',
             current_value: currentValue,
             target_value: targetValue,
             rows
           }, {
             name: label,
             value: targetValue - currentValue,
-            group_name: 'rest',
+            type: 'uncompleted',
             current_value: currentValue,
             target_value: targetValue,
-            rows,
-            completedRate
+            rows
           });
         } else {
           result.unshift({
             name: label,
             value: currentValue,
-            group_name: 'completed',
+            type: 'completed',
             current_value: currentValue,
             target_value: targetValue,
             rows
@@ -181,21 +172,13 @@ async function calculator(chart, value, _ref) {
           targetValue,
           rows
         } = labelCountMap[key];
-        let completedRate;
-        if (!targetValue && targetValue) {
-          completedRate = 100;
-        } else if (!targetValue && !targetValue) {
-          completedRate = 'empty';
-        } else {
-          completedRate = (targetValue / targetValue * 100).toFixed(0);
-        }
         if (currentValue < targetValue) {
           result.unshift({
             name: label,
             groupby: groupLabel,
             value: currentValue,
             color,
-            group_name: 'completed',
+            type: 'completed',
             current_value: currentValue,
             target_value: targetValue,
             rows
@@ -204,11 +187,10 @@ async function calculator(chart, value, _ref) {
             groupby: groupLabel,
             value: targetValue - currentValue,
             color,
-            group_name: 'rest',
+            type: 'uncompleted',
             current_value: currentValue,
             target_value: targetValue,
-            rows,
-            completedRate
+            rows
           });
         } else {
           result.unshift({
@@ -216,7 +198,7 @@ async function calculator(chart, value, _ref) {
             groupby: groupLabel,
             value: currentValue,
             color,
-            group_name: 'completed',
+            type: 'completed',
             current_value: currentValue,
             target_value: targetValue,
             rows

package/dist/utils/contexts.js

@@ -1,2 +1,3 @@
 import React from 'react';
-export const settingsContext = React.createContext('');
+export const settingsContext = React.createContext('');
+export const DepartmentsContext = React.createContext([]);

package/package.json

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