From 607407b340bb4beac99a9d577db4b06a3db3b6ca Mon Sep 17 00:00:00 2001
From: likui628 <90845831+likui628@users.noreply.github.com>
Date: Mon, 5 Aug 2024 20:20:10 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=B0=86=E9=BB=98=E8=AE=A4=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=8A=A0=E5=85=A5=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/layouts/basic.vue           |  1 -
 .../layouts/src/basic/header/header.vue       | 59 +++++++++++++++----
 packages/effects/layouts/src/basic/layout.vue | 14 +----
 3 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/apps/web-antd/src/layouts/basic.vue b/apps/web-antd/src/layouts/basic.vue
index 6b7456e6d88..ab1832c2516 100644
--- a/apps/web-antd/src/layouts/basic.vue
+++ b/apps/web-antd/src/layouts/basic.vue
@@ -118,7 +118,6 @@ function handleMakeAll() {
 
 <template>
   <BasicLayout @clear-preferences-and-logout="handleLogout">
-    <!--    <template #header-1>插槽1</template>-->
     <template #user-dropdown>
       <UserDropdown
         :avatar
diff --git a/packages/effects/layouts/src/basic/header/header.vue b/packages/effects/layouts/src/basic/header/header.vue
index cea8fa78378..8ae3e6ea142 100644
--- a/packages/effects/layouts/src/basic/header/header.vue
+++ b/packages/effects/layouts/src/basic/header/header.vue
@@ -26,13 +26,38 @@ const accessStore = useAccessStore();
 const { globalSearchShortcutKey } = usePreferences();
 const slots = useSlots();
 const headerSlots = computed(() => {
-  const list = [{ index: 20, name: 'user-dropdown' }];
+  const list = [{ index: 30, name: 'user-dropdown' }];
   if (preferences.widget.globalSearch) {
+    list.push({
+      index: 5,
+      name: 'global-search',
+    });
+  }
+  if (preferences.widget.themeToggle) {
     list.push({
       index: 10,
+      name: 'theme-toggle',
+    });
+  }
+  if (preferences.widget.languageToggle) {
+    list.push({
+      index: 15,
+      name: 'language-toggle',
+    });
+  }
+  if (preferences.widget.fullscreen) {
+    list.push({
+      index: 20,
+      name: 'fullscreen',
+    });
+  }
+  if (preferences.widget.notification) {
+    list.push({
+      index: 25,
       name: 'notification',
     });
   }
+
   Object.keys(slots).forEach((key) => {
     const name = key.split('-');
     if (key.startsWith('header-')) {
@@ -51,17 +76,25 @@ const headerSlots = computed(() => {
     <slot name="menu"></slot>
   </div>
   <div class="flex h-full min-w-0 flex-shrink-0 items-center">
-    <GlobalSearch
-      v-if="preferences.widget.globalSearch"
-      :enable-shortcut-key="globalSearchShortcutKey"
-      :menus="accessStore.accessMenus"
-      class="mr-4"
-    />
-    <ThemeToggle v-if="preferences.widget.themeToggle" class="mr-2" />
-    <LanguageToggle v-if="preferences.widget.languageToggle" class="mr-2" />
-    <VbenFullScreen v-if="preferences.widget.fullscreen" class="mr-2" />
-    <!--    <slot v-if="preferences.widget.notification" name="notification"></slot>-->
-    <!--    <slot name="user-dropdown"></slot>-->
-    <slot v-for="slot in headerSlots" :name="slot.name"></slot>
+    <template v-for="slot in headerSlots" :key="slot.name">
+      <slot :name="slot.name">
+        <template v-if="slot.name === 'global-search'">
+          <GlobalSearch
+            :enable-shortcut-key="globalSearchShortcutKey"
+            :menus="accessStore.accessMenus"
+            class="mr-4"
+          />
+        </template>
+        <template v-else-if="slot.name === 'theme-toggle'">
+          <ThemeToggle class="mr-2" />
+        </template>
+        <template v-else-if="slot.name === 'language-toggle'">
+          <LanguageToggle class="mr-2" />
+        </template>
+        <template v-else-if="slot.name === 'fullscreen'">
+          <VbenFullScreen class="mr-2" />
+        </template>
+      </slot>
+    </template>
   </div>
 </template>
diff --git a/packages/effects/layouts/src/basic/layout.vue b/packages/effects/layouts/src/basic/layout.vue
index 940fefaa910..9748d6561be 100644
--- a/packages/effects/layouts/src/basic/layout.vue
+++ b/packages/effects/layouts/src/basic/layout.vue
@@ -135,11 +135,8 @@ watch(
   () => preferences.app.watermark,
   async (val) => {
     if (val) {
-      // await nextTick();
-
-      updateWatermark({
+      await updateWatermark({
         content: `${preferences.app.name} 用户名: ${userStore.userInfo?.username}`,
-        // parent: contentRef.value,
       });
     }
   },
@@ -147,15 +144,10 @@ watch(
     immediate: true,
   },
 );
+
 const slots = useSlots();
 const headerSlots = computed(() => {
-  const array: string[] = [];
-  Object.keys(slots).forEach((key: string) => {
-    if (key.startsWith('header-')) {
-      array.push(key);
-    }
-  });
-  return array;
+  return Object.keys(slots).filter((key) => key.startsWith('header-'));
 });
 </script>