From 0b5ab090a4d069e553366c7ceec019c4f2282e28 Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Wed, 13 Dec 2023 17:32:17 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=8A=A5=E9=94=99=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 +-
 .../src/components/pagetable/PageTable.vue    | 10 ++----
 mayfly_go_web/src/layout/main/columns.vue     | 18 +++-------
 mayfly_go_web/src/layout/main/defaults.vue    | 36 ++++++++-----------
 mayfly_go_web/src/layout/main/transverse.vue  |  6 +---
 mayfly_go_web/src/layout/navMenu/subItem.vue  |  7 ++--
 .../src/layout/routerView/iframes.vue         |  2 +-
 .../src/layout/routerView/parent.vue          | 16 ++++-----
 8 files changed, 35 insertions(+), 62 deletions(-)

diff --git a/README.md b/README.md
index 753ec6c1..7f8cc769 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@
 
 ### 介绍
 
-web 版 **linux(终端[终端回放] 文件 脚本 进程 计划任务)、数据库（mysql postgres）、redis(单机 哨兵 集群)、mongo 统一管理操作平台**
+web 版 **linux(终端[终端回放] 文件 脚本 进程 计划任务)、数据库（mysql postgres 达梦）、redis(单机 哨兵 集群)、mongo 统一管理操作平台**
 
 ### 开发语言与主要框架
 
diff --git a/mayfly_go_web/src/components/pagetable/PageTable.vue b/mayfly_go_web/src/components/pagetable/PageTable.vue
index bc1c3c22..4d72ec57 100644
--- a/mayfly_go_web/src/components/pagetable/PageTable.vue
+++ b/mayfly_go_web/src/components/pagetable/PageTable.vue
@@ -215,13 +215,9 @@ watch(
     }
 );
 
