From ed4da2ab50a65b921a32a67d50e61733410b54e7 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 13 Mar 2023 18:26:39 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/console/accounts.js                       | 12 ++++++------
 .../AccountBackupCreateUpdate.vue}                   |  2 +-
 .../AccountBackupExecutionInfo.vue}                  |  0
 .../AccountBackupExecutionDetail}/index.vue          |  4 ++--
 .../AccountBackupExecutionList.vue}                  |  0
 .../AccountBackupDetail/AccountBackupInfo.vue}       |  0
 .../AccountBackupDetail}/index.vue                   |  6 +++---
 .../AccountBackupList.vue}                           |  0
 .../components/FormTypeField.vue                     |  0
 .../{AccountBackupPlan => AccountBackup}/fields.js   |  0
 .../{AccountBackupPlan => AccountBackup}/index.vue   |  5 +++--
 .../accounts/AccountPush/AccountPushCreateUpdate.vue | 10 +++++-----
 12 files changed, 20 insertions(+), 19 deletions(-)
 rename src/views/accounts/{AccountBackupPlan/AccountBackupPlanCreateUpdate.vue => AccountBackup/AccountBackupCreateUpdate.vue} (99%)
 rename src/views/accounts/{AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail/AccountBackupPlanExecutionInfo.vue => AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/AccountBackupExecutionInfo.vue} (100%)
 rename src/views/accounts/{AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail => AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail}/index.vue (83%)
 rename src/views/accounts/{AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionList.vue => AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue} (100%)
 rename src/views/accounts/{AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanInfo.vue => AccountBackup/AccountBackupDetail/AccountBackupInfo.vue} (100%)
 rename src/views/accounts/{AccountBackupPlan/AccountBackupPlanDetail => AccountBackup/AccountBackupDetail}/index.vue (77%)
 rename src/views/accounts/{AccountBackupPlan/AccountBackupPlanList.vue => AccountBackup/AccountBackupList.vue} (100%)
 rename src/views/accounts/{AccountBackupPlan => AccountBackup}/components/FormTypeField.vue (100%)
 rename src/views/accounts/{AccountBackupPlan => AccountBackup}/fields.js (100%)
 rename src/views/accounts/{AccountBackupPlan => AccountBackup}/index.vue (87%)

