From 828264b31d42ffe9732e1455e5cefc6117f223f0 Mon Sep 17 00:00:00 2001 From: wuyiping0628 <1106773985@qq.com> Date: Sun, 8 Sep 2024 19:50:01 -0700 Subject: [PATCH 1/2] fix(alert): [alert] updata alert xdesign --- .../sites/demos/pc/app/tag/slot-default-composition-api.vue | 6 ++++++ examples/sites/demos/pc/app/tag/slot-default.vue | 6 ++++++ packages/design/smb/src/alert/index.ts | 5 ++--- packages/theme/src/tag/smb-theme.js | 2 +- 4 files changed, 15 insertions(+), 4 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 30dd4e5c93..707110cf3a 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,6 +8,9 @@ 标签 + + + @@ -41,4 +44,7 @@ const TinyIconChevronRight = iconChevronRight() .medium { font-size: 20px; } +.tiny-only-iocn { + border-radius: 0px 8px 0px 8px; +} diff --git a/examples/sites/demos/pc/app/tag/slot-default.vue b/examples/sites/demos/pc/app/tag/slot-default.vue index 7d4574576e..efc5a511e4 100644 --- a/examples/sites/demos/pc/app/tag/slot-default.vue +++ b/examples/sites/demos/pc/app/tag/slot-default.vue @@ -6,6 +6,9 @@ 标签 标签 标签 + + + @@ -49,4 +52,7 @@ export default { .medium { font-size: 20px; } +.tiny-only-iocn { + border-radius: 0px 6px 0px 6px; +} diff --git a/packages/design/smb/src/alert/index.ts b/packages/design/smb/src/alert/index.ts index 56686f74dc..5ca619b24d 100644 --- a/packages/design/smb/src/alert/index.ts +++ b/packages/design/smb/src/alert/index.ts @@ -1,9 +1,8 @@ -import { iconWarningTriangle, iconPromptExclamation } from '@opentiny/vue-icon' +import { iconWarningTriangle } from '@opentiny/vue-icon' export default { icons: { - warning: iconWarningTriangle(), - info: iconPromptExclamation() + warning: iconWarningTriangle() }, renderless: (props, hooks, { emit }, api) => { const state = api.state diff --git a/packages/theme/src/tag/smb-theme.js b/packages/theme/src/tag/smb-theme.js index cdaf18ff06..44ff942998 100644 --- a/packages/theme/src/tag/smb-theme.js +++ b/packages/theme/src/tag/smb-theme.js @@ -7,7 +7,7 @@ export const tinyTagSMBTheme = { 'ti-tag-medium-padding-horizontal': 'var(--ti-common-space-3x)', 'ti-tag-small-padding-horizontal': 'var(--ti-common-space-base)', 'ti-tag-small-border-radius': 'var(--ti-common-border-radius-1)', - 'ti-tag-primary-background-color': 'var(--ti-common-color-bg-light-normal)', + 'ti-tag-primary-background-color': 'var(--ti-common-color-bg-6)', 'ti-tag-info-background-color': 'var(--ti-common-color-bg-light-normal)', 'ti-tag-border-weight': '0', 'ti-tag-border-radius': 'var(--ti-common-border-radius-2)', From efb1cabde39aeb28ec458a41b806433e0551977b Mon Sep 17 00:00:00 2001 From: wuyiping0628 <1106773985@qq.com> Date: Mon, 9 Sep 2024 01:32:26 -0700 Subject: [PATCH 2/2] 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 707110cf3a..5a3e16e4c9 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 efc5a511e4..2fbba8242e 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 a75e18d739..ff23f17b72 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 44ff942998..fc405f5fbf 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 de601516c1..71ea015edf 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); }