From cdbbca43c4466d36e9cef08b81cb0fe689c6da25 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: 星期四, 14 十一月 2024 16:23:16 +0800
Subject: [PATCH] chore: 锁定vue-json-pretty版本
---
src/layout/components/AppMain.vue | 82 ++++++++++++++++++++++++-----------------
1 files changed, 48 insertions(+), 34 deletions(-)
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index e600479..7f86ef4 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,42 +1,43 @@
-<script lang="ts">
-export default {
- name: 'AppMin'
-}
-</script>
+<template>
+ <section class="app-main">
+ <router-view v-slot="{ Component, route }">
+ <transition v-if="!route.meta.noCache" :enter-active-class="animante" mode="out-in">
+ <keep-alive v-if="!route.meta.noCache" :include="tagsViewStore.cachedViews">
+ <component :is="Component" v-if="!route.meta.link" :key="route.path" />
+ </keep-alive>
+ </transition>
+ <transition v-if="route.meta.noCache" :enter-active-class="animante" mode="out-in">
+ <component :is="Component" v-if="!route.meta.link && route.meta.noCache" :key="route.path" />
+ </transition>
+ </router-view>
+ <iframe-toggle />
+ </section>
+</template>
-<script setup lang="ts">
-import useTagsViewStore from '@/store/modules/tagsView';
+<script setup name="AppMain" lang="ts">
import useSettingsStore from '@/store/modules/settings';
-import IframeToggle from './IframeToggle/index.vue'
-import { ComponentInternalInstance } from "vue";
+import useTagsViewStore from '@/store/modules/tagsView';
+
+import IframeToggle from './IframeToggle/index.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const tagsViewStore = useTagsViewStore();
// 闅忔満鍔ㄧ敾闆嗗悎
const animante = ref<string>('');
const animationEnable = ref(useSettingsStore().animationEnable);
-watch(()=> useSettingsStore().animationEnable, (val) => {
- animationEnable.value = val;
- if (val) {
- animante.value = proxy?.animate.animateList[Math.round(Math.random() * proxy?.animate.animateList.length)] as string;
- } else {
- animante.value = proxy?.animate.defaultAnimate as string;
- }
-}, { immediate: true });
+watch(
+ () => useSettingsStore().animationEnable,
+ (val: boolean) => {
+ animationEnable.value = val;
+ if (val) {
+ animante.value = proxy?.animate.animateList[Math.round(Math.random() * proxy?.animate.animateList.length)] as string;
+ } else {
+ animante.value = proxy?.animate.defaultAnimate as string;
+ }
+ },
+ { immediate: true }
+);
</script>
-
-<template>
- <section class="app-main">
- <router-view v-slot="{ Component, route }">
- <transition :enter-active-class="animante" mode="out-in">
- <keep-alive :include="tagsViewStore.cachedViews">
- <component v-if="!route.meta.link" :is="Component" :key="route.path" />
- </keep-alive>
- </transition>
- </router-view>
- <iframe-toggle />
- </section>
-</template>
<style lang="scss" scoped>
.app-main {
@@ -47,7 +48,7 @@
overflow: hidden;
}
-.fixed-header+.app-main {
+.fixed-header + .app-main {
padding-top: 50px;
}
@@ -57,17 +58,30 @@
min-height: calc(100vh - 84px);
}
- .fixed-header+.app-main {
+ .fixed-header + .app-main {
padding-top: 84px;
}
}
</style>
-
<style lang="scss">
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
.fixed-header {
- padding-right: 17px;
+ padding-right: 6px;
}
}
+
+::-webkit-scrollbar {
+ width: 6px;
+ height: 6px;
+}
+
+::-webkit-scrollbar-track {
+ background-color: #f1f1f1;
+}
+
+::-webkit-scrollbar-thumb {
+ background-color: #c0c0c0;
+ border-radius: 3px;
+}
</style>
--
Gitblit v1.9.3