From 4596c496eed518175d9ac94d4a2cd4a22b665491 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Wed, 23 Nov 2022 11:34:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BA=A4=E4=BA=92=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/App.vue                          | 14 +++++++--
 frontend/src/components/back-button/index.vue | 24 +++++---------
 frontend/src/lang/modules/zh.ts               |  3 +-
 frontend/src/layout/layout-content.vue        |  7 +++--
 frontend/src/routers/modules/website.ts       |  8 -----
 frontend/src/views/website/website/index.vue  | 31 ++++++++++++-------
 .../{config => website/nginx}/index.vue       |  2 +-
 7 files changed, 47 insertions(+), 42 deletions(-)
 rename frontend/src/views/website/{config => website/nginx}/index.vue (57%)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 2c75e87d4..b225a8ab7 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,11 +1,11 @@
 <template>
     <el-config-provider :locale="i18nLocale" :button="config" :size="assemblySize">
-        <router-view></router-view>
+        <router-view v-if="isRouterAlive"></router-view>
     </el-config-provider>
 </template>
 
 <script setup lang="ts">
-import { reactive, computed } from 'vue';
+import { reactive, computed, ref, nextTick, provide } from 'vue';
 import { GlobalStore } from '@/store';
 import zhCn from 'element-plus/es/locale/lang/zh-cn';
 import en from 'element-plus/es/locale/lang/en';
@@ -24,6 +24,16 @@ const i18nLocale = computed((): any => {
 });
 
 const assemblySize = computed((): string => globalStore.assemblySize);
+
+let isRouterAlive = ref(true);
+
+const reload = () => {
+    isRouterAlive.value = false;
+    nextTick(function () {
+        isRouterAlive.value = true;
+    });
+};
+provide('reload', reload);
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/frontend/src/components/back-button/index.vue b/frontend/src/components/back-button/index.vue
index c9d2f2938..f153ca245 100644
--- a/frontend/src/components/back-button/index.vue
+++ b/frontend/src/components/back-button/index.vue
@@ -1,11 +1,9 @@
 <template>
-    <!-- <el-icon class="back-button" @click="jump">
-        <Back />
-    </el-icon> -->
     <el-page-header :content="header" @back="jump" />
 </template>
 
 <script setup lang="ts">
+import { inject } from 'vue';
 import { useRouter } from 'vue-router';
 const router = useRouter();
 const props = defineProps({
@@ -13,9 +11,13 @@ const props = defineProps({
     name: String,
     to: Object,
     header: String,
+    reload: Boolean,
 });
 function jump() {
-    const { path, name, to } = props;
+    const { path, name, to, reload } = props;
+    if (reload) {
+        reloadPage();
+    }
     if (path) {
         router.push(path);
     }
@@ -26,16 +28,6 @@ function jump() {
         router.push(to);
     }
 }
+
+let reloadPage: Function = inject('reload');
 </script>
-
-<style lang="scss">
-// .back-button {
-//     cursor: pointer;
-//     margin-right: 10px;
-//     font-weight: 600;
-
-//     &:active {
-//         transform: scale(0.85);
-//     }
-// }
-</style>
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index fe2ce192f..07943f463 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -139,7 +139,7 @@ export default {
         cronjob: '计划任务',
         host: '主机',
         security: '安全',
-        files: '文件管理',
+        files: '文件',
         monitor: '监控',
         terminal: '终端',
         settings: '面板设置',
@@ -752,5 +752,6 @@ export default {
         aliasHelper: '代号是网站目录的文件夹名称',
         lastBackupAt: '上次备份时间',
         null: '无',
+        nginxConfig: 'Nginx配置',
     },
 };
diff --git a/frontend/src/layout/layout-content.vue b/frontend/src/layout/layout-content.vue
index 832b214ce..7ff6bedf1 100644
--- a/frontend/src/layout/layout-content.vue
+++ b/frontend/src/layout/layout-content.vue
@@ -7,8 +7,10 @@
                     :name="backName"
                     :to="backTo"
                     :header="header"
+                    :reload="reload"
                     v-if="showBack"
                 ></back-button>
+                <!-- <el-page-header @back="reload" v-if="showBack" :content="header"></el-page-header> -->
                 <span v-else>{{ header }}</span>
             </slot>
         </div>
@@ -37,11 +39,12 @@ const prop = defineProps({
     backPath: String,
     backName: String,
     backTo: Object,
+    reload: Boolean,
 });
 
 const showBack = computed(() => {
-    const { backPath, backName, backTo } = prop;
-    return backPath || backName || backTo;
+    const { backPath, backName, backTo, reload } = prop;
+    return backPath || backName || backTo || reload;
 });
 </script>
 
diff --git a/frontend/src/routers/modules/website.ts b/frontend/src/routers/modules/website.ts
index 2b0d4fe7c..3fbd22875 100644
--- a/frontend/src/routers/modules/website.ts
+++ b/frontend/src/routers/modules/website.ts
@@ -36,14 +36,6 @@ const webSiteRouter = {
                 title: 'menu.ssl',
             },
         },
-        {
-            path: '/websites/nginx',
-            name: 'Config',
-            component: () => import('@/views/website/config/index.vue'),
-            meta: {
-                title: 'menu.config',
-            },
-        },
     ],
 };
 
diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue
index 7f0f1f11a..4d19178c3 100644
--- a/frontend/src/views/website/website/index.vue
+++ b/frontend/src/views/website/website/index.vue
@@ -1,9 +1,9 @@
 <template>
-    <div ref="websiteRef">
-        <LayoutContent>
-            <AppStatus :app-key="'nginx'" :parentRef="websiteRef"></AppStatus>
-            <br />
-            <el-card>
+    <LayoutContent>
+        <AppStatus :app-key="'nginx'" @setting="setting"></AppStatus>
+        <br />
+        <el-card v-if="!openNginxConfig">
+            <LayoutContent :header="$t('website.website')">
                 <ComplexTable :pagination-config="paginationConfig" :data="data" @search="search()">
                     <template #toolbar>
                         <el-button type="primary" plain @click="openCreate">
@@ -30,13 +30,16 @@
                         fix
                     />
                 </ComplexTable>
-            </el-card>
+            </LayoutContent>
+        </el-card>
+        <el-card v-if="openNginxConfig">
+            <NginxConfig></NginxConfig>
+        </el-card>
 
-            <CreateWebSite ref="createRef" @close="search"></CreateWebSite>
-            <DeleteWebsite ref="deleteRef" @close="search"></DeleteWebsite>
-            <WebSiteGroup ref="groupRef"></WebSiteGroup>
-        </LayoutContent>
-    </div>
+        <CreateWebSite ref="createRef" @close="search"></CreateWebSite>
+        <DeleteWebsite ref="deleteRef" @close="search"></DeleteWebsite>
+        <WebSiteGroup ref="groupRef"></WebSiteGroup>
+    </LayoutContent>
 </template>
 
 <script lang="ts" setup>
@@ -49,6 +52,7 @@ import WebSiteGroup from './group/index.vue';
 import { SearchWebSites } from '@/api/modules/website';
 import { WebSite } from '@/api/interface/website';
 import AppStatus from '@/components/app-status/index.vue';
+import NginxConfig from './nginx/index.vue';
 
 import i18n from '@/lang';
 import router from '@/routers';
@@ -56,7 +60,7 @@ import router from '@/routers';
 const createRef = ref();
 const deleteRef = ref();
 const groupRef = ref();
-const websiteRef = ref();
+let openNginxConfig = ref(false);
 
 const paginationConfig = reactive({
     currentPage: 1,
@@ -77,6 +81,9 @@ const search = async () => {
         paginationConfig.total = res.data.total;
     });
 };
+const setting = () => {
+    openNginxConfig.value = true;
+};
 
 const openConfig = (id: number) => {
     router.push({ name: 'WebsiteConfig', params: { id: id, tab: 'basic' } });
diff --git a/frontend/src/views/website/config/index.vue b/frontend/src/views/website/website/nginx/index.vue
similarity index 57%
rename from frontend/src/views/website/config/index.vue
rename to frontend/src/views/website/website/nginx/index.vue
index cdfc73be6..e006e4b3d 100644
--- a/frontend/src/views/website/config/index.vue
+++ b/frontend/src/views/website/website/nginx/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <LayoutContent></LayoutContent>
+    <LayoutContent :header="$t('website.nginxConfig')" :reload="true"></LayoutContent>
 </template>
 
 <script lang="ts" setup>