提交 04e324a5 编写于 作者: L lang

Marker x, y support relative percent

上级 7f1523d0
...@@ -230,6 +230,10 @@ define(function (require) { ...@@ -230,6 +230,10 @@ define(function (require) {
var textStyleHoverModel = labelHoverModel.getModel('textStyle'); var textStyleHoverModel = labelHoverModel.getModel('textStyle');
var defaultText = numberUtil.round(seriesModel.getRawValue(idx)); var defaultText = numberUtil.round(seriesModel.getRawValue(idx));
if (isNaN(defaultText)) {
// Use name
defaultText = lineData.getName(idx);
}
line.setStyle(zrUtil.extend( line.setStyle(zrUtil.extend(
{ {
stroke: lineData.getItemVisual(idx, 'color') stroke: lineData.getItemVisual(idx, 'color')
......
...@@ -4,6 +4,7 @@ define(function (require) { ...@@ -4,6 +4,7 @@ define(function (require) {
var List = require('../../data/List'); var List = require('../../data/List');
var formatUtil = require('../../util/format'); var formatUtil = require('../../util/format');
var modelUtil = require('../../util/model'); var modelUtil = require('../../util/model');
var numberUtil = require('../../util/number');
var addCommas = formatUtil.addCommas; var addCommas = formatUtil.addCommas;
var encodeHTML = formatUtil.encodeHTML; var encodeHTML = formatUtil.encodeHTML;
...@@ -198,7 +199,10 @@ define(function (require) { ...@@ -198,7 +199,10 @@ define(function (require) {
var xPx = itemModel.get('x'); var xPx = itemModel.get('x');
var yPx = itemModel.get('y'); var yPx = itemModel.get('y');
if (xPx != null && yPx != null) { if (xPx != null && yPx != null) {
point = [xPx, yPx]; point = [
numberUtil.parsePercent(xPx, api.getWidth()),
numberUtil.parsePercent(yPx, api.getHeight())
];
} }
else { else {
var x = data.get(dims[0], idx); var x = data.get(dims[0], idx);
......
...@@ -4,6 +4,7 @@ define(function (require) { ...@@ -4,6 +4,7 @@ define(function (require) {
var zrUtil = require('zrender/core/util'); var zrUtil = require('zrender/core/util');
var formatUtil = require('../../util/format'); var formatUtil = require('../../util/format');
var modelUtil = require('../../util/model'); var modelUtil = require('../../util/model');
var numberUtil = require('../../util/number');
var addCommas = formatUtil.addCommas; var addCommas = formatUtil.addCommas;
var encodeHTML = formatUtil.encodeHTML; var encodeHTML = formatUtil.encodeHTML;
...@@ -95,7 +96,10 @@ define(function (require) { ...@@ -95,7 +96,10 @@ define(function (require) {
var xPx = itemModel.getShallow('x'); var xPx = itemModel.getShallow('x');
var yPx = itemModel.getShallow('y'); var yPx = itemModel.getShallow('y');
if (xPx != null && yPx != null) { if (xPx != null && yPx != null) {
point = [xPx, yPx]; point = [
numberUtil.parsePercent(xPx, api.getWidth()),
numberUtil.parsePercent(yPx, api.getHeight())
];
} }
else if (coordSys) { else if (coordSys) {
var x = mpData.get(dims[0], idx); var x = mpData.get(dims[0], idx);
......
...@@ -135,7 +135,8 @@ define(function (require) { ...@@ -135,7 +135,8 @@ define(function (require) {
*/ */
var dataFilter = function (coordSys, item) { var dataFilter = function (coordSys, item) {
// Alwalys return true if there is no coordSys // Alwalys return true if there is no coordSys
return coordSys ? coordSys.containData(item.value) : true; return (coordSys && item.value && (item.x == null || item.y == null))
? coordSys.containData(item.value) : true;
}; };
return { return {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册