From 894b0f1c182a36ad1774a8144bf50dd4e0b62a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=87=95=E5=8D=9A=E6=96=87?= <349952469@qq.com>
Date: Fri, 17 Jun 2022 15:59:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(projects):=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=A1=B6=E9=83=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/BasicLayout/index.vue          | 11 ++++++++++-
 src/layouts/common/GlobalBackTop/index.vue | 13 +++++++++++++
 src/layouts/common/index.ts                |  3 ++-
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 src/layouts/common/GlobalBackTop/index.vue

diff --git a/src/layouts/BasicLayout/index.vue b/src/layouts/BasicLayout/index.vue
index 28ae640c..601d51d1 100644
--- a/src/layouts/BasicLayout/index.vue
+++ b/src/layouts/BasicLayout/index.vue
@@ -27,6 +27,7 @@
       <global-footer />
     </template>
   </admin-layout>
+  <global-back-top />
   <setting-drawer />
 </template>
 
@@ -35,7 +36,15 @@ import AdminLayout from '@soybeanjs/vue-admin-layout';
 import { useAppStore, useThemeStore } from '@/store';
 import { useBasicLayout } from '@/composables';
 import { useBoolean } from '@/hooks';
-import { SettingDrawer, GlobalHeader, GlobalTab, GlobalSider, GlobalContent, GlobalFooter } from '../common';
+import {
+  SettingDrawer,
+  GlobalHeader,
+  GlobalTab,
+  GlobalSider,
+  GlobalContent,
+  GlobalFooter,
+  GlobalBackTop
+} from '../common';
 
 const app = useAppStore();
 const theme = useThemeStore();
diff --git a/src/layouts/common/GlobalBackTop/index.vue b/src/layouts/common/GlobalBackTop/index.vue
new file mode 100644
index 00000000..a2373ecc
--- /dev/null
+++ b/src/layouts/common/GlobalBackTop/index.vue
@@ -0,0 +1,13 @@
+<template>
+  <n-back-top :show="show" class="z-1000" />
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue';
+import { useWindowScroll } from '@vueuse/core';
+
+const { y: scrollY } = useWindowScroll();
+
+const show = computed(() => scrollY.value > 180);
+</script>
+<style scoped></style>
diff --git a/src/layouts/common/index.ts b/src/layouts/common/index.ts
index 40f8c81e..b6d3f0b9 100644
--- a/src/layouts/common/index.ts
+++ b/src/layouts/common/index.ts
@@ -5,5 +5,6 @@ import GlobalSider from './GlobalSider/index.vue';
 import GlobalContent from './GlobalContent/index.vue';
 import GlobalFooter from './GlobalFooter/index.vue';
 import GlobalLogo from './GlobalLogo/index.vue';
+import GlobalBackTop from './GlobalBackTop/index.vue';
 
-export { SettingDrawer, GlobalHeader, GlobalTab, GlobalSider, GlobalContent, GlobalFooter, GlobalLogo };
+export { SettingDrawer, GlobalHeader, GlobalTab, GlobalSider, GlobalContent, GlobalFooter, GlobalLogo, GlobalBackTop };

From 41147b34fae2aa4ffd701ad1f1704463ab4ebe0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=87=95=E5=8D=9A=E6=96=87?= <349952469@qq.com>
Date: Fri, 17 Jun 2022 16:29:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(projects):=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/GlobalHeader/components/MessageList.vue     | 10 +++-------
 .../common/GlobalHeader/components/SystemMessage.vue   |  9 ++++-----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/layouts/common/GlobalHeader/components/MessageList.vue b/src/layouts/common/GlobalHeader/components/MessageList.vue
index 0983054b..3d7ce022 100644
--- a/src/layouts/common/GlobalHeader/components/MessageList.vue
+++ b/src/layouts/common/GlobalHeader/components/MessageList.vue
@@ -14,7 +14,7 @@
             <Icon v-else-if="item.icon" class="text-34px text-primary" :icon="item.icon" />
           </template>
           <template #header>
-            <n-ellipsis :line-clamp="titleRows" :tooltip="{ placement: 'top' }">
+            <n-ellipsis :line-clamp="1">
               {{ item.title }}
               <template #tooltip>
                 {{ item.title }}
@@ -25,7 +25,7 @@
             <n-tag v-bind="item.tagProps" size="small">{{ item.tagTitle }}</n-tag>
           </template>
           <template #description>
-            <n-ellipsis v-if="item.description" :line-clamp="descRows">
+            <n-ellipsis v-if="item.description" :line-clamp="2">
               {{ item.description }}
             </n-ellipsis>
             <p>{{ item.date }}</p>
@@ -40,8 +40,6 @@ import { Icon } from '@iconify/vue';
 
 interface Props {
   list?: Message.List[];
-  titleRows?: number;
-  descRows?: number;
 }
 
 interface Emits {
@@ -49,9 +47,7 @@ interface Emits {
 }
 
 withDefaults(defineProps<Props>(), {
-  list: () => [],
-  titleRows: 1,
-  descRows: 2
+  list: () => []
 });
 
 const emit = defineEmits<Emits>();
diff --git a/src/layouts/common/GlobalHeader/components/SystemMessage.vue b/src/layouts/common/GlobalHeader/components/SystemMessage.vue
index 32ccd2c7..8e3f32ed 100644
--- a/src/layouts/common/GlobalHeader/components/SystemMessage.vue
+++ b/src/layouts/common/GlobalHeader/components/SystemMessage.vue
@@ -1,18 +1,17 @@
 <template>
-  <n-popover trigger="click" class="!p-0" placement="bottom">
+  <n-popover class="!p-0" trigger="click" placement="bottom">
     <template #trigger>
-      <hover-container tooltip-content="消息通知" class="w-40px h-full relative" :inverted="theme.header.inverted">
+      <hover-container class="w-40px h-full relative" tooltip-content="消息通知" :inverted="theme.header.inverted">
         <icon-clarity:notification-line class="text-18px" />
         <n-badge
           :value="count"
-          :show="count > 0"
           :max="99"
           :class="[count < 10 ? '-right-2px' : '-right-10px']"
           class="absolute top-10px"
         />
       </hover-container>
     </template>
-    <n-tabs v-model:value="currentTab" type="line" class="w-360px" justify-content="space-evenly">
+    <n-tabs v-model:value="currentTab" class="w-360px" type="line" justify-content="space-evenly">
       <n-tab-pane v-for="(item, index) in tabData" :key="item.key" :name="index">
         <template #tab>
           <div class="flex-x-center items-center w-120px">
@@ -21,7 +20,7 @@
               v-bind="item.badgeProps"
               :value="item.list.filter(message => !message.isRead).length"
               :max="99"
-              :show="item.list.length !== 0"
+              show-zero
             />
           </div>
         </template>