From 201f6cfdce9467d870bd5289b5a9feadf3eaeab7 Mon Sep 17 00:00:00 2001 From: kener Date: Mon, 13 Jan 2014 19:31:00 +0800 Subject: [PATCH] =?UTF-8?q?markLine=20symbolsize=E6=94=AF=E6=8C=81function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/base.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/component/base.js b/src/component/base.js index 5d0897075..4df707943 100644 --- a/src/component/base.js +++ b/src/component/base.js @@ -695,6 +695,16 @@ define(function(require) { xEnd, yEnd, // 坐标 color // 默认color,来自legend或dataRange全局分配 ) { + var value0 = typeof data[0] != 'undefined' + ? (typeof data[0].value != 'undefined' + ? data[0].value + : data[0]) + : '-'; + var value1 = typeof data[1] != 'undefined' + ? (typeof data[1].value != 'undefined' + ? data[1].value + : data[1]) + : '-'; var symbol = [ self.query(data[0], 'symbol') || mlOption.symbol[0], self.query(data[1], 'symbol') || mlOption.symbol[1] @@ -703,6 +713,12 @@ define(function(require) { self.query(data[0], 'symbolSize') || mlOption.symbolSize[0], self.query(data[1], 'symbolSize') || mlOption.symbolSize[1] ]; + symbolSize[0] = typeof symbolSize[0] == 'function' + ? symbolSize[0](value0) + : symbolSize[0]; + symbolSize[1] = typeof symbolSize[1] == 'function' + ? symbolSize[1](value1) + : symbolSize[1]; var symbolRotate = [ self.query(data[0], 'symbolRotate') || mlOption.symbolRotate[0], self.query(data[1], 'symbolRotate') || mlOption.symbolRotate[1] -- GitLab