From 3c21d78ead7d0a4a17300e78f7af250e2f13ba78 Mon Sep 17 00:00:00 2001 From: Cv-Enginner123 <1136261471@qq.com> Date: Wed, 21 Sep 2022 16:30:25 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix(radio):=20=E4=BF=AE=E5=A4=8D=20radio-gr?= =?UTF-8?q?oup=20=E6=8C=89=E9=92=AE=E5=BD=A2=E6=80=81=E5=B1=9E=E6=80=A7=20?= =?UTF-8?q?direction=3D"column"=20=E6=97=B6=E6=A0=B7=E5=BC=8F=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devui/radio/src/radio-button.scss | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/packages/devui-vue/devui/radio/src/radio-button.scss b/packages/devui-vue/devui/radio/src/radio-button.scss index 36b3ba94cd..255190f3ce 100644 --- a/packages/devui-vue/devui/radio/src/radio-button.scss +++ b/packages/devui-vue/devui/radio/src/radio-button.scss @@ -29,7 +29,6 @@ $button-padding-map: ( color: $devui-text; cursor: pointer; border: 1px solid $devui-line; - border-left: none; user-select: none; @each $size in ('lg', 'md', 'sm') { &.#{$devui-prefix}-radio-button--#{$size} { @@ -69,16 +68,30 @@ $button-padding-map: ( background-color: #ffffff; border-color: $devui-disabled-line; } +} + +.#{$devui-prefix}-radio-group { + &.is-row { + .#{$devui-prefix}-radio-button { + border-left: none; + + &:first-child { + border-top-left-radius: $devui-border-radius; + border-bottom-left-radius: $devui-border-radius; + border-left: 1px solid $devui-disabled-line; + box-shadow: none; + } - &:first-child { - border-top-left-radius: $devui-border-radius; - border-bottom-left-radius: $devui-border-radius; - border-left: 1px solid $devui-disabled-line; - box-shadow: none; + &:last-child { + border-top-right-radius: $devui-border-radius; + border-bottom-right-radius: $devui-border-radius; + } + } } - &:last-child { - border-top-right-radius: $devui-border-radius; - border-bottom-right-radius: $devui-border-radius; + &.is-column { + .#{$devui-prefix}-radio-button { + border-radius: $devui-border-radius; + } } } From 1ed6c41ebdb5c19ea819f9c4c8ad06383f346a7c Mon Sep 17 00:00:00 2001 From: Cv-Enginner123 <1136261471@qq.com> Date: Wed, 21 Sep 2022 16:30:56 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix(checkbox):=20=E4=BF=AE=E5=A4=8D=20check?= =?UTF-8?q?box-group=20=E6=8C=89=E9=92=AE=E5=BD=A2=E6=80=81=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=20direction=3D"column"=20=E6=97=B6=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devui/checkbox/src/checkbox-button.scss | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/packages/devui-vue/devui/checkbox/src/checkbox-button.scss b/packages/devui-vue/devui/checkbox/src/checkbox-button.scss index 83bdeb3747..3de973a754 100644 --- a/packages/devui-vue/devui/checkbox/src/checkbox-button.scss +++ b/packages/devui-vue/devui/checkbox/src/checkbox-button.scss @@ -81,20 +81,34 @@ $checkbox-label-height-map: ( border-color: $devui-disabled-line; } } +} - &:first-child { - .#{$devui-prefix}-checkbox-button__content { - border-top-left-radius: $devui-border-radius; - border-bottom-left-radius: $devui-border-radius; - border-left: 1px solid $devui-disabled-line; - box-shadow: none; +.#{$devui-prefix}-checkbox__group { + &.is-row { + .#{$devui-prefix}-checkbox-button { + border-left: none; + + &:first-child { + .#{$devui-prefix}-checkbox-button__content { + border-top-left-radius: $devui-border-radius; + border-bottom-left-radius: $devui-border-radius; + border-left: 1px solid $devui-disabled-line; + box-shadow: none; + } + } + + &:last-child { + .#{$devui-prefix}-checkbox-button__content { + border-top-right-radius: $devui-border-radius; + border-bottom-right-radius: $devui-border-radius; + } + } } } - &:last-child { + &.is-column { .#{$devui-prefix}-checkbox-button__content { - border-top-right-radius: $devui-border-radius; - border-bottom-right-radius: $devui-border-radius; + border-radius: $devui-border-radius; } } } From aee6968913b1a3cc626c425aeb0d82ed730d2f6b Mon Sep 17 00:00:00 2001 From: Cv-Engineer123 <1136261471@qq.com> Date: Wed, 28 Sep 2022 18:24:09 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix(checkbox):=20=E4=BF=AE=E5=A4=8D=20check?= =?UTF-8?q?box-group=20=E6=8C=89=E9=92=AE=E5=BD=A2=E6=80=81=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=20direction=3D"column"=20=E6=97=B6=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devui/checkbox/src/checkbox-button.scss | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/packages/devui-vue/devui/checkbox/src/checkbox-button.scss b/packages/devui-vue/devui/checkbox/src/checkbox-button.scss index 3de973a754..1e52cca36e 100644 --- a/packages/devui-vue/devui/checkbox/src/checkbox-button.scss +++ b/packages/devui-vue/devui/checkbox/src/checkbox-button.scss @@ -42,7 +42,6 @@ $checkbox-label-height-map: ( padding: 10px 20px; cursor: pointer; border: 1px solid $devui-disabled-line; - border-left: none; display: inline-block; line-height: 1; user-select: none; @@ -86,7 +85,9 @@ $checkbox-label-height-map: ( .#{$devui-prefix}-checkbox__group { &.is-row { .#{$devui-prefix}-checkbox-button { - border-left: none; + &__content { + border-left: none; + } &:first-child { .#{$devui-prefix}-checkbox-button__content { @@ -107,8 +108,31 @@ $checkbox-label-height-map: ( } &.is-column { - .#{$devui-prefix}-checkbox-button__content { - border-radius: $devui-border-radius; + .#{$devui-prefix}-checkbox-button { + width: 100%; + margin-top: 0; + + &__content { + width: 100%; + border-top: none; + box-shadow: 0 -1px 0 0 $devui-disabled-line; + } + + &:first-child { + .#{$devui-prefix}-checkbox-button__content { + border-top-left-radius: $devui-border-radius; + border-top-right-radius: $devui-border-radius; + border-top: 1px solid $devui-disabled-line; + box-shadow: none; + } + } + + &:last-child { + .#{$devui-prefix}-checkbox-button__content { + border-bottom-left-radius: $devui-border-radius; + border-bottom-right-radius: $devui-border-radius; + } + } } } } From f57b722bd0896ae3bc5347355b6ee1a6a13e55cc Mon Sep 17 00:00:00 2001 From: Cv-Engineer123 <1136261471@qq.com> Date: Wed, 28 Sep 2022 18:26:35 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix(radio):=20=E4=BF=AE=E5=A4=8D=20radio-gr?= =?UTF-8?q?oup=20=E6=8C=89=E9=92=AE=E5=BD=A2=E6=80=81=E5=B1=9E=E6=80=A7=20?= =?UTF-8?q?direction=3D"column"=20=E6=97=B6=E6=A0=B7=E5=BC=8F=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devui-vue/devui/radio/src/radio-button.scss | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/devui-vue/devui/radio/src/radio-button.scss b/packages/devui-vue/devui/radio/src/radio-button.scss index 255190f3ce..aba92a52f0 100644 --- a/packages/devui-vue/devui/radio/src/radio-button.scss +++ b/packages/devui-vue/devui/radio/src/radio-button.scss @@ -91,7 +91,20 @@ $button-padding-map: ( &.is-column { .#{$devui-prefix}-radio-button { - border-radius: $devui-border-radius; + width: 100%; + border-top: none; + + &:first-child { + border-top-left-radius: $devui-border-radius; + border-top-right-radius: $devui-border-radius; + border-top: 1px solid $devui-disabled-line; + box-shadow: none; + } + + &:last-child { + border-bottom-left-radius: $devui-border-radius; + border-bottom-right-radius: $devui-border-radius; + } } } } From 87c9404b36c00deb9e45b9ba34a6c0282e2dd081 Mon Sep 17 00:00:00 2001 From: Cv-Engineer123 <1136261471@qq.com> Date: Wed, 28 Sep 2022 18:46:51 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix(radio):=20=E7=A7=BB=E9=99=A4group?= =?UTF-8?q?=E4=B8=AD=E6=97=A0=E7=94=A8=E7=9A=84box-shadow:=20none=EF=BC=88?= =?UTF-8?q?=E5=9B=A0=E4=B8=BAradio-button=E5=B9=B6=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=9C=AA=E5=AE=9A=E4=B9=89box-shadow=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/devui-vue/devui/radio/src/radio-button.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/devui-vue/devui/radio/src/radio-button.scss b/packages/devui-vue/devui/radio/src/radio-button.scss index aba92a52f0..44c3d300b1 100644 --- a/packages/devui-vue/devui/radio/src/radio-button.scss +++ b/packages/devui-vue/devui/radio/src/radio-button.scss @@ -79,7 +79,6 @@ $button-padding-map: ( border-top-left-radius: $devui-border-radius; border-bottom-left-radius: $devui-border-radius; border-left: 1px solid $devui-disabled-line; - box-shadow: none; } &:last-child { @@ -98,7 +97,6 @@ $button-padding-map: ( border-top-left-radius: $devui-border-radius; border-top-right-radius: $devui-border-radius; border-top: 1px solid $devui-disabled-line; - box-shadow: none; } &:last-child { From 458e6bfd07df7b112a3db13a7112827f03ec00ea Mon Sep 17 00:00:00 2001 From: Cv-Engineer123 <1136261471@qq.com> Date: Wed, 28 Sep 2022 18:51:43 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix(checkbox):=20=E5=B0=86checkbox-button?= =?UTF-8?q?=E7=9A=84box-shadow=E6=9B=B4=E6=94=B9=E5=88=B0group=E4=B8=AD(?= =?UTF-8?q?=E8=8B=A5=E4=B8=8D=E4=BD=BF=E7=94=A8group=E6=97=B6=E5=88=99?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81box-shadow)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/devui-vue/devui/checkbox/src/checkbox-button.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devui-vue/devui/checkbox/src/checkbox-button.scss b/packages/devui-vue/devui/checkbox/src/checkbox-button.scss index 1e52cca36e..be66e264af 100644 --- a/packages/devui-vue/devui/checkbox/src/checkbox-button.scss +++ b/packages/devui-vue/devui/checkbox/src/checkbox-button.scss @@ -45,7 +45,6 @@ $checkbox-label-height-map: ( display: inline-block; line-height: 1; user-select: none; - box-shadow: -1px 0 0 0 $devui-disabled-line; @each $size in ('lg', 'md', 'sm') { &.#{$devui-prefix}-checkbox-button--#{$size} { font-size: map-get($font-size-map, #{$size}); @@ -87,6 +86,7 @@ $checkbox-label-height-map: ( .#{$devui-prefix}-checkbox-button { &__content { border-left: none; + box-shadow: -1px 0 0 0 $devui-disabled-line; } &:first-child {