From d1424ae6a030f6308fccb420897ac5c8b49011cc Mon Sep 17 00:00:00 2001
From: wuyiping0628 <1106773985@qq.com>
Date: Mon, 9 Sep 2024 01:32:26 -0700
Subject: [PATCH] fix(tag): [tag] updata tag xdesign
---
.../sites/demos/pc/app/tag/slot-default-composition-api.vue | 6 +++---
examples/sites/demos/pc/app/tag/slot-default.vue | 2 +-
packages/theme/src/tag/index.less | 2 +-
packages/theme/src/tag/smb-theme.js | 1 +
packages/theme/src/tag/vars.less | 2 ++
5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/examples/sites/demos/pc/app/tag/slot-default-composition-api.vue b/examples/sites/demos/pc/app/tag/slot-default-composition-api.vue
index 707110cf3..5a3e16e4c 100644
--- a/examples/sites/demos/pc/app/tag/slot-default-composition-api.vue
+++ b/examples/sites/demos/pc/app/tag/slot-default-composition-api.vue
@@ -8,8 +8,8 @@
标签
-
-
+
+
@@ -45,6 +45,6 @@ const TinyIconChevronRight = iconChevronRight()
font-size: 20px;
}
.tiny-only-iocn {
- border-radius: 0px 8px 0px 8px;
+ border-radius: 0px 6px;
}
diff --git a/examples/sites/demos/pc/app/tag/slot-default.vue b/examples/sites/demos/pc/app/tag/slot-default.vue
index efc5a511e..2fbba8242 100644
--- a/examples/sites/demos/pc/app/tag/slot-default.vue
+++ b/examples/sites/demos/pc/app/tag/slot-default.vue
@@ -53,6 +53,6 @@ export default {
font-size: 20px;
}
.tiny-only-iocn {
- border-radius: 0px 6px 0px 6px;
+ border-radius: 0px 6px;
}
diff --git a/packages/theme/src/tag/index.less b/packages/theme/src/tag/index.less
index a75e18d73..ff23f17b7 100644
--- a/packages/theme/src/tag/index.less
+++ b/packages/theme/src/tag/index.less
@@ -258,7 +258,7 @@
&.is-disabled:hover {
cursor: not-allowed;
color: #c2c2c2;
- background-color: rgba(0, 0, 0, 0.05);
+ background-color: var(--ti-tag-disabled-background-color);
svg,
svg:hover,
.@{tag-prefix-cls}__close {
diff --git a/packages/theme/src/tag/smb-theme.js b/packages/theme/src/tag/smb-theme.js
index 44ff94299..fc405f5fb 100644
--- a/packages/theme/src/tag/smb-theme.js
+++ b/packages/theme/src/tag/smb-theme.js
@@ -13,6 +13,7 @@ export const tinyTagSMBTheme = {
'ti-tag-border-radius': 'var(--ti-common-border-radius-2)',
'ti-tag-close-font-size': 'var(--ti-common-font-size-2)',
'ti-tag-close-margin-left': 'var(--ti-common-space-base)',
+ 'ti-tag-disabled-background-color': 'var(--ti-common-color-bg-disabled)',
'ti-tag-close-margin-right': 'calc(var(--ti-common-space-base) * -1)',
'ti-tag-close-medium-margin-left': 'var(--ti-common-space-2x)',
'ti-tag-close-medium-margin-right': 'calc(var(--ti-common-space-base) * -1)',
diff --git a/packages/theme/src/tag/vars.less b/packages/theme/src/tag/vars.less
index de601516c..71ea015ed 100644
--- a/packages/theme/src/tag/vars.less
+++ b/packages/theme/src/tag/vars.less
@@ -156,4 +156,6 @@
--ti-tag-grey-text-color: var(--ti-common-color-text-gray);
// grey标签背景色
--ti-tag-grey-bg-color: #e6e6e6;
+ // 禁用背景色
+ --ti-tag-disabled-background-color: rgba(0, 0, 0, 0.05);
}