From 95ee9e911e53c073da74f342b4c9962495b110c4 Mon Sep 17 00:00:00 2001 From: Joe Li Date: Thu, 30 Jun 2022 09:51:57 -0700 Subject: [PATCH] Revert "feat(plugin-chart-echarts): Support stacking negative and positive values (#20408)" This reverts commit c959d92dd17499e3fb7a0f4f02f3781516f3d3e6. --- superset-frontend/package-lock.json | 32 +++++++++---------- .../plugins/plugin-chart-echarts/package.json | 2 +- .../src/Timeseries/transformers.ts | 1 - 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index c0b831b35d839..a17672c429f51 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -26530,12 +26530,12 @@ } }, "node_modules/echarts": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.3.tgz", - "integrity": "sha512-BRw2serInRwO5SIwRviZ6Xgm5Lb7irgz+sLiFMmy/HOaf4SQ+7oYqxKzRHAKp4xHQ05AuHw1xvoQWJjDQq/FGw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.2.tgz", + "integrity": "sha512-LWCt7ohOKdJqyiBJ0OGBmE9szLdfA9sGcsMEi+GGoc6+Xo75C+BkcT/6NNGRHAWtnQl2fNow05AQjznpap28TQ==", "dependencies": { "tslib": "2.3.0", - "zrender": "5.3.2" + "zrender": "5.3.1" } }, "node_modules/echarts/node_modules/tslib": { @@ -54238,9 +54238,9 @@ } }, "node_modules/zrender": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.3.2.tgz", - "integrity": "sha512-8IiYdfwHj2rx0UeIGZGGU4WEVSDEdeVCaIg/fomejg1Xu6OifAL1GVzIPHg2D+MyUkbNgPWji90t0a8IDk+39w==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.3.1.tgz", + "integrity": "sha512-7olqIjy0gWfznKr6vgfnGBk7y4UtdMvdwFmK92vVQsQeDPyzkHW1OlrLEKg6GHz1W5ePf0FeN1q2vkl/HFqhXw==", "dependencies": { "tslib": "2.3.0" } @@ -55366,7 +55366,7 @@ "license": "Apache-2.0", "dependencies": { "d3-array": "^1.2.0", - "echarts": "^5.3.3", + "echarts": "^5.3.2", "lodash": "^4.17.15", "moment": "^2.26.0" }, @@ -68179,7 +68179,7 @@ "version": "file:plugins/plugin-chart-echarts", "requires": { "d3-array": "^1.2.0", - "echarts": "^5.3.3", + "echarts": "^5.3.2", "lodash": "^4.17.15", "moment": "^2.26.0" } @@ -76576,12 +76576,12 @@ } }, "echarts": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.3.tgz", - "integrity": "sha512-BRw2serInRwO5SIwRviZ6Xgm5Lb7irgz+sLiFMmy/HOaf4SQ+7oYqxKzRHAKp4xHQ05AuHw1xvoQWJjDQq/FGw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.2.tgz", + "integrity": "sha512-LWCt7ohOKdJqyiBJ0OGBmE9szLdfA9sGcsMEi+GGoc6+Xo75C+BkcT/6NNGRHAWtnQl2fNow05AQjznpap28TQ==", "requires": { "tslib": "2.3.0", - "zrender": "5.3.2" + "zrender": "5.3.1" }, "dependencies": { "tslib": { @@ -98016,9 +98016,9 @@ } }, "zrender": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.3.2.tgz", - "integrity": "sha512-8IiYdfwHj2rx0UeIGZGGU4WEVSDEdeVCaIg/fomejg1Xu6OifAL1GVzIPHg2D+MyUkbNgPWji90t0a8IDk+39w==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.3.1.tgz", + "integrity": "sha512-7olqIjy0gWfznKr6vgfnGBk7y4UtdMvdwFmK92vVQsQeDPyzkHW1OlrLEKg6GHz1W5ePf0FeN1q2vkl/HFqhXw==", "requires": { "tslib": "2.3.0" }, diff --git a/superset-frontend/plugins/plugin-chart-echarts/package.json b/superset-frontend/plugins/plugin-chart-echarts/package.json index f37fbd95d919c..0c5cbcf595ae0 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/package.json +++ b/superset-frontend/plugins/plugin-chart-echarts/package.json @@ -27,7 +27,7 @@ }, "dependencies": { "d3-array": "^1.2.0", - "echarts": "^5.3.3", + "echarts": "^5.3.2", "lodash": "^4.17.15", "moment": "^2.26.0" }, diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts index bd15cbf099b93..93565de46c278 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts @@ -204,7 +204,6 @@ export function transformSeries( ? seriesType : undefined, stack: stackId, - stackStrategy: 'all', lineStyle, areaStyle: area || forecastSeries.type === ForecastSeriesEnum.ForecastUpper