From 3b074c7ac954e659f6db541125a836ed5e20ba0f Mon Sep 17 00:00:00 2001
From: jiangweidong <1053570670@qq.com>
Date: Fri, 10 Jan 2025 10:36:17 +0800
Subject: [PATCH 1/2] perf: Cloud sync support ali rds

---
 src/components/Table/CardTable/index.vue      |  3 ++-
 .../assets/Asset/AssetList/DatabaseList.vue   | 15 ++++++++++++++-
 src/views/assets/Asset/AssetList/HostList.vue |  4 +++-
 .../assets/Cloud/Account/AccountList.vue      | 19 ++++++++++++-------
 .../Cloud/Account/components/AuthPanel.vue    |  1 +
 .../Account/components/ProviderPanel.vue      |  4 ++--
 src/views/assets/Cloud/const.js               |  3 +--
 7 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/components/Table/CardTable/index.vue b/src/components/Table/CardTable/index.vue
index 9915141b77..93c6bf1365 100644
--- a/src/components/Table/CardTable/index.vue
+++ b/src/components/Table/CardTable/index.vue
@@ -158,7 +158,8 @@ export default {
       const pageQuery = this.getPageQuery(this.page, this.paginationSize)
       const query = Object.assign(this.extraQuery, pageQuery)
       const queryString = Object.keys(query).map(key => key + '=' + query[key]).join('&')
-      const url = `${this.tableUrl}?${queryString}`
+      const connector = this.tableUrl.indexOf('?') === -1 ? '?' : '&'
+      const url = `${this.tableUrl}${connector}${queryString}`
 
       this.$axios
         .get(url, this.axiosConfig)
diff --git a/src/views/assets/Asset/AssetList/DatabaseList.vue b/src/views/assets/Asset/AssetList/DatabaseList.vue
index ab0c940cbb..fefc05c456 100644
--- a/src/views/assets/Asset/AssetList/DatabaseList.vue
+++ b/src/views/assets/Asset/AssetList/DatabaseList.vue
@@ -13,7 +13,20 @@ export default {
     return {
       config: {
         category: 'database',
-        url: '/api/v1/assets/databases/'
+        url: '/api/v1/assets/databases/',
+        headerActions: {
+          extraActions: [
+            {
+              name: this.$t('CloudSync'),
+              title: this.$t('CloudSync'),
+              icon: 'cloud-provider',
+              has: () => this.$hasPerm('xpack.view_account') && this.$hasLicense(),
+              callback: () => this.$router.push(
+                { name: 'CloudAccountList', query: { category: 'database' }}
+              )
+            }
+          ]
+        }
       }
     }
   }
diff --git a/src/views/assets/Asset/AssetList/HostList.vue b/src/views/assets/Asset/AssetList/HostList.vue
index 655990a9e2..ed3308104f 100644
--- a/src/views/assets/Asset/AssetList/HostList.vue
+++ b/src/views/assets/Asset/AssetList/HostList.vue
@@ -37,7 +37,9 @@ export default {
               title: this.$t('CloudSync'),
               icon: 'cloud-provider',
               has: () => vm.$hasPerm('xpack.view_account') && vm.$hasLicense(),
-              callback: () => this.$router.push({ name: 'CloudAccountList' })
+              callback: () => this.$router.push(
+                { name: 'CloudAccountList', query: { category: 'host' }}
+              )
             }
           ]
         },
