From 94c2887c8108b39f45c6abdae2f541476c123899 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Thu, 26 Jan 2023 22:13:01 +0800 Subject: [PATCH] fix: button classname error --- components/button/button.tsx | 3 +-- components/form/style/index.less | 1 - components/form/style/rtl.less | 1 - components/input/style/search-input.less | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/components/button/button.tsx b/components/button/button.tsx index 23761d7a5..81cd2f7aa 100644 --- a/components/button/button.tsx +++ b/components/button/button.tsx @@ -85,8 +85,8 @@ export default defineComponent({ return { [hashId.value]: true, [`${pre}`]: true, - [`${pre}-${type}`]: type, [`${pre}-${shape}`]: shape !== 'default' && shape, + [`${pre}-${type}`]: type, [`${pre}-${sizeCls}`]: sizeCls, [`${pre}-loading`]: innerLoading.value, [`${pre}-background-ghost`]: ghost && !isUnBorderedButtonType(type), @@ -177,7 +177,6 @@ export default defineComponent({ if (!disabled) { delete buttonProps.disabled; } - const iconNode = icon && !innerLoading.value ? ( icon diff --git a/components/form/style/index.less b/components/form/style/index.less index 99ee0e90a..97be5a012 100644 --- a/components/form/style/index.less +++ b/components/form/style/index.less @@ -1,7 +1,6 @@ @import '../../style/themes/index'; @import '../../style/mixins/index'; @import '../../input/style/mixin'; -@import '../../button/style/mixin'; @import '../../grid/style/mixin'; @import './components'; @import './inline'; diff --git a/components/form/style/rtl.less b/components/form/style/rtl.less index 505ee0c52..7a297ef9c 100644 --- a/components/form/style/rtl.less +++ b/components/form/style/rtl.less @@ -1,7 +1,6 @@ @import '../../style/themes/index'; @import '../../style/mixins/index'; @import '../../input/style/mixin'; -@import '../../button/style/mixin'; @import '../../grid/style/mixin'; @form-prefix-cls: ~'@{ant-prefix}-form'; diff --git a/components/input/style/search-input.less b/components/input/style/search-input.less index 06d52022f..7a92cfb2d 100644 --- a/components/input/style/search-input.less +++ b/components/input/style/search-input.less @@ -1,6 +1,5 @@ @import '../../style/themes/index'; @import '../../style/mixins/index'; -@import '../../button/style/mixin'; @import './mixin'; @search-prefix: ~'@{ant-prefix}-input-search';