Commit 0c5101256b249752664ea97a7c8c606a3a5abe06
1 parent
21b0e1fd
style: cutMenu层级样式
Showing
3 changed files
with
3 additions
and
6 deletions
yudao-ui-admin-vue3/package.json
| 1 | { | 1 | { |
| 2 | "name": "ruoyi-vue-pro-vue3", | 2 | "name": "ruoyi-vue-pro-vue3", |
| 3 | - "version": "1.6.4.1801", | 3 | + "version": "1.6.4.1811", |
| 4 | "description": "基于vue3、element-plus、typesScript、vite3", | 4 | "description": "基于vue3、element-plus、typesScript、vite3", |
| 5 | "author": "xingyu", | 5 | "author": "xingyu", |
| 6 | "private": false, | 6 | "private": false, |
yudao-ui-admin-vue3/src/components/Setting/src/Setting.vue
| @@ -208,7 +208,7 @@ const clear = () => { | @@ -208,7 +208,7 @@ const clear = () => { | ||
| 208 | <Icon icon="ep:setting" color="#fff" /> | 208 | <Icon icon="ep:setting" color="#fff" /> |
| 209 | </div> | 209 | </div> |
| 210 | 210 | ||
| 211 | - <ElDrawer v-model="drawer" direction="rtl" size="350px"> | 211 | + <ElDrawer v-model="drawer" direction="rtl" size="350px" :z-index="4000"> |
| 212 | <template #header> | 212 | <template #header> |
| 213 | <span class="text-16px font-700">{{ t('setting.projectSetting') }}</span> | 213 | <span class="text-16px font-700">{{ t('setting.projectSetting') }}</span> |
| 214 | </template> | 214 | </template> |
yudao-ui-admin-vue3/src/components/TabMenu/src/TabMenu.vue
| @@ -78,9 +78,6 @@ export default defineComponent({ | @@ -78,9 +78,6 @@ export default defineComponent({ | ||
| 78 | watch( | 78 | watch( |
| 79 | () => collapse.value, | 79 | () => collapse.value, |
| 80 | (collapse: boolean) => { | 80 | (collapse: boolean) => { |
| 81 | - if (unref(fixedMenu)) { | ||
| 82 | - return | ||
| 83 | - } | ||
| 84 | if (!collapse) { | 81 | if (!collapse) { |
| 85 | setTimeout(() => { | 82 | setTimeout(() => { |
| 86 | showTitle.value = !collapse | 83 | showTitle.value = !collapse |
| @@ -144,7 +141,7 @@ export default defineComponent({ | @@ -144,7 +141,7 @@ export default defineComponent({ | ||
| 144 | id={`${variables.namespace}-menu`} | 141 | id={`${variables.namespace}-menu`} |
| 145 | class={[ | 142 | class={[ |
| 146 | prefixCls, | 143 | prefixCls, |
| 147 | - 'relative bg-[var(--left-menu-bg-color)] top-1px z-99999', | 144 | + 'relative bg-[var(--left-menu-bg-color)] top-1px z-3000', |
| 148 | { | 145 | { |
| 149 | 'w-[var(--tab-menu-max-width)]': !unref(collapse), | 146 | 'w-[var(--tab-menu-max-width)]': !unref(collapse), |
| 150 | 'w-[var(--tab-menu-min-width)]': unref(collapse) | 147 | 'w-[var(--tab-menu-min-width)]': unref(collapse) |