diff --git a/src/router/console/accounts.js b/src/router/console/accounts.js
index 1892c2e46..354d74b88 100644
--- a/src/router/console/accounts.js
+++ b/src/router/console/accounts.js
@@ -307,7 +307,7 @@ export default [
     children: [
       {
         path: '',
-        component: () => import('@/views/accounts/AccountBackupPlan/index.vue'),
+        component: () => import('@/views/accounts/AccountBackup/index.vue'),
         name: 'AccountBackupList',
         meta: {
           title: i18n.t('accounts.AccountBackup.AccountBackup'),
@@ -316,7 +316,7 @@ export default [
       },
       {
         path: 'create',
-        component: () => import('@/views/accounts/AccountBackupPlan/AccountBackupPlanCreateUpdate.vue'),
+        component: () => import('@/views/accounts/AccountBackup/AccountBackupCreateUpdate.vue'),
         name: 'AccountBackupPlanCreate',
         meta: {
           title: i18n.t('accounts.AccountBackup.AccountBackupCreate'),
@@ -326,7 +326,7 @@ export default [
       },
       {
         path: ':id/update',
-        component: () => import('@/views/accounts/AccountBackupPlan/AccountBackupPlanCreateUpdate.vue'),
+        component: () => import('@/views/accounts/AccountBackup/AccountBackupCreateUpdate.vue'),
         name: 'AccountBackupPlanUpdate',
         meta: {
           title: i18n.t('accounts.AccountBackup.AccountBackupUpdate'),
@@ -336,21 +336,21 @@ export default [
       },
       {
         path: ':id',
-        component: () => import('@/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/index.vue'),
+        component: () => import('@/views/accounts/AccountBackup/AccountBackupDetail/index.vue'),
         name: 'AccountBackupPlanDetail',
         meta: { title: i18n.t('accounts.AccountBackup.AccountBackup') },
         hidden: true
       },
       {
         path: 'executions',
-        component: () => import('@/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionList.vue'),
+        component: () => import('@/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue'),
         name: 'AccountBackupPlanExecutionList',
         meta: { title: i18n.t('accounts.AccountBackup.ExecutionDetail') },
         hidden: true
       },
       {
         path: 'executions/:id',
-        component: () => import('@/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail/index.vue'),
+        component: () => import('@/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/index.vue'),
         name: 'AccountBackupPlanExecutionDetail',
         meta: { title: i18n.t('accounts.AccountBackup.ExecutionDetail') },
         hidden: true
diff --git a/src/views/accounts/AccountBackupPlan/AccountBackupPlanCreateUpdate.vue b/src/views/accounts/AccountBackup/AccountBackupCreateUpdate.vue
similarity index 99%
rename from src/views/accounts/AccountBackupPlan/AccountBackupPlanCreateUpdate.vue
rename to src/views/accounts/AccountBackup/AccountBackupCreateUpdate.vue
index 1831f0dd9..cf53e51b1 100644
--- a/src/views/accounts/AccountBackupPlan/AccountBackupPlanCreateUpdate.vue
+++ b/src/views/accounts/AccountBackup/AccountBackupCreateUpdate.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericCreateUpdatePage } from '@/layout/components'
-import getChangeSecretFields from '@/views/accounts/AccountBackupPlan/fields'
+import getChangeSecretFields from '@/views/accounts/AccountBackup/fields'
 
 export default {
   name: 'AccountBackupPlanUpdate',
diff --git a/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail/AccountBackupPlanExecutionInfo.vue b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/AccountBackupExecutionInfo.vue
similarity index 100%
rename from src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail/AccountBackupPlanExecutionInfo.vue
rename to src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/AccountBackupExecutionInfo.vue
diff --git a/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail/index.vue b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/index.vue
similarity index 83%
rename from src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail/index.vue
rename to src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/index.vue
index ef94de8d0..3602a8921 100644
--- a/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail/index.vue
+++ b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <GenericDetailPage :object.sync="execution" :active-menu.sync="config.activeMenu" v-bind="config" v-on="$listeners">
+  <GenericDetailPage :active-menu.sync="config.activeMenu" :object.sync="execution" v-bind="config" v-on="$listeners">
     <keep-alive>
       <component :is="config.activeMenu" :object="execution" />
     </keep-alive>
@@ -8,7 +8,7 @@
 
 <script>
 import { GenericDetailPage } from '@/layout/components'
-import AccountBackupPlanExecutionInfo from './AccountBackupPlanExecutionInfo'
+import AccountBackupPlanExecutionInfo from './AccountBackupExecutionInfo.vue'
 
 export default {
   components: {
diff --git a/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionList.vue b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue
similarity index 100%
rename from src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionList.vue
rename to src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue
diff --git a/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanInfo.vue b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupInfo.vue
similarity index 100%
rename from src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanInfo.vue
rename to src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupInfo.vue
diff --git a/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/index.vue b/src/views/accounts/AccountBackup/AccountBackupDetail/index.vue
similarity index 77%
rename from src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/index.vue
rename to src/views/accounts/AccountBackup/AccountBackupDetail/index.vue
index 2c8336897..5051a0c4b 100644
--- a/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/index.vue
+++ b/src/views/accounts/AccountBackup/AccountBackupDetail/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <GenericDetailPage :object.sync="plan" :active-menu.sync="config.activeMenu" v-bind="config">
+  <GenericDetailPage :active-menu.sync="config.activeMenu" :object.sync="plan" v-bind="config">
     <keep-alive>
       <component :is="config.activeMenu" :object="plan" />
     </keep-alive>
@@ -8,8 +8,8 @@
 
 <script>
 import { GenericDetailPage } from '@/layout/components'
-import AccountBackupPlanInfo from './AccountBackupPlanInfo'
-import AccountBackupPlanExecutionList from './AccountBackupPlanExecution/AccountBackupPlanExecutionList'
+import AccountBackupPlanInfo from './AccountBackupInfo.vue'
+import AccountBackupPlanExecutionList from './AccountBackupExecution/AccountBackupExecutionList.vue'
 
 export default {
   components: {
diff --git a/src/views/accounts/AccountBackupPlan/AccountBackupPlanList.vue b/src/views/accounts/AccountBackup/AccountBackupList.vue
similarity index 100%
rename from src/views/accounts/AccountBackupPlan/AccountBackupPlanList.vue
rename to src/views/accounts/AccountBackup/AccountBackupList.vue
diff --git a/src/views/accounts/AccountBackupPlan/components/FormTypeField.vue b/src/views/accounts/AccountBackup/components/FormTypeField.vue
similarity index 100%
rename from src/views/accounts/AccountBackupPlan/components/FormTypeField.vue
rename to src/views/accounts/AccountBackup/components/FormTypeField.vue
diff --git a/src/views/accounts/AccountBackupPlan/fields.js b/src/views/accounts/AccountBackup/fields.js
similarity index 100%
rename from src/views/accounts/AccountBackupPlan/fields.js
rename to src/views/accounts/AccountBackup/fields.js
diff --git a/src/views/accounts/AccountBackupPlan/index.vue b/src/views/accounts/AccountBackup/index.vue
similarity index 87%
rename from src/views/accounts/AccountBackupPlan/index.vue
rename to src/views/accounts/AccountBackup/index.vue
index 29a14e989..7713abbc5 100644
--- a/src/views/accounts/AccountBackupPlan/index.vue
+++ b/src/views/accounts/AccountBackup/index.vue
@@ -4,6 +4,7 @@
 
 <script>
 import { TabPage } from '@/layout/components'
+
 export default {
   name: 'Index',
   components: {
@@ -18,13 +19,13 @@ export default {
             title: this.$t('accounts.AccountBackup.AccountBackup'),
             name: 'AccountBackupPlanList',
             hidden: !this.$hasPerm('accounts.view_accountbackupautomation'),
-            component: () => import('@/views/accounts/AccountBackupPlan/AccountBackupPlanList.vue')
+            component: () => import('@/views/accounts/AccountBackup/AccountBackupList.vue')
           },
           {
             title: this.$t('accounts.AccountBackup.ExecutionList'),
             name: 'AccountBackupPlanExecutionList',
             hidden: !this.$hasPerm('accounts.view_accountbackupexecution'),
-            component: () => import('@/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionList.vue')
+            component: () => import('@/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue')
           }
         ]
       }
diff --git a/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue b/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue
index df0d8959c..6abb079b1 100644
--- a/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue
+++ b/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue
@@ -28,13 +28,13 @@ export default {
       encryptedFields: ['secret'],
       fields: [
         [this.$t('common.Basic'), ['name']],
-        [this.$t('xpack.Asset'), ['accounts', 'assets', 'nodes']],
+        [this.$t('xpack.Asset'), ['assets', 'nodes']],
         [
-          this.$t('accounts.AccountChangeSecret.SecretKeyStrategy'),
+          this.$t('assets.Account'),
           [
-            'secret_strategy', 'secret_type', 'secret',
-            'password_rules', 'ssh_key_change_strategy',
-            'ssh_key', 'passphrase'
+            'accounts', 'secret_strategy', 'secret_type', 'secret',
+            'password_rules', 'ssh_key_change_strategy', 'ssh_key',
+            'passphrase'
           ]
         ],
         [this.$t('xpack.Timer'), ['is_periodic', 'crontab', 'interval']],