修改goview平台与原平台暗主题配置包裹后RouterView被影响问题
parent
4b7e422519
commit
87c5746a01
10
src/App.vue
10
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();
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue