From e70a3282846ad756052bb2dbed8e5f74848217a6 Mon Sep 17 00:00:00 2001
From: Soybean <2570172956@qq.com>
Date: Fri, 19 Nov 2021 13:14:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor(components):=20=E9=87=8D=E6=9E=84AppPr?=
 =?UTF-8?q?ovider?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AppProvider.vue                           | 26 ++++---------------
 .../components/NaiveProviderContent.vue}      |  4 +--
 .../common/NaiveProvider/components/index.ts  |  3 +++
 src/components/common/NaiveProvider/index.vue | 18 +++++++++++++
 src/components/common/index.ts                |  4 +--
 5 files changed, 30 insertions(+), 25 deletions(-)
 rename src/components/common/{AppProviderContent/index.vue => NaiveProvider/components/NaiveProviderContent.vue} (88%)
 create mode 100644 src/components/common/NaiveProvider/components/index.ts
 create mode 100644 src/components/common/NaiveProvider/index.vue

diff --git a/src/AppProvider.vue b/src/AppProvider.vue
index e8a07869..e7c525eb 100644
--- a/src/AppProvider.vue
+++ b/src/AppProvider.vue
@@ -7,32 +7,16 @@
     :theme-overrides="theme.themeOverrids"
   >
     <n-element class="h-full">
-      <n-loading-bar-provider>
-        <n-dialog-provider>
-          <n-notification-provider>
-            <n-message-provider>
-              <slot></slot>
-              <app-provider-content />
-            </n-message-provider>
-          </n-notification-provider>
-        </n-dialog-provider>
-      </n-loading-bar-provider>
+      <naive-provider>
+        <slot></slot>
+      </naive-provider>
     </n-element>
   </n-config-provider>
 </template>
 
 <script lang="ts" setup>
-import {
-  NConfigProvider,
-  NElement,
-  NLoadingBarProvider,
-  NDialogProvider,
-  NNotificationProvider,
-  NMessageProvider,
-  zhCN,
-  dateZhCN
-} from 'naive-ui';
-import { AppProviderContent } from '@/components';
+import { NConfigProvider, NElement, zhCN, dateZhCN } from 'naive-ui';
+import { NaiveProvider } from '@/components';
 import { useThemeStore } from '@/store';
 import { useDarkMode } from '@/composables';
 
diff --git a/src/components/common/AppProviderContent/index.vue b/src/components/common/NaiveProvider/components/NaiveProviderContent.vue
similarity index 88%
rename from src/components/common/AppProviderContent/index.vue
rename to src/components/common/NaiveProvider/components/NaiveProviderContent.vue
index e4adf246..e497643a 100644
--- a/src/components/common/AppProviderContent/index.vue
+++ b/src/components/common/NaiveProvider/components/NaiveProviderContent.vue
@@ -6,13 +6,13 @@
 import { useLoadingBar, useDialog, useMessage, useNotification } from 'naive-ui';
 
 // 挂载naive组件的方法至window, 以便在路由钩子函数和请求函数里面调用
-function registerNaiveUiTools() {
+function registerNaiveTools() {
   window.$loadingBar = useLoadingBar();
   window.$dialog = useDialog();
   window.$message = useMessage();
   window.$notification = useNotification();
 }
 
-registerNaiveUiTools();
+registerNaiveTools();
 </script>
 <style scoped></style>
diff --git a/src/components/common/NaiveProvider/components/index.ts b/src/components/common/NaiveProvider/components/index.ts
new file mode 100644
index 00000000..11b83311
--- /dev/null
+++ b/src/components/common/NaiveProvider/components/index.ts
@@ -0,0 +1,3 @@
+import NaiveProviderContent from './NaiveProviderContent.vue';
+
+export { NaiveProviderContent };
diff --git a/src/components/common/NaiveProvider/index.vue b/src/components/common/NaiveProvider/index.vue
new file mode 100644
index 00000000..ab32c03b
--- /dev/null
+++ b/src/components/common/NaiveProvider/index.vue
@@ -0,0 +1,18 @@
+<template>
+  <n-loading-bar-provider>
+    <n-dialog-provider>
+      <n-notification-provider>
+        <n-message-provider>
+          <slot></slot>
+          <naive-provider-content />
+        </n-message-provider>
+      </n-notification-provider>
+    </n-dialog-provider>
+  </n-loading-bar-provider>
+</template>
+
+<script setup lang="ts">
+import { NLoadingBarProvider, NDialogProvider, NNotificationProvider, NMessageProvider } from 'naive-ui';
+import { NaiveProviderContent } from './components';
+</script>
+<style scoped></style>
diff --git a/src/components/common/index.ts b/src/components/common/index.ts
index 3677b762..d24e55c7 100644
--- a/src/components/common/index.ts
+++ b/src/components/common/index.ts
@@ -1,8 +1,8 @@
-import AppProviderContent from './AppProviderContent/index.vue';
+import NaiveProvider from './NaiveProvider/index.vue';
 import SystemLogo from './SystemLogo/index.vue';
 import ExceptionSvg from './ExceptionSvg/index.vue';
 import LoginBg from './LoginBg/index.vue';
 import BannerSvg from './BannerSvg/index.vue';
 import HoverContainer from './HoverContainer/index.vue';
 
-export { AppProviderContent, SystemLogo, ExceptionSvg, LoginBg, BannerSvg, HoverContainer };
+export { NaiveProvider, SystemLogo, ExceptionSvg, LoginBg, BannerSvg, HoverContainer };