Skip to content

Commit 769e002

Browse files
committed
Merge branch 'dev'
2 parents 75bd63f + 0ac9488 commit 769e002

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

packages/devui-vue/devui/menu/src/styles/vertical.scss

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
width $devui-animation-duration-slow $devui-animation-ease-in-smooth,
1111
padding $devui-animation-duration-slow $devui-animation-ease-in-smooth;
1212
border-right: $devui-line 1px solid;
13-
background: $devui-area !important;
1413

1514
::after {
1615
transition: all $devui-animation-duration-fast $devui-animation-ease-in-smooth;
@@ -60,6 +59,12 @@
6059
color: $devui-menu-item;
6160
background: $devui-block;
6261
display: flex;
62+
transition: background-color $devui-animation-duration-fast $devui-animation-ease-in-out-smooth;
63+
64+
&:hover {
65+
color: $devui-list-item-hover-text;
66+
background-color: $devui-list-item-hover-bg;
67+
}
6368

6469
span:nth-child(2) {
6570
// flex: auto;
@@ -88,7 +93,6 @@
8893
padding: 0;
8994
.#{$devui-prefix}-menu-item {
9095
display: flex;
91-
background: $devui-area;
9296

9397
& > span {
9498
flex: auto;
@@ -109,6 +113,12 @@
109113
padding-left: 18px;
110114
align-items: center;
111115
color: $devui-menu-item;
116+
transition: background-color $devui-animation-duration-fast $devui-animation-ease-in-out-smooth;
117+
118+
&:hover {
119+
color: $devui-list-item-hover-text;
120+
background-color: $devui-list-item-hover-bg;
121+
}
112122

113123
&:nth-child(1) {
114124
font-size: $devui-font-size-lg;

packages/devui-vue/devui/select/src/use-select.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ export default function useSelect(
124124

125125
const getInjectOptions = (values: KeyType<OptionObjectItem, 'value'>[]) => {
126126
return values.map((value) => {
127-
if (props.multiple && props.allowCreate) {
127+
if (props.allowCreate) {
128128
const option = injectOptions.value.get(value);
129129
if (option) {
130130
return option;
@@ -208,6 +208,9 @@ export default function useSelect(
208208
}
209209
getMultipleSelected(checkedItems);
210210
} else {
211+
if (item.create) {
212+
filterQuery.value = '';
213+
}
211214
ctx.emit('update:modelValue', item.value);
212215
getSingleSelected(item);
213216
toggleChange(false);

packages/devui-vue/devui/switch/src/switch.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
width: 100%;
1919
height: 62.5%;
2020
border-radius: $devui-border-radius-full;
21-
background: $devui-line;
21+
background: $devui-shape-icon-fill;
2222
border: 1px solid $devui-line;
2323
position: relative;
2424
display: inline-block;

packages/devui-vue/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-devui",
3-
"version": "1.6.6",
3+
"version": "1.6.7",
44
"license": "MIT",
55
"description": "DevUI components based on Vite and Vue3",
66
"keywords": [

0 commit comments

Comments
 (0)