Skip to content

feat(cascader): [cascader,tree] dark theme adaptation #3136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 19, 2025
Merged

feat(cascader): [cascader,tree] dark theme adaptation #3136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
49d190c
feat(cascader): [cascader,transfer,tree] dark theme adaptation
lcy0620 Mar 17, 2025
5a3afd0
feat(cascader): [cascader,transfer,tree] dark theme adaptation
lcy0620 Mar 18, 2025
a443747
feat(cascader): [cascader,transfer,tree] dark theme adaptation
lcy0620 Mar 18, 2025
d071009
feat(cascader): [cascader,transfer,tree] dark theme adaptation
lcy0620 Mar 18, 2025
0dce3d5
feat(cascader): [cascader,transfer,tree] dark theme adaptation
lcy0620 Mar 18, 2025
880562f
feat(cascader): [cascader,transfer,tree] dark theme adaptation
lcy0620 Mar 18, 2025
cba4ca2
feat(cascader): [cascader,transfer,tree] dark theme adaptation
lcy0620 Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/cascader/filterable-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,6 @@ const options = ref([
<style scoped lang="less">
.no-data {
text-align: center;
line-height: 240px;
line-height: 200px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/cascader/filterable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,6 @@ export default {
<style scoped lang="less">
.no-data {
text-align: center;
line-height: 240px;
line-height: 200px;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/transfer/custom-render-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ header {
}
:deep(.red) {
font-weight: bold;
color: red;
color: #d94838;
}
</style>
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/transfer/custom-render.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ header {
}
:deep(.red) {
font-weight: bold;
color: red;
color: #d94838;
}
</style>
4 changes: 2 additions & 2 deletions examples/sites/demos/pc/app/tree/icons-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
:data="data"
show-checkbox
:expand-icon="expandIcon"
expand-icon-color="#c2c2c2"
expand-icon-color="#5291FF"
:shrink-icon="shrinkIcon"
shrink-icon-color="#191919"
shrink-icon-color="#5291FF"
>
<template #prefix="{ node }">
<component v-if="node.data.icon === 'file'" :is="tinyIconFile"></component>
Expand Down
4 changes: 2 additions & 2 deletions examples/sites/demos/pc/app/tree/icons.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
:data="data"
show-checkbox
:expand-icon="expandIcon"
expand-icon-color="#c2c2c2"
expand-icon-color="#5291FF"
:shrink-icon="shrinkIcon"
shrink-icon-color="#191919"
shrink-icon-color="#5291FF"
>
<template #prefix="{ node }">
<component v-if="node.data.icon === 'file'" :is="tinyIconFile"></component>
Expand Down
2 changes: 1 addition & 1 deletion packages/theme/src/cascader-menu/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}

& &__wrap {
min-height: 204px;
min-height: 208px;
}
// tiny 新增： 直接使用级联面板时，高度要放开，不能被 tiny-scrollbar限制了
& &__wrap-expand {
Expand Down
14 changes: 10 additions & 4 deletions packages/theme/src/cascader-node/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
background: var(--tv-CascaderNode-selectable-active-bg-color);
color: var(--tv-CascaderNode-selectable-text-color);
&:hover {
background: var(--tv-CascaderNode-selectable-hover-bg-color);
background: var(--tv-CascaderNode-hover-bg-color);
}
}

&.in-active-path:hover {
background: var(--tv-CascaderNode-selectable-hover-bg-color);
background: var(--tv-CascaderNode-hover-bg-color);
}

&:not(.is-disabled):not(.in-active-path):not(.is-active) {
Expand Down Expand Up @@ -62,7 +62,7 @@

&__prefix,
&__postfix {
font-size: var(--tv-CascaderNode-icon-font-size);
font-size: var(--tv-CascaderNode-icon-size);
fill: var(--tv-CascaderNode-icon-color);
}

Expand All @@ -73,6 +73,9 @@
}
.@{cascader-node-prefix-cls}__label {
font-weight: var(--tv-CascaderNode-active-font-weight);
svg {
fill: var(--tv-CascaderNode-active-icon-color);
}
}
}

Expand All @@ -99,7 +102,10 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;

svg {
font-size: var(--tv-CascaderNode-icon-size);
fill: var(--tv-CascaderNode-icon-color);
}
// 兼容ie10-ie11
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
flex-basis: auto;
Expand Down
2 changes: 1 addition & 1 deletion packages/theme/src/cascader-node/vars.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
// 下拉列表子项禁用状态时的背景色
--tv-CascaderNode-disabled-bg-color: var(--tv-color-bg-disabled, #f0f0f0);
// 下拉列表子项的icon图标的字体大小
--tv-CascaderNode-icon-font-size: var(--tv-font-size-sm, 12px);
--tv-CascaderNode-icon-size: var(--tv-font-size-sm, 12px);
// 下拉列表子项的icon图标的色
--tv-CascaderNode-icon-color: var(--tv-color-icon, #808080);
// 下拉列表子项禁用时的icon图标的色
Expand Down
9 changes: 3 additions & 6 deletions packages/theme/src/cascader/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,10 @@
.@{cascader-prefix-cls}-panel {
justify-content: flex-start;
align-items: flex-start;
border: solid 1px var(--tv-Cascader-border-color);
}
.@{cascader-prefix-cls}-menu {
border: 1px solid #e4e7ed;
background:var(--tv-Cascader-dropdown-bg-color);
&:not(:first-child) {
margin-left: -1px;
}
.@{cascader-prefix-cls}-menu {
background:var(--tv-Cascader-dropdown-bg-color);
.@{cascader-prefix-cls}-menu__wrap {
height: auto;
padding-bottom: 6px;
Expand Down
4 changes: 3 additions & 1 deletion packages/theme/src/cascader/vars.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
--tv-Cascader-font-size: var(--tv-font-size-default, 14px);
// 输入框图标字体大小
--tv-Cascader-input-icon-font-size: 10px; // 无对应变量
// 下拉菜单边框色
--tv-Cascader-border-color: var(--tv-color-border-divider);
// 悬浮时显示的边框色
--tv-Cascader-hover-border-color: var(--tv-color-border-hover, #191919);
// 聚焦时显示的边框色
Expand Down Expand Up @@ -54,7 +56,7 @@
// 下拉列表子项悬浮时的背景色（没有生效）
--tv-Cascader-item-hover-bg-color: var(--tv-color-bg-hover);
// 搜索后下拉列表无匹配数据的文本色
--tv-Cascader-empty-text-color: var(--tv-color-text-weaken, #808080);
--tv-Cascader-empty-text-color: var(--tv-color-text-secondary);
// 搜索框的文本色（没有生效）
--tv-Cascader-search-input-text-color: var(--tv-color-text, #191919);
// 搜索框的占位符的文本色（没有生效）
Expand Down
4 changes: 3 additions & 1 deletion packages/theme/src/transfer/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@
text-align: left;
padding-right: var(--tv-Transfer-panel-body-padding-right);
padding-left: var(--tv-Transfer-panel-body-padding-left);

.tiny-table.simple table tbody tr:has(td svg.is-check) {
background-color: var(--tv-Transfer-panel-item-active-bg-color);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check compatibility of the ':has()' pseudo-class as it may not be supported in all browsers. Consider using an alternative approach for broader compatibility.

}
&.is-with-footer {
padding-bottom: var(--tv-Transfer-panel-body-footer-padding-bottom);
height: var(--tv-Transfer-panel-body-footer-height);
Expand Down
2 changes: 2 additions & 0 deletions packages/theme/src/transfer/vars.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@
--tv-Transfer-panel-item-hover-text-color: var(--tv-color-text, #191919);
// 面板悬浮时背景色
--tv-Transfer-panel-item-hover-bg-color: var(--tv-color-bg, #f5f5f5);
// 面板选中时背景色
--tv-Transfer-panel-item-active-bg-color: var(--tv-color-bg-active-emphasize-light);
// 面板搜索框高度
--tv-Transfer-panel-filter-height: 32px;
// 面板搜索框字体大小
Expand Down
4 changes: 3 additions & 1 deletion packages/theme/src/tree/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,10 @@
overflow: hidden;
padding-left: var(--tv-Tree-node-padding-left);

svg {
& > svg {
fill: var(--tv-Tree-node-operate-icon-color);
font-size: var(--tv-Tree-node-operate-icon-font-size);
margin-right: calc(var(--tv-Tree-node-label-margin-left) / 2);
&:hover {
fill: var(--tv-Tree-node-checked-icon-color);
}
Expand Down