[timeline] Fix #7506 (next button and prev button can not be disabled).

6b10351b · sushuang · 801fc009 · 6b10351b · 6b10351b · 6b10351b
5 changed file
--- a/src/component/timeline/SliderTimelineView.js
+++ b/src/component/timeline/SliderTimelineView.js
@@ -147,7 +147,7 @@ export default TimelineView.extend({
        var mainLength = orient === 'vertical' ? viewRect.height : viewRect.width;

        var controlModel = timelineModel.getModel('controlStyle');
-        var showControl = controlModel.get('show');
+        var showControl = controlModel.get('show', true);
        var controlSize = showControl ? controlModel.get('itemSize') : 0;
        var controlGap = showControl ? controlModel.get('itemGap') : 0;
        var sizePlusGap = controlSize + controlGap;
@@ -161,7 +161,6 @@ export default TimelineView.extend({
        var nextBtnPosition;
        var axisExtent;
        var controlPosition = controlModel.get('position', true);
-        var showControl = controlModel.get('show', true);
        var showPlayBtn = showControl && controlModel.get('showPlayBtn', true);
        var showPrevBtn = showControl && controlModel.get('showPrevBtn', true);
        var showNextBtn = showControl && controlModel.get('showNextBtn', true);

--- a/src/preprocessor/helper/compatStyle.js
+++ b/src/preprocessor/helper/compatStyle.js
@@ -41,13 +41,20 @@ function compatEC2ItemStyle(opt) {
    }
 }

-function convertNormalEmphasis(opt, optType) {
+function convertNormalEmphasis(opt, optType, useExtend) {
    if (opt && opt[optType] && (opt[optType].normal || opt[optType].emphasis)) {
        var normalOpt = opt[optType].normal;
        var emphasisOpt = opt[optType].emphasis;

        if (normalOpt) {
-            opt[optType] = normalOpt;
+            // Timeline controlStyle has other properties besides normal and emphasis
+            if (useExtend) {
+                opt[optType].normal = opt[optType].emphasis = null;
+                zrUtil.defaults(opt[optType], normalOpt);
+            }
+            else {
+                opt[optType] = normalOpt;
+            }
        }
        if (emphasisOpt) {
            opt.emphasis = opt.emphasis || {};
@@ -246,7 +253,7 @@ export default function (option, isTheme) {
        compatEC3CommonStyles(timelineOpt);
        convertNormalEmphasis(timelineOpt, 'label');
        convertNormalEmphasis(timelineOpt, 'itemStyle');
-        convertNormalEmphasis(timelineOpt, 'controlStyle');
+        convertNormalEmphasis(timelineOpt, 'controlStyle', true);
        convertNormalEmphasis(timelineOpt, 'checkpointStyle');

        var data = timelineOpt.data;

--- a/test/pie.html
+++ b/test/pie.html
@@ -5,17 +5,17 @@
        <script src="lib/config.js"></script>
        <script src="data/pie-texture.js"></script>
        <script src="lib/dat.gui.min.js"></script>
+        <link rel="stylesheet" href="lib/reset.css" />
+        <script src="lib/testHelper.js"></script>
    </head>
    <body>
        <style>
-            html, body, #main {
-                width: 100%;
-                height: 100%;
-                /* background-image: url(old_mathematics.png); */
-                /* background-repeat: repeat; */
-            }
        </style>
+
        <div id="main"></div>
+        <div id="main2"></div>
+
+
        <script>
            var chart;
            require([
@@ -296,5 +296,44 @@
            })

        </script>
+
+
+
+
+
+
+
+        <script>
+            require([
+                'echarts'
+            ], function (echarts) {
+
+                var option = {
+                    legend: {},
+                    dataset: {
+                        source: [
+                            {name: 'a', value: 123},
+                            {name: 'b', value: 456},
+                            {name: 'should be selected', value: 789, selected: true}
+                        ]
+                    },
+                    series: {
+                        type: 'pie',
+                        selectedMode: 'multiply'
+                    }
+                };
+
+                testHelper.create(echarts, 'main2', {
+                    option: option,
+                    info: option
+                })
+
+            });
+        </script>
+
+
+
+
+
    </body>
 </html>
\ No newline at end of file
--- a/test/timeline-finance.html
+++ b/test/timeline-finance.html
@@ -66,9 +66,11 @@ var option = {
            autoPlay: true,
            // currentIndex: 2,
            playInterval: 1000,
-            // controlStyle: {
-            //     position: 'left'
-            // },
+            controlStyle: {
+                showNextBtn: false,
+                showPrevBtn: false,
+                position: 'left'
+            },
            data: [
                '2002-01-01','2003-01-01','2004-01-01',
                {

--- a/test/tooltip-setOption.html
+++ b/test/tooltip-setOption.html
@@ -29,9 +29,12 @@
        <div><a target="_blank" href="dynamicData2.html">dynamicData2.html</a></div>
        <div><a target="_blank" href="dynamicData3.html">dynamicData3.html</a></div>
        <h1>triggerOn click setOption when trigger axis (keep show)</h1>
-        <div class="chart" id="click-setOption1"></div>
-        <h1>triggerOn click setOption when trigger item (keep show)</h1>
-        <div class="chart" id="click-setOption2"></div>
+        <!-- <div class="chart" id="click-setOption1"></div> -->
+
+
+        <h1>tooltip should auto show and auto disappear when setOption(..., {notMerge: true})</h1>
+        <div class="chart" id="setOption2">
+        </div>



@@ -98,14 +101,60 @@

                var chart = createChart('click-setOption1', echarts, option, baseTop);
                window.ecClickSetOptionAxisChart = chart;
+            })
+        </script>
+
+

-                chart.on('showTip', function (params) {
-                    console.log('asdf', params);
-                    chart.setOption({
-                        // tooltip: {}
+
+        <script>
+            require([
+                'echarts'
+            ], function (echarts) {
+
+                function genOption() {
+                    return {
+                        tooltip: {
+                            trigger: 'axis',
+                            axisPointer: {
+                                type: 'cross'
+                            }
+                        },
+                        xAxis: {},
+                        yAxis: {},
+                        series: [{
+                            type: 'scatter',
+                            data: [
+                                [Math.random(), Math.random() * 100],
+                                [Math.random(), Math.random() * 100],
+                                [Math.random(), Math.random() * 100]
+                            ]
+                        }]
+                    };
+                }
+
+                var chart = echarts.init(document.getElementById('setOption2'));
+                chart.setOption(genOption());
+
+                setTimeout(function () {
+                    chart.dispatchAction({
+                        type: 'showTip',
+                        seriesIndex: 0,
+                        dataIndex: 0
                    });
-                });
-            })
+
+                    setTimeout(function () {
+
+                        // chart.clear();
+                        chart.dispose();
+
+                        chart = echarts.init(document.getElementById('setOption2'));
+
+                        chart.setOption(genOption());
+                    }, 2000)
+                }, 100);
+
+            });
        </script>