Merge branch 'dev'

DevCloudFE · Mar 30, 2024 · 769e002 · 769e002
2 parents 75bd63f + 0ac9488
commit 769e002
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/packages/devui-vue/devui/menu/src/styles/vertical.scss b/packages/devui-vue/devui/menu/src/styles/vertical.scss
@@ -10,7 +10,6 @@
     width $devui-animation-duration-slow $devui-animation-ease-in-smooth,
     padding $devui-animation-duration-slow $devui-animation-ease-in-smooth;
   border-right: $devui-line 1px solid;
-  background: $devui-area !important;
 
   ::after {
     transition: all $devui-animation-duration-fast $devui-animation-ease-in-smooth;
@@ -60,6 +59,12 @@
     color: $devui-menu-item;
     background: $devui-block;
     display: flex;
+    transition: background-color $devui-animation-duration-fast $devui-animation-ease-in-out-smooth;
+
+    &:hover {
+      color: $devui-list-item-hover-text;
+      background-color: $devui-list-item-hover-bg;
+    }
 
     span:nth-child(2) {
       // flex: auto;
@@ -88,7 +93,6 @@
     padding: 0;
     .#{$devui-prefix}-menu-item {
       display: flex;
-      background: $devui-area;
 
       & > span {
         flex: auto;
@@ -109,6 +113,12 @@
       padding-left: 18px;
       align-items: center;
       color: $devui-menu-item;
+      transition: background-color $devui-animation-duration-fast $devui-animation-ease-in-out-smooth;
+
+      &:hover {
+        color: $devui-list-item-hover-text;
+        background-color: $devui-list-item-hover-bg;
+      }
 
       &:nth-child(1) {
         font-size: $devui-font-size-lg;

diff --git a/packages/devui-vue/devui/select/src/use-select.ts b/packages/devui-vue/devui/select/src/use-select.ts
@@ -124,7 +124,7 @@ export default function useSelect(
 
   const getInjectOptions = (values: KeyType<OptionObjectItem, 'value'>[]) => {
     return values.map((value) => {
-      if (props.multiple && props.allowCreate) {
+      if (props.allowCreate) {
         const option = injectOptions.value.get(value);
         if (option) {
           return option;
@@ -208,6 +208,9 @@ export default function useSelect(
       }
       getMultipleSelected(checkedItems);
     } else {
+      if (item.create) {
+        filterQuery.value = '';
+      }
       ctx.emit('update:modelValue', item.value);
       getSingleSelected(item);
       toggleChange(false);

diff --git a/packages/devui-vue/devui/switch/src/switch.scss b/packages/devui-vue/devui/switch/src/switch.scss
@@ -18,7 +18,7 @@
     width: 100%;
     height: 62.5%;
     border-radius: $devui-border-radius-full;
-    background: $devui-line;
+    background: $devui-shape-icon-fill;
     border: 1px solid $devui-line;
     position: relative;
     display: inline-block;

diff --git a/packages/devui-vue/package.json b/packages/devui-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-devui",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "license": "MIT",
   "description": "DevUI components based on Vite and Vue3",
   "keywords": [