修改goview平台与原平台暗主题配置包裹后RouterView被影响问题
parent
4b7e422519
commit
87c5746a01
10
src/App.vue
10
src/App.vue
|
|
@ -1,12 +1,8 @@
|
||||||
<template>
|
<template>
|
||||||
<ConfigProvider :locale="getAntdLocale" :theme="themeConfig">
|
<ConfigProvider :locale="getAntdLocale" :theme="themeConfig">
|
||||||
<NConfigProvider
|
|
||||||
:theme="darkNTheme"
|
|
||||||
>
|
|
||||||
<AppProvider>
|
<AppProvider>
|
||||||
<RouterView />
|
<RouterView />
|
||||||
</AppProvider>
|
</AppProvider>
|
||||||
</NConfigProvider>
|
|
||||||
</ConfigProvider>
|
</ConfigProvider>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -19,12 +15,6 @@
|
||||||
import { useDarkModeTheme } from '@/hooks/setting/useDarkModeTheme';
|
import { useDarkModeTheme } from '@/hooks/setting/useDarkModeTheme';
|
||||||
import 'dayjs/locale/zh-cn';
|
import 'dayjs/locale/zh-cn';
|
||||||
import { computed } from 'vue';
|
import { computed } from 'vue';
|
||||||
import { NConfigProvider } from 'naive-ui'
|
|
||||||
import { useDarkThemeHook, useThemeOverridesHook, useCode, useLang } from '@/hooks'
|
|
||||||
|
|
||||||
// 暗黑主题
|
|
||||||
const darkNTheme = useDarkThemeHook()
|
|
||||||
|
|
||||||
// support Multi-language
|
// support Multi-language
|
||||||
const { getAntdLocale } = useLocale();
|
const { getAntdLocale } = useLocale();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
|
<NConfigProvider :theme="darkNTheme">
|
||||||
<!-- 工作台相关 -->
|
<!-- 工作台相关 -->
|
||||||
<div class="go-chart">
|
<div class="go-chart">
|
||||||
<n-layout>
|
<n-layout>
|
||||||
|
|
@ -36,6 +37,7 @@
|
||||||
></n-dropdown>
|
></n-dropdown>
|
||||||
<!-- 加载蒙层 -->
|
<!-- 加载蒙层 -->
|
||||||
<content-load></content-load>
|
<content-load></content-load>
|
||||||
|
</NConfigProvider>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
|
@ -44,6 +46,10 @@
|
||||||
import { useContextMenu } from './hooks/useContextMenu.hook';
|
import { useContextMenu } from './hooks/useContextMenu.hook';
|
||||||
import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore';
|
import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore';
|
||||||
import { useChartHistoryStore } from '@/store/modules/chartHistoryStore/chartHistoryStore';
|
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 chartHistoryStoreStore = useChartHistoryStore();
|
||||||
const chartEditStore = useChartEditStore();
|
const chartEditStore = useChartEditStore();
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
|
<NConfigProvider :theme="darkNTheme">
|
||||||
<div class="go-project">
|
<div class="go-project">
|
||||||
<n-layout has-sider position="absolute">
|
<n-layout has-sider position="absolute">
|
||||||
<n-space vertical>
|
<n-space vertical>
|
||||||
|
|
@ -21,12 +22,17 @@
|
||||||
</n-layout>
|
</n-layout>
|
||||||
</n-layout>
|
</n-layout>
|
||||||
</div>
|
</div>
|
||||||
|
</NConfigProvider>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ProjectLayoutSider } from './layout/components/ProjectLayoutSider';
|
import { ProjectLayoutSider } from './layout/components/ProjectLayoutSider';
|
||||||
import { LayoutHeaderPro } from '@/layout/components/LayoutHeaderPro';
|
import { LayoutHeaderPro } from '@/layout/components/LayoutHeaderPro';
|
||||||
import { LayoutTransitionMain } from '@/layout/components/LayoutTransitionMain/index';
|
import { LayoutTransitionMain } from '@/layout/components/LayoutTransitionMain/index';
|
||||||
|
import { useDarkThemeHook, useThemeOverridesHook, useCode, useLang } from '@/hooks'
|
||||||
|
import { NConfigProvider } from 'naive-ui'
|
||||||
|
// 暗黑主题
|
||||||
|
const darkNTheme = useDarkThemeHook()
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue