diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json index 52c0f5311..a02f90c9d 100644 --- a/yudao-ui-admin-vue3/package.json +++ b/yudao-ui-admin-vue3/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi-vue-pro-vue3", - "version": "1.6.4.1801", + "version": "1.6.4.1811", "description": "基于vue3、element-plus、typesScript、vite3", "author": "xingyu", "private": false, diff --git a/yudao-ui-admin-vue3/src/components/Setting/src/Setting.vue b/yudao-ui-admin-vue3/src/components/Setting/src/Setting.vue index 628a22ea0..558c81c9a 100644 --- a/yudao-ui-admin-vue3/src/components/Setting/src/Setting.vue +++ b/yudao-ui-admin-vue3/src/components/Setting/src/Setting.vue @@ -208,7 +208,7 @@ const clear = () => { - + diff --git a/yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue b/yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue index 0625e21c5..1ec61ca27 100644 --- a/yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue +++ b/yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue @@ -78,9 +78,6 @@ export default defineComponent({ watch( () => collapse.value, (collapse: boolean) => { - if (unref(fixedMenu)) { - return - } if (!collapse) { setTimeout(() => { showTitle.value = !collapse @@ -144,7 +141,7 @@ export default defineComponent({ id={`${variables.namespace}-menu`} class={[ prefixCls, - 'relative bg-[var(--left-menu-bg-color)] top-1px z-99999', + 'relative bg-[var(--left-menu-bg-color)] top-1px z-3000', { 'w-[var(--tab-menu-max-width)]': !unref(collapse), 'w-[var(--tab-menu-min-width)]': unref(collapse)