diff --git a/src/views/assets/Cloud/Account/AccountList.vue b/src/views/assets/Cloud/Account/AccountList.vue
index dcb03f09d0..ef32d42052 100644
--- a/src/views/assets/Cloud/Account/AccountList.vue
+++ b/src/views/assets/Cloud/Account/AccountList.vue
@@ -33,7 +33,7 @@ export default {
       colWidth: 6,
       subComponent: AccountPanel,
       tableConfig: {
-        url: '/api/v1/xpack/cloud/accounts/',
+        url: `/api/v1/xpack/cloud/accounts/?category=${this.$route.query.category}`,
         permissions: {
           app: 'xpack',
           resource: 'account'
@@ -58,12 +58,15 @@ export default {
               title: this.$t('PublicCloud'),
               icon: 'public-cloud',
               callback: () => {
-                const providers = [
-                  aliyun, qcloud, qcloud_lighthouse, huaweicloud,
-                  baiducloud, jdcloud, kingsoftcloud, aws_china,
-                  aws_international, azure, azure_international,
-                  gcp, ucloud, volcengine
-                ]
+                let providers = [aliyun]
+                if (this.$route.query.category === 'host') {
+                  providers = providers.concat([
+                    aliyun, qcloud, qcloud_lighthouse, huaweicloud,
+                    baiducloud, jdcloud, kingsoftcloud, aws_china,
+                    aws_international, azure, azure_international,
+                    gcp, ucloud, volcengine
+                  ])
+                }
                 this.providerConfig.providers = providers.map(
                   (item) => ACCOUNT_PROVIDER_ATTRS_MAP[item]
                 )
@@ -74,6 +77,7 @@ export default {
               name: 'privateCloud',
               icon: 'private-cloud',
               title: this.$t('PrivateCloud'),
+              has: () => this.$route.query.category === 'host',
               callback: () => {
                 const providers = [
                   vmware, qingcloud_private, huaweicloud_private, state_private,
@@ -89,6 +93,7 @@ export default {
               name: 'LAN',
               title: this.$t('LAN'),
               icon: 'computer',
+              has: () => this.$route.query.category === 'host',
               callback: () => {
                 const providers = [lan]
                 this.providerConfig.providers = providers.map(
diff --git a/src/views/assets/Cloud/Account/components/AuthPanel.vue b/src/views/assets/Cloud/Account/components/AuthPanel.vue
index 63518c848b..90dbe7741e 100644
--- a/src/views/assets/Cloud/Account/components/AuthPanel.vue
+++ b/src/views/assets/Cloud/Account/components/AuthPanel.vue
@@ -164,6 +164,7 @@ export default {
           const newValues = JSON.parse(JSON.stringify(values))
           newValues['attrs'] = encryptAttrsField(newValues.attrs)
           newValues['provider'] = vm.provider
+          newValues['category'] = this.$route.query.category || 'host'
           return newValues
         },
         addContinue: true
diff --git a/src/views/assets/Cloud/Account/components/ProviderPanel.vue b/src/views/assets/Cloud/Account/components/ProviderPanel.vue
index 3d9d6d5da5..9939dda562 100644
--- a/src/views/assets/Cloud/Account/components/ProviderPanel.vue
+++ b/src/views/assets/Cloud/Account/components/ProviderPanel.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="cloud-select-wrap">
-    <el-row :gutter="12">
-      <el-col v-for="p in providers" :key="p.name" :style="p.imageCSS ? p.imageCSS : ''">
+    <el-row :gutter="12" style="min-height: 300px">
+      <el-col v-for="p in providers" :key="p.name">
         <el-card
           :body-style="{ display: 'flex', alignItems: 'center', justifyContent: 'flex-start' }"
           :class="selected === p.name ? 'active': ''"
diff --git a/src/views/assets/Cloud/const.js b/src/views/assets/Cloud/const.js
index d3ec982d9a..f1216a6879 100644
--- a/src/views/assets/Cloud/const.js
+++ b/src/views/assets/Cloud/const.js
@@ -178,8 +178,7 @@ export const ACCOUNT_PROVIDER_ATTRS_MAP = {
     name: lan,
     title: i18n.t('LAN'),
     attrs: ['ip_group', 'test_port', 'test_timeout', 'hostname_prefix'],
-    image: require('@/assets/img/cloud/lan.svg'),
-    imageCSS: { height: '250px' }
+    image: require('@/assets/img/cloud/lan.svg')
   }
 }
 

From c7576086741a246b3fe3d368b14e5e050148e31a Mon Sep 17 00:00:00 2001
From: jiangweidong <1053570670@qq.com>
Date: Mon, 13 Jan 2025 11:46:28 +0800
Subject: [PATCH 2/2] feat: Resolve the issue of failure to return to the list
 after cloud synchronization jump.

---
 .../Cloud/Strategy/StrategyCreateUpdate.vue    | 13 ++++++++++---
 .../Cloud/Strategy/StrategyDetail/index.vue    |  9 +--------
 .../assets/Cloud/Strategy/StrategyList.vue     | 18 +++++++++++++++---
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/views/assets/Cloud/Strategy/StrategyCreateUpdate.vue b/src/views/assets/Cloud/Strategy/StrategyCreateUpdate.vue
index 455e648b90..abfa5d957d 100644
--- a/src/views/assets/Cloud/Strategy/StrategyCreateUpdate.vue
+++ b/src/views/assets/Cloud/Strategy/StrategyCreateUpdate.vue
@@ -36,15 +36,22 @@ export default {
           component: ActionInput
         }
       },
-      updateSuccessNextRoute: { name: 'CloudAccountList', params: { activeMenu: 'StrategyList' }},
-      createSuccessNextRoute: { name: 'CloudAccountList', params: { activeMenu: 'StrategyList' }},
+      updateSuccessNextRoute: this.getNextRoute(),
+      createSuccessNextRoute: this.getNextRoute(),
       getUrl() {
         const id = this.$route.params?.id
         return id ? `${this.url}${id}/` : this.url
       }
     }
   },
-  methods: {}
+  methods: {
+    getNextRoute() {
+      return {
+        name: 'CloudAccountList', params: { activeMenu: 'StrategyList' },
+        query: { category: this.$route.query.category || 'host' }
+      }
+    }
+  }
 }
 
 </script>
diff --git a/src/views/assets/Cloud/Strategy/StrategyDetail/index.vue b/src/views/assets/Cloud/Strategy/StrategyDetail/index.vue
index 8e6523ae94..ca6c5f5cc8 100644
--- a/src/views/assets/Cloud/Strategy/StrategyDetail/index.vue
+++ b/src/views/assets/Cloud/Strategy/StrategyDetail/index.vue
@@ -38,14 +38,7 @@ export default {
             return this.Account.name !== 'default'
           },
           deleteSuccessRoute: 'CloudAccountList',
-          updateCallback: () => {
-            const id = this.$route.params.id
-            const routeName = 'CloudStrategyUpdate'
-            this.$router.push({
-              name: routeName,
-              params: { id: id }
-            })
-          }
+          updateRoute: 'CloudStrategyUpdate'
         }
       }
     }
diff --git a/src/views/assets/Cloud/Strategy/StrategyList.vue b/src/views/assets/Cloud/Strategy/StrategyList.vue
index 69f6613b6d..cdfe3eebeb 100644
--- a/src/views/assets/Cloud/Strategy/StrategyList.vue
+++ b/src/views/assets/Cloud/Strategy/StrategyList.vue
@@ -27,7 +27,10 @@ export default {
           name: {
             formatter: DetailFormatter,
             formatterArgs: {
-              route: 'CloudStrategyDetail'
+              getRoute: ({ row }) => ({
+                name: 'CloudStrategyDetail', params: { id: row.id },
+                query: { category: this.$route.query.category || 'host' }
+              })
             }
           },
           strategy_rules: {
@@ -38,7 +41,12 @@ export default {
           },
           actions: {
             formatterArgs: {
-              updateRoute: 'CloudStrategyUpdate',
+              updateRoute: ({ row }) => {
+                return {
+                  name: 'CloudStrategyUpdate', params: { id: row.id },
+                  query: { category: this.$route.query.category || 'host' }
+                }
+              },
               hasClone: false,
               canDelete: ({ row }) => { return row.name !== 'default' },
               canUpdate: ({ row }) => { return row.name !== 'default' }
@@ -50,7 +58,11 @@ export default {
         hasImport: false,
         hasExport: false,
         hasMoreActions: false,
-        createRoute: 'CloudStrategyCreate'
+        createRoute: () => {
+          return {
+            name: 'CloudStrategyCreate', query: { category: this.$route.query.category || 'host' }
+          }
+        }
       }
     }
   },