From 0e06418d94c4b2b2584256f94b88d9a3fee928d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E5=A3=B0?= Date: Sat, 2 Oct 2021 15:03:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=85=AC=E5=85=B1=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=94=A8=E5=BD=93=E5=89=8D=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=8C=85=E8=A3=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../editable-select/src/editable-select.scss | 47 +++++++++---------- devui/vue-devui | 1 + 2 files changed, 23 insertions(+), 25 deletions(-) create mode 160000 devui/vue-devui diff --git a/devui/editable-select/src/editable-select.scss b/devui/editable-select/src/editable-select.scss index 0af1fe5e..4691547d 100644 --- a/devui/editable-select/src/editable-select.scss +++ b/devui/editable-select/src/editable-select.scss @@ -1,12 +1,28 @@ -@import '../../style/theme/color'; -@import '../../style/core/animation'; +@import "../../style/theme/color"; +@import "../../style/core/animation"; + +.devui-form-group { + input::-ms-clear { + display: none; + } + ul.devui-list-unstyled { + margin: 0; + overflow-y: auto; + padding: 0; + } + .devui-dropdown-bg { + background: $devui-list-item-hover-bg; + } + .devui-popup-tips { + color: $devui-text-weak; + padding: 4px 12px; + } +} .devui-select-chevron-icon { display: inline-flex; vertical-align: middle; - transition: - transform $devui-animation-duration-slow - $devui-animation-ease-in-out-smooth; + transition: transform $devui-animation-duration-slow $devui-animation-ease-in-out-smooth; } .devui-select-open .devui-select-chevron-icon { @@ -17,10 +33,6 @@ fill: $devui-text-weak; // TODO: Color-Question } -input::-ms-clear { - display: none; -} - .devui-no-data-tip { user-select: none; cursor: not-allowed; @@ -31,7 +43,7 @@ input::-ms-clear { padding-right: 24px; } -.devui-form-group.devui-has-feedback > .devui-form-control-feedback { +.devui-has-feedback > .devui-form-control-feedback { line-height: 26px; } // 下拉部分 @@ -89,18 +101,3 @@ input::-ms-clear { cursor: not-allowed; color: $devui-disabled-text; } - -ul.devui-list-unstyled { - margin: 0; - overflow-y: auto; - padding: 0; -} - -.devui-dropdown-bg { - background: $devui-list-item-hover-bg; -} - -.devui-popup-tips { - color: $devui-text-weak; - padding: 4px 12px; -} diff --git a/devui/vue-devui b/devui/vue-devui new file mode 160000 index 00000000..99a96e63 --- /dev/null +++ b/devui/vue-devui @@ -0,0 +1 @@ +Subproject commit 99a96e63021ee4c1970a9c211771330d2ca210af -- Gitee From 57dc98892e7727cbb5f2dc74b6a52d6f4469d598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E5=A3=B0?= Date: Sat, 2 Oct 2021 07:23:51 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20devu?= =?UTF-8?q?i/vue-devui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- devui/vue-devui | 1 - 1 file changed, 1 deletion(-) delete mode 160000 devui/vue-devui diff --git a/devui/vue-devui b/devui/vue-devui deleted file mode 160000 index 99a96e63..00000000 --- a/devui/vue-devui +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 99a96e63021ee4c1970a9c211771330d2ca210af -- Gitee From df54f523c7eacc8072dc1a746b0134cb19ad24ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E5=A3=B0?= Date: Sun, 3 Oct 2021 15:41:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=85=AC=E5=85=B1=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=94=A8=E5=BD=93=E5=89=8D=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=8C=85=E8=A3=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../editable-select/src/editable-select.scss | 94 +++++++++---------- 1 file changed, 45 insertions(+), 49 deletions(-) diff --git a/devui/editable-select/src/editable-select.scss b/devui/editable-select/src/editable-select.scss index 4691547d..02cf48b8 100644 --- a/devui/editable-select/src/editable-select.scss +++ b/devui/editable-select/src/editable-select.scss @@ -17,59 +17,61 @@ color: $devui-text-weak; padding: 4px 12px; } + .devui-form-control { + outline: none; + padding-right: 24px; + } } -.devui-select-chevron-icon { - display: inline-flex; - vertical-align: middle; - transition: transform $devui-animation-duration-slow $devui-animation-ease-in-out-smooth; -} - -.devui-select-open .devui-select-chevron-icon { - transform: rotate(180deg); -} - -.devui-select-chevron-icon svg path { - fill: $devui-text-weak; // TODO: Color-Question -} - -.devui-no-data-tip { - user-select: none; - cursor: not-allowed; +.devui-select-open { + .devui-select-chevron-icon{ + transform: rotate(180deg); + svg path { + fill: $devui-text-weak; // TODO: Color-Question + } + } } -.devui-form-control { - outline: none; - padding-right: 24px; +.devui-form-control-feedback{ + .devui-select-chevron-icon { + display: inline-flex; + vertical-align: middle; + transition: transform $devui-animation-duration-slow $devui-animation-ease-in-out-smooth; + } } .devui-has-feedback > .devui-form-control-feedback { line-height: 26px; } -// 下拉部分 -.devui-dropdown-menu { - width: 100%; - display: block; -} - -.devui-dropdown-item { - cursor: pointer; - display: block; - width: 100%; - padding: 8px 12px; - clear: both; - border: 0; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - line-height: 14px; -} -.devui-dropdown-menu { - .devui-dropdown-item:not(.disabled) { - &.selected { - color: $devui-list-item-active-text; - background-color: $devui-list-item-active-bg; +// 下拉部分 +.devui-dropdown-wrap { + .devui-dropdown-menu { + width: 100%; + display: block; + .devui-dropdown-item { + cursor: pointer; + display: block; + width: 100%; + padding: 8px 12px; + clear: both; + border: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + line-height: 14px; + } + .devui-dropdown-item:not(.disabled) { + &.selected { + color: $devui-list-item-active-text; + background-color: $devui-list-item-active-bg; + } + } + // 选项disabled + .devui-dropdown-item.disabled, + .devui-dropdown-item.disabled:hover { + cursor: not-allowed; + color: $devui-disabled-text; } } } @@ -95,9 +97,3 @@ background-color: $devui-unavailable; } } -// 选项disabled -.devui-dropdown-item.disabled, -.devui-dropdown-item.disabled:hover { - cursor: not-allowed; - color: $devui-disabled-text; -} -- Gitee