kingecg
/
gohttpdUi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

This commit is contained in:
kailong321200875 2022-10-11 15:13:52 +08:00
parent 58dd38f46c 993af6bb65
commit 30e2cffd97
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Setting/src/Setting.vue
View File

@ -208,7 +208,7 @@ const clear = () => {
<Icon icon="ant-design:setting-outlined" color="#fff" /> <Icon icon="ant-design:setting-outlined" color="#fff" />
</div> </div>
<ElDrawer v-model="drawer" direction="rtl" size="350px"> <ElDrawer v-model="drawer" direction="rtl" size="350px" :z-index="4000">
<template #header> <template #header>
<span class="text-16px font-700">{{ t('setting.projectSetting') }}</span> <span class="text-16px font-700">{{ t('setting.projectSetting') }}</span>
</template> </template>

5
src/components/TabMenu/src/TabMenu.vue
View File

@ -78,9 +78,6 @@ export default defineComponent({
watch( watch(
() => collapse.value, () => collapse.value,
(collapse: boolean) => { (collapse: boolean) => {
if (unref(fixedMenu)) {
return
}
if (!collapse) { if (!collapse) {
setTimeout(() => { setTimeout(() => {
showTitle.value = !collapse showTitle.value = !collapse
@ -144,7 +141,7 @@ export default defineComponent({
id={`${variables.namespace}-menu`} id={`${variables.namespace}-menu`}
class={[ class={[
prefixCls, 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-max-width)]': !unref(collapse),
'w-[var(--tab-menu-min-width)]': unref(collapse) 'w-[var(--tab-menu-min-width)]': unref(collapse)