Merge branch 'develop'

src/components/Setting/src/Setting.vue

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

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)