From 2fafe28dd930fb74f4532e728ec9cf42a002af0d Mon Sep 17 00:00:00 2001 From: jiawulin001 Date: Wed, 30 Mar 2022 12:58:54 +0800 Subject: [PATCH 1/3] fix: Dump areaStyle polygon when notMerge is true --- src/chart/line/LineView.ts | 4 ++++ test/setOption.html | 40 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/src/chart/line/LineView.ts b/src/chart/line/LineView.ts index 27527a14e2..8b48ca2836 100644 --- a/src/chart/line/LineView.ts +++ b/src/chart/line/LineView.ts @@ -730,6 +730,10 @@ class LineView extends ChartView { polygon = this._newPolygon( points, stackedOnPoints ); + }// If areaStyle is removed + else if(polygon){ + lineGroup.remove(polygon); + polygon = this._polygon = null; } // NOTE: Must update _endLabel before setClipPath. diff --git a/test/setOption.html b/test/setOption.html index 2b3c8cf262..e9ccedf53d 100755 --- a/test/setOption.html +++ b/test/setOption.html @@ -40,6 +40,7 @@
+
+ + \ No newline at end of file From f5c6ecdff73201545ae67e1edf58044e01f45f88 Mon Sep 17 00:00:00 2001 From: jiawulin001 Date: Wed, 30 Mar 2022 20:24:27 +0800 Subject: [PATCH 2/3] Update for lint flaws --- src/chart/line/LineView.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chart/line/LineView.ts b/src/chart/line/LineView.ts index 8b48ca2836..493c17d186 100644 --- a/src/chart/line/LineView.ts +++ b/src/chart/line/LineView.ts @@ -731,7 +731,7 @@ class LineView extends ChartView { points, stackedOnPoints ); }// If areaStyle is removed - else if(polygon){ + else if (polygon) { lineGroup.remove(polygon); polygon = this._polygon = null; } From d92ddba618c7aa218b80bd8f974b58f35594d874 Mon Sep 17 00:00:00 2001 From: plainheart Date: Mon, 11 Apr 2022 09:12:30 +0800 Subject: [PATCH 3/3] test: tweak test case title and add VRT action. --- test/runTest/actions/__meta__.json | 2 +- test/runTest/actions/setOption.json | 2 +- test/setOption.html | 15 +++++---------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/test/runTest/actions/__meta__.json b/test/runTest/actions/__meta__.json index e40563eb12..70b3b82b79 100644 --- a/test/runTest/actions/__meta__.json +++ b/test/runTest/actions/__meta__.json @@ -162,7 +162,7 @@ "scatter-random-stream-fix-axis": 1, "scatter-single-axis": 2, "scatterMatrix": 3, - "setOption": 1, + "setOption": 2, "splitLine": 1, "stackBar-dataZoom": 7, "sunburst-book": 1, diff --git a/test/runTest/actions/setOption.json b/test/runTest/actions/setOption.json index 3b605ae0eb..8a00044d55 100644 --- a/test/runTest/actions/setOption.json +++ b/test/runTest/actions/setOption.json @@ -1 +1 @@ -[{"name":"Action 1","ops":[{"type":"mousedown","time":936,"x":125,"y":78},{"type":"mouseup","time":1105,"x":125,"y":78},{"time":1106,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":1695,"x":126,"y":78},{"type":"mousemove","time":1896,"x":172,"y":79},{"type":"mousemove","time":2103,"x":264,"y":86},{"type":"mousemove","time":2312,"x":279,"y":85},{"type":"mousemove","time":2518,"x":282,"y":80},{"type":"mousemove","time":2734,"x":284,"y":80},{"type":"mousedown","time":3062,"x":284,"y":80},{"type":"mouseup","time":3201,"x":284,"y":80},{"time":3202,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":3894,"x":283,"y":80},{"type":"mousemove","time":4095,"x":214,"y":72},{"type":"mousemove","time":4305,"x":202,"y":72},{"type":"mousedown","time":4867,"x":202,"y":72},{"type":"mouseup","time":5001,"x":202,"y":72},{"time":5002,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":5278,"x":202,"y":73},{"type":"mousemove","time":5478,"x":284,"y":211},{"type":"mousemove","time":5687,"x":299,"y":233},{"type":"mousewheel","time":5961,"x":299,"y":233,"deltaY":1},{"type":"mousewheel","time":5996,"x":299,"y":233,"deltaY":11},{"type":"mousewheel","time":6012,"x":299,"y":233,"deltaY":5},{"type":"mousewheel","time":6028,"x":299,"y":233,"deltaY":6},{"type":"mousewheel","time":6046,"x":299,"y":233,"deltaY":6},{"type":"mousewheel","time":6062,"x":299,"y":233,"deltaY":5},{"type":"mousewheel","time":6091,"x":299,"y":233,"deltaY":2},{"type":"mousewheel","time":6110,"x":299,"y":233,"deltaY":2},{"type":"mousemove","time":6679,"x":299,"y":233},{"type":"mousemove","time":6879,"x":209,"y":110},{"type":"mousemove","time":7080,"x":259,"y":81},{"type":"mousemove","time":7288,"x":273,"y":74},{"type":"mousemove","time":7494,"x":232,"y":73},{"type":"mousedown","time":7502,"x":232,"y":73},{"type":"mouseup","time":7605,"x":232,"y":73},{"time":7606,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":7811,"x":233,"y":73},{"type":"mousemove","time":8011,"x":281,"y":75},{"type":"mousemove","time":8212,"x":300,"y":72},{"type":"mousemove","time":9762,"x":297,"y":79},{"type":"mousemove","time":9968,"x":283,"y":159},{"type":"mousewheel","time":10178,"x":283,"y":159,"deltaY":1},{"type":"mousewheel","time":10205,"x":283,"y":159,"deltaY":4},{"type":"mousewheel","time":10220,"x":283,"y":159,"deltaY":4},{"type":"mousewheel","time":10239,"x":283,"y":159,"deltaY":8},{"type":"mousewheel","time":10253,"x":283,"y":159,"deltaY":2},{"type":"mousewheel","time":10267,"x":283,"y":159,"deltaY":6},{"type":"mousewheel","time":10284,"x":283,"y":159,"deltaY":5},{"type":"mousewheel","time":10311,"x":283,"y":159,"deltaY":4},{"type":"mousewheel","time":10328,"x":283,"y":159,"deltaY":3},{"type":"mousewheel","time":10347,"x":283,"y":159,"deltaY":1},{"type":"mousemove","time":10628,"x":283,"y":159},{"type":"mousemove","time":10828,"x":306,"y":86},{"type":"mousedown","time":11039,"x":309,"y":80},{"type":"mousemove","time":11057,"x":309,"y":80},{"type":"mouseup","time":11141,"x":309,"y":80},{"time":11142,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":11882,"x":309,"y":83},{"type":"mousemove","time":12089,"x":318,"y":105},{"type":"mousemove","time":12305,"x":320,"y":110},{"type":"mousedown","time":12619,"x":320,"y":110},{"type":"mouseup","time":12760,"x":320,"y":110},{"time":12761,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":13544,"x":319,"y":109},{"type":"mousemove","time":13751,"x":191,"y":69},{"type":"mousemove","time":13995,"x":191,"y":69},{"type":"mousedown","time":14201,"x":194,"y":79},{"type":"mousemove","time":14208,"x":194,"y":79},{"type":"mouseup","time":14307,"x":194,"y":79},{"time":14308,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":14495,"x":194,"y":79},{"type":"mousemove","time":14696,"x":279,"y":77},{"type":"mousemove","time":14906,"x":321,"y":75},{"type":"mousemove","time":15121,"x":322,"y":75},{"type":"mousedown","time":15839,"x":322,"y":75},{"type":"mouseup","time":15975,"x":322,"y":75},{"time":15976,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":16428,"x":322,"y":75},{"type":"mousemove","time":16629,"x":322,"y":75},{"type":"mousemove","time":16828,"x":340,"y":74},{"type":"mousemove","time":17037,"x":791,"y":97}],"scrollY":0,"scrollX":0,"timestamp":1622697871680}] \ No newline at end of file +[{"name":"Action 1","ops":[{"type":"mousedown","time":936,"x":125,"y":78},{"type":"mouseup","time":1105,"x":125,"y":78},{"time":1106,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":1695,"x":126,"y":78},{"type":"mousemove","time":1896,"x":172,"y":79},{"type":"mousemove","time":2103,"x":264,"y":86},{"type":"mousemove","time":2312,"x":279,"y":85},{"type":"mousemove","time":2518,"x":282,"y":80},{"type":"mousemove","time":2734,"x":284,"y":80},{"type":"mousedown","time":3062,"x":284,"y":80},{"type":"mouseup","time":3201,"x":284,"y":80},{"time":3202,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":3894,"x":283,"y":80},{"type":"mousemove","time":4095,"x":214,"y":72},{"type":"mousemove","time":4305,"x":202,"y":72},{"type":"mousedown","time":4867,"x":202,"y":72},{"type":"mouseup","time":5001,"x":202,"y":72},{"time":5002,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":5278,"x":202,"y":73},{"type":"mousemove","time":5478,"x":284,"y":211},{"type":"mousemove","time":5687,"x":299,"y":233},{"type":"mousewheel","time":5961,"x":299,"y":233,"deltaY":1},{"type":"mousewheel","time":5996,"x":299,"y":233,"deltaY":11},{"type":"mousewheel","time":6012,"x":299,"y":233,"deltaY":5},{"type":"mousewheel","time":6028,"x":299,"y":233,"deltaY":6},{"type":"mousewheel","time":6046,"x":299,"y":233,"deltaY":6},{"type":"mousewheel","time":6062,"x":299,"y":233,"deltaY":5},{"type":"mousewheel","time":6091,"x":299,"y":233,"deltaY":2},{"type":"mousewheel","time":6110,"x":299,"y":233,"deltaY":2},{"type":"mousemove","time":6679,"x":299,"y":233},{"type":"mousemove","time":6879,"x":209,"y":110},{"type":"mousemove","time":7080,"x":259,"y":81},{"type":"mousemove","time":7288,"x":273,"y":74},{"type":"mousemove","time":7494,"x":232,"y":73},{"type":"mousedown","time":7502,"x":232,"y":73},{"type":"mouseup","time":7605,"x":232,"y":73},{"time":7606,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":7811,"x":233,"y":73},{"type":"mousemove","time":8011,"x":281,"y":75},{"type":"mousemove","time":8212,"x":300,"y":72},{"type":"mousemove","time":9762,"x":297,"y":79},{"type":"mousemove","time":9968,"x":283,"y":159},{"type":"mousewheel","time":10178,"x":283,"y":159,"deltaY":1},{"type":"mousewheel","time":10205,"x":283,"y":159,"deltaY":4},{"type":"mousewheel","time":10220,"x":283,"y":159,"deltaY":4},{"type":"mousewheel","time":10239,"x":283,"y":159,"deltaY":8},{"type":"mousewheel","time":10253,"x":283,"y":159,"deltaY":2},{"type":"mousewheel","time":10267,"x":283,"y":159,"deltaY":6},{"type":"mousewheel","time":10284,"x":283,"y":159,"deltaY":5},{"type":"mousewheel","time":10311,"x":283,"y":159,"deltaY":4},{"type":"mousewheel","time":10328,"x":283,"y":159,"deltaY":3},{"type":"mousewheel","time":10347,"x":283,"y":159,"deltaY":1},{"type":"mousemove","time":10628,"x":283,"y":159},{"type":"mousemove","time":10828,"x":306,"y":86},{"type":"mousedown","time":11039,"x":309,"y":80},{"type":"mousemove","time":11057,"x":309,"y":80},{"type":"mouseup","time":11141,"x":309,"y":80},{"time":11142,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":11882,"x":309,"y":83},{"type":"mousemove","time":12089,"x":318,"y":105},{"type":"mousemove","time":12305,"x":320,"y":110},{"type":"mousedown","time":12619,"x":320,"y":110},{"type":"mouseup","time":12760,"x":320,"y":110},{"time":12761,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":13544,"x":319,"y":109},{"type":"mousemove","time":13751,"x":191,"y":69},{"type":"mousemove","time":13995,"x":191,"y":69},{"type":"mousedown","time":14201,"x":194,"y":79},{"type":"mousemove","time":14208,"x":194,"y":79},{"type":"mouseup","time":14307,"x":194,"y":79},{"time":14308,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":14495,"x":194,"y":79},{"type":"mousemove","time":14696,"x":279,"y":77},{"type":"mousemove","time":14906,"x":321,"y":75},{"type":"mousemove","time":15121,"x":322,"y":75},{"type":"mousedown","time":15839,"x":322,"y":75},{"type":"mouseup","time":15975,"x":322,"y":75},{"time":15976,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":16428,"x":322,"y":75},{"type":"mousemove","time":16629,"x":322,"y":75},{"type":"mousemove","time":16828,"x":340,"y":74},{"type":"mousemove","time":17037,"x":791,"y":97}],"scrollY":0,"scrollX":0,"timestamp":1622697871680},{"name":"Action 2","ops":[{"type":"mousedown","time":893,"x":158,"y":175},{"type":"mouseup","time":1028,"x":158,"y":175},{"time":1029,"delay":400,"type":"screenshot-auto"},{"type":"screenshot","time":2867}],"scrollY":398.3999938964844,"scrollX":0,"timestamp":1649639450776}] \ No newline at end of file diff --git a/test/setOption.html b/test/setOption.html index e9ccedf53d..02a6da07b0 100755 --- a/test/setOption.html +++ b/test/setOption.html @@ -44,11 +44,6 @@ - \ No newline at end of file +