From 25593cc2497b31c71b34fb22cb7e0a53a06f1e0a Mon Sep 17 00:00:00 2001
From: xxqc <xxqcs@qq.com>
Date: Wed, 5 Jul 2023 13:48:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=8B=E5=80=BC?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90=E6=97=B6=EF=BC=8C=E9=80=89?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BA=86=E4=B8=80=E4=B8=AA[1]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Tree/src/BasicTree.vue   | 3 ++-
 src/views/system/role/RoleMenuModal.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/Tree/src/BasicTree.vue b/src/components/Tree/src/BasicTree.vue
index 4a09f8c..03e84e5 100644
--- a/src/components/Tree/src/BasicTree.vue
+++ b/src/components/Tree/src/BasicTree.vue
@@ -85,7 +85,7 @@ export default defineComponent({
 
           const rawVal = toRaw(state.checkedKeys)
           emit('update:value', rawVal)
-          emit('check', rawVal, e)
+          emit('check', state.checkStrictly ? rawVal.checked : rawVal, e)
         },
         onRightClick: handleRightClick
       }
@@ -163,6 +163,7 @@ export default defineComponent({
 
     function checkAll(checkAll: boolean) {
       state.checkedKeys = checkAll ? getEnabledKeys() : ([] as KeyType[])
+      emit('check', state.checkedKeys, [])
     }
 
     function expandAll(expandAll: boolean) {
diff --git a/src/views/system/role/RoleMenuModal.vue b/src/views/system/role/RoleMenuModal.vue
index b0638e8..cd460d9 100644
--- a/src/views/system/role/RoleMenuModal.vue
+++ b/src/views/system/role/RoleMenuModal.vue
@@ -114,7 +114,7 @@ function menuCheck(checkedKeys: CheckKeys, event: CheckedEvent) {
     // 这里是子节点的ID
     menuKeys.value = checkedKeys as number[]
     // 这里是父节点的ID 默认空数组
-    menuHalfKeys.value = event.halfCheckedKeys as number[]
+    menuHalfKeys.value = (event.halfCheckedKeys as number[]) || []
   }
 }
 </script>

From 5a25a6d5621f93ef7e242f9eaadd198d2fdcde85 Mon Sep 17 00:00:00 2001
From: xxqc <xxqcs@qq.com>
Date: Wed, 5 Jul 2023 14:27:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9A=97=E9=BB=91?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=EF=BC=8C=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/default/tabs/index.less | 19 +++++++++++++------
 src/views/base/login/LoginForm.vue  |  8 +++++++-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/layouts/default/tabs/index.less b/src/layouts/default/tabs/index.less
index 2a70122..8a02782 100644
--- a/src/layouts/default/tabs/index.less
+++ b/src/layouts/default/tabs/index.less
@@ -6,14 +6,26 @@ html[data-theme='dark'] {
       border-bottom: none !important;
     }
   }
+  .ant-tabs-tab:not(.ant-tabs-tab-active) {
+    border: none !important;
+    &:hover {
+      color: inherit;
+      background-color: rgba(255, 255, 255, 0.5) !important;
+    }
+  }
 }
 
 html[data-theme='light'] {
   .@{prefix-cls} {
     .ant-tabs-tab:not(.ant-tabs-tab-active) {
       border: none !important;
+      &:hover {
+        color: inherit;
+        background-color: #dee1e6;
+      }
     }
   }
+
 }
 
 .@{prefix-cls} {
@@ -120,12 +132,7 @@ html[data-theme='light'] {
         }
       }
 
-      .ant-tabs-tab:not(.ant-tabs-tab-active) {
-        &:hover {
-          color: inherit;
-          background-color: #dee1e6;
-        }
-      }
+      
 
       .ant-tabs-tab-active {
         position: relative;
diff --git a/src/views/base/login/LoginForm.vue b/src/views/base/login/LoginForm.vue
index 35f54fd..86387ab 100644
--- a/src/views/base/login/LoginForm.vue
+++ b/src/views/base/login/LoginForm.vue
@@ -14,7 +14,13 @@
       <Input size="large" v-model:value="formData.username" :placeholder="t('sys.login.userName')" class="fix-auto-fill" />
     </FormItem>
     <FormItem name="password" class="enter-x">
-      <InputPassword size="large" visibilityToggle v-model:value="formData.password" :placeholder="t('sys.login.password')" />
+      <InputPassword
+        size="large"
+        visibilityToggle
+        v-model:value="formData.password"
+        :placeholder="t('sys.login.password')"
+        class="fix-auto-fill"
+      />
     </FormItem>
 
     <Row class="enter-x">