From 3e3cb309ce5a262a84e90860f8756a46d53ba653 Mon Sep 17 00:00:00 2001
From: w940853815 <940853815@qq.com>
Date: Thu, 13 Feb 2025 15:19:08 +0800
Subject: [PATCH] perf: Merge More into Info and update detail page

---
 src/components/Cards/DetailCard/auto.vue      |  2 +-
 .../AccountDiscover/AccountDetail/index.vue   |  8 +----
 .../AccountDiscover/AccountDetail/info.vue    | 10 +++++-
 .../AccountDiscover/AccountDetail/more.vue    | 35 -------------------
 4 files changed, 11 insertions(+), 44 deletions(-)
 delete mode 100644 src/views/accounts/AccountDiscover/AccountDetail/more.vue

diff --git a/src/components/Cards/DetailCard/auto.vue b/src/components/Cards/DetailCard/auto.vue
index d66cafa64..36a2d8136 100644
--- a/src/components/Cards/DetailCard/auto.vue
+++ b/src/components/Cards/DetailCard/auto.vue
@@ -173,7 +173,7 @@ export default {
       const data = await this.$store.dispatch('common/getUrlMeta', { url: this.url })
       let remoteMeta = data.actions['GET'] || {}
       if (this.nested) {
-        remoteMeta = remoteMeta[this.nested]?.children || {}
+        remoteMeta = remoteMeta[this.nested]?.children || remoteMeta || {}
       }
       let fields = this.fields
       fields = fields || Object.keys(remoteMeta)
diff --git a/src/views/accounts/AccountDiscover/AccountDetail/index.vue b/src/views/accounts/AccountDiscover/AccountDetail/index.vue
index 0fc498341..4a9af6b2f 100644
--- a/src/views/accounts/AccountDiscover/AccountDetail/index.vue
+++ b/src/views/accounts/AccountDiscover/AccountDetail/index.vue
@@ -9,14 +9,12 @@
 <script>
 import { GenericDetailPage } from '@/layout/components'
 import Info from './info.vue'
-import More from './more.vue'
 
 export default {
   name: 'AccountDiscoverDetail',
   components: {
     GenericDetailPage,
-    Info,
-    More
+    Info
   },
   data() {
     return {
@@ -32,10 +30,6 @@ export default {
           {
             title: this.$t('Basic'),
             name: 'Info'
-          },
-          {
-            title: this.$t('More'),
-            name: 'More'
           }
         ],
         getTitle: this.getExecutionTitle
diff --git a/src/views/accounts/AccountDiscover/AccountDetail/info.vue b/src/views/accounts/AccountDiscover/AccountDetail/info.vue
index ebec74f47..f57129703 100644
--- a/src/views/accounts/AccountDiscover/AccountDetail/info.vue
+++ b/src/views/accounts/AccountDiscover/AccountDetail/info.vue
@@ -1,6 +1,7 @@
 <template>
   <TwoCol>
     <AutoDetailCard :fields="detailFields" :object="object" :url="url" />
+    <AutoDetailCard v-bind="moreConfig" />
   </TwoCol>
 </template>
 
@@ -28,7 +29,14 @@ export default {
         'date_last_login', 'address_last_login',
         'remote_present', 'present',
         'date_updated', 'status'
-      ]
+      ],
+      moreConfig: {
+        url: `/api/v1/accounts/gathered-accounts/${this.object.id}/details/`,
+        title: this.$t('More'),
+        object: this.object,
+        nested: 'detail',
+        showUndefined: false
+      }
     }
   },
   computed: {}
diff --git a/src/views/accounts/AccountDiscover/AccountDetail/more.vue b/src/views/accounts/AccountDiscover/AccountDetail/more.vue
deleted file mode 100644
index eee852be1..000000000
--- a/src/views/accounts/AccountDiscover/AccountDetail/more.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-  <TwoCol>
-    <AutoDetailCard :object="detail" :url="url" />
-  </TwoCol>
-</template>
-
-<script>
-import AutoDetailCard from '@/components/Cards/DetailCard/auto.vue'
-import TwoCol from '@/layout/components/Page/TwoColPage.vue'
-
-export default {
-  name: 'AccountDiscoverMore',
-  components: {
-    TwoCol,
-    AutoDetailCard
-  },
-  props: {
-    object: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    return {
-      url: `/api/v1/accounts/gathered-accounts/${this.object.id}/details/`,
-      detail: this.object?.detail
-    }
-  },
-  computed: {}
-}
-</script>
-
-<style scoped>
-
-</style>