[incubator-echarts] branch master updated: series->symbol支持函数类型，根据需要来设置每个数据的图形

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git


The following commit(s) were added to refs/heads/master by this push:
     new 8107c77  series->symbol支持函数类型，根据需要来设置每个数据的图形
     new f6430b0  Merge pull request #9664 from helllojayden/dev
8107c77 is described below

commit 8107c774d798918f315f4c85f3311fc670e86293
Author: 喻鹏程 <yu...@upg.cn>
AuthorDate: Mon Dec 31 10:21:47 2018 +0800

    series->symbol支持函数类型，根据需要来设置每个数据的图形
---
 src/visual/symbol.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/visual/symbol.js b/src/visual/symbol.js
index 670a3bd..823bd8b 100644
--- a/src/visual/symbol.js
+++ b/src/visual/symbol.js
@@ -29,13 +29,13 @@ export default function (seriesType, defaultSymbolType, legendSymbol) {
         reset: function (seriesModel, ecModel, api) {
             var data = seriesModel.getData();
 
-            var symbolType = seriesModel.get('symbol') || defaultSymbolType;
+            var symbolType = seriesModel.get('symbol');
             var symbolSize = seriesModel.get('symbolSize');
             var keepAspect = seriesModel.get('symbolKeepAspect');
 
             data.setVisual({
-                legendSymbol: legendSymbol || symbolType,
-                symbol: symbolType,
+                legendSymbol: legendSymbol || symbolType || defaultSymbolType,
+                symbol: symbolType || defaultSymbolType,
                 symbolSize: symbolSize,
                 symbolKeepAspect: keepAspect
             });
@@ -45,9 +45,15 @@ export default function (seriesType, defaultSymbolType, legendSymbol) {
                 return;
             }
 
-            var hasCallback = typeof symbolSize === 'function';
+            var hasCallback = typeof symbolType === 'function' || typeof symbolSize === 'function';
 
             function dataEach(data, idx) {
+                if (typeof symbolType === 'function') {
+                    var rawValue = seriesModel.getRawValue(idx);
+
+                    var params = seriesModel.getDataParams(idx);
+                    data.setItemVisual(idx, 'symbol', symbolType(rawValue, params));
+                }
                 if (typeof symbolSize === 'function') {
                     var rawValue = seriesModel.getRawValue(idx);
                     // FIXME


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org