Tweak the symbol function and add test.

2b86ddd8 · sushuang · a0b6abc8 · 2b86ddd8 · 2b86ddd8
隐藏空白更改
内联并排

Showing with 147 addition and 12 deletion

src/visual/symbol.js src/visual/symbol.js +8 -12

test/symbol2.html test/symbol2.html +139 -0

未找到文件。
--- a/src/visual/symbol.js
+++ b/src/visual/symbol.js
@@ -45,20 +45,16 @@ export default function (seriesType, defaultSymbolType, legendSymbol) {
                return;
            }

-            var hasCallback = typeof symbolType === 'function' || typeof symbolSize === 'function';
+            var hasSymbolTypeCallback = typeof symbolType === 'function';
+            var hasSymbolSizeCallback = typeof symbolSize === 'function';
+            var hasCallback = hasSymbolTypeCallback || hasSymbolSizeCallback;

            function dataEach(data, idx) {
-                if (typeof symbolType === 'function') {
+                if (hasCallback) {
                    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
                    var params = seriesModel.getDataParams(idx);
-                    data.setItemVisual(idx, 'symbolSize', symbolSize(rawValue, params));
+                    hasSymbolTypeCallback && data.setItemVisual(idx, 'symbol', symbolType(rawValue, params));
+                    hasSymbolSizeCallback && data.setItemVisual(idx, 'symbolSize', symbolSize(rawValue, params));
                }

                if (data.hasItemOption) {
@@ -66,8 +62,8 @@ export default function (seriesType, defaultSymbolType, legendSymbol) {
                    var itemSymbolType = itemModel.getShallow('symbol', true);
                    var itemSymbolSize = itemModel.getShallow('symbolSize',
                        true);
-                    var itemSymbolKeepAspect
-                        = itemModel.getShallow('symbolKeepAspect', true);
+                    var itemSymbolKeepAspect =
+                        itemModel.getShallow('symbolKeepAspect', true);

                    // If has item symbol
                    if (itemSymbolType != null) {

--- a/test/symbol2.html
+++ b/test/symbol2.html
+<!DOCTYPE html>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
+        <script src="lib/jquery.min.js"></script>
+        <script src="lib/facePrint.js"></script>
+        <script src="lib/testHelper.js"></script>
+        <!-- <script src="ut/lib/canteen.js"></script> -->
+        <link rel="stylesheet" href="lib/reset.css" />
+    </head>
+    <body>
+        <style>
+        </style>
+
+
+        <div id="main0"></div>
+        <div id="main1"></div>
+
+
+
+
+        <script>
+
+            require([
+                'echarts'/*, 'map/js/china' */
+            ], function (echarts) {
+                var option = {
+                    xAxis: {},
+                    yAxis: {},
+                    series: [{
+                        symbolSize: 30,
+                        symbol: 'diamond',
+                        data: [
+                            [10.0, 8.04],
+                            [8.0, 6.95],
+                            [13.0, 7.58]
+                        ],
+                        type: 'scatter'
+                    }]
+                };
+
+                var chart = testHelper.create(echarts, 'main0', {
+                    title: 'click button to change symbol type',
+                    option: option,
+                    buttons: [{
+                        text: 'Change symbol to "circle"',
+                        onclick: function () {
+                            chart.setOption({
+                                series: {
+                                    symbol: 'circle'
+                                }
+                            });
+                        }
+                    }, {
+                        text: 'Change symbol to "rect"',
+                        onclick: function () {
+                            chart.setOption({
+                                series: {
+                                    symbol: 'rect'
+                                }
+                            });
+                        }
+                    }]
+                });
+            });
+
+        </script>
+
+
+
+
+
+        <script>
+
+            require([
+                'echarts'/*, 'map/js/china' */
+            ], function (echarts) {
+                var option = {
+                    xAxis: {},
+                    yAxis: {},
+                    series: [{
+                        symbolSize: 30,
+                        symbol: function (rawValue, params) {
+                            return ['rect', 'diamond', 'circle'][params.dataIndex];
+                        },
+                        label: {
+                            show: true,
+                            formatter: function (params) {
+                                return params.dataIndex;
+                            }
+                        },
+                        data: [
+                            [10.0, 8.04],
+                            [8.0, 6.95],
+                            [13.0, 7.58]
+                        ],
+                        type: 'scatter'
+                    }]
+                };
+
+                var chart = testHelper.create(echarts, 'main1', {
+                    title: 'symbol function make it display 0: "rect", 1: "diamond", 2: "circle"',
+                    option: option
+                });
+            });
+
+        </script>
+
+
+
+
+
+
+
+    </body>
+</html>
\ No newline at end of file