From 61d1a05100e6e47d5b9b5e09434d78b24705a658 Mon Sep 17 00:00:00 2001 From: zhongfabin Date: Sun, 10 Oct 2021 16:06:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E5=8D=95=E8=AF=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- devui/button/src/button.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devui/button/src/button.tsx b/devui/button/src/button.tsx index 080db685..f8b1ed34 100644 --- a/devui/button/src/button.tsx +++ b/devui/button/src/button.tsx @@ -22,10 +22,10 @@ export default defineComponent({ const btnClass = computed(() => { const { btnStyle, size, position, bordered, icon } = props; const origin = `devui-btn devui-btn-${btnStyle} devui-btn-${size} devui-btn-${position}`; - const broderedClazz = bordered ? 'bordered' : ''; + const borderedClazz = bordered ? 'bordered' : ''; const btnIcon = !!icon && !hasContent.value && btnStyle !== 'primary' ? 'd-btn-icon' : ''; const btnIconWrap = !!icon ? 'd-btn-icon-wrap' : ''; - return `${origin} ${broderedClazz} ${btnIcon} ${btnIconWrap}`; + return `${origin} ${borderedClazz} ${btnIcon} ${btnIconWrap}`; }); const iconClass = computed(() => { @@ -72,4 +72,4 @@ export default defineComponent({ ); } } -}); \ No newline at end of file +}); -- Gitee From 2f40639143f49ab4fc83ab8fc24edb4fdad0ec8f Mon Sep 17 00:00:00 2001 From: zhongfabin Date: Tue, 12 Oct 2021 20:52:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20button=20=E4=B8=AD=20borderClaz?= =?UTF-8?q?z=20=E6=94=B9=E4=B8=BA=20borderClass?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- devui/button/src/button.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devui/button/src/button.tsx b/devui/button/src/button.tsx index f8b1ed34..0130fd82 100644 --- a/devui/button/src/button.tsx +++ b/devui/button/src/button.tsx @@ -22,10 +22,10 @@ export default defineComponent({ const btnClass = computed(() => { const { btnStyle, size, position, bordered, icon } = props; const origin = `devui-btn devui-btn-${btnStyle} devui-btn-${size} devui-btn-${position}`; - const borderedClazz = bordered ? 'bordered' : ''; + const borderedClass = bordered ? 'bordered' : ''; const btnIcon = !!icon && !hasContent.value && btnStyle !== 'primary' ? 'd-btn-icon' : ''; const btnIconWrap = !!icon ? 'd-btn-icon-wrap' : ''; - return `${origin} ${borderedClazz} ${btnIcon} ${btnIconWrap}`; + return `${origin} ${borderedClass} ${btnIcon} ${btnIconWrap}`; }); const iconClass = computed(() => { -- Gitee