From 49e40088eecc5889e28292aa4aedb99f215184da Mon Sep 17 00:00:00 2001 From: "linghao.su" Date: Sun, 25 Jun 2023 23:05:22 +0800 Subject: [PATCH 1/2] fix(label): fix labelLine default style when normal state not show but other state show --- src/label/labelGuideHelper.ts | 12 ++ test/roseType-labeline.html | 120 ++++++++++++++++++++ test/runTest/actions/__meta__.json | 1 + test/runTest/actions/roseType-labeline.json | 1 + 4 files changed, 134 insertions(+) create mode 100644 test/roseType-labeline.html create mode 100644 test/runTest/actions/roseType-labeline.json diff --git a/src/label/labelGuideHelper.ts b/src/label/labelGuideHelper.ts index fdb70665e1..1de695781b 100644 --- a/src/label/labelGuideHelper.ts +++ b/src/label/labelGuideHelper.ts @@ -606,6 +606,13 @@ export function setLabelLineStyle( const showNormal = normalModel.get('show'); const labelIgnoreNormal = label.ignore; + // if labelLine exist and need to show in any state + const needToShow = !!labelLine && !!DISPLAY_STATES.find(stateName => { + const stateModel = statesModels[stateName]; + + return stateModel.get('show'); + }); + for (let i = 0; i < DISPLAY_STATES.length; i++) { const stateName = DISPLAY_STATES[i]; const stateModel = statesModels[stateName]; @@ -622,6 +629,11 @@ export function setLabelLineStyle( if (stateObj) { stateObj.ignore = true; } + + // set default labelLine style + if (needToShow) { + setLabelLineState(labelLine, true, stateName, stateModel); + } continue; } // Create labelLine if not exists diff --git a/test/roseType-labeline.html b/test/roseType-labeline.html new file mode 100644 index 0000000000..a763dcc0e2 --- /dev/null +++ b/test/roseType-labeline.html @@ -0,0 +1,120 @@ + + + + + + + + + + + +
+ + + diff --git a/test/runTest/actions/__meta__.json b/test/runTest/actions/__meta__.json index e5263c1683..3f364348ab 100644 --- a/test/runTest/actions/__meta__.json +++ b/test/runTest/actions/__meta__.json @@ -166,6 +166,7 @@ "radar3": 2, "radar4": 1, "resize-animation": 1, + "roseType-labeline": 1, "sankey-depth": 1, "sankey-jump": 1, "sankey-level": 1, diff --git a/test/runTest/actions/roseType-labeline.json b/test/runTest/actions/roseType-labeline.json new file mode 100644 index 0000000000..a15b1ced2c --- /dev/null +++ b/test/runTest/actions/roseType-labeline.json @@ -0,0 +1 @@ +[{"name":"Action 1","ops":[{"type":"mousemove","time":170,"x":251,"y":401},{"type":"mousemove","time":371,"x":256,"y":385},{"type":"mousemove","time":571,"x":257,"y":352},{"type":"mousemove","time":771,"x":362,"y":265},{"type":"mousemove","time":971,"x":428,"y":210},{"type":"mousemove","time":1172,"x":448,"y":203},{"type":"mousemove","time":1380,"x":494,"y":194},{"type":"mousemove","time":1580,"x":541,"y":268},{"type":"mousemove","time":1782,"x":542,"y":276},{"type":"mousemove","time":1895,"x":542,"y":276},{"type":"mousemove","time":2095,"x":516,"y":339},{"type":"mousemove","time":2296,"x":515,"y":341},{"type":"mousemove","time":2504,"x":452,"y":388},{"type":"mousemove","time":2704,"x":447,"y":388},{"type":"mousemove","time":2904,"x":415,"y":384},{"type":"mousemove","time":3105,"x":391,"y":340},{"type":"mousemove","time":3307,"x":389,"y":329},{"type":"mousemove","time":3512,"x":400,"y":291},{"type":"mousemove","time":3716,"x":400,"y":282},{"type":"mousemove","time":3929,"x":428,"y":269},{"type":"mousemove","time":4129,"x":429,"y":269},{"type":"mousemove","time":4204,"x":429,"y":269},{"type":"mousemove","time":4407,"x":429,"y":270},{"type":"mousemove","time":5029,"x":429,"y":270},{"type":"mousemove","time":5229,"x":424,"y":270},{"type":"mousemove","time":5429,"x":376,"y":276},{"type":"mousemove","time":5633,"x":350,"y":298},{"type":"mousemove","time":5838,"x":386,"y":293},{"type":"mousemove","time":6041,"x":410,"y":300},{"type":"mousemove","time":6562,"x":410,"y":299},{"type":"mousemove","time":6770,"x":410,"y":299},{"type":"mousemove","time":6970,"x":409,"y":299},{"type":"mousemove","time":8195,"x":409,"y":299},{"type":"screenshot","time":8577},{"type":"mousemove","time":9020,"x":409,"y":299},{"type":"mousemove","time":9221,"x":386,"y":302},{"type":"mousemove","time":9429,"x":377,"y":310},{"type":"mousemove","time":9629,"x":383,"y":332},{"type":"mousemove","time":9831,"x":386,"y":333},{"type":"mousemove","time":10036,"x":397,"y":343},{"type":"mousemove","time":10237,"x":420,"y":351},{"type":"mousemove","time":10437,"x":459,"y":366},{"type":"mousemove","time":10637,"x":459,"y":367},{"type":"mousemove","time":10846,"x":461,"y":366},{"type":"screenshot","time":11116},{"type":"mousemove","time":11138,"x":461,"y":366},{"type":"mousemove","time":11337,"x":520,"y":332},{"type":"mousemove","time":11537,"x":528,"y":309},{"type":"mousemove","time":11739,"x":532,"y":267},{"type":"screenshot","time":12240},{"type":"mousemove","time":12271,"x":532,"y":267},{"type":"mousemove","time":12471,"x":481,"y":197},{"type":"mousemove","time":12674,"x":480,"y":195},{"type":"mousemove","time":12787,"x":480,"y":196},{"type":"screenshot","time":13084},{"type":"mousemove","time":13112,"x":480,"y":196},{"type":"mousemove","time":13313,"x":480,"y":197},{"type":"mousemove","time":13513,"x":454,"y":222},{"type":"mousemove","time":13715,"x":440,"y":240},{"type":"mousemove","time":13924,"x":436,"y":247},{"type":"mousemove","time":14128,"x":437,"y":248},{"type":"mousemove","time":14329,"x":437,"y":249}],"scrollY":0,"scrollX":0,"timestamp":1687699940477}] \ No newline at end of file From a913d209633f7fb5495f844c685217f9c2233ec4 Mon Sep 17 00:00:00 2001 From: "linghao.su" Date: Mon, 23 Oct 2023 09:43:01 +0800 Subject: [PATCH 2/2] fix(pie): revert code in src, keep test retain --- src/label/labelGuideHelper.ts | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/label/labelGuideHelper.ts b/src/label/labelGuideHelper.ts index 1de695781b..fdb70665e1 100644 --- a/src/label/labelGuideHelper.ts +++ b/src/label/labelGuideHelper.ts @@ -606,13 +606,6 @@ export function setLabelLineStyle( const showNormal = normalModel.get('show'); const labelIgnoreNormal = label.ignore; - // if labelLine exist and need to show in any state - const needToShow = !!labelLine && !!DISPLAY_STATES.find(stateName => { - const stateModel = statesModels[stateName]; - - return stateModel.get('show'); - }); - for (let i = 0; i < DISPLAY_STATES.length; i++) { const stateName = DISPLAY_STATES[i]; const stateModel = statesModels[stateName]; @@ -629,11 +622,6 @@ export function setLabelLineStyle( if (stateObj) { stateObj.ignore = true; } - - // set default labelLine style - if (needToShow) { - setLabelLineState(labelLine, true, stateName, stateModel); - } continue; } // Create labelLine if not exists