-watch(
-    () => isShowSearch.value,
-    () => {
-        console.log('watch show sa');
-        calcuTableHeight();
-    }
-);
+watch(isShowSearch, () => {
+    calcuTableHeight();
+});
 
 onMounted(async () => {
     calcuTableHeight();
diff --git a/mayfly_go_web/src/layout/main/columns.vue b/mayfly_go_web/src/layout/main/columns.vue
index 7a8b96ee..3430eeb7 100644
--- a/mayfly_go_web/src/layout/main/columns.vue
+++ b/mayfly_go_web/src/layout/main/columns.vue
@@ -15,23 +15,15 @@
     </el-container>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup name="layoutColumns">
 import { computed } from 'vue';
 import Aside from '@/layout/component/aside.vue';
 import Header from '@/layout/component/header.vue';
 import Main from '@/layout/component/main.vue';
 import ColumnsAside from '@/layout/component/columnsAside.vue';
 import { useThemeConfig } from '@/store/themeConfig';
-export default {
-    name: 'layoutColumns',
-    components: { Aside, Header, Main, ColumnsAside },
-    setup() {
-        const isFixedHeader = computed(() => {
-            return useThemeConfig().themeConfig.isFixedHeader;
-        });
-        return {
-            isFixedHeader,
-        };
-    },
-};
+
+const isFixedHeader = computed(() => {
+    return useThemeConfig().themeConfig.isFixedHeader;
+});
 </script>
diff --git a/mayfly_go_web/src/layout/main/defaults.vue b/mayfly_go_web/src/layout/main/defaults.vue
index 00483055..9c0d1bec 100644
--- a/mayfly_go_web/src/layout/main/defaults.vue
+++ b/mayfly_go_web/src/layout/main/defaults.vue
@@ -12,32 +12,24 @@
     </el-container>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup name="layoutDefaults">
 import { computed, getCurrentInstance, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import Aside from '@/layout/component/aside.vue';
 import Header from '@/layout/component/header.vue';
 import Main from '@/layout/component/main.vue';
 import { useThemeConfig } from '@/store/themeConfig';
-export default {
-    name: 'layoutDefaults',
-    components: { Aside, Header, Main },
-    setup() {
-        const { proxy } = getCurrentInstance() as any;
-        const route = useRoute();
-        const isFixedHeader = computed(() => {
-            return useThemeConfig().themeConfig.isFixedHeader;
-        });
-        // 监听路由的变化
-        watch(
-            () => route.path,
-            () => {
-                proxy.$refs.layoutScrollbarRef.wrapRef.scrollTop = 0;
-            }
-        );
-        return {
-            isFixedHeader,
-        };
-    },
-};
+
+const { proxy } = getCurrentInstance() as any;
+const route = useRoute();
+const isFixedHeader = computed(() => {
+    return useThemeConfig().themeConfig.isFixedHeader;
+});
+// 监听路由的变化
+watch(
+    () => route.path,
+    () => {
+        proxy.$refs.layoutScrollbarRef.wrapRef.scrollTop = 0;
+    }
+);
 </script>
diff --git a/mayfly_go_web/src/layout/main/transverse.vue b/mayfly_go_web/src/layout/main/transverse.vue
index 329366d5..b0d02f30 100644
--- a/mayfly_go_web/src/layout/main/transverse.vue
+++ b/mayfly_go_web/src/layout/main/transverse.vue
@@ -6,11 +6,7 @@
     </el-container>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup name="layoutTransverse">
 import Header from '@/layout/component/header.vue';
 import Main from '@/layout/component/main.vue';
-export default {
-    name: 'layoutTransverse',
-    components: { Header, Main },
-};
 </script>
diff --git a/mayfly_go_web/src/layout/navMenu/subItem.vue b/mayfly_go_web/src/layout/navMenu/subItem.vue
index d3ed4ba8..ca620c52 100644
--- a/mayfly_go_web/src/layout/navMenu/subItem.vue
+++ b/mayfly_go_web/src/layout/navMenu/subItem.vue
@@ -2,19 +2,19 @@
     <template v-for="val in chils">
         <el-sub-menu :index="val.path" :key="val.path" v-if="val.children && val.children.length > 0">
             <template #title>
-                <SvgIcon :name="val.meta.icon"/>
+                <SvgIcon :name="val.meta.icon" />
                 <span>{{ val.meta.title }}</span>
             </template>
             <sub-item :chil="val.children" />
         </el-sub-menu>
         <el-menu-item :index="val.path" :key="val?.path" v-else>
             <template v-if="!val.meta.link || (val.meta.link && val.meta.linkType == 1)">
-                <SvgIcon :name="val.meta.icon"/>
+                <SvgIcon :name="val.meta.icon" />
                 <span>{{ val.meta.title }}</span>
             </template>
             <template v-else>
                 <a :href="val.meta.link" target="_blank">
-                    <SvgIcon :name="val.meta.icon"/>
+                    <SvgIcon :name="val.meta.icon" />
                     {{ val.meta.title }}
                 </a>
             </template>
@@ -24,7 +24,6 @@
 
 <script lang="ts">
 import { computed, defineComponent } from 'vue';
-import SvgIcon from '@/components/svgIcon/index.vue';
 export default defineComponent({
     name: 'navMenuSubItem',
     props: {
diff --git a/mayfly_go_web/src/layout/routerView/iframes.vue b/mayfly_go_web/src/layout/routerView/iframes.vue
index 5fb64385..4f5f1b47 100644
--- a/mayfly_go_web/src/layout/routerView/iframes.vue
+++ b/mayfly_go_web/src/layout/routerView/iframes.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, toRefs, onMounted, onBeforeMount, onUnmounted, nextTick, getCurrentInstance } from 'vue';
+import { defineComponent, reactive, toRefs, onMounted, onBeforeMount, onUnmounted, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
 import mittBus from '@/common/utils/mitt';
 export default defineComponent({
diff --git a/mayfly_go_web/src/layout/routerView/parent.vue b/mayfly_go_web/src/layout/routerView/parent.vue
index ef75af45..eb38c2af 100644
--- a/mayfly_go_web/src/layout/routerView/parent.vue
+++ b/mayfly_go_web/src/layout/routerView/parent.vue
@@ -1,13 +1,11 @@
 <template>
-    <div class="h100">
-        <router-view v-slot="{ Component }">
-            <transition :name="setTransitionName" mode="out-in">
-                <keep-alive :include="getKeepAliveNames">
-                    <component :is="Component" :key="state.refreshRouterViewKey" class="w100" />
-                </keep-alive>
-            </transition>
-        </router-view>
-    </div>
+    <router-view v-slot="{ Component }">
+        <transition appear :name="setTransitionName" mode="out-in">
+            <keep-alive :include="getKeepAliveNames">
+                <component :is="Component" :key="state.refreshRouterViewKey" />
+            </keep-alive>
+        </transition>
+    </router-view>
 </template>
 
 <script lang="ts" setup name="layoutParentView">