From 87c5746a01d3cd846456114423a5e644df0a8f98 Mon Sep 17 00:00:00 2001
From: zhufu <17863654727@163.com>
Date: Thu, 20 Feb 2025 08:49:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9goview=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=B8=8E=E5=8E=9F=E5=B9=B3=E5=8F=B0=E6=9A=97=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8C=85=E8=A3=B9=E5=90=8ERouterView?=
 =?UTF-8?q?=E8=A2=AB=E5=BD=B1=E5=93=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                 | 10 -----
 src/views/chart/index.vue   | 80 ++++++++++++++++++++-----------------
 src/views/project/index.vue | 46 +++++++++++----------
 3 files changed, 69 insertions(+), 67 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 7dbfc2c..95902ea 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,8 @@
 <template>
   <ConfigProvider :locale="getAntdLocale" :theme="themeConfig">
-    <NConfigProvider
-      :theme="darkNTheme"
-    >
       <AppProvider>
         <RouterView />
       </AppProvider>
-    </NConfigProvider>
   </ConfigProvider>
 </template>
 
@@ -19,12 +15,6 @@
   import { useDarkModeTheme } from '@/hooks/setting/useDarkModeTheme';
   import 'dayjs/locale/zh-cn';
   import { computed } from 'vue';
-  import { NConfigProvider } from 'naive-ui'
-  import { useDarkThemeHook, useThemeOverridesHook, useCode, useLang } from '@/hooks'
-
-  // 暗黑主题
-  const darkNTheme = useDarkThemeHook()
-
   // support Multi-language
   const { getAntdLocale } = useLocale();
 
diff --git a/src/views/chart/index.vue b/src/views/chart/index.vue
index 2b854c5..7424b3e 100644
--- a/src/views/chart/index.vue
+++ b/src/views/chart/index.vue
@@ -1,41 +1,43 @@
 <template>
-  <!-- 工作台相关 -->
-  <div class="go-chart">
-    <n-layout>
-      <layout-header-pro>
-        <template #left>
-          <header-left-btn></header-left-btn>
-        </template>
-        <template #center>
-          <header-title></header-title>
-        </template>
-        <template #ri-left>
-          <header-right-btn></header-right-btn>
-        </template>
-      </layout-header-pro>
-      <n-layout-content content-style="overflow:hidden; display: flex">
-        <div style="overflow: hidden; display: flex">
-          <content-charts></content-charts>
-          <content-layers></content-layers>
-        </div>
-        <content-configurations></content-configurations>
-      </n-layout-content>
-    </n-layout>
-  </div>
-  <!-- 右键 -->
-  <n-dropdown
-    placement="bottom-start"
-    trigger="manual"
-    size="small"
-    :x="mousePosition.x"
-    :y="mousePosition.y"
-    :options="menuOptions"
-    :show="chartEditStore.getRightMenuShow"
-    :on-clickoutside="onClickOutSide"
-    @select="handleMenuSelect"
-  ></n-dropdown>
-  <!-- 加载蒙层 -->
-  <content-load></content-load>
+  <NConfigProvider :theme="darkNTheme">
+    <!-- 工作台相关 -->
+    <div class="go-chart">
+      <n-layout>
+        <layout-header-pro>
+          <template #left>
+            <header-left-btn></header-left-btn>
+          </template>
+          <template #center>
+            <header-title></header-title>
+          </template>
+          <template #ri-left>
+            <header-right-btn></header-right-btn>
+          </template>
+        </layout-header-pro>
+        <n-layout-content content-style="overflow:hidden; display: flex">
+          <div style="overflow: hidden; display: flex">
+            <content-charts></content-charts>
+            <content-layers></content-layers>
+          </div>
+          <content-configurations></content-configurations>
+        </n-layout-content>
+      </n-layout>
+    </div>
+    <!-- 右键 -->
+    <n-dropdown
+      placement="bottom-start"
+      trigger="manual"
+      size="small"
+      :x="mousePosition.x"
+      :y="mousePosition.y"
+      :options="menuOptions"
+      :show="chartEditStore.getRightMenuShow"
+      :on-clickoutside="onClickOutSide"
+      @select="handleMenuSelect"
+    ></n-dropdown>
+    <!-- 加载蒙层 -->
+    <content-load></content-load>
+  </NConfigProvider>
 </template>
 
 <script setup lang="ts">
@@ -44,6 +46,10 @@
   import { useContextMenu } from './hooks/useContextMenu.hook';
   import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore';
   import { useChartHistoryStore } from '@/store/modules/chartHistoryStore/chartHistoryStore';
+  import { useDarkThemeHook, useThemeOverridesHook, useCode, useLang } from '@/hooks'
+  import { NConfigProvider } from 'naive-ui'
+  // 暗黑主题
+  const darkNTheme = useDarkThemeHook()
 
   const chartHistoryStoreStore = useChartHistoryStore();
   const chartEditStore = useChartEditStore();
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index 7099d43..ce1f111 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -1,32 +1,38 @@
 <template>
-  <div class="go-project">
-    <n-layout has-sider position="absolute">
-      <n-space vertical>
-        <project-layout-sider></project-layout-sider>
-      </n-space>
-      <n-layout>
-        <!-- <layout-header-pro></layout-header-pro> -->
-        <n-layout
-          id="go-project-content-top"
-          class="content-top"
-          position="absolute"
-          :native-scrollbar="false"
-        >
-          <n-layout-content>
-            <layout-transition-main>
-              <router-view></router-view>
-            </layout-transition-main>
-          </n-layout-content>
+  <NConfigProvider :theme="darkNTheme">
+    <div class="go-project">
+      <n-layout has-sider position="absolute">
+        <n-space vertical>
+          <project-layout-sider></project-layout-sider>
+        </n-space>
+        <n-layout>
+          <!-- <layout-header-pro></layout-header-pro> -->
+          <n-layout
+            id="go-project-content-top"
+            class="content-top"
+            position="absolute"
+            :native-scrollbar="false"
+          >
+            <n-layout-content>
+              <layout-transition-main>
+                <router-view></router-view>
+              </layout-transition-main>
+            </n-layout-content>
+          </n-layout>
         </n-layout>
       </n-layout>
-    </n-layout>
-  </div>
+    </div>
+  </NConfigProvider>
 </template>
 
 <script setup lang="ts">
   import { ProjectLayoutSider } from './layout/components/ProjectLayoutSider';
   import { LayoutHeaderPro } from '@/layout/components/LayoutHeaderPro';
   import { LayoutTransitionMain } from '@/layout/components/LayoutTransitionMain/index';
+  import { useDarkThemeHook, useThemeOverridesHook, useCode, useLang } from '@/hooks'
+  import { NConfigProvider } from 'naive-ui'
+  // 暗黑主题
+  const darkNTheme = useDarkThemeHook()
 </script>
 
 <style lang="scss" scoped>