@easyv/charts 1.2.7 → 1.2.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/components/AnimateData.js +11 -7
- package/lib/components/Axis.js +8 -4
- package/lib/components/Band.js +8 -4
- package/lib/components/BaseLine.js +23 -12
- package/lib/components/Brush.js +2 -2
- package/lib/components/Carousel.js +13 -6
- package/lib/components/CartesianChart.js +14 -7
- package/lib/components/Chart.js +9 -6
- package/lib/components/ChartContainer.js +8 -4
- package/lib/components/ConicalGradient.js +6 -2
- package/lib/components/ExtentData.js +7 -4
- package/lib/components/FilterData.js +7 -4
- package/lib/components/Label.js +2 -2
- package/lib/components/Legend.js +11 -5
- package/lib/components/Line.js +49 -37
- package/lib/components/Mapping.js +8 -5
- package/lib/components/Marquee.js +2 -2
- package/lib/components/PieChart.js +24 -10
- package/lib/components/StackData.js +7 -4
- package/lib/components/StereoBar.js +8 -4
- package/lib/components/TextOverflow.js +2 -2
- package/lib/components/Tooltip.js +2 -2
- package/lib/components/index.js +49 -49
- package/lib/formatter/legend.js +2 -2
- package/lib/hooks/index.js +14 -14
- package/lib/hooks/useAnimateData.js +2 -2
- package/lib/hooks/useAxes.js +2 -2
- package/lib/hooks/useCarouselAxisX.js +2 -2
- package/lib/hooks/useExtentData.js +2 -2
- package/lib/hooks/useFilterData.js +3 -3
- package/lib/hooks/useStackData.js +5 -3
- package/lib/index.js +6 -2
- package/lib/utils/index.js +9 -6
- package/package.json +1 -1
- package/src/components/BaseLine.js +15 -8
- package/src/components/CartesianChart.js +3 -0
- package/src/components/Line.js +2 -1
- package/src/components/PieChart.js +4 -13
- package/src/utils/index.js +1 -1
package/lib/hooks/index.js
CHANGED
|
@@ -5,46 +5,46 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
Object.defineProperty(exports, "
|
|
8
|
+
Object.defineProperty(exports, "useAnimateData", {
|
|
9
9
|
enumerable: true,
|
|
10
10
|
get: function get() {
|
|
11
|
-
return
|
|
11
|
+
return _useAnimateData["default"];
|
|
12
12
|
}
|
|
13
13
|
});
|
|
14
|
-
Object.defineProperty(exports, "
|
|
14
|
+
Object.defineProperty(exports, "useAxes", {
|
|
15
15
|
enumerable: true,
|
|
16
16
|
get: function get() {
|
|
17
|
-
return
|
|
17
|
+
return _useAxes["default"];
|
|
18
18
|
}
|
|
19
19
|
});
|
|
20
|
-
Object.defineProperty(exports, "
|
|
20
|
+
Object.defineProperty(exports, "useCarouselAxisX", {
|
|
21
21
|
enumerable: true,
|
|
22
22
|
get: function get() {
|
|
23
|
-
return
|
|
23
|
+
return _useCarouselAxisX["default"];
|
|
24
24
|
}
|
|
25
25
|
});
|
|
26
|
-
Object.defineProperty(exports, "
|
|
26
|
+
Object.defineProperty(exports, "useExtentData", {
|
|
27
27
|
enumerable: true,
|
|
28
28
|
get: function get() {
|
|
29
|
-
return
|
|
29
|
+
return _useExtentData["default"];
|
|
30
30
|
}
|
|
31
31
|
});
|
|
32
|
-
Object.defineProperty(exports, "
|
|
32
|
+
Object.defineProperty(exports, "useFilterData", {
|
|
33
33
|
enumerable: true,
|
|
34
34
|
get: function get() {
|
|
35
|
-
return
|
|
35
|
+
return _useFilterData["default"];
|
|
36
36
|
}
|
|
37
37
|
});
|
|
38
|
-
Object.defineProperty(exports, "
|
|
38
|
+
Object.defineProperty(exports, "useStackData", {
|
|
39
39
|
enumerable: true,
|
|
40
40
|
get: function get() {
|
|
41
|
-
return
|
|
41
|
+
return _useStackData["default"];
|
|
42
42
|
}
|
|
43
43
|
});
|
|
44
|
-
Object.defineProperty(exports, "
|
|
44
|
+
Object.defineProperty(exports, "useTooltip", {
|
|
45
45
|
enumerable: true,
|
|
46
46
|
get: function get() {
|
|
47
|
-
return
|
|
47
|
+
return _useTooltip["default"];
|
|
48
48
|
}
|
|
49
49
|
});
|
|
50
50
|
|
|
@@ -15,9 +15,9 @@ var _react = require("react");
|
|
|
15
15
|
|
|
16
16
|
var _popmotion = require("popmotion");
|
|
17
17
|
|
|
18
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
18
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
19
19
|
|
|
20
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
20
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
21
21
|
|
|
22
22
|
/**
|
|
23
23
|
* 图表数据动画
|
package/lib/hooks/useAxes.js
CHANGED
|
@@ -17,9 +17,9 @@ var _utils = require("../utils");
|
|
|
17
17
|
|
|
18
18
|
var _utils2 = require("@easyv/utils/lib/common/utils");
|
|
19
19
|
|
|
20
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
20
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
21
21
|
|
|
22
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
22
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
23
23
|
|
|
24
24
|
var scales = {
|
|
25
25
|
linear: _d3Scale.scaleLinear,
|
|
@@ -17,9 +17,9 @@ var _react = require("react");
|
|
|
17
17
|
|
|
18
18
|
var _popmotion = require("popmotion");
|
|
19
19
|
|
|
20
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
20
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
21
21
|
|
|
22
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
22
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
23
23
|
|
|
24
24
|
var initialState = {
|
|
25
25
|
currentIndex: null,
|
|
@@ -19,9 +19,9 @@ var _d3v = require("d3v7");
|
|
|
19
19
|
|
|
20
20
|
var _utils = require("../utils");
|
|
21
21
|
|
|
22
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
22
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
23
23
|
|
|
24
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
24
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
25
25
|
|
|
26
26
|
var stackData = function stackData(data, series) {
|
|
27
27
|
var dataMap = (0, _d3v.group)(data, function (d) {
|
|
@@ -13,11 +13,11 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
|
|
|
13
13
|
|
|
14
14
|
var _react = require("react");
|
|
15
15
|
|
|
16
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
16
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
17
17
|
|
|
18
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
18
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
19
19
|
|
|
20
|
-
function _createForOfIteratorHelper(o, allowArrayLike) { var it
|
|
20
|
+
function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
|
|
21
21
|
|
|
22
22
|
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
23
23
|
|
|
@@ -19,15 +19,17 @@ var _d3v = require("d3v7");
|
|
|
19
19
|
|
|
20
20
|
var _utils = require("../utils");
|
|
21
21
|
|
|
22
|
-
|
|
22
|
+
var _excluded = ["name"];
|
|
23
23
|
|
|
24
|
-
function
|
|
24
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
25
|
+
|
|
26
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
25
27
|
|
|
26
28
|
var getSeriesMap = function getSeriesMap(series) {
|
|
27
29
|
var seriesMap = new Map();
|
|
28
30
|
series.forEach(function (_ref) {
|
|
29
31
|
var name = _ref.name,
|
|
30
|
-
rest = (0, _objectWithoutProperties2["default"])(_ref,
|
|
32
|
+
rest = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
|
|
31
33
|
seriesMap.set(name, _objectSpread(_objectSpread({}, rest), {}, {
|
|
32
34
|
name: name,
|
|
33
35
|
data: []
|
package/lib/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
4
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
@@ -82,4 +82,8 @@ Object.keys(_utils3).forEach(function (key) {
|
|
|
82
82
|
return _utils3[key];
|
|
83
83
|
}
|
|
84
84
|
});
|
|
85
|
-
});
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
88
|
+
|
|
89
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
package/lib/utils/index.js
CHANGED
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
8
|
exports.band = band;
|
|
9
|
-
exports.
|
|
9
|
+
exports.sortPie = exports.seriesYOrZ = exports.resetStacks = exports.reduceConfig = exports.isValidHttpUrl = exports.identity = exports.getTranslate3d = exports.getTranslate2d = exports.getTicksOfAxis = exports.getTickCoord = exports.getStacks = exports.getMousePos = exports.getMargin = exports.getIcon = exports.getGridCoord = exports.getFontStyle = exports.getDomPath = exports.getDataWithPercent = exports.getCurrentStack = exports.getColorList = exports.getChildren = exports.getBreakWord = exports.getBandwidth = exports.getBandSeriesStepAndWidth = exports.getBandBackground = exports.filterChildren = exports.dateFormat = exports.dataYOrZ = void 0;
|
|
10
10
|
|
|
11
11
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
12
12
|
|
|
@@ -26,9 +26,12 @@ var _server = require("react-dom/server");
|
|
|
26
26
|
|
|
27
27
|
var _svgPoints = require("svg-points");
|
|
28
28
|
|
|
29
|
-
|
|
29
|
+
var _excluded = ["backgroundSize"],
|
|
30
|
+
_excluded2 = ["vote", "value"];
|
|
30
31
|
|
|
31
|
-
function
|
|
32
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
33
|
+
|
|
34
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
32
35
|
|
|
33
36
|
var defaultSize = 10;
|
|
34
37
|
var defaultBackground = '#000000';
|
|
@@ -590,7 +593,7 @@ var getBandBackground = function getBandBackground(pattern, fill) {
|
|
|
590
593
|
|
|
591
594
|
var _pattern$backgroundSi = pattern.backgroundSize,
|
|
592
595
|
backgroundSize = _pattern$backgroundSi === void 0 ? '100% 100%' : _pattern$backgroundSi,
|
|
593
|
-
_pattern = (0, _objectWithoutProperties2["default"])(pattern,
|
|
596
|
+
_pattern = (0, _objectWithoutProperties2["default"])(pattern, _excluded);
|
|
594
597
|
|
|
595
598
|
return 'center top / ' + backgroundSize + ' url("data:image/svg+xml,' + encodeURIComponent((0, _server.renderToStaticMarkup)( /*#__PURE__*/React.createElement(SvgBackground, {
|
|
596
599
|
fill: fill,
|
|
@@ -795,7 +798,7 @@ var getDataWithPercent = function getDataWithPercent() {
|
|
|
795
798
|
var targetSeats = digits * 100;
|
|
796
799
|
var total = (0, _d3v.sum)(data, function (d) {
|
|
797
800
|
return d.value;
|
|
798
|
-
});
|
|
801
|
+
}) || 1;
|
|
799
802
|
var votesPerQuota = data.map(function (d, index) {
|
|
800
803
|
return _objectSpread(_objectSpread({}, d), {}, {
|
|
801
804
|
vote: Math.round(d.value / total * digits * 100),
|
|
@@ -814,7 +817,7 @@ var getDataWithPercent = function getDataWithPercent() {
|
|
|
814
817
|
var tmp = votesPerQuota.map(function (_ref28, index) {
|
|
815
818
|
var vote = _ref28.vote,
|
|
816
819
|
value = _ref28.value,
|
|
817
|
-
data = (0, _objectWithoutProperties2["default"])(_ref28,
|
|
820
|
+
data = (0, _objectWithoutProperties2["default"])(_ref28, _excluded2);
|
|
818
821
|
|
|
819
822
|
var obj = _objectSpread(_objectSpread({}, data), {}, {
|
|
820
823
|
value: value,
|
package/package.json
CHANGED
|
@@ -7,6 +7,8 @@ import { getFontStyle } from '../utils';
|
|
|
7
7
|
export default memo(
|
|
8
8
|
({
|
|
9
9
|
width,
|
|
10
|
+
height,
|
|
11
|
+
baseLineOri: orientation,
|
|
10
12
|
config: {
|
|
11
13
|
dataStyle: {
|
|
12
14
|
data: {
|
|
@@ -36,14 +38,19 @@ export default memo(
|
|
|
36
38
|
data
|
|
37
39
|
}) => {
|
|
38
40
|
if (!data.value) return null;
|
|
41
|
+
console.log(orientation, 'orientation')
|
|
42
|
+
const x1 = orientation == 'left' ? yScaler(data.value) : marginLeft,
|
|
43
|
+
x2 = orientation == 'left' ? yScaler(data.value) : width - marginRight,
|
|
44
|
+
y1 = orientation == 'left' ? marginLeft : yScaler(data.value),
|
|
45
|
+
y2 = orientation == 'left' ? height - marginRight : yScaler(data.value);
|
|
39
46
|
return (
|
|
40
47
|
<>
|
|
41
48
|
<g className='__easyv-baseLine' >
|
|
42
49
|
<line
|
|
43
|
-
x1={
|
|
44
|
-
x2={
|
|
45
|
-
y1={
|
|
46
|
-
y2={
|
|
50
|
+
x1={x1}
|
|
51
|
+
x2={x2}
|
|
52
|
+
y1={y1}
|
|
53
|
+
y2={y2}
|
|
47
54
|
stroke={color}
|
|
48
55
|
fill='none'
|
|
49
56
|
strokeDasharray={lineType === 'dash' ? strokeDasharray : null}
|
|
@@ -54,8 +61,8 @@ export default memo(
|
|
|
54
61
|
<foreignObject
|
|
55
62
|
width={100}
|
|
56
63
|
height={100}
|
|
57
|
-
x={
|
|
58
|
-
y={
|
|
64
|
+
x={x2 + labelTranslate.x}
|
|
65
|
+
y={y2 - textStyle.fontSize + labelTranslate.y}>
|
|
59
66
|
<div>
|
|
60
67
|
<span style={{ ...getFontStyle(textStyle) }}>{label}</span>
|
|
61
68
|
</div>
|
|
@@ -64,8 +71,8 @@ export default memo(
|
|
|
64
71
|
<foreignObject
|
|
65
72
|
width={100}
|
|
66
73
|
height={100}
|
|
67
|
-
x={
|
|
68
|
-
y={
|
|
74
|
+
x={x2 + dataTranslate.x}
|
|
75
|
+
y={y2 + dataTranslate.y}>
|
|
69
76
|
<div>
|
|
70
77
|
<span style={{ ...getFontStyle(dataStyle) }}>{data.value}</span>
|
|
71
78
|
</div>
|
|
@@ -43,6 +43,7 @@ const Chart = memo(
|
|
|
43
43
|
series,
|
|
44
44
|
tooltip,
|
|
45
45
|
baseLine: {
|
|
46
|
+
orientation:baseLineOri,
|
|
46
47
|
config: baseLineConfig = {},
|
|
47
48
|
data: baseLineData = []
|
|
48
49
|
},
|
|
@@ -177,9 +178,11 @@ const Chart = memo(
|
|
|
177
178
|
const yAxis = axes.get(yOrZ);
|
|
178
179
|
return (
|
|
179
180
|
yAxis && (<BaseLine
|
|
181
|
+
height={height}
|
|
180
182
|
width={width}
|
|
181
183
|
key={index}
|
|
182
184
|
config={baseLineConfig[index]}
|
|
185
|
+
baseLineOri={baseLineOri}
|
|
183
186
|
yAxis={yAxis}
|
|
184
187
|
data={item} />)
|
|
185
188
|
)
|
package/src/components/Line.js
CHANGED
|
@@ -38,7 +38,8 @@ const Area = ({
|
|
|
38
38
|
const areaGen = d3Area()
|
|
39
39
|
.x(({ data: { x } }) => xScaler(x))
|
|
40
40
|
.y1(({ data: { y } }) => yScaler(y))
|
|
41
|
-
.y0(height)
|
|
41
|
+
// .y0(height)
|
|
42
|
+
.y0(({})=>yScaler(0))
|
|
42
43
|
.defined(defined);
|
|
43
44
|
curve && areaGen.curve(curveCatmullRom.alpha(tension));
|
|
44
45
|
curve && areaGen.curve(curveMonotoneX);
|
|
@@ -267,8 +267,9 @@ const Component = memo(
|
|
|
267
267
|
},
|
|
268
268
|
state: { currentIndex, trigger },
|
|
269
269
|
onEvent,
|
|
270
|
-
data = [],
|
|
270
|
+
data:originData = [],
|
|
271
271
|
}) => {
|
|
272
|
+
const data =originData.map(d=>({...d,y:d.y<0?0:d.y}));
|
|
272
273
|
const prevIndex = useRef(null);
|
|
273
274
|
const { precision: legendPrecision } = legend.config.percent;
|
|
274
275
|
const {
|
|
@@ -469,17 +470,7 @@ const Component = memo(
|
|
|
469
470
|
strokeWidth={outerDecorate.width}
|
|
470
471
|
/>
|
|
471
472
|
{_arcs.map(
|
|
472
|
-
(
|
|
473
|
-
{
|
|
474
|
-
id,
|
|
475
|
-
value,
|
|
476
|
-
series,
|
|
477
|
-
arc,
|
|
478
|
-
innerRadius,
|
|
479
|
-
outerRadius,
|
|
480
|
-
},
|
|
481
|
-
index
|
|
482
|
-
) => {
|
|
473
|
+
({ id, value, series, arc, innerRadius, outerRadius }, index) => {
|
|
483
474
|
const arcWidth = outerRadius - innerRadius;
|
|
484
475
|
const path = arc
|
|
485
476
|
.innerRadius(centerRadius)
|
|
@@ -638,7 +629,7 @@ const Component = memo(
|
|
|
638
629
|
}
|
|
639
630
|
{
|
|
640
631
|
//类目文本
|
|
641
|
-
|
|
632
|
+
value && categoryText && categoryText.show && (
|
|
642
633
|
<g>
|
|
643
634
|
<path
|
|
644
635
|
onClick={onClick}
|
package/src/utils/index.js
CHANGED
|
@@ -634,7 +634,7 @@ const getDataWithPercent = (data = [], precision = 0) => {
|
|
|
634
634
|
const digits = Math.pow(10, precision);
|
|
635
635
|
const targetSeats = digits * 100;
|
|
636
636
|
|
|
637
|
-
const total = sum(data, (d) => d.value);
|
|
637
|
+
const total = sum(data, (d) => d.value) || 1;
|
|
638
638
|
|
|
639
639
|
const votesPerQuota = data.map((d, index) => ({
|
|
640
640
|
...d,
|