From 32d2408588c487cff2cf73e3cc132e5105ff4459 Mon Sep 17 00:00:00 2001
From: kailong321200875 <321200875@qq.com>
Date: Tue, 11 Oct 2022 14:34:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?style:=20cutMenu=E5=B1=82=E7=BA=A7=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/TabMenu/src/TabMenu.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/TabMenu/src/TabMenu.vue b/src/components/TabMenu/src/TabMenu.vue
index 0625e21..78b7348 100644
--- a/src/components/TabMenu/src/TabMenu.vue
+++ b/src/components/TabMenu/src/TabMenu.vue
@@ -144,7 +144,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-1000',
{
'w-[var(--tab-menu-max-width)]': !unref(collapse),
'w-[var(--tab-menu-min-width)]': unref(collapse)
From 993af6bb6576249e66e0c0ea592ebf851f65ab8c Mon Sep 17 00:00:00 2001
From: kailong321200875 <321200875@qq.com>
Date: Tue, 11 Oct 2022 14:44:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DcutMenu=E6=94=B6?=
=?UTF-8?q?=E8=B5=B7=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Setting/src/Setting.vue | 2 +-
src/components/TabMenu/src/TabMenu.vue | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/components/Setting/src/Setting.vue b/src/components/Setting/src/Setting.vue
index fd239f2..913833e 100644
--- a/src/components/Setting/src/Setting.vue
+++ b/src/components/Setting/src/Setting.vue
@@ -208,7 +208,7 @@ const clear = () => {
-
+
{{ t('setting.projectSetting') }}
diff --git a/src/components/TabMenu/src/TabMenu.vue b/src/components/TabMenu/src/TabMenu.vue
index 78b7348..1ec61ca 100644
--- a/src/components/TabMenu/src/TabMenu.vue
+++ b/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-1000',
+ '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)