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/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 @@
-
+
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[]) || []
}
}