Browse Source

fix: disable trash for nginx-log, sites list, streams list

Jacky 3 weeks ago
parent
commit
c77689ee1c

+ 1 - 13
app/src/App.vue

@@ -5,10 +5,9 @@ import zh_CN from 'ant-design-vue/es/locale/zh_CN'
 import zh_TW from 'ant-design-vue/es/locale/zh_TW'
 import loadTranslations from '@/api/translations'
 import gettext from '@/gettext'
-import { useSettingsStore, useUserStore } from '@/pinia'
+import { useSettingsStore } from '@/pinia'
 
 const route = useRoute()
-const router = useRouter()
 
 const media = window.matchMedia('(prefers-color-scheme: dark)')
 
@@ -47,20 +46,9 @@ const lang = computed(() => {
 })
 
 const settings = useSettingsStore()
-const user = useUserStore()
 const is_theme_dark = computed(() => settings.theme === 'dark')
 
 loadTranslations(route)
-
-if (user.isLogin) {
-  watch(route, () => {
-    settings.route_path = route.path
-  })
-
-  onMounted(() => {
-    router.push(settings.route_path)
-  })
-}
 </script>
 
 <template>

+ 14 - 0
app/src/layouts/BaseLayout.vue

@@ -8,6 +8,9 @@ import FooterLayout from './FooterLayout.vue'
 import HeaderLayout from './HeaderLayout.vue'
 import SideBar from './SideBar.vue'
 
+const route = useRoute()
+const router = useRouter()
+
 const drawerVisible = ref(false)
 const collapsed = ref(false)
 const hideLayoutSidebar = ref(false)
@@ -47,6 +50,17 @@ provide('breadList', breadList)
 
 const userStore = useUserStore()
 const { token } = storeToRefs(userStore)
+
+const settingsStore = useSettingsStore()
+const { route_path } = storeToRefs(settingsStore)
+
+watch(route, () => {
+  route_path.value = route.path
+})
+
+onMounted(() => {
+  router.push(route_path.value)
+})
 </script>
 
 <template>

+ 1 - 0
app/src/views/nginx_log/NginxLogList.vue

@@ -75,6 +75,7 @@ function viewLog(record: { type: string, path: string }) {
     disable-add
     disable-export
     disable-delete
+    disable-trash
     disable-view
     disable-edit
   >

+ 1 - 0
app/src/views/site/site_list/SiteList.vue

@@ -72,6 +72,7 @@ function handle_click_duplicate(name: string) {
       }"
       disable-add
       disable-delete
+      disable-trash
       disable-view
       disable-export
       row-selection-type="checkbox"

+ 1 - 0
app/src/views/stream/StreamList.vue

@@ -86,6 +86,7 @@ function handleAddStream() {
       }"
       disable-add
       disable-delete
+      disable-trash
       disable-view
       disable-export
       row-selection-type="checkbox"