You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ma...@apache.org on 2025/03/20 03:11:45 UTC
(superset) branch template_less updated (e0d86df5a5 -> 11bc4965e3)
This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a change to branch template_less
in repository https://gitbox.apache.org/repos/asf/superset.git
from e0d86df5a5 merging
new b9be692e55 fix MoreOutlined button background
new 9cb6c3b039 color
new 1ca0f34210 more button background
new 11bc4965e3 echarts theming
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../plugin-chart-echarts/src/Funnel/transformProps.ts | 5 +++--
.../plugin-chart-echarts/src/Gauge/transformProps.ts | 1 +
.../plugin-chart-echarts/src/Radar/transformProps.ts | 17 +++++++++++++++++
.../plugin-chart-echarts/src/Sunburst/transformProps.ts | 11 +++++++----
.../src/Timeseries/transformProps.ts | 1 -
.../plugins/plugin-chart-echarts/src/Tree/constants.ts | 1 -
.../plugin-chart-echarts/src/Tree/transformProps.ts | 5 ++++-
.../plugin-chart-echarts/src/Treemap/transformProps.ts | 15 ++++++++++++---
.../src/Waterfall/transformProps.ts | 17 ++++++++++-------
.../plugins/plugin-chart-echarts/src/utils/series.ts | 4 ++--
.../src/SqlLab/components/SqlEditor/index.tsx | 7 ++++++-
.../src/components/Label/reusable/PublishedLabel.tsx | 7 ++-----
superset-frontend/src/features/charts/ChartCard.tsx | 2 +-
.../src/features/dashboards/DashboardCard.tsx | 2 +-
superset-frontend/src/features/tags/TagCard.tsx | 2 +-
15 files changed, 67 insertions(+), 30 deletions(-)
(superset) 04/04: echarts theming
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch template_less
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 11bc4965e36dc64286f263dcc644f3e95536f5cb
Author: Maxime Beauchemin <ma...@gmail.com>
AuthorDate: Wed Mar 19 20:09:00 2025 -0700
echarts theming
---
.../plugin-chart-echarts/src/Funnel/transformProps.ts | 5 +++--
.../plugin-chart-echarts/src/Gauge/transformProps.ts | 1 +
.../plugin-chart-echarts/src/Radar/transformProps.ts | 17 +++++++++++++++++
.../plugin-chart-echarts/src/Sunburst/transformProps.ts | 11 +++++++----
.../src/Timeseries/transformProps.ts | 1 -
.../plugins/plugin-chart-echarts/src/Tree/constants.ts | 1 -
.../plugin-chart-echarts/src/Tree/transformProps.ts | 5 ++++-
.../plugin-chart-echarts/src/Treemap/transformProps.ts | 15 ++++++++++++---
.../src/Waterfall/transformProps.ts | 17 ++++++++++-------
.../plugins/plugin-chart-echarts/src/utils/series.ts | 4 ++--
10 files changed, 56 insertions(+), 21 deletions(-)
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/transformProps.ts
index b2ba862e6a..ff5a97c348 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/transformProps.ts
@@ -227,7 +227,9 @@ export default function transformProps(
const defaultLabel = {
formatter,
show: showLabels,
- color: theme.colors.grayscale.dark2,
+ color: theme.colorText,
+ textBorderColor: theme.colorBgBase,
+ textBorderWidth: 1,
};
const series: FunnelSeriesOption[] = [
@@ -245,7 +247,6 @@ export default function transformProps(
label: {
...defaultLabel,
position: labelLine ? 'outer' : 'inner',
- textBorderColor: 'transparent',
},
emphasis: {
label: {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/transformProps.ts
index 2a0ebd85cc..29dcafc45b 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/transformProps.ts
@@ -183,6 +183,7 @@ export default function transformProps(
`${index * titleOffsetFromTitle + OFFSETS.titleFromCenter}%`,
],
fontSize,
+ color: theme.colorTextSecondary,
},
detail: {
offsetCenter: [
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Radar/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Radar/transformProps.ts
index c9d0d2cfe3..c991255abf 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Radar/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Radar/transformProps.ts
@@ -275,6 +275,23 @@ export default function transformProps(
radar: {
shape: isCircle ? 'circle' : 'polygon',
indicator,
+ splitLine: {
+ show: true,
+ lineStyle: {
+ color: theme.colorSplit,
+ },
+ },
+ splitArea: {
+ show: true,
+ areaStyle: {
+ color: [theme.colorBgLayout, theme.colorBgContainer],
+ },
+ },
+ axisLine: {
+ lineStyle: {
+ color: theme.colorSplit,
+ },
+ },
},
};
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Sunburst/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Sunburst/transformProps.ts
index 68b9b2d807..22da9e02ce 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Sunburst/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Sunburst/transformProps.ts
@@ -274,7 +274,11 @@ export default function transformProps(
} else {
linearColorScale(totalSecondaryValue / totalValue);
}
-
+ const labelProps = {
+ color: theme.colorText,
+ textBorderColor: theme.colorBgBase,
+ textBorderWidth: 1,
+ };
const traverse = (
treeNodes: TreeNode[],
path: string[],
@@ -316,7 +320,7 @@ export default function transformProps(
opacity: OpacityEnum.SemiTransparent,
},
label: {
- color: `rgba(0, 0, 0, ${OpacityEnum.SemiTransparent})`,
+ ...labelProps,
},
};
}
@@ -356,10 +360,10 @@ export default function transformProps(
},
},
label: {
+ ...labelProps,
width: (radius * 0.6) / (columns.length || 1),
show: showLabels,
formatter,
- color: theme.colors.grayscale.dark2,
minAngle: minShowLabelAngle,
overflow: 'breakAll',
},
@@ -381,7 +385,6 @@ export default function transformProps(
}
: null,
};
-
return {
formData,
width,
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
index 0fb392a12d..fff1d75b14 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
@@ -669,7 +669,6 @@ export default function transformProps(
const onFocusedSeries = (seriesName: string | null) => {
focusedSeries = seriesName;
};
-
return {
echartOptions,
emitCrossFilters,
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Tree/constants.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Tree/constants.ts
index 79cea342a2..38c3eb9498 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Tree/constants.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Tree/constants.ts
@@ -27,7 +27,6 @@ export const DEFAULT_TREE_SERIES_OPTION: TreeSeriesOption = {
animation: true,
animationDuration: 500,
animationEasing: 'cubicOut',
- lineStyle: { color: 'source', width: 1.5 },
};
export const DEFAULT_FORM_DATA: Partial<EchartsTreeFormData> = {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Tree/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Tree/transformProps.ts
index 6065545a11..7b8aefee52 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Tree/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Tree/transformProps.ts
@@ -199,7 +199,10 @@ export default function transformProps(
symbol,
roam,
symbolSize,
- lineStyle: DEFAULT_TREE_SERIES_OPTION.lineStyle,
+ lineStyle: {
+ color: theme.colorText,
+ width: 1.5,
+ },
select: DEFAULT_TREE_SERIES_OPTION.select,
leaves: { label: { position: childLabelPosition } },
},
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/transformProps.ts
index f38c229e3f..5ed0c565c3 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Treemap/transformProps.ts
@@ -163,6 +163,11 @@ export default function transformProps(
const metricLabel = getMetricLabel(metric);
const groupbyLabels = groupby.map(getColumnLabel);
const treeData = treeBuilder(data, groupbyLabels, metricLabel);
+ const labelProps = {
+ color: theme.colorText,
+ borderColor: theme.colorBgBase,
+ borderWidth: 1,
+ };
const traverse = (treeNodes: TreeNode[], path: string[]) =>
treeNodes.map(treeNode => {
const { name: nodeName, value, groupBy } = treeNode;
@@ -201,9 +206,12 @@ export default function transformProps(
...item,
itemStyle: {
colorAlpha: OpacityEnum.SemiTransparent,
+ color: theme.colorText,
+ borderColor: theme.colorBgBase,
+ borderWidth: 2,
},
label: {
- color: `rgba(0, 0, 0, ${OpacityEnum.SemiTransparent})`,
+ ...labelProps,
},
};
}
@@ -256,18 +264,20 @@ export default function transformProps(
},
emphasis: {
label: {
+ ...labelProps,
show: true,
},
},
levels,
label: {
+ ...labelProps,
show: showLabels,
position: labelPosition,
formatter,
- color: theme.colors.grayscale.dark2,
fontSize: LABEL_FONTSIZE,
},
upperLabel: {
+ ...labelProps,
show: showUpperLabels,
formatter,
textBorderColor: 'transparent',
@@ -290,7 +300,6 @@ export default function transformProps(
},
series,
};
-
return {
formData,
width,
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/transformProps.ts
index a1d410ab88..e2fc17e239 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/transformProps.ts
@@ -355,7 +355,13 @@ export default function transformProps(
disabled: true,
},
};
-
+ const labelProps = {
+ show: showValue,
+ formatter: seriesformatter,
+ color: theme.colorText,
+ borderColor: theme.colorBgBase,
+ borderWidth: 1,
+ };
const barSeries: BarSeriesOption[] = [
{
...seriesProps,
@@ -366,9 +372,8 @@ export default function transformProps(
...seriesProps,
name: LEGEND.INCREASE,
label: {
- show: showValue,
+ ...labelProps,
position: 'top',
- formatter: seriesformatter,
},
itemStyle: {
color: rgbToHex(increaseColor.r, increaseColor.g, increaseColor.b),
@@ -379,9 +384,8 @@ export default function transformProps(
...seriesProps,
name: LEGEND.DECREASE,
label: {
- show: showValue,
+ ...labelProps,
position: 'bottom',
- formatter: seriesformatter,
},
itemStyle: {
color: rgbToHex(decreaseColor.r, decreaseColor.g, decreaseColor.b),
@@ -392,9 +396,8 @@ export default function transformProps(
...seriesProps,
name: LEGEND.TOTAL,
label: {
- show: showValue,
+ ...labelProps,
position: 'top',
- formatter: seriesformatter,
},
itemStyle: {
color: rgbToHex(totalColor.r, totalColor.g, totalColor.b),
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts b/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
index e82e633c0f..e268c9b769 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
@@ -440,8 +440,8 @@ export function getLegendProps(
selectorLabel: {
fontFamily: theme.fontFamily,
fontSize: theme.fontSizeSM,
- color: theme.colors.grayscale.base,
- borderColor: theme.colors.grayscale.base,
+ color: theme.colorText,
+ borderColor: theme.colorBgBase,
},
};
const MIN_LEGEND_WIDTH = 0;
(superset) 01/04: fix MoreOutlined button background
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch template_less
in repository https://gitbox.apache.org/repos/asf/superset.git
commit b9be692e5507babc3fdb45a17d17becd21ce95d3
Author: Maxime Beauchemin <ma...@gmail.com>
AuthorDate: Wed Mar 19 16:28:10 2025 -0700
fix MoreOutlined button background
---
superset-frontend/src/features/charts/ChartCard.tsx | 2 +-
superset-frontend/src/features/dashboards/DashboardCard.tsx | 2 +-
superset-frontend/src/features/tags/TagCard.tsx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/superset-frontend/src/features/charts/ChartCard.tsx b/superset-frontend/src/features/charts/ChartCard.tsx
index 4c340ab524..a168391c5f 100644
--- a/superset-frontend/src/features/charts/ChartCard.tsx
+++ b/superset-frontend/src/features/charts/ChartCard.tsx
@@ -188,7 +188,7 @@ export default function ChartCard({
/>
)}
<Dropdown dropdownRender={() => menu} trigger={['click', 'hover']}>
- <Button buttonSize="xsmall" type="link">
+ <Button buttonSize="xsmall" type="link" buttonStyle="link">
<Icons.MoreOutlined iconSize="xl" />
</Button>
</Dropdown>
diff --git a/superset-frontend/src/features/dashboards/DashboardCard.tsx b/superset-frontend/src/features/dashboards/DashboardCard.tsx
index edfd28f6d0..f3b586b269 100644
--- a/superset-frontend/src/features/dashboards/DashboardCard.tsx
+++ b/superset-frontend/src/features/dashboards/DashboardCard.tsx
@@ -177,7 +177,7 @@ function DashboardCard({
/>
)}
<Dropdown dropdownRender={() => menu} trigger={['hover', 'click']}>
- <Button buttonSize="xsmall" type="link">
+ <Button buttonSize="xsmall" buttonStyle="link">
<Icons.MoreOutlined iconSize="xl" />
</Button>
</Dropdown>
diff --git a/superset-frontend/src/features/tags/TagCard.tsx b/superset-frontend/src/features/tags/TagCard.tsx
index 0bf1008f46..5ffd3bcd5d 100644
--- a/superset-frontend/src/features/tags/TagCard.tsx
+++ b/superset-frontend/src/features/tags/TagCard.tsx
@@ -109,7 +109,7 @@ function TagCard({
}}
>
<Dropdown dropdownRender={() => menu} trigger={['click', 'hover']}>
- <Button buttonSize="xsmall" type="link">
+ <Button buttonSize="xsmall" buttonStyle="link">
<Icons.MoreOutlined iconSize="xl" />
</Button>
</Dropdown>
(superset) 03/04: more button background
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch template_less
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 1ca0f342109380f39dc6bf3f260c2b796620535c
Author: Maxime Beauchemin <ma...@gmail.com>
AuthorDate: Wed Mar 19 17:02:57 2025 -0700
more button background
---
superset-frontend/src/SqlLab/components/SqlEditor/index.tsx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx b/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx
index f5a4b5e8b4..974daec645 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx
@@ -872,7 +872,12 @@ const SqlEditor: FC<Props> = ({
dropdownRender={() => renderDropdown()}
trigger={['click']}
>
- <Button buttonSize="xsmall" type="link" showMarginRight={false}>
+ <Button
+ buttonSize="xsmall"
+ type="link"
+ showMarginRight={false}
+ buttonStyle="link"
+ >
<Icons.EllipsisOutlined />
</Button>
</Dropdown>
(superset) 02/04: color
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch template_less
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 9cb6c3b039281f6572adcd312d6501970662f115
Author: Maxime Beauchemin <ma...@gmail.com>
AuthorDate: Wed Mar 19 16:57:58 2025 -0700
color
---
superset-frontend/src/components/Label/reusable/PublishedLabel.tsx | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/superset-frontend/src/components/Label/reusable/PublishedLabel.tsx b/superset-frontend/src/components/Label/reusable/PublishedLabel.tsx
index ec24180df0..ce33a5364a 100644
--- a/superset-frontend/src/components/Label/reusable/PublishedLabel.tsx
+++ b/superset-frontend/src/components/Label/reusable/PublishedLabel.tsx
@@ -33,12 +33,9 @@ const PublishedLabel: React.FC<PublishedLabelProps> = ({
const theme = useTheme();
const label = isPublished ? t('Published') : t('Draft');
const icon = isPublished ? (
- <Icons.CheckCircleOutlined
- iconSize="s"
- iconColor={theme.colors.primary.dark2}
- />
+ <Icons.CheckCircleOutlined iconSize="s" iconColor={theme.colorSuccess} />
) : (
- <Icons.MinusCircleOutlined iconSize="s" />
+ <Icons.MinusCircleOutlined iconSize="s" iconColor={theme.colorPrimary} />
);
const labelType = isPublished ? 'success' : 'primary';