From ef97df09cbed47fecb54ab5970f179ea18863ebb Mon Sep 17 00:00:00 2001
From: jiangweidong <80373698+fit2cloud-jiangweidong@users.noreply.github.com>
Date: Tue, 28 Dec 2021 18:16:13 +0800
Subject: [PATCH 01/15] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=20Redis=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84=E7=BA=B3=E7=AE=A1=20(#1246?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 支持 Redis 数据库的纳管

* feat: 支持Redis数据库的纳管, 将redis_acl协议合并到redis协议中
---
 src/components/DataActions/index.vue                  |  2 +-
 src/i18n/langs/cn.json                                |  7 ++++++-
 src/i18n/langs/en.json                                |  7 ++++++-
 .../applications/DatabaseApp/DatabaseAppList.vue      |  9 ++++++++-
 .../SystemUserCreateUpdate/CommonUser/database.vue    |  4 ++--
 .../SystemUserCreateUpdate/CommonUser/index.vue       |  1 +
 .../SystemUser/SystemUserCreateUpdate/fields.js       |  2 ++
 .../SystemUser/SystemUserList/CommonUserList.vue      |  9 ++++++++-
 src/views/perms/const.js                              | 11 ++++++++++-
 9 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/components/DataActions/index.vue b/src/components/DataActions/index.vue
index c09fda5fa..1d88919d6 100644
--- a/src/components/DataActions/index.vue
+++ b/src/components/DataActions/index.vue
@@ -15,7 +15,7 @@
         </el-button>
         <el-dropdown-menu slot="dropdown">
           <template v-for="option in action.dropdown">
-            <div v-if="option.group" :key="'group:'+option.name" class="dropdown-menu-title">
+            <div v-if="option.group" :key="'group:'+option.name" class="dropdown-menu-title" style="width:130px">
               {{ option.group }}
             </div>
             <el-dropdown-item
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 65725b943..cab64ba97 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -45,6 +45,7 @@
       "vmware_client":"Vmware Client",
       "custom":"Custom",
       "mysql": "MySQL",
+      "redis": "Redis",
       "oracle": "Oracle",
       "postgresql": "PostgreSQL",
       "mariadb": "MariaDB",
@@ -88,7 +89,9 @@
     "cluster": "集群",
     "kubernetes":"Kubernetes",
     "clusterHelpTextMessage": "例如：https://172.16.8.8:8443",
-    "DBInfo": "数据库信息"
+    "DBInfo": "数据库信息",
+    "RDBProtocol": "关系型数据库协议",
+    "NoSQLProtocol": "非关系型数据库协议"
   },
   "assets": {
     "AppList": "应用列表",
@@ -228,6 +231,8 @@
     "ipDomain": "IP(域名)",
     "HostProtocol": "主机协议",
     "DatabaseProtocol": "数据库协议",
+    "RDBProtocol": "关系型数据库协议",
+    "NoSQLProtocol": "非关系型数据库协议",
     "OtherProtocol": "其它协议",
     "PasswordOrToken": "密码 / 令牌"
   },
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index a006e75fe..193add9bd 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -40,6 +40,7 @@
       "vmware_client":"Vmware Client",
       "custom":"Custom",
       "mysql": "MySQL",
+      "redis": "Redis",
       "oracle": "Oracle",
       "postgresql": "PostgreSQL",
       "mariadb": "MariaDB",
@@ -83,7 +84,9 @@
     "cluster": "Cluster",
     "kubernetes":"Kubernetes",
     "clusterHelpTextMessage": "Tips: https://172.16.8.8:8443",
-    "DBInfo": "Database Info"
+    "DBInfo": "Database Info",
+    "RDBProtocol": "RDS Protocol",
+    "NoSQLProtocol": "NoSQL Protocol"
   },
   "assets": {
     "AppList": "Application list",
@@ -222,6 +225,8 @@
     "ipDomain": "IP(Domain)",
     "HostProtocol": "Host Protocol",
     "DatabaseProtocol": "Database Protocol",
+    "RDBProtocol": "RDS Protocol",
+    "NoSQLProtocol": "NoSQL Protocol",
     "OtherProtocol": "Other Protocol",
     "PasswordOrToken": "Password / Token"
   },
diff --git a/src/views/applications/DatabaseApp/DatabaseAppList.vue b/src/views/applications/DatabaseApp/DatabaseAppList.vue
index ac3cf04f3..66bd021bd 100644
--- a/src/views/applications/DatabaseApp/DatabaseAppList.vue
+++ b/src/views/applications/DatabaseApp/DatabaseAppList.vue
@@ -79,7 +79,8 @@ export default {
             {
               name: 'MySQL',
               title: 'MySQL',
-              has: true
+              has: true,
+              group: this.$t('assets.RDBProtocol')
             },
             {
               name: 'PostgreSQL',
@@ -101,6 +102,12 @@ export default {
               name: 'SQLServer',
               title: 'SQLServer',
               has: this.$store.getters.hasValidLicense
+            },
+            {
+              name: 'Redis',
+              title: 'Redis',
+              has: true,
+              group: this.$t('assets.NoSQLProtocol')
             }
           ]
         }
diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/database.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/database.vue
index b63947a76..c86f9b612 100644
--- a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/database.vue
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/database.vue
@@ -25,8 +25,8 @@ export default {
         auto_push: false
       },
       fields: [
-        [this.$t('common.Basic'), ['name', 'login_mode', 'username', 'priority', 'protocol']],
-        [this.$t('common.Auth'), ['password']],
+        [this.$t('common.Basic'), ['name', 'username', 'priority', 'protocol']],
+        [this.$t('common.Auth'), ['login_mode', 'password']],
         [this.$t('common.Command filter'), ['cmd_filters']],
         [this.$t('common.Other'), ['comment']]
       ],
diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/index.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/index.vue
index 985a407cd..9fb5d5bc3 100644
--- a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/index.vue
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/index.vue
@@ -47,6 +47,7 @@ export default {
         case 'postgresql':
         case 'mariadb':
         case 'sqlserver':
+        case 'redis':
           return Database
         case 'k8s':
           return K8S
diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js b/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js
index fbf5cb0b8..5af6cd0ad 100644
--- a/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js
@@ -31,6 +31,8 @@ function getFields() {
         this.fieldsMeta.username.rules[0].required = false
       } else if (form.username_same_with_user) {
         this.fieldsMeta.username.rules[0].required = false
+      } else if (form.protocol === 'redis') {
+        this.fieldsMeta.username.rules[0].required = false
       } else {
         this.fieldsMeta.username.rules[0].required = true
       }
diff --git a/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue b/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue
index 8fd7a8acd..252d51639 100644
--- a/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue
+++ b/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue
@@ -105,7 +105,7 @@ export default {
               title: 'MySQL',
               type: 'primary',
               has: true,
-              group: this.$t('assets.DatabaseProtocol')
+              group: this.$t('assets.RDBProtocol')
             },
             {
               name: 'PostgreSQL',
@@ -131,6 +131,13 @@ export default {
               type: 'primary',
               has: this.$store.getters.hasValidLicense
             },
+            {
+              name: 'Redis',
+              title: 'Redis',
+              type: 'primary',
+              has: true,
+              group: this.$t('assets.NoSQLProtocol')
+            },
             {
               name: 'K8S',
               title: 'K8S',
diff --git a/src/views/perms/const.js b/src/views/perms/const.js
index 633a54224..f9fb44019 100644
--- a/src/views/perms/const.js
+++ b/src/views/perms/const.js
@@ -43,6 +43,7 @@ export const REMOTE_APP = [
 ]
 
 export const MYSQL = 'mysql'
+export const REDIS = 'redis'
 export const ORACLE = 'oracle'
 export const POSTGRESQL = 'postgresql'
 export const MARIADB = 'mariadb'
@@ -56,7 +57,7 @@ export const DATABASE = [
     type: 'primary',
     category: DATABASE_CATEGORY,
     has: true,
-    group: i18n.t('applications.Database')
+    group: i18n.t('applications.RDBProtocol')
   },
   {
     name: ORACLE,
@@ -85,6 +86,14 @@ export const DATABASE = [
     type: 'primary',
     category: DATABASE_CATEGORY,
     has: hasLicence
+  },
+  {
+    name: REDIS,
+    title: i18n.t(`applications.applicationsType.${REDIS}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: true,
+    group: i18n.t('applications.NoSQLProtocol')
   }
 ]
 

From ec00a541f874d8045bea5e9e45e9315202527537 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Fri, 24 Dec 2021 17:39:33 +0800
Subject: [PATCH 02/15] =?UTF-8?q?feat:=20=E5=91=BD=E4=BB=A4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=20remote=5Faddr?=
 =?UTF-8?q?=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sessions/CommandList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index bc17d8c34..66eb457e5 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -49,7 +49,7 @@ export default {
           }
         },
         columns: [
-          'expandCol', 'input', 'risk_level', 'user',
+          'expandCol', 'input', 'risk_level', 'user', 'remote_addr',
           'asset', 'system_user', 'session', 'timestamp'
         ],
         extraQuery: {

From 4ecdf1575da97254b08f696f38f238c56dd30c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 29 Dec 2021 16:31:33 +0800
Subject: [PATCH 03/15] =?UTF-8?q?fix:=20=E5=BA=94=E7=94=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=B1=BB=E5=9E=8B=E6=90=9C=E7=B4=A2=EF=BC=8C=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DatabaseApp/DatabaseAppList.vue           | 97 +++++++++++--------
 .../KubernetesApp/KubernetesAppList.vue       |  8 +-
 .../applications/RemoteApp/RemoteAppList.vue  | 20 ++--
 3 files changed, 77 insertions(+), 48 deletions(-)

diff --git a/src/views/applications/DatabaseApp/DatabaseAppList.vue b/src/views/applications/DatabaseApp/DatabaseAppList.vue
index 66bd021bd..9750da02e 100644
--- a/src/views/applications/DatabaseApp/DatabaseAppList.vue
+++ b/src/views/applications/DatabaseApp/DatabaseAppList.vue
@@ -11,6 +11,41 @@ export default {
   },
   data() {
     const vm = this
+    const appType = [
+      {
+        name: 'mysql',
+        title: 'MySQL',
+        has: true,
+        group: this.$t('assets.RDBProtocol')
+      },
+      {
+        name: 'postgresql',
+        title: 'PostgreSQL',
+        has: this.$store.getters.hasValidLicense
+      },
+      {
+        name: 'mariadb',
+        title: 'MariaDB',
+        type: 'primary',
+        has: this.$store.getters.hasValidLicense
+      },
+      {
+        name: 'oracle',
+        title: 'Oracle',
+        has: this.$store.getters.hasValidLicense
+      },
+      {
+        name: 'sqlserver',
+        title: 'SQLServer',
+        has: this.$store.getters.hasValidLicense
+      },
+      {
+        name: 'redis',
+        title: 'Redis',
+        has: true,
+        group: this.$t('assets.NoSQLProtocol')
+      }
+    ]
     return {
       tableConfig: {
         url: '/api/v1/applications/applications/?category=db',
@@ -24,8 +59,7 @@ export default {
         },
         columnsMeta: {
           type_display: {
-            label: this.$t('applications.type'),
-            width: '120px'
+            label: this.$t('applications.type')
           },
           'attrs.host': {
             label: this.$t('applications.host'),
@@ -69,50 +103,37 @@ export default {
         hasBulkDelete: true,
         createRoute: 'DatabaseAppCreate',
         searchConfig: {
-          exclude: ['category', 'type']
+          exclude: ['category', 'type'],
+          options: [
+            {
+              value: 'type',
+              label: this.$t('applications.type'),
+              children: this.getAppType(appType)
+            }
+          ]
         },
         moreCreates: {
           callback: (item) => {
             vm.$router.push({ name: 'DatabaseAppCreate', query: { type: item.name.toLowerCase() }})
           },
-          dropdown: [
-            {
-              name: 'MySQL',
-              title: 'MySQL',
-              has: true,
-              group: this.$t('assets.RDBProtocol')
-            },
-            {
-              name: 'PostgreSQL',
-              title: 'PostgreSQL',
-              has: this.$store.getters.hasValidLicense
-            },
-            {
-              name: 'MariaDB',
-              title: 'MariaDB',
-              type: 'primary',
-              has: this.$store.getters.hasValidLicense
-            },
-            {
-              name: 'Oracle',
-              title: 'Oracle',
-              has: this.$store.getters.hasValidLicense
-            },
-            {
-              name: 'SQLServer',
-              title: 'SQLServer',
-              has: this.$store.getters.hasValidLicense
-            },
-            {
-              name: 'Redis',
-              title: 'Redis',
-              has: true,
-              group: this.$t('assets.NoSQLProtocol')
-            }
-          ]
+          dropdown: appType
         }
       }
     }
+  },
+  methods: {
+    getAppType(arr) {
+      const searchAppType = []
+      if (arr.length < 1) return searchAppType
+      arr.forEach((i) => {
+        const option = {
+          value: i.name,
+          label: i.title
+        }
+        searchAppType.push(option)
+      })
+      return searchAppType
+    }
   }
 }
 </script>
diff --git a/src/views/applications/KubernetesApp/KubernetesAppList.vue b/src/views/applications/KubernetesApp/KubernetesAppList.vue
index 628ba7ded..b572a77d3 100644
--- a/src/views/applications/KubernetesApp/KubernetesAppList.vue
+++ b/src/views/applications/KubernetesApp/KubernetesAppList.vue
@@ -15,12 +15,12 @@ export default {
       tableConfig: {
         url: '/api/v1/applications/applications/?category=cloud',
         columns: [
-          'name', 'type', 'attrs.cluster',
+          'name', 'type_display', 'attrs.cluster',
           'created_by', 'date_created', 'date_updated', 'comment', 'org_name', 'actions'
         ],
         columnsShow: {
           min: ['name', 'actions'],
-          default: ['name', 'type', 'attrs.cluster', 'comment', 'actions']
+          default: ['name', 'type_display', 'attrs.cluster', 'comment', 'actions']
         },
         columnsMeta: {
           'attrs.cluster': {
@@ -29,8 +29,8 @@ export default {
           comment: {
             width: '340px'
           },
-          type: {
-            width: '140px'
+          type_display: {
+            label: this.$t('applications.type')
           },
           actions: {
             prop: 'actions',
diff --git a/src/views/applications/RemoteApp/RemoteAppList.vue b/src/views/applications/RemoteApp/RemoteAppList.vue
index ede2da147..9d3733c25 100644
--- a/src/views/applications/RemoteApp/RemoteAppList.vue
+++ b/src/views/applications/RemoteApp/RemoteAppList.vue
@@ -17,17 +17,16 @@ export default {
       tableConfig: {
         url: '/api/v1/applications/applications/?category=remote_app',
         columns: [
-          'name', 'type', 'attrs.asset',
+          'name', 'type_display', 'attrs.asset',
           'created_by', 'date_created', 'date_updated', 'comment', 'org_name', 'actions'
         ],
         columnsShow: {
           min: ['name', 'actions'],
-          default: ['name', 'type', 'attrs.asset', 'comment', 'actions']
+          default: ['name', 'type_display', 'attrs.asset', 'comment', 'actions']
         },
         columnsMeta: {
-          type: {
-            displayKey: 'get_type_display',
-            width: '140px'
+          type_display: {
+            label: this.$t('applications.type')
           },
           'attrs.asset': {
             label: this.$t('assets.Assets'),
@@ -67,7 +66,14 @@ export default {
         hasImport: false,
         // createRoute: 'RemoteAppCreate',
         searchConfig: {
-          exclude: ['category', 'type']
+          exclude: ['category', 'type'],
+          options: [
+            {
+              value: 'type',
+              label: this.$t('applications.type'),
+              children: this.getCreateAppType()
+            }
+          ]
         },
         moreCreates: {
           dropdown: this.getCreateAppType(),
@@ -85,6 +91,8 @@ export default {
         const item = { ...REMOTE_APP_TYPE_META_MAP[value] }
         item.can = true
         item.has = true
+        item.value = item.name
+        item.label = item.title
         extraMoreActions.push(item)
       }
       return extraMoreActions

From 31e699bd2d2c34ba226f1fbc886f0f4850a65a63 Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Wed, 22 Dec 2021 17:39:08 +0800
Subject: [PATCH 04/15] =?UTF-8?q?feat:=20=E5=BA=94=E7=94=A8=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E5=A2=9E=E5=8A=A0Action=E5=8A=A8=E4=BD=9C=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataForm/utils.js          |  3 ++
 .../ApplicationPermissionCreateUpdate.vue     |  8 +++-
 .../AssetPermissionCreateUpdate.vue           |  5 +--
 .../PermissionFormActionField.vue}            | 39 +++++++++++++++++--
 .../tickets/RequestAssetPerm/CreateUpdate.vue |  4 +-
 5 files changed, 48 insertions(+), 11 deletions(-)
 rename src/views/perms/{AssetPermission/components/AssetPermissionFormActionField.vue => components/PermissionFormActionField.vue} (63%)

diff --git a/src/components/AutoDataForm/utils.js b/src/components/AutoDataForm/utils.js
index b8b467487..b8dbfeb09 100644
--- a/src/components/AutoDataForm/utils.js
+++ b/src/components/AutoDataForm/utils.js
@@ -18,6 +18,9 @@ export class FormFieldGenerator {
           })
         }
         break
+      case 'multiple choice':
+        field.el.choices = fieldRemoteMeta['choices']
+        break
       case 'datetime':
         type = 'date-picker'
         field.el = {
diff --git a/src/views/perms/ApplicationPermission/ApplicationPermissionCreateUpdate.vue b/src/views/perms/ApplicationPermission/ApplicationPermissionCreateUpdate.vue
index 20c071b2b..fae819744 100644
--- a/src/views/perms/ApplicationPermission/ApplicationPermissionCreateUpdate.vue
+++ b/src/views/perms/ApplicationPermission/ApplicationPermissionCreateUpdate.vue
@@ -11,6 +11,7 @@
 <script>
 import { GenericCreateUpdatePage } from '@/layout/components'
 import { getDayFuture } from '@/utils/common'
+import PermissionFormActionField from '../components/PermissionFormActionField'
 
 export default {
   components: {
@@ -29,9 +30,10 @@ export default {
         [this.$t('common.Basic'), ['name']],
         [this.$t('perms.User'), ['users', 'user_groups']],
         [this.$t('assets.Applications'), ['category', 'type', 'applications', 'system_users']],
+        [this.$t('common.action'), ['actions']],
         [this.$t('common.Other'), ['is_active', 'date_start', 'date_expired', 'comment']]
       ],
-      url: '/api/v1/perms/application-permissions/',
+      url: `/api/v1/perms/application-permissions/?category=${this.$route.query.category}&type=${this.$route.query.type}`,
       fieldsMeta: {
         users: {
           el: {
@@ -101,7 +103,9 @@ export default {
           label: this.$t('common.dateExpired')
         },
         actions: {
-          label: this.$t('perms.Actions')
+          label: this.$t('perms.Actions'),
+          component: PermissionFormActionField,
+          helpText: this.$t('common.actionsTips')
         },
         is_active: {
           type: 'checkbox'
diff --git a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue
index 0f55db72f..024e13c92 100644
--- a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericCreateUpdatePage } from '@/layout/components'
-import AssetPermissionFormActionField from './components/AssetPermissionFormActionField'
+import PermissionFormActionField from '../components/PermissionFormActionField'
 import AssetSelect from '@/components/AssetSelect'
 import { getDayFuture } from '@/utils/common'
 
@@ -24,7 +24,6 @@ export default {
     return {
       initial: {
         is_active: true,
-        actions: ['all', 'connect', 'updownload', 'upload_file', 'download_file'],
         date_start: new Date().toISOString(),
         date_expired: getDayFuture(36500, new Date()).toISOString(),
         nodes: nodesInitial,
@@ -92,7 +91,7 @@ export default {
         },
         actions: {
           label: this.$t('perms.Actions'),
-          component: AssetPermissionFormActionField,
+          component: PermissionFormActionField,
           helpText: this.$t('common.actionsTips')
         },
         date_start: {
diff --git a/src/views/perms/AssetPermission/components/AssetPermissionFormActionField.vue b/src/views/perms/components/PermissionFormActionField.vue
similarity index 63%
rename from src/views/perms/AssetPermission/components/AssetPermissionFormActionField.vue
rename to src/views/perms/components/PermissionFormActionField.vue
index 406e426a1..35b3da7be 100644
--- a/src/views/perms/AssetPermission/components/AssetPermissionFormActionField.vue
+++ b/src/views/perms/components/PermissionFormActionField.vue
@@ -1,6 +1,6 @@
 <template>
   <el-tree
-    :data="data"
+    :data="iData"
     show-checkbox
     node-key="id"
     :default-expand-all="false"
@@ -13,11 +13,15 @@
 
 <script>
 export default {
-  name: 'AssetPermissionFormActionField',
+  name: 'PermissionFormActionField',
   props: {
     value: {
       type: Array,
-      default: () => ['all', 'connect', 'upload_file', 'download_file', 'updownload', 'clipboard_copy_paste', 'clipboard_copy', 'clipboard_paste']
+      default: () => []
+    },
+    choices: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
@@ -26,7 +30,7 @@ export default {
         children: 'children',
         label: 'label'
       },
-      data: [
+      fullChoicesTreeNodes: [
         {
           id: 'all',
           label: this.$t('perms.all'),
@@ -68,7 +72,34 @@ export default {
       ]
     }
   },
+  computed: {
+    choicesIDs() {
+      return this.choices.map((v) => v.value)
+    },
+    iData() {
+      this.$log.debug('choices: ', this.choicesIDs)
+      const fullTreeNodes = _.cloneDeep(this.fullChoicesTreeNodes)
+      const treeNodes = this.trimChoicesTreeNodes(fullTreeNodes)
+      this.$log.debug('choicesTreeNodes: ', treeNodes)
+      return treeNodes
+    }
+  },
   methods: {
+    trimChoicesTreeNodes(treeNodes) {
+      const newTreeNodes = []
+      for (const treeNode of treeNodes) {
+        if (!this.choicesIDs.includes(treeNode.id)) {
+          continue
+        }
+        let children = treeNode.children || []
+        if (children.length !== 0) {
+          children = this.trimChoicesTreeNodes(children)
+          treeNode.children = children
+        }
+        newTreeNodes.push(treeNode)
+      }
+      return newTreeNodes
+    },
     handleCheckChange(data, obj) {
       const checkedKeys = obj.checkedKeys
       if (checkedKeys.length !== 0) {
diff --git a/src/views/tickets/RequestAssetPerm/CreateUpdate.vue b/src/views/tickets/RequestAssetPerm/CreateUpdate.vue
index 5f84d8c8e..e8e0a3254 100644
--- a/src/views/tickets/RequestAssetPerm/CreateUpdate.vue
+++ b/src/views/tickets/RequestAssetPerm/CreateUpdate.vue
@@ -6,7 +6,7 @@
 import { GenericCreateUpdatePage } from '@/layout/components'
 import Select2 from '@/components/FormFields/Select2'
 import { getDaysFuture } from '@/utils/common'
-import AssetPermissionFormActionField from '@/views/perms/AssetPermission/components/AssetPermissionFormActionField'
+import PermissionFormActionField from '@/views/perms/components/PermissionFormActionField'
 export default {
   components: {
     GenericCreateUpdatePage
@@ -50,7 +50,7 @@ export default {
           fieldsMeta: {
             apply_actions: {
               label: this.$t('perms.Actions'),
-              component: AssetPermissionFormActionField,
+              component: PermissionFormActionField,
               helpText: this.$t('common.actionsTips')
             },
             apply_nodes: {

From 16c6f4c77f2d60039924ddbbc01eee09b9e590c3 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Thu, 30 Dec 2021 19:58:39 +0800
Subject: [PATCH 05/15] feat: add passphrase

---
 .../AccountListTable/UpdateSecretInfo.vue       |  7 ++++++-
 src/i18n/langs/cn.json                          |  1 +
 src/i18n/langs/en.json                          |  1 +
 .../ChangeAuthPlanCreateUpdate.vue              |  3 ++-
 src/views/accounts/ChangeAuthPlan/fields.js     | 17 ++++++++++-------
 .../Domain/DomainDetail/GatewayCreateUpdate.vue |  2 +-
 .../SystemUserCreateUpdate/CommonUser/ssh.vue   |  3 ++-
 .../SystemUser/SystemUserCreateUpdate/fields.js | 12 +++++++++++-
 8 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/components/AccountListTable/UpdateSecretInfo.vue b/src/components/AccountListTable/UpdateSecretInfo.vue
index b05ac51ab..6e52ed4a7 100644
--- a/src/components/AccountListTable/UpdateSecretInfo.vue
+++ b/src/components/AccountListTable/UpdateSecretInfo.vue
@@ -21,6 +21,9 @@
       <el-form-item :label="this.$t('assets.SSHKey')">
         <input type="file" @change="onPrivateKeyLoaded">
       </el-form-item>
+      <el-form-item :label="this.$t('assets.Passphrase')">
+        <el-input v-model="authInfo.passphrase" type="password" />
+      </el-form-item>
     </el-form>
   </Dialog>
 </template>
@@ -42,7 +45,8 @@ export default {
     return {
       authInfo: {
         password: '',
-        private_key: ''
+        private_key: '',
+        passphrase: ''
       }
     }
   },
@@ -54,6 +58,7 @@ export default {
       }
       if (this.authInfo.private_key !== '') {
         data.private_key = this.authInfo.private_key
+        data.passphrase = this.authInfo.passphrase
       }
       this.$axios.patch(
         `/api/v1/assets/accounts/${this.account.id}/`,
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index cab64ba97..758ab6071 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -171,6 +171,7 @@
     "Other": "其它",
     "Hardware": "硬件信息",
     "Password": "密码",
+    "Passphrase": "密钥密码",
     "PasswordWithoutSpecialCharHelpText": "不能包含特殊字符",
     "Pending": "等待",
     "Platform": "系统平台",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 193add9bd..4ce42560b 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -168,6 +168,7 @@
     "Os": "Os",
     "Other": "Other",
     "Password": "Password",
+    "Passphrase": "Passphrase",
     "PasswordWithoutSpecialCharHelpText": "Password can't has special chars ",
     "Pending": "Pending",
     "Platform": "Platform",
diff --git a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue
index 521654f9b..1cb752d65 100644
--- a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue
+++ b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue
@@ -19,7 +19,7 @@ export default {
         [this.$t('common.Basic'), ['name']],
         [this.$t('xpack.Asset'), ['username', 'assets', 'nodes']],
         [this.$t('xpack.ChangeAuthPlan.PasswordStrategy'), ['is_password', 'password_strategy', 'password', 'password_rules']],
-        [this.$t('xpack.ChangeAuthPlan.SecretKeyStrategy'), ['is_ssh_key', 'ssh_key_strategy', 'private_key']],
+        [this.$t('xpack.ChangeAuthPlan.SecretKeyStrategy'), ['is_ssh_key', 'ssh_key_strategy', 'private_key', 'passphrase']],
         [this.$t('xpack.Timer'), ['is_periodic', 'crontab', 'interval']],
         [this.$t('common.Other'), ['recipients', 'comment']]
       ],
@@ -38,6 +38,7 @@ export default {
         username: fields.username,
         assets: fields.assets,
         password: fields.password,
+        passphrase: fields.passphrase,
         password_rules: fields.asset_password_rules,
         private_key: fields.private_key,
         nodes: fields.nodes,
diff --git a/src/views/accounts/ChangeAuthPlan/fields.js b/src/views/accounts/ChangeAuthPlan/fields.js
index e33110ec5..4cf078908 100644
--- a/src/views/accounts/ChangeAuthPlan/fields.js
+++ b/src/views/accounts/ChangeAuthPlan/fields.js
@@ -1,6 +1,6 @@
 import i18n from '@/i18n/i18n'
-import { AssetSelect, CronTab } from '@/components'
-import Select2 from '@/components/FormFields/Select2'
+import { AssetSelect, CronTab, UploadKey } from '@/components'
+import { Select2 } from '@/components/FormFields/Select2'
 import { Required } from '@/components/DataForm/rules'
 
 var validatorInterval = (rule, value, callback) => {
@@ -103,6 +103,12 @@ function getFields() {
     ]
   }
 
+  const passphrase = {
+    hidden: (formValue) => {
+      return formValue.is_ssh_key === false
+    }
+  }
+
   const asset_password_rules = {
     type: 'group',
     items: generatePasswordRulesItemsFields('asset')
@@ -114,11 +120,7 @@ function getFields() {
   }
 
   const private_key = {
-    el: {
-      type: 'textarea',
-      placeholder: '-----BEGIN OPENSSH PRIVATE KEY-----',
-      autosize: { minRows: 3 }
-    },
+    component: UploadKey,
     hidden: (formValue) => {
       return formValue.is_ssh_key === false
     },
@@ -225,6 +227,7 @@ function getFields() {
     password_strategy: password_strategy,
     ssh_key_strategy: ssh_key_strategy,
     private_key: private_key,
+    passphrase: passphrase,
     asset_password_rules: asset_password_rules,
     database_password_rules: database_password_rules,
     nodes: nodes,
diff --git a/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue b/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue
index 0cb3f5d02..ede129f7a 100644
--- a/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue
+++ b/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue
@@ -20,7 +20,7 @@ export default {
       },
       fields: [
         [this.$t('common.Basic'), ['name', 'ip', 'port', 'protocol', 'domain']],
-        [this.$t('assets.Auth'), ['username', 'password', 'private_key']],
+        [this.$t('assets.Auth'), ['username', 'password', 'private_key', 'passphrase']],
         [this.$t('common.Other'), ['is_active', 'comment']]
       ],
       fieldsMeta: {
diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/ssh.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/ssh.vue
index 6ae281d49..aa0c978be 100644
--- a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/ssh.vue
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/ssh.vue
@@ -31,7 +31,7 @@ export default {
       },
       fields: [
         [this.$t('common.Basic'), ['name', 'protocol', 'username', 'username_same_with_user']],
-        [this.$t('common.Auth'), ['login_mode', 'auto_generate_key', 'password', 'private_key']],
+        [this.$t('common.Auth'), ['login_mode', 'auto_generate_key', 'password', 'private_key', 'passphrase']],
         [this.$t('assets.AutoPush'), ['auto_push', 'sudo', 'shell', 'home', 'system_groups']],
         [this.$t('common.Command filter'), ['cmd_filters']],
         [this.$t('assets.UserSwitch'), ['su_enabled', 'su_from']],
@@ -41,6 +41,7 @@ export default {
         login_mode: fields.login_mode,
         username: fields.username,
         private_key: fields.private_key,
+        passphrase: fields.passphrase,
         username_same_with_user: fields.username_same_with_user,
         auto_generate_key: fields.auto_generate_key,
         protocol: fields.protocol,
diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js b/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js
index 5af6cd0ad..3abaac907 100644
--- a/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js
@@ -154,7 +154,6 @@ function getFields() {
   }
 
   const password = {
-    helpText: this.$t('assets.PasswordHelpMessage'),
     component: UpdateToken,
     hidden: form => {
       if (form.login_mode !== 'auto' || form.auto_generate_key) {
@@ -166,6 +165,16 @@ function getFields() {
     }
   }
 
+  const passphrase = {
+    component: UpdateToken,
+    hidden: (form) => {
+      if (form.login_mode !== 'auto') {
+        return true
+      }
+      return form.auto_generate_key === true
+    }
+  }
+
   const system_groups = {
     label: this.$t('assets.LinuxUserAffiliateGroup'),
     hidden: (item) => !item.auto_push || item.username_same_with_user,
@@ -186,6 +195,7 @@ function getFields() {
     auto_push: auto_push,
     update_password: update_password,
     password: password,
+    passphrase: passphrase,
     system_groups: system_groups,
     type: type
   }

From fa3daea82de884ac152433e3b80733425f703f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com>
Date: Thu, 30 Dec 2021 19:11:25 +0800
Subject: [PATCH 06/15] =?UTF-8?q?feat:=20=E5=B7=A5=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=9A=E8=AF=9D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/GenericTicketDetail.vue        |   5 +-
 src/views/tickets/components/Session.vue      | 134 ++++++++++++++++++
 2 files changed, 138 insertions(+), 1 deletion(-)
 create mode 100644 src/views/tickets/components/Session.vue

diff --git a/src/views/tickets/components/GenericTicketDetail.vue b/src/views/tickets/components/GenericTicketDetail.vue
index 5815068ee..0432357c4 100644
--- a/src/views/tickets/components/GenericTicketDetail.vue
+++ b/src/views/tickets/components/GenericTicketDetail.vue
@@ -9,6 +9,7 @@
     </el-col>
     <el-col :span="6" :offset="1">
       <Steps :object="object" />
+      <Session :object="object" />
     </el-col>
   </el-row>
 </template>
@@ -17,9 +18,11 @@
 import Details from './Details'
 import Comments from './Comments'
 import Steps from './Steps'
+import Session from './Session'
+
 export default {
   name: 'GenericTicketDetail',
-  components: { Steps, Comments, Details },
+  components: { Steps, Comments, Details, Session },
   props: {
     object: {
       type: Object,
diff --git a/src/views/tickets/components/Session.vue b/src/views/tickets/components/Session.vue
new file mode 100644
index 000000000..2d3119672
--- /dev/null
+++ b/src/views/tickets/components/Session.vue
@@ -0,0 +1,134 @@
+<template>
+  <IBox v-if="session.id" v-loading="loading" class="box">
+    <div slot="header" class="clearfix ibox-title">
+      <i class="fa fa-rocket" />
+      {{ $t('sessions.session') }}
+    </div>
+    <div class="content">
+      <el-row class="item">
+        <el-col>
+          <span class="item-label">{{ $t('sessions.target') }}：</span>
+          <span class="item-value">{{ session.asset }}</span>
+        </el-col>
+        <el-col>
+          <span class="item-label">{{ $t('sessions.remoteAddr') }}：</span>
+          <span class="item-value">{{ session.remote_addr }}</span>
+        </el-col>
+        <el-col>
+          <span class="item-label">{{ $t('sessions.protocol') }}：</span>
+          <span class="item-value">{{ session.protocol }}</span>
+        </el-col>
+      </el-row>
+    </div>
+    <el-divider />
+    <div class="bottom-btn">
+      <el-button
+        type="danger"
+        size="small"
+        :disabled="!session.can_terminate"
+        @click="onConnect"
+      >
+        {{ $t('sessions.terminate') }}
+      </el-button>
+      <el-button
+        type="primary"
+        size="small"
+        :disabled="!session.can_join"
+        @click="onMonitor"
+      >
+        {{ $t('sessions.Monitor') }}
+      </el-button>
+    </div>
+  </IBox>
+</template>
+
+<script>
+import IBox from '@/components/IBox'
+
+export default {
+  components: { IBox },
+  props: {
+    object: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      session: {},
+      curTimer: null,
+      loading: false
+    }
+  },
+
+  created() {
+    if (this.object.state !== 'open') {
+      this.init()
+    }
+  },
+  destroyed() {
+    clearTimeout(this.curTimer)
+  },
+  methods: {
+    init() {
+      this.loading = true
+      const url = `/api/v1/tickets/tickets/${this.object.id}/session/`
+      this.$axios({
+        url,
+        method: 'get',
+        disableFlashErrorMsg: true
+      }).then(res => {
+        this.session = res || {}
+      }).catch(err => {
+        this.$log.debug('error', err)
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    onConnect() {
+      const url = '/api/v1/terminal/tasks/kill-session-for-ticket/'
+      const data = [this.session.id] || []
+      this.$axios.post(url, data).then(res => {
+        this.$message.success(this.$t('sessions.TerminateTaskSendSuccessMsg'))
+        this.curTimer = setTimeout(() => {
+          this.init()
+        }, 50000)
+      }).catch(err => {
+        this.$message.error(err)
+      })
+    },
+    onMonitor() {
+      const joinUrl = `/luna/monitor/${this.session.id}`
+      window.open(joinUrl, 'height=600, width=800, top=400, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')
+    }
+  }
+
+}
+</script>
+
+<style lang='scss' scoped>
+  .box {
+    margin-top: 15px;
+    margin-bottom: 15px;
+    &>>> .el-divider--horizontal {
+      margin: 10px 0;
+    }
+  }
+  .content {
+    line-height: 2.5;
+    font-size: 13px;
+    color: #676A6C;
+    .item-label {
+      font-weight: 700;
+    }
+    .item-value {
+      color: #676A6C;
+    }
+    &>>> .el-col {
+      line-height: 24px;
+    }
+  }
+  .bottom-btn {
+    text-align: right;
+  }
+</style>

From e13f2b34ff5059540c722d3bbb55350bca0cb934 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Fri, 31 Dec 2021 16:34:13 +0800
Subject: [PATCH 07/15] fix: ticket bug

---
 src/views/tickets/RequestApplicationPerm/CreateUpdate.vue | 2 +-
 src/views/tickets/RequestAssetPerm/CreateUpdate.vue       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue b/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue
index 012798df3..231a39f41 100644
--- a/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue
+++ b/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue
@@ -219,7 +219,7 @@ export default {
   },
   mounted() {
     let userAllOrgIds = this.$store.state.users.profile['user_all_orgs']
-    const currentOrgId = this.$store.getters.currentOrg.id
+    const currentOrgId = this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : null
     userAllOrgIds = userAllOrgIds ? userAllOrgIds.map(i => i.id) : []
     if (userAllOrgIds.length > 0) {
       if (userAllOrgIds.includes(currentOrgId)) {
diff --git a/src/views/tickets/RequestAssetPerm/CreateUpdate.vue b/src/views/tickets/RequestAssetPerm/CreateUpdate.vue
index e8e0a3254..092f6779b 100644
--- a/src/views/tickets/RequestAssetPerm/CreateUpdate.vue
+++ b/src/views/tickets/RequestAssetPerm/CreateUpdate.vue
@@ -131,7 +131,7 @@ export default {
   },
   mounted() {
     let userAllOrgIds = this.$store.state.users.profile['user_all_orgs']
-    const currentOrgId = this.$store.getters.currentOrg.id
+    const currentOrgId = this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : null
     userAllOrgIds = userAllOrgIds ? userAllOrgIds.map(i => i.id) : []
     if (userAllOrgIds.length > 0) {
       if (userAllOrgIds.includes(currentOrgId)) {

From 61c777532b5e49928c32b1621e0e3f16a84f529d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com>
Date: Fri, 31 Dec 2021 16:40:15 +0800
Subject: [PATCH 08/15] =?UTF-8?q?feat:=20=E5=B7=A5=E5=8D=95=E4=BC=9A?=
 =?UTF-8?q?=E8=AF=9D=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                   | 1 +
 src/i18n/langs/en.json                   | 1 +
 src/views/tickets/components/Session.vue | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 758ab6071..2b19dc179 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -790,6 +790,7 @@
     "accountName": "账户名称",
     "active": "激活中",
     "alive": "在线",
+    "noAlive": "离线",
     "asset": "资产",
     "target": "目标",
     "bucket": "桶名称",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 4ce42560b..c6be5a961 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -771,6 +771,7 @@
     "accountName": "Account name",
     "active": "active",
     "alive": "alive",
+    "noAlive": "no alive",
     "asset": "Asset",
     "target": "Target",
     "bucket": "Bucket",
diff --git a/src/views/tickets/components/Session.vue b/src/views/tickets/components/Session.vue
index 2d3119672..7708d588e 100644
--- a/src/views/tickets/components/Session.vue
+++ b/src/views/tickets/components/Session.vue
@@ -6,6 +6,12 @@
     </div>
     <div class="content">
       <el-row class="item">
+        <el-col>
+          <span class="item-label">{{ $t('tickets.status') }}：</span>
+          <span class="item-value">
+            {{ session.is_finished ? $t('sessions.noAlive') : $t('sessions.alive') }}
+          </span>
+        </el-col>
         <el-col>
           <span class="item-label">{{ $t('sessions.target') }}：</span>
           <span class="item-value">{{ session.asset }}</span>

From 0cafadd23070d90ba66b18653e3a30fc97c649e7 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Fri, 31 Dec 2021 14:44:57 +0800
Subject: [PATCH 09/15] =?UTF-8?q?feat:=20=E8=B5=84=E4=BA=A7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=20is=5Factive=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Asset/AssetList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/assets/Asset/AssetList.vue b/src/views/assets/Asset/AssetList.vue
index f49772b42..999339f19 100644
--- a/src/views/assets/Asset/AssetList.vue
+++ b/src/views/assets/Asset/AssetList.vue
@@ -88,7 +88,7 @@ export default {
           'protocols', 'platform', 'hardware_info', 'model',
           'cpu_model', 'cpu_cores', 'cpu_count', 'cpu_vcpus',
           'disk_info', 'disk_total', 'memory', 'os', 'os_arch',
-          'os_version', 'number', 'vendor', 'sn',
+          'os_version', 'number', 'vendor', 'sn', 'is_active',
           'connectivity', 'labels_display',
           'created_by', 'date_created', 'comment', 'org_name', 'actions'
         ],

From 8add1b7f92757cf2e15fba1b3f28e6717044e2c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 4 Jan 2022 14:37:34 +0800
Subject: [PATCH 10/15] =?UTF-8?q?feat:=20lina=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8C=BA=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                              | 10 +---------
 src/layout/components/Footer/index.vue |  7 ++++++-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 65e13619f..1c2a60559 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,4 @@ server {
 
 
 ## License & Copyright
-Copyright (c) 2014-2021 飞致云 FIT2CLOUD, All rights reserved.
-
-Licensed under The GNU General Public License version 2 (GPLv2) (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
-https://github.com/jumpserver/lina/blob/dev/LICENSE
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-
+Be consistent with [jumpserver](https://github.com/jumpserver/jumpserver)
diff --git a/src/layout/components/Footer/index.vue b/src/layout/components/Footer/index.vue
index 391a66333..27f3a4361 100644
--- a/src/layout/components/Footer/index.vue
+++ b/src/layout/components/Footer/index.vue
@@ -4,7 +4,7 @@
       Version <strong> dev </strong> <span v-if="!publicSettings.XPACK_LICENSE_IS_VALID"> GPLv2. </span>
     </div>
     <div v-if="!publicSettings.XPACK_LICENSE_IS_VALID" style="padding-left:20px;">
-      <strong>Copyright</strong> FIT2CLOUD 飞致云 © 2014-2021
+      <strong>Copyright</strong> FIT2CLOUD 飞致云 © 2014-{{ curYear }}
     </div>
   </div>
 </template>
@@ -12,6 +12,11 @@
 import { mapGetters } from 'vuex'
 export default {
   name: 'Footer',
+  data() {
+    return {
+      curYear: this.$moment().year() || ''
+    }
+  },
   computed: {
     ...mapGetters([
       'sidebar',

From def153cc420b380e3193310f6c456ec77a86df56 Mon Sep 17 00:00:00 2001
From: v-hleihuai <v-hleihuai.tencent.com>
Date: Sun, 9 Jan 2022 00:55:25 +0800
Subject: [PATCH 11/15] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9i18n=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormFields/UploadField.vue   | 20 +++++++++++++++-----
 src/i18n/langs/cn.json                      |  4 ++++
 src/i18n/langs/en.json                      |  4 ++++
 src/views/accounts/ChangeAuthPlan/fields.js |  4 ++++
 yarn.lock                                   | 12 ++++++++++++
 5 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/components/FormFields/UploadField.vue b/src/components/FormFields/UploadField.vue
index 1e1143ea2..e297ac30d 100644
--- a/src/components/FormFields/UploadField.vue
+++ b/src/components/FormFields/UploadField.vue
@@ -1,8 +1,12 @@
 <template>
   <div>
-    <input type="file" @change="Onchange">
+    <input ref="upLoadFile" type="file" style="display: none" @change="Onchange">
+    <el-button size="mini" @click.native.stop="onUpLoad">
+      {{ this.$t('common.SelectFile') }}
+    </el-button>
+    <span>{{ fileName }}</span>
     <div v-if="tip !== ''">{{ tip }}</div>
-    <input v-model="value" type="text" hidden v-on="$listeners">
+    <el-input v-model="value" type="text" hidden v-on="$listeners" />
     <div>
       <img :src="preview" v-bind="$attrs">
     </div>
@@ -23,6 +27,7 @@ export default {
   },
   data() {
     return {
+      fileName: '',
       initial: this.value,
       preview: this.value
     }
@@ -34,16 +39,21 @@ export default {
     }
   },
   methods: {
+    onUpLoad() {
+      this.$refs.upLoadFile.click()
+    },
     onInput(val) {
       this.$emit('input', val)
     },
     Onchange(e) {
-      if (e.target.files[0] === undefined) {
+      const upLoadFile = e.target.files[0]
+      this.fileName = upLoadFile?.name || ''
+      if (upLoadFile === undefined) {
         this.$emit('input', this.initial)
         return
       }
-      this.$emit('fileChange', e.target.files[0])
-      this.$emit('input', this.getObjectURL(e.target.files[0]))
+      this.$emit('fileChange', upLoadFile)
+      this.$emit('input', this.getObjectURL(upLoadFile))
     },
     getObjectURL(file) {
       let url = null
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 2b19dc179..50c831023 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -1309,6 +1309,10 @@
       "Name": "名称",
       "NodeAmount": "节点数量",
       "PasswordLength": "密码长度",
+      "ChangePassword": "更改密码",
+      "ModifySSHKey": "修改 SSH Key",
+      "Addressee": "收件人",
+      "OnlyMailSend": "当前只支持邮件发送",
       "PasswordStrategy": "密码策略",
       "SecretKeyStrategy": "密钥策略",
       "RegularlyPerform": "定期执行",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index c6be5a961..99337e6fe 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -1266,6 +1266,10 @@
       "Name": "Name",
       "NodeAmount": "Node",
       "PasswordLength": "Password length",
+      "ChangePassword": "Change password",
+      "ModifySSHKey": "Modify SSH Key",
+      "Addressee": "Addressee",
+      "OnlyMailSend": "Currently only mail sending is supported",
       "PasswordStrategy": "Password strategy",
       "SecretKeyStrategy": "Secret key strategy",
       "RegularlyPerform": "Regularly perform",
diff --git a/src/views/accounts/ChangeAuthPlan/fields.js b/src/views/accounts/ChangeAuthPlan/fields.js
index 4cf078908..acebb09f9 100644
--- a/src/views/accounts/ChangeAuthPlan/fields.js
+++ b/src/views/accounts/ChangeAuthPlan/fields.js
@@ -130,6 +130,8 @@ function getFields() {
   }
 
   const recipients = {
+    label: i18n.t('xpack.ChangeAuthPlan.Addressee'),
+    helpText: i18n.t('xpack.ChangeAuthPlan.OnlyMailSend'),
     el: {
       value: [],
       ajax: {
@@ -155,10 +157,12 @@ function getFields() {
   }
 
   const is_password = {
+    label: i18n.t('xpack.ChangeAuthPlan.ChangePassword'),
     type: 'switch'
   }
 
   const is_ssh_key = {
+    label: i18n.t('xpack.ChangeAuthPlan.ModifySSHKey'),
     type: 'switch'
   }
 
diff --git a/yarn.lock b/yarn.lock
index 586cba155..43a279e32 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10793,6 +10793,13 @@ vue-jest@^3.0.4:
     tsconfig "^7.0.0"
     vue-template-es2015-compiler "^1.6.0"
 
+vue-json-editor@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/vue-json-editor/-/vue-json-editor-1.4.3.tgz#004c9037ac91f16dd8fc558c9914e5f33a41d71c"
+  integrity sha512-st9HdXBgCnyEmmfWrZQiKzp4KuYXzmYVUNDn5h6Fa18MrrGS1amnyUFyv7hQFsNBDW27B7BKkdGOqszYT1srAg==
+  dependencies:
+    vue "^2.2.6"
+
 vue-loader@^15.7.0:
   version "15.9.1"
   resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.1.tgz#bd2ab8f3d281e51d7b81d15390a58424d142243e"
@@ -10850,6 +10857,11 @@ vue@2.6.11:
   resolved "https://registry.npm.taobao.org/vue/download/vue-2.6.11.tgz?cache=0&sync_timestamp=1587135947786&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5"
   integrity sha1-dllNh31LEiNEBuhONSdcbVFBJcU=
 
+vue@^2.2.6:
+  version "2.6.14"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
+  integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==
+
 vuejs-logger@^1.5.4:
   version "1.5.4"
   resolved "https://registry.npm.taobao.org/vuejs-logger/download/vuejs-logger-1.5.4.tgz#c8bb12ed29ca90b8087144a44ad852d9bd170c6e"

From f13bc4fccbf8c740c789200738ae00d342f97e04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com>
Date: Mon, 10 Jan 2022 14:57:17 +0800
Subject: [PATCH 12/15] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E4=B8=8B=E8=BD=BD=E7=BB=84=E4=BB=B6=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormFields/UploadField.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/FormFields/UploadField.vue b/src/components/FormFields/UploadField.vue
index e297ac30d..41b4ff499 100644
--- a/src/components/FormFields/UploadField.vue
+++ b/src/components/FormFields/UploadField.vue
@@ -6,7 +6,7 @@
     </el-button>
     <span>{{ fileName }}</span>
     <div v-if="tip !== ''">{{ tip }}</div>
-    <el-input v-model="value" type="text" hidden v-on="$listeners" />
+    <input v-model="value" type="text" hidden v-on="$listeners">
     <div>
       <img :src="preview" v-bind="$attrs">
     </div>
@@ -47,11 +47,11 @@ export default {
     },
     Onchange(e) {
       const upLoadFile = e.target.files[0]
-      this.fileName = upLoadFile?.name || ''
       if (upLoadFile === undefined) {
         this.$emit('input', this.initial)
         return
       }
+      this.fileName = upLoadFile?.name || ''
       this.$emit('fileChange', upLoadFile)
       this.$emit('input', this.getObjectURL(upLoadFile))
     },

From aa94c1792c9c1522acd117251e0e7341c2455127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 12 Jan 2022 14:12:56 +0800
Subject: [PATCH 13/15] =?UTF-8?q?feat:=20=E5=B7=A5=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                        |  1 +
 src/i18n/langs/en.json                        |  1 +
 .../Detail/TicketDetail.vue                   | 39 ++++++++++-------
 .../RequestAssetPerm/Detail/TicketDetail.vue  | 43 +++++++++++--------
 src/views/tickets/TicketListTable.vue         |  5 +++
 5 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 50c831023..390cf293c 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -302,6 +302,7 @@
     "Close": "关闭",
     "Command filter": "命令过滤器",
     "Comment": "备注",
+    "Number": "编号",
     "Confirm": "确认",
     "Create": "创建",
     "CreatedBy": "创建者",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 99337e6fe..d8e8e65da 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -289,6 +289,7 @@
     "Close": "Close",
     "Command filter": "Command filter",
     "Comment": "Comment",
+    "Number": "Number",
     "Confirm": "Confirm",
     "Create": "Create",
     "CreatedBy": "Created by",
diff --git a/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue b/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue
index 810997054..900ce4be8 100644
--- a/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue
+++ b/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue
@@ -40,66 +40,73 @@ export default {
   },
   computed: {
     detailCardItems() {
+      const obj = this.object || {}
       return [
+        {
+          key: this.$t('common.Number'),
+          value: obj.serial_num
+        },
         {
           key: this.$t('tickets.status'),
-          value: this.object.status,
+          value: obj.status,
           formatter: (item, val) => {
             return <el-tag type={this.statusMap.type} size='mini'> { this.statusMap.title }</el-tag>
           }
         },
         {
           key: this.$t('tickets.type'),
-          value: this.object.type_display
+          value: obj.type_display
         },
         {
           key: this.$t('tickets.user'),
-          value: this.object['applicant_display']
+          value: obj['applicant_display']
         },
         {
           key: this.$t('tickets.OrgName'),
-          value: this.object['org_name']
+          value: obj['org_name']
         },
         {
           key: this.$t('common.dateCreated'),
-          value: toSafeLocalDateStr(this.object.date_created)
+          value: toSafeLocalDateStr(obj.date_created)
         },
         {
           key: this.$t('common.Comment'),
-          value: this.object.comment
+          value: obj.comment
         }
       ]
     },
     specialCardItems() {
+      const meta = this.object.meta || {}
       return [
         {
           key: this.$t('applications.appType'),
-          value: `${this.object.meta['apply_category_display']} / ${this.object.meta['apply_type_display']} `
+          value: `${meta['apply_category_display']} / ${meta['apply_type_display']} `
         },
         {
           key: this.$t('applications.appName'),
-          value: this.object.meta.apply_applications_display.join(', ')
+          value: meta?.apply_applications_display?.join(', ') || ''
         },
         {
           key: this.$t('tickets.SystemUser'),
-          value: this.object.meta.apply_system_users_display.join(', ')
+          value: meta?.apply_system_users_display?.join(', ') || ''
         },
         {
           key: this.$t('common.dateStart'),
-          value: toSafeLocalDateStr(this.object.meta.apply_date_start)
+          value: toSafeLocalDateStr(meta.apply_date_start)
         },
         {
           key: this.$t('common.dateExpired'),
-          value: toSafeLocalDateStr(this.object.meta.apply_date_expired)
+          value: toSafeLocalDateStr(meta.apply_date_expired)
         }
       ]
     },
     assignedCardItems() {
       const vm = this
+      const meta = this.object.meta || {}
       return [
         {
           key: this.$t('tickets.PermissionName'),
-          value: this.object.meta.apply_permission_name,
+          value: meta.apply_permission_name,
           formatter: function(item, value) {
             const to = { name: 'ApplicationPermissionDetail', params: { id: vm.object.id }, query: { oid: vm.object.org_id }}
             if (vm.object.status === 'closed' && vm.object.state === 'approved') {
@@ -111,19 +118,19 @@ export default {
         },
         {
           key: this.$t('applications.appName'),
-          value: this.object.meta.apply_applications_display.join(', ')
+          value: meta?.apply_applications_display?.join(', ') || ''
         },
         {
           key: this.$t('tickets.SystemUser'),
-          value: this.object.meta.apply_system_users_display.join(', ')
+          value: meta?.apply_system_users_display?.join(', ') || ''
         },
         {
           key: this.$t('common.dateStart'),
-          value: toSafeLocalDateStr(this.object.meta.apply_date_start)
+          value: toSafeLocalDateStr(meta.apply_date_start)
         },
         {
           key: this.$t('common.dateExpired'),
-          value: toSafeLocalDateStr(this.object.meta.apply_date_expired)
+          value: toSafeLocalDateStr(meta.apply_date_expired)
         }
       ]
     },
diff --git a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
index 6df2fd008..58d948576 100644
--- a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
+++ b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
@@ -38,66 +38,73 @@ export default {
   },
   computed: {
     detailCardItems() {
+      const obj = this.object || {}
       return [
+        {
+          key: this.$t('common.Number'),
+          value: obj.serial_num
+        },
         {
           key: this.$t('tickets.status'),
-          value: this.object.state,
+          value: obj.state,
           formatter: (item, val) => {
             return <el-tag type={this.statusMap.type} size='mini'> { this.statusMap.title }</el-tag>
           }
         },
         {
           key: this.$t('tickets.type'),
-          value: this.object.type_display
+          value: obj.type_display
         },
         {
           key: this.$t('tickets.user'),
-          value: this.object['applicant_display']
+          value: obj['applicant_display']
         },
         {
           key: this.$t('tickets.OrgName'),
-          value: this.object.org_name
+          value: obj.org_name
         },
         {
           key: this.$t('common.dateCreated'),
-          value: toSafeLocalDateStr(this.object.date_created)
+          value: toSafeLocalDateStr(obj.date_created)
         },
         {
           key: this.$t('common.Comment'),
-          value: this.object.comment
+          value: obj.comment
         }
       ]
     },
     specialCardItems() {
+      const meta = this.object.meta || {}
       return [
         {
           key: this.$t('perms.Node'),
-          value: this.object.meta.apply_nodes_display.join(', ')
+          value: meta?.apply_nodes_display?.join(', ') || ''
         },
         {
           key: this.$t('tickets.Asset'),
-          value: this.object.meta.apply_assets_display.join(', ')
+          value: meta?.apply_assets_display?.join(', ') || ''
         },
         {
           key: this.$t('tickets.SystemUser'),
-          value: this.object.meta.apply_system_users_display.join(', ')
+          value: meta?.apply_system_users_display?.join(', ') || ''
         },
         {
           key: this.$t('assets.Action'),
-          value: forMatAction(this, this.object.meta['apply_actions_display'])
+          value: forMatAction(this, meta['apply_actions_display'])
         },
         {
           key: this.$t('common.dateStart'),
-          value: toSafeLocalDateStr(this.object.meta.apply_date_start)
+          value: toSafeLocalDateStr(meta.apply_date_start)
         },
         {
           key: this.$t('common.dateExpired'),
-          value: toSafeLocalDateStr(this.object.meta.apply_date_expired)
+          value: toSafeLocalDateStr(meta.apply_date_expired)
         }
       ]
     },
     assignedCardItems() {
       const vm = this
+      const meta = this.object.meta || {}
       return [
         {
           key: this.$t('tickets.PermissionName'),
@@ -113,27 +120,27 @@ export default {
         },
         {
           key: this.$t('perms.Node'),
-          value: this.object.meta.apply_nodes_display.join(', ')
+          value: meta?.apply_nodes_display?.join(', ') || ''
         },
         {
           key: this.$t('assets.Asset'),
-          value: this.object.meta.apply_assets_display.join(', ')
+          value: meta?.apply_assets_display?.join(', ') || ''
         },
         {
           key: this.$t('tickets.SystemUser'),
-          value: this.object.meta.apply_system_users_display.join(', ')
+          value: meta?.apply_system_users_display?.join(', ') || ''
         },
         {
           key: this.$t('assets.Action'),
-          value: forMatAction(this, this.object.meta['apply_actions_display'])
+          value: forMatAction(this, meta['apply_actions_display'])
         },
         {
           key: this.$t('common.dateStart'),
-          value: toSafeLocalDateStr(this.object.meta.apply_date_start)
+          value: toSafeLocalDateStr(meta?.apply_date_start)
         },
         {
           key: this.$t('common.dateExpired'),
-          value: toSafeLocalDateStr(this.object.meta.apply_date_expired)
+          value: toSafeLocalDateStr(meta?.apply_date_expired)
         }
       ]
     },
diff --git a/src/views/tickets/TicketListTable.vue b/src/views/tickets/TicketListTable.vue
index b9a1a45fc..8b728cb48 100644
--- a/src/views/tickets/TicketListTable.vue
+++ b/src/views/tickets/TicketListTable.vue
@@ -26,6 +26,11 @@ export default {
       ticketTableConfig: {
         url: this.url,
         columns: [
+          {
+            prop: 'serial_num',
+            label: this.$t('common.Number'),
+            sortable: 'custom'
+          },
           {
             prop: 'title',
             label: this.$t('tickets.title'),

From 03031e94c1f3410f58f6add44a450c6f8c690812 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Mon, 10 Jan 2022 19:03:57 +0800
Subject: [PATCH 14/15] =?UTF-8?q?feat:=20=E9=80=83=E7=94=9F=E9=80=9A?=
 =?UTF-8?q?=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                        |   7 ++
 src/router/accounts.js                        |  49 +++++++++
 .../EscapeRoutePlanCreateUpdate.vue           |  48 +++++++++
 .../EscapeRoutePlanExecutionInfo.vue          |  52 +++++++++
 .../EscapeRoutePlanExecutionTaskList.vue      |  79 ++++++++++++++
 .../EscapeRoutePlanExecutionDetail/index.vue  |  54 ++++++++++
 .../EscapeRoutePlanExecutionList.vue          | 102 ++++++++++++++++++
 .../EscapeRoutePlanInfo.vue                   |  94 ++++++++++++++++
 .../EscapeRoutePlanDetail/index.vue           |  43 ++++++++
 .../EscapeRoutePlan/EscapeRoutePlanList.vue   |  95 ++++++++++++++++
 src/views/accounts/EscapeRoutePlan/fields.js  |  57 ++++++++++
 src/views/accounts/EscapeRoutePlan/index.vue  |  36 +++++++
 12 files changed, 716 insertions(+)
 create mode 100644 src/views/accounts/EscapeRoutePlan/EscapeRoutePlanCreateUpdate.vue
 create mode 100644 src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionInfo.vue
 create mode 100644 src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionTaskList.vue
 create mode 100644 src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/index.vue
 create mode 100644 src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionList.vue
 create mode 100644 src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanInfo.vue
 create mode 100644 src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/index.vue
 create mode 100644 src/views/accounts/EscapeRoutePlan/EscapeRoutePlanList.vue
 create mode 100644 src/views/accounts/EscapeRoutePlan/fields.js
 create mode 100644 src/views/accounts/EscapeRoutePlan/index.vue

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 390cf293c..e024de250 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -1326,6 +1326,13 @@
       "TimerPeriod": "定时执行周期",
       "Username": "用户名"
     },
+    "EscapeRoutePlan": {
+      "EscapeRoutePlan": "逃生通道",
+      "EscapeRoutePlanCreate": "创建逃生通道",
+      "EscapeRoutePlanUpdate": "更新逃生通道",
+      "ExecutionDetail": "执行详情",
+      "MailRecipient": "邮件收件人"
+    },
     "Cloud": {
       "ServerAccountKey": "服务账号密钥",
       "IPNetworkSegment": "IP网段",
diff --git a/src/router/accounts.js b/src/router/accounts.js
index 436b0501b..8bb29d93a 100644
--- a/src/router/accounts.js
+++ b/src/router/accounts.js
@@ -161,5 +161,54 @@ export default [
         hidden: true
       }
     ]
+  },
+  {
+    path: 'escape',
+    component: empty,
+    redirect: '',
+    meta: { title: i18n.t('xpack.EscapeRoutePlan.EscapeRoutePlan') },
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/accounts/EscapeRoutePlan/index.vue'),
+        name: 'EscapeRoutePlanIndex',
+        meta: { title: i18n.t('xpack.EscapeRoutePlan.EscapeRoutePlan'), activeMenu: '/accounts/escape' }
+      },
+      {
+        path: '',
+        component: () => import('@/views/accounts/EscapeRoutePlan/EscapeRoutePlanList.vue'),
+        name: 'EscapeRoutePlanList',
+        meta: { title: i18n.t('xpack.EscapeRoutePlan.EscapeRoutePlan'), activeMenu: '/accounts/escape' },
+        hidden: true
+      },
+      {
+        path: 'create',
+        component: () => import('@/views/accounts/EscapeRoutePlan/EscapeRoutePlanCreateUpdate.vue'),
+        name: 'EscapeRoutePlanCreate',
+        meta: { title: i18n.t('xpack.EscapeRoutePlan.EscapeRoutePlanCreate'), activeMenu: '/accounts/escape', action: 'create' },
+        hidden: true
+      },
+      {
+        path: ':id/update',
+        component: () => import('@/views/accounts/EscapeRoutePlan/EscapeRoutePlanCreateUpdate.vue'),
+        name: 'EscapeRoutePlanUpdate',
+        meta: { title: i18n.t('xpack.EscapeRoutePlan.EscapeRoutePlanUpdate'), activeMenu: '/accounts/escape', action: 'update' },
+        hidden: true
+      },
+      {
+        path: ':id',
+        component: () => import('@/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/index.vue'),
+        name: 'EscapeRoutePlanDetail',
+        meta: { title: i18n.t('xpack.EscapeRoutePlan.EscapeRoutePlan'), activeMenu: '/accounts/escape' },
+        hidden: true
+      },
+      {
+        path: 'plan-execution/:id',
+        component: () => import('@/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/index.vue'),
+        name: 'EscapeRoutePlanExecutionDetail',
+        meta: { title: i18n.t('xpack.EscapeRoutePlan.ExecutionDetail'), activeMenu: '/accounts/escape' },
+        hidden: true
+      }
+    ]
   }
 ]
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanCreateUpdate.vue b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanCreateUpdate.vue
new file mode 100644
index 000000000..8e9788df7
--- /dev/null
+++ b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanCreateUpdate.vue
@@ -0,0 +1,48 @@
+<template>
+  <GenericCreateUpdatePage v-bind="$data" />
+</template>
+
+<script>
+import { GenericCreateUpdatePage } from '@/layout/components'
+import getFields from '@/views/accounts/EscapeRoutePlan/fields'
+
+export default {
+  name: 'EscapeRoutePlanreateUpdate',
+  components: {
+    GenericCreateUpdatePage
+  },
+  data() {
+    const fields = getFields.bind(this)()
+    return {
+      url: '/api/v1/assets/escape/',
+      fields: [
+        [this.$t('common.Basic'), ['name']],
+        [this.$t('xpack.Timer'), ['is_periodic', 'crontab', 'interval']],
+        [this.$t('common.Other'), ['recipients', 'comment']]
+      ],
+      initial: {
+        is_periodic: true,
+        interval: 24
+      },
+      fieldsMeta: {
+        is_periodic: fields.is_periodic,
+        crontab: fields.crontab,
+        interval: fields.interval,
+        recipients: fields.recipients
+      },
+      createSuccessNextRoute: { name: 'EscapeRoutePlanIndex' },
+      updateSuccessNextRoute: { name: 'EscapeRoutePlanIndex' },
+      cleanFormValue(data) {
+        if (data['interval'] === '') {
+          delete data['interval']
+        }
+        return data
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionInfo.vue b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionInfo.vue
new file mode 100644
index 000000000..3bde75299
--- /dev/null
+++ b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionInfo.vue
@@ -0,0 +1,52 @@
+<template>
+  <el-row :gutter="20">
+    <el-col :md="14" :sm="24">
+      <DetailCard :items="detailItems" />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import DetailCard from '@/components/DetailCard'
+import { toSafeLocalDateStr } from '@/utils/common'
+
+export default {
+  name: 'EscapeRoutePlanExecutionInfo',
+  components: {
+    DetailCard
+  },
+  props: {
+    object: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  computed: {
+    detailItems() {
+      return [
+        {
+          key: this.$t('xpack.ChangeAuthPlan.TimeDelta'),
+          value: this.object.timedelta.toFixed(2) + 's'
+        },
+        {
+          key: this.$t('xpack.ChangeAuthPlan.DateStart'),
+          value: toSafeLocalDateStr(this.object.date_start)
+        },
+        {
+          key: this.$t('xpack.ChangeAuthPlan.MailRecipient'),
+          value: this.object.recipients ? this.object.recipients.map(
+            i => `${i[0]}` + `${i[1] ? ': ' + this.$t('xpack.ChangeAuthPlan.ContainAttachment') : ''}`).join(', ') : ''
+        }
+      ]
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionTaskList.vue b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionTaskList.vue
new file mode 100644
index 000000000..241e987ee
--- /dev/null
+++ b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionTaskList.vue
@@ -0,0 +1,79 @@
+<template>
+  <GenericListTable :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import GenericListTable from '@/layout/components/GenericListTable'
+
+export default {
+  name: 'EscapeRoutePlanExecutionTaskList',
+  components: {
+    GenericListTable
+  },
+  props: {
+    object: {
+      type: Object,
+      required: true,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      tableConfig: {
+        url: `/api/v1/xpack/assets/escape-execution-subtask/?plan_execution_id=${this.object.id}`,
+        columns: [
+          'is_success', 'reason', 'timedelta', 'date_start', 'actions'
+        ],
+        columnsMeta: {
+          is_success: {
+            label: this.$t('xpack.ChangeAuthPlan.Success')
+          },
+          timedelta: {
+            label: this.$t('xpack.ChangeAuthPlan.TimeDelta'),
+            width: '90px',
+            formatter: function(row) {
+              return row.timedelta.toFixed(2) + 's'
+            }
+          },
+          actions: {
+            formatterArgs: {
+              hasDelete: false,
+              hasUpdate: false,
+              hasClone: false,
+              extraActions: [
+                {
+                  name: 'retry',
+                  type: 'info',
+                  title: this.$t('xpack.ChangeAuthPlan.Retry'),
+                  callback: function({ row, tableData }) {
+                    this.$axios.put(
+                      `/api/v1/assets/escape-execution-subtask/${row.id}/`,
+                    ).then(res => {
+                      window.open(`/#/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600')
+                    })
+                  }.bind(this)
+                }
+              ]
+            }
+          }
+        }
+      },
+      headerActions: {
+        hasSearch: true,
+        hasRefresh: true,
+        hasLeftActions: true,
+        hasRightActions: true,
+        hasExport: false,
+        hasImport: false,
+        hasCreate: false,
+        hasBulkDelete: false,
+        hasBulkUpdate: false
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/index.vue b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/index.vue
new file mode 100644
index 000000000..e8d3b1796
--- /dev/null
+++ b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/index.vue
@@ -0,0 +1,54 @@
+<template>
+  <GenericDetailPage :object.sync="execution" :active-menu.sync="config.activeMenu" v-bind="config" v-on="$listeners">
+    <keep-alive>
+      <component :is="config.activeMenu" :object="execution" />
+    </keep-alive>
+  </GenericDetailPage>
+</template>
+
+<script>
+import { GenericDetailPage } from '@/layout/components'
+import EscapeRoutePlanExecutionInfo from './EscapeRoutePlanExecutionInfo'
+import EscapeRoutePlanExecutionTaskList from './EscapeRoutePlanExecutionTaskList'
+
+export default {
+  components: {
+    GenericDetailPage,
+    EscapeRoutePlanExecutionInfo,
+    EscapeRoutePlanExecutionTaskList
+  },
+  data() {
+    return {
+      execution: { id: '' },
+      config: {
+        activeMenu: 'EscapeRoutePlanExecutionInfo',
+        actions: {
+          hasUpdate: false,
+          hasDelete: false
+        },
+        submenu: [
+          {
+            title: this.$t('common.BasicInfo'),
+            name: 'EscapeRoutePlanExecutionInfo'
+          },
+          {
+            title: this.$t('xpack.ChangeAuthPlan.TaskList'),
+            name: 'EscapeRoutePlanExecutionTaskList'
+          }
+        ],
+        getTitle: this.getExecutionTitle
+
+      }
+    }
+  },
+  methods: {
+    getExecutionTitle() {
+      return `${this.$route.meta.title}: ${this.execution.id}`
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionList.vue b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionList.vue
new file mode 100644
index 000000000..d8a3aaf8c
--- /dev/null
+++ b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionList.vue
@@ -0,0 +1,102 @@
+<template>
+  <GenericListTable :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import GenericListTable from '@/layout/components/GenericListTable'
+
+export default {
+  name: 'EscapeRoutePlanExecution',
+  components: {
+    GenericListTable
+  },
+  props: {
+    object: {
+      type: Object,
+      required: true,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      tableConfig: {
+        url: `/api/v1/assets/escape-execution/?plan_id=${this.object.id}`,
+        columns: [
+          'username', 'result_summary', 'timedelta', 'trigger_display', 'date_start', 'actions'
+        ],
+        columnsMeta: {
+          result_summary: {
+            label: this.$t('xpack.ChangeAuthPlan.Result'),
+            width: '80px',
+            showOverflowTooltip: true,
+            formatter: function(row) {
+              const summary = <div>
+                <span class='text-primary'>{row.result_summary.succeed}</span>/
+                <span class='text-danger'>{row.result_summary.failed}</span>/
+                <span>{row.result_summary.total}</span>
+              </div>
+              return summary
+            }
+          },
+          password_strategy_display: {
+            label: this.$t('xpack.ChangeAuthPlan.PasswordStrategy'),
+            width: '220px',
+            showOverflowTooltip: true
+          },
+          timedelta: {
+            label: this.$t('xpack.ChangeAuthPlan.TimeDelta'),
+            width: '90px',
+            formatter: function(row) {
+              return row.timedelta.toFixed(2) + 's'
+            }
+          },
+          date_start: {
+            showOverflowTooltip: true
+          },
+          actions: {
+            formatterArgs: {
+              hasDelete: false,
+              hasUpdate: false,
+              hasClone: false,
+              extraActions: [
+                {
+                  name: 'log',
+                  type: 'primary',
+                  title: this.$t('xpack.ChangeAuthPlan.Log'),
+                  callback: function({ row }) {
+                    window.open(`/#/ops/celery/task/${row.id}/log/`, '_blank', 'toolbar=yes, width=900, height=600')
+                  }
+                },
+                {
+                  name: 'detail',
+                  title: this.$t('xpack.ChangeAuthPlan.Detail'),
+                  type: 'info',
+                  callback: function({ row }) {
+                    return this.$router.push({ name: 'EscapeRoutePlanExecutionDetail', params: { id: row.id }})
+                  }
+                }
+              ]
+            }
+          }
+        }
+      },
+      headerActions: {
+        hasSearch: true,
+        hasRefresh: true,
+        hasRightActions: true,
+        hasLeftActions: true,
+        hasMoreActions: false,
+        hasExport: false,
+        hasImport: false,
+        hasCreate: false,
+        hasBulkDelete: false,
+        hasBulkUpdate: false
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanInfo.vue b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanInfo.vue
new file mode 100644
index 000000000..6834ce537
--- /dev/null
+++ b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanInfo.vue
@@ -0,0 +1,94 @@
+<template>
+  <el-row :gutter="20">
+    <el-col :md="14" :sm="24">
+      <DetailCard :items="detailItems" />
+    </el-col>
+    <el-col :md="10" :sm="24">
+      <QuickActions :actions="quickActions" type="primary" />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { DetailCard, QuickActions } from '@/components'
+import { toSafeLocalDateStr } from '@/utils/common'
+
+export default {
+  name: 'EscapeRoutePlanInfo',
+  components: {
+    DetailCard,
+    QuickActions
+  },
+  props: {
+    object: {
+      type: Object,
+      required: true,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      url: '/api/v1/assets/escape/',
+      quickActions: [
+        {
+          title: this.$t('xpack.ChangeAuthPlan.ManualExecutePlan'),
+          attrs: {
+            type: 'primary',
+            label: this.$t('xpack.ChangeAuthPlan.Execute')
+          },
+          callbacks: {
+            click: function() {
+              this.$axios.post(
+                `/api/v1/assets/escape-execution/`,
+                { plan: this.object.id }
+              ).then(res => {
+                window.open(`/#/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600')
+              })
+            }.bind(this)
+          }
+        }
+      ]
+    }
+  },
+  computed: {
+    detailItems() {
+      return [
+        {
+          key: this.$t('xpack.ChangeAuthPlan.Name'),
+          value: this.object.name
+        },
+        {
+          key: this.$t('xpack.ChangeAuthPlan.RegularlyPerform'),
+          value: this.object.crontab,
+          formatter: (item, val) => {
+            return <span>{this.object.is_periodic ? val : ''}</span>
+          }
+        },
+        {
+          key: this.$t('xpack.ChangeAuthPlan.CyclePerform'),
+          value: this.object.interval,
+          formatter: (item, val) => {
+            return <span>{this.object.is_periodic ? val : ''}</span>
+          }
+        },
+        {
+          key: this.$t('xpack.ChangeAuthPlan.DateJoined'),
+          value: toSafeLocalDateStr(this.object.date_created)
+        },
+        {
+          key: this.$t('xpack.ChangeAuthPlan.DateUpdated'),
+          value: toSafeLocalDateStr(this.object.date_updated)
+        },
+        {
+          key: this.$t('common.Comment'),
+          value: this.object.comment
+        }
+      ]
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/index.vue b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/index.vue
new file mode 100644
index 000000000..afec846ec
--- /dev/null
+++ b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/index.vue
@@ -0,0 +1,43 @@
+<template>
+  <GenericDetailPage :object.sync="plan" :active-menu.sync="config.activeMenu" v-bind="config">
+    <keep-alive>
+      <component :is="config.activeMenu" :object="plan" />
+    </keep-alive>
+  </GenericDetailPage>
+</template>
+
+<script>
+import { GenericDetailPage } from '@/layout/components'
+import EscapeRoutePlanInfo from './EscapeRoutePlanInfo'
+import EscapeRoutePlanExecutionList from './EscapeRoutePlanExecution/EscapeRoutePlanExecutionList'
+
+export default {
+  components: {
+    GenericDetailPage,
+    EscapeRoutePlanInfo,
+    EscapeRoutePlanExecutionList
+  },
+  data() {
+    return {
+      plan: { name: '', comment: '' },
+      config: {
+        activeMenu: 'EscapeRoutePlanInfo',
+        submenu: [
+          {
+            title: this.$t('common.BasicInfo'),
+            name: 'EscapeRoutePlanInfo'
+          },
+          {
+            title: this.$t('xpack.ChangeAuthPlan.ExecutionList'),
+            name: 'EscapeRoutePlanExecutionList'
+          }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanList.vue b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanList.vue
new file mode 100644
index 000000000..d5768414d
--- /dev/null
+++ b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanList.vue
@@ -0,0 +1,95 @@
+<template>
+  <GenericListTable :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListTable } from '@/layout/components'
+import { DetailFormatter } from '@/components/TableFormatters'
+import { openTaskPage } from '@/utils/jms'
+
+export default {
+  name: 'EscapeRoutePlanList',
+  components: {
+    GenericListTable
+  },
+  data() {
+    const vm = this
+    return {
+      tableConfig: {
+        url: '/api/v1/assets/escape/',
+        columns: [
+          'name', 'is_periodic', 'periodic_display', 'comment', 'org_name', 'actions'
+        ],
+        columnsShow: {
+          min: ['name', 'actions'],
+          default: ['name', 'org_name', 'is_periodic', 'periodic_display', 'actions']
+        },
+        columnsMeta: {
+          name: {
+            formatter: DetailFormatter,
+            formatterArgs: {
+              route: 'EscapeRoutePlanDetail'
+            }
+          },
+          is_periodic: {
+            label: vm.$t('xpack.ChangeAuthPlan.Timer'),
+            formatterArgs: {
+              showFalse: false
+            },
+            width: '80px'
+          },
+          periodic_display: {
+            label: vm.$t('xpack.ChangeAuthPlan.TimerPeriod'),
+            showOverflowTooltip: true,
+            width: '150px'
+          },
+          comment: {
+            width: '90px'
+          },
+          actions: {
+            width: '164px',
+            formatterArgs: {
+              onClone: ({ row }) => {
+                vm.$router.push({ name: 'EscapeRoutePlanCreate', query: { clone_from: row.id }})
+              },
+              onUpdate: ({ row }) => {
+                vm.$router.push({ name: 'EscapeRoutePlanUpdate', params: { id: row.id }})
+              },
+              extraActions: [
+                {
+                  title: vm.$t('xpack.Execute'),
+                  name: 'execute',
+                  type: 'info',
+                  callback: function({ row }) {
+                    this.$axios.post(
+                      `/api/v1/assets/escape-execution/`,
+                      { plan: row.id }
+                    ).then(res => {
+                      openTaskPage(res['task'])
+                    })
+                  }.bind(this)
+                }
+              ]
+            }
+          }
+        }
+      },
+      headerActions: {
+        hasRefresh: true,
+        hasExport: false,
+        hasImport: false,
+        hasMoreActions: false,
+        createRoute: () => {
+          return {
+            name: 'EscapeRoutePlanCreate'
+          }
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/accounts/EscapeRoutePlan/fields.js b/src/views/accounts/EscapeRoutePlan/fields.js
new file mode 100644
index 000000000..33c513a37
--- /dev/null
+++ b/src/views/accounts/EscapeRoutePlan/fields.js
@@ -0,0 +1,57 @@
+import i18n from '@/i18n/i18n'
+import { CronTab } from '@/components'
+
+var validatorInterval = (rule, value, callback) => {
+  if (parseInt(value) < 1) {
+    return callback(new Error(i18n.t('xpack.ChangeAuthPlan.validatorMessage.EnsureThisValueIsGreaterThanOrEqualTo1')))
+  }
+  callback()
+}
+
+function getFields() {
+  const recipients = {
+    el: {
+      value: [],
+      ajax: {
+        url: '/api/v1/users/users/?fields_size=mini',
+        transformOption: (item) => {
+          return { label: item.name + '(' + item.username + ')', value: item.id }
+        }
+      }
+    }
+  }
+
+  const is_periodic = {
+    type: 'switch'
+  }
+
+  const crontab = {
+    type: 'cronTab',
+    component: CronTab,
+    label: i18n.t('xpack.RegularlyPerform'),
+    hidden: (formValue) => {
+      return formValue.is_periodic === false
+    },
+    helpText: i18n.t('xpack.HelpText.CrontabOfCreateUpdatePage')
+  }
+
+  const interval = {
+    label: i18n.t('xpack.CyclePerform'),
+    hidden: (formValue) => {
+      return formValue.is_periodic === false
+    },
+    helpText: i18n.t('xpack.HelpText.IntervalOfCreateUpdatePage'),
+    rules: [
+      { validator: validatorInterval }
+    ]
+  }
+
+  return {
+    is_periodic: is_periodic,
+    crontab: crontab,
+    interval: interval,
+    recipients: recipients
+  }
+}
+
+export default getFields
diff --git a/src/views/accounts/EscapeRoutePlan/index.vue b/src/views/accounts/EscapeRoutePlan/index.vue
new file mode 100644
index 000000000..85ad5ba2a
--- /dev/null
+++ b/src/views/accounts/EscapeRoutePlan/index.vue
@@ -0,0 +1,36 @@
+<template>
+  <TabPage :active-menu.sync="config.activeMenu" :submenu="config.submenu">
+    <keep-alive>
+      <component :is="config.activeMenu" />
+    </keep-alive>
+  </TabPage>
+</template>
+
+<script>
+import { TabPage } from '@/layout/components'
+import EscapeRoutePlanList from './EscapeRoutePlanList'
+export default {
+  name: 'Index',
+  components: {
+    TabPage,
+    EscapeRoutePlanList
+  },
+  data() {
+    return {
+      config: {
+        activeMenu: 'EscapeRoutePlanList',
+        submenu: [
+          {
+            title: this.$t('xpack.EscapeRoutePlan.EscapeRoutePlan'),
+            name: 'EscapeRoutePlanList'
+          }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

From 2aad1110d0f2d20c07fa5c4cb6638934fcae9402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 11 Jan 2022 10:05:55 +0800
Subject: [PATCH 15/15] =?UTF-8?q?feat:=20=E8=B4=A6=E5=8F=B7=E5=A4=87?=
 =?UTF-8?q?=E4=BB=BD=E8=AF=A6=E6=83=85=E9=A1=B5=E6=9B=BF=E6=8D=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                        | 12 ++-
 src/i18n/langs/en.json                        |  9 ++
 src/router/accounts.js                        | 40 ++++----
 .../AccountBackupPlanCreateUpdate.vue}        | 22 +++--
 .../AccountBackupPlanExecutionInfo.vue}       | 10 +-
 .../index.vue                                 | 15 +--
 .../AccountBackupPlanExecutionList.vue}       | 26 +-----
 .../AccountBackupPlanInfo.vue}                |  5 +-
 .../AccountBackupPlanDetail}/index.vue        | 19 ++--
 .../AccountBackupPlanList.vue}                | 16 ++--
 .../components/FormTypeField.vue              | 92 +++++++++++++++++++
 .../fields.js                                 |  0
 .../index.vue                                 | 10 +-
 .../EscapeRoutePlanExecutionTaskList.vue      | 79 ----------------
 14 files changed, 186 insertions(+), 169 deletions(-)
 rename src/views/accounts/{EscapeRoutePlan/EscapeRoutePlanCreateUpdate.vue => AccountBackupPlan/AccountBackupPlanCreateUpdate.vue} (57%)
 rename src/views/accounts/{EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionInfo.vue => AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail/AccountBackupPlanExecutionInfo.vue} (79%)
 rename src/views/accounts/{EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail => AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail}/index.vue (64%)
 rename src/views/accounts/{EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionList.vue => AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionList.vue} (65%)
 rename src/views/accounts/{EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanInfo.vue => AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanInfo.vue} (94%)
 rename src/views/accounts/{EscapeRoutePlan/EscapeRoutePlanDetail => AccountBackupPlan/AccountBackupPlanDetail}/index.vue (58%)
 rename src/views/accounts/{EscapeRoutePlan/EscapeRoutePlanList.vue => AccountBackupPlan/AccountBackupPlanList.vue} (80%)
 create mode 100644 src/views/accounts/AccountBackupPlan/components/FormTypeField.vue
 rename src/views/accounts/{EscapeRoutePlan => AccountBackupPlan}/fields.js (100%)
 rename src/views/accounts/{EscapeRoutePlan => AccountBackupPlan}/index.vue (65%)
 delete mode 100644 src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionTaskList.vue

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index e024de250..b8687903b 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -1326,12 +1326,14 @@
       "TimerPeriod": "定时执行周期",
       "Username": "用户名"
     },
-    "EscapeRoutePlan": {
-      "EscapeRoutePlan": "逃生通道",
-      "EscapeRoutePlanCreate": "创建逃生通道",
-      "EscapeRoutePlanUpdate": "更新逃生通道",
+    "AccountBackupPlan": {
+      "AccountBackupPlan": "账号备份",
+      "AccountBackupPlanCreate": "创建账号备份",
+      "AccountBackupPlanUpdate": "更新账号备份",
       "ExecutionDetail": "执行详情",
-      "MailRecipient": "邮件收件人"
+      "MailRecipient": "邮件收件人",
+      "IsSuccess": "是否成功",
+      "Reason": "原因"
     },
     "Cloud": {
       "ServerAccountKey": "服务账号密钥",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index d8e8e65da..686fce716 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -1283,6 +1283,15 @@
       "TimerPeriod": "Timer period",
       "Username": "Username"
     },
+    "AccountBackupPlan": {
+      "AccountBackupPlan": "Account backup plan",
+      "AccountBackupPlanreate": "Account backup plan",
+      "AccountBackupPlanUpdate": "Account backup plan",
+      "ExecutionDetail": "Execution detail",
+      "MailRecipient": "Mail recipient",
+      "IsSuccess": "Is success",
+      "Reason": "Reason"
+    },
     "Cloud": {
       "ServerAccountKey": "Server Account Key",
       "IPNetworkSegment": "Ip Network Segment",
diff --git a/src/router/accounts.js b/src/router/accounts.js
index 8bb29d93a..2c02d371c 100644
--- a/src/router/accounts.js
+++ b/src/router/accounts.js
@@ -163,50 +163,50 @@ export default [
     ]
   },
   {
-    path: 'escape',
+    path: 'backup',
     component: empty,
     redirect: '',
-    meta: { title: i18n.t('xpack.EscapeRoutePlan.EscapeRoutePlan') },
+    meta: { title: i18n.t('xpack.AccountBackupPlan.AccountBackupPlan') },
     children: [
       {
         path: '',
-        component: () => import('@/views/accounts/EscapeRoutePlan/index.vue'),
-        name: 'EscapeRoutePlanIndex',
-        meta: { title: i18n.t('xpack.EscapeRoutePlan.EscapeRoutePlan'), activeMenu: '/accounts/escape' }
+        component: () => import('@/views/accounts/AccountBackupPlan/index.vue'),
+        name: 'AccountBackupPlanIndex',
+        meta: { title: i18n.t('xpack.AccountBackupPlan.AccountBackupPlan'), activeMenu: '/accounts/backup' }
       },
       {
         path: '',
-        component: () => import('@/views/accounts/EscapeRoutePlan/EscapeRoutePlanList.vue'),
-        name: 'EscapeRoutePlanList',
-        meta: { title: i18n.t('xpack.EscapeRoutePlan.EscapeRoutePlan'), activeMenu: '/accounts/escape' },
+        component: () => import('@/views/accounts/AccountBackupPlan/AccountBackupPlanList.vue'),
+        name: 'AccountBackupPlanList',
+        meta: { title: i18n.t('xpack.AccountBackupPlan.AccountBackupPlan'), activeMenu: '/accounts/backup' },
         hidden: true
       },
       {
         path: 'create',
-        component: () => import('@/views/accounts/EscapeRoutePlan/EscapeRoutePlanCreateUpdate.vue'),
-        name: 'EscapeRoutePlanCreate',
-        meta: { title: i18n.t('xpack.EscapeRoutePlan.EscapeRoutePlanCreate'), activeMenu: '/accounts/escape', action: 'create' },
+        component: () => import('@/views/accounts/AccountBackupPlan/AccountBackupPlanCreateUpdate.vue'),
+        name: 'AccountBackupPlanCreate',
+        meta: { title: i18n.t('xpack.AccountBackupPlan.AccountBackupPlanCreate'), activeMenu: '/accounts/backup', action: 'create' },
         hidden: true
       },
       {
         path: ':id/update',
-        component: () => import('@/views/accounts/EscapeRoutePlan/EscapeRoutePlanCreateUpdate.vue'),
-        name: 'EscapeRoutePlanUpdate',
-        meta: { title: i18n.t('xpack.EscapeRoutePlan.EscapeRoutePlanUpdate'), activeMenu: '/accounts/escape', action: 'update' },
+        component: () => import('@/views/accounts/AccountBackupPlan/AccountBackupPlanCreateUpdate.vue'),
+        name: 'AccountBackupPlanUpdate',
+        meta: { title: i18n.t('xpack.AccountBackupPlan.AccountBackupPlanUpdate'), activeMenu: '/accounts/backup', action: 'update' },
         hidden: true
       },
       {
         path: ':id',
-        component: () => import('@/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/index.vue'),
-        name: 'EscapeRoutePlanDetail',
-        meta: { title: i18n.t('xpack.EscapeRoutePlan.EscapeRoutePlan'), activeMenu: '/accounts/escape' },
+        component: () => import('@/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/index.vue'),
+        name: 'AccountBackupPlanDetail',
+        meta: { title: i18n.t('xpack.AccountBackupPlan.AccountBackupPlan'), activeMenu: '/accounts/backup' },
         hidden: true
       },
       {
         path: 'plan-execution/:id',
-        component: () => import('@/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/index.vue'),
-        name: 'EscapeRoutePlanExecutionDetail',
-        meta: { title: i18n.t('xpack.EscapeRoutePlan.ExecutionDetail'), activeMenu: '/accounts/escape' },
+        component: () => import('@/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail/index.vue'),
+        name: 'AccountBackupPlanExecutionDetail',
+        meta: { title: i18n.t('xpack.AccountBackupPlan.ExecutionDetail'), activeMenu: '/accounts/backup' },
         hidden: true
       }
     ]
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanCreateUpdate.vue b/src/views/accounts/AccountBackupPlan/AccountBackupPlanCreateUpdate.vue
similarity index 57%
rename from src/views/accounts/EscapeRoutePlan/EscapeRoutePlanCreateUpdate.vue
rename to src/views/accounts/AccountBackupPlan/AccountBackupPlanCreateUpdate.vue
index 8e9788df7..66c30893b 100644
--- a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanCreateUpdate.vue
+++ b/src/views/accounts/AccountBackupPlan/AccountBackupPlanCreateUpdate.vue
@@ -4,34 +4,40 @@
 
 <script>
 import { GenericCreateUpdatePage } from '@/layout/components'
-import getFields from '@/views/accounts/EscapeRoutePlan/fields'
+import getFields from '@/views/accounts/AccountBackupPlan/fields'
+import FormTypeField from './components/FormTypeField'
 
 export default {
-  name: 'EscapeRoutePlanreateUpdate',
+  name: 'AccountBackupPlanUpdate',
   components: {
     GenericCreateUpdatePage
   },
   data() {
     const fields = getFields.bind(this)()
     return {
-      url: '/api/v1/assets/escape/',
+      url: '/api/v1/assets/backup/',
       fields: [
-        [this.$t('common.Basic'), ['name']],
+        [this.$t('common.Basic'), ['name', 'types']],
         [this.$t('xpack.Timer'), ['is_periodic', 'crontab', 'interval']],
         [this.$t('common.Other'), ['recipients', 'comment']]
       ],
       initial: {
         is_periodic: true,
-        interval: 24
+        interval: 24,
+        types: ['all', 'asset', 'application']
       },
       fieldsMeta: {
         is_periodic: fields.is_periodic,
         crontab: fields.crontab,
         interval: fields.interval,
-        recipients: fields.recipients
+        recipients: fields.recipients,
+        types: {
+          label: this.$t('perms.Actions'),
+          component: FormTypeField
+        }
       },
-      createSuccessNextRoute: { name: 'EscapeRoutePlanIndex' },
-      updateSuccessNextRoute: { name: 'EscapeRoutePlanIndex' },
+      createSuccessNextRoute: { name: 'AccountBackupPlanIndex' },
+      updateSuccessNextRoute: { name: 'AccountBackupPlanIndex' },
       cleanFormValue(data) {
         if (data['interval'] === '') {
           delete data['interval']
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionInfo.vue b/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail/AccountBackupPlanExecutionInfo.vue
similarity index 79%
rename from src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionInfo.vue
rename to src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail/AccountBackupPlanExecutionInfo.vue
index 3bde75299..467e99d23 100644
--- a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionInfo.vue
+++ b/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail/AccountBackupPlanExecutionInfo.vue
@@ -11,7 +11,7 @@ import DetailCard from '@/components/DetailCard'
 import { toSafeLocalDateStr } from '@/utils/common'
 
 export default {
-  name: 'EscapeRoutePlanExecutionInfo',
+  name: 'AccountBackupPlanExecutionInfo',
   components: {
     DetailCard
   },
@@ -36,6 +36,14 @@ export default {
           key: this.$t('xpack.ChangeAuthPlan.DateStart'),
           value: toSafeLocalDateStr(this.object.date_start)
         },
+        {
+          key: this.$t('xpack.AccountBackupPlan.IsSuccess'),
+          value: this.object.is_success
+        },
+        {
+          key: this.$t('xpack.AccountBackupPlan.Reason'),
+          value: this.object.reason
+        },
         {
           key: this.$t('xpack.ChangeAuthPlan.MailRecipient'),
           value: this.object.recipients ? this.object.recipients.map(
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/index.vue b/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail/index.vue
similarity index 64%
rename from src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/index.vue
rename to src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail/index.vue
index e8d3b1796..64e715fcd 100644
--- a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/index.vue
+++ b/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionDetail/index.vue
@@ -8,32 +8,27 @@
 
 <script>
 import { GenericDetailPage } from '@/layout/components'
-import EscapeRoutePlanExecutionInfo from './EscapeRoutePlanExecutionInfo'
-import EscapeRoutePlanExecutionTaskList from './EscapeRoutePlanExecutionTaskList'
+import AccountBackupPlanExecutionInfo from './AccountBackupPlanExecutionInfo'
 
 export default {
   components: {
     GenericDetailPage,
-    EscapeRoutePlanExecutionInfo,
-    EscapeRoutePlanExecutionTaskList
+    AccountBackupPlanExecutionInfo
   },
   data() {
     return {
       execution: { id: '' },
       config: {
-        activeMenu: 'EscapeRoutePlanExecutionInfo',
+        activeMenu: 'AccountBackupPlanExecutionInfo',
         actions: {
+          detailApiUrl: `/api/v1/assets/backup-execution/${this.$route.params.id}/`,
           hasUpdate: false,
           hasDelete: false
         },
         submenu: [
           {
             title: this.$t('common.BasicInfo'),
-            name: 'EscapeRoutePlanExecutionInfo'
-          },
-          {
-            title: this.$t('xpack.ChangeAuthPlan.TaskList'),
-            name: 'EscapeRoutePlanExecutionTaskList'
+            name: 'AccountBackupPlanExecutionInfo'
           }
         ],
         getTitle: this.getExecutionTitle
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionList.vue b/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionList.vue
similarity index 65%
rename from src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionList.vue
rename to src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionList.vue
index d8a3aaf8c..ba00c372f 100644
--- a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionList.vue
+++ b/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanExecution/AccountBackupPlanExecutionList.vue
@@ -6,7 +6,7 @@
 import GenericListTable from '@/layout/components/GenericListTable'
 
 export default {
-  name: 'EscapeRoutePlanExecution',
+  name: 'AccountBackupPlanExecution',
   components: {
     GenericListTable
   },
@@ -20,29 +20,11 @@ export default {
   data() {
     return {
       tableConfig: {
-        url: `/api/v1/assets/escape-execution/?plan_id=${this.object.id}`,
+        url: `/api/v1/assets/backup-execution/?plan_id=${this.object.id}`,
         columns: [
-          'username', 'result_summary', 'timedelta', 'trigger_display', 'date_start', 'actions'
+          'timedelta', 'trigger_display', 'date_start', 'is_success', 'reason', 'actions'
         ],
         columnsMeta: {
-          result_summary: {
-            label: this.$t('xpack.ChangeAuthPlan.Result'),
-            width: '80px',
-            showOverflowTooltip: true,
-            formatter: function(row) {
-              const summary = <div>
-                <span class='text-primary'>{row.result_summary.succeed}</span>/
-                <span class='text-danger'>{row.result_summary.failed}</span>/
-                <span>{row.result_summary.total}</span>
-              </div>
-              return summary
-            }
-          },
-          password_strategy_display: {
-            label: this.$t('xpack.ChangeAuthPlan.PasswordStrategy'),
-            width: '220px',
-            showOverflowTooltip: true
-          },
           timedelta: {
             label: this.$t('xpack.ChangeAuthPlan.TimeDelta'),
             width: '90px',
@@ -72,7 +54,7 @@ export default {
                   title: this.$t('xpack.ChangeAuthPlan.Detail'),
                   type: 'info',
                   callback: function({ row }) {
-                    return this.$router.push({ name: 'EscapeRoutePlanExecutionDetail', params: { id: row.id }})
+                    return this.$router.push({ name: 'AccountBackupPlanExecutionDetail', params: { id: row.id }})
                   }
                 }
               ]
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanInfo.vue b/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanInfo.vue
similarity index 94%
rename from src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanInfo.vue
rename to src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanInfo.vue
index 6834ce537..d219dfcc0 100644
--- a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanInfo.vue
+++ b/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/AccountBackupPlanInfo.vue
@@ -14,7 +14,7 @@ import { DetailCard, QuickActions } from '@/components'
 import { toSafeLocalDateStr } from '@/utils/common'
 
 export default {
-  name: 'EscapeRoutePlanInfo',
+  name: 'AccountBackupPlanInfo',
   components: {
     DetailCard,
     QuickActions
@@ -28,7 +28,6 @@ export default {
   },
   data() {
     return {
-      url: '/api/v1/assets/escape/',
       quickActions: [
         {
           title: this.$t('xpack.ChangeAuthPlan.ManualExecutePlan'),
@@ -39,7 +38,7 @@ export default {
           callbacks: {
             click: function() {
               this.$axios.post(
-                `/api/v1/assets/escape-execution/`,
+                `/api/v1/assets/backup-execution/`,
                 { plan: this.object.id }
               ).then(res => {
                 window.open(`/#/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600')
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/index.vue b/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/index.vue
similarity index 58%
rename from src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/index.vue
rename to src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/index.vue
index afec846ec..8de584869 100644
--- a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/index.vue
+++ b/src/views/accounts/AccountBackupPlan/AccountBackupPlanDetail/index.vue
@@ -8,30 +8,33 @@
 
 <script>
 import { GenericDetailPage } from '@/layout/components'
-import EscapeRoutePlanInfo from './EscapeRoutePlanInfo'
-import EscapeRoutePlanExecutionList from './EscapeRoutePlanExecution/EscapeRoutePlanExecutionList'
+import AccountBackupPlanInfo from './AccountBackupPlanInfo'
+import AccountBackupPlanExecutionList from './AccountBackupPlanExecution/AccountBackupPlanExecutionList'
 
 export default {
   components: {
     GenericDetailPage,
-    EscapeRoutePlanInfo,
-    EscapeRoutePlanExecutionList
+    AccountBackupPlanInfo,
+    AccountBackupPlanExecutionList
   },
   data() {
     return {
       plan: { name: '', comment: '' },
       config: {
-        activeMenu: 'EscapeRoutePlanInfo',
+        activeMenu: 'AccountBackupPlanInfo',
         submenu: [
           {
             title: this.$t('common.BasicInfo'),
-            name: 'EscapeRoutePlanInfo'
+            name: 'AccountBackupPlanInfo'
           },
           {
             title: this.$t('xpack.ChangeAuthPlan.ExecutionList'),
-            name: 'EscapeRoutePlanExecutionList'
+            name: 'AccountBackupPlanExecutionList'
           }
-        ]
+        ],
+        actions: {
+          detailApiUrl: `/api/v1/assets/backup/${this.$route.params.id}/`
+        }
       }
     }
   }
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanList.vue b/src/views/accounts/AccountBackupPlan/AccountBackupPlanList.vue
similarity index 80%
rename from src/views/accounts/EscapeRoutePlan/EscapeRoutePlanList.vue
rename to src/views/accounts/AccountBackupPlan/AccountBackupPlanList.vue
index d5768414d..ee202a41f 100644
--- a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanList.vue
+++ b/src/views/accounts/AccountBackupPlan/AccountBackupPlanList.vue
@@ -8,7 +8,7 @@ import { DetailFormatter } from '@/components/TableFormatters'
 import { openTaskPage } from '@/utils/jms'
 
 export default {
-  name: 'EscapeRoutePlanList',
+  name: 'AccountBackupPlanList',
   components: {
     GenericListTable
   },
@@ -16,9 +16,9 @@ export default {
     const vm = this
     return {
       tableConfig: {
-        url: '/api/v1/assets/escape/',
+        url: '/api/v1/assets/backup/',
         columns: [
-          'name', 'is_periodic', 'periodic_display', 'comment', 'org_name', 'actions'
+          'name', 'is_periodic', 'periodic_display', 'org_name', 'comment', 'actions'
         ],
         columnsShow: {
           min: ['name', 'actions'],
@@ -28,7 +28,7 @@ export default {
           name: {
             formatter: DetailFormatter,
             formatterArgs: {
-              route: 'EscapeRoutePlanDetail'
+              route: 'AccountBackupPlanDetail'
             }
           },
           is_periodic: {
@@ -50,10 +50,10 @@ export default {
             width: '164px',
             formatterArgs: {
               onClone: ({ row }) => {
-                vm.$router.push({ name: 'EscapeRoutePlanCreate', query: { clone_from: row.id }})
+                vm.$router.push({ name: 'AccountBackupPlanCreate', query: { clone_from: row.id }})
               },
               onUpdate: ({ row }) => {
-                vm.$router.push({ name: 'EscapeRoutePlanUpdate', params: { id: row.id }})
+                vm.$router.push({ name: 'AccountBackupPlanUpdate', params: { id: row.id }})
               },
               extraActions: [
                 {
@@ -62,7 +62,7 @@ export default {
                   type: 'info',
                   callback: function({ row }) {
                     this.$axios.post(
-                      `/api/v1/assets/escape-execution/`,
+                      `/api/v1/assets/backup-execution/`,
                       { plan: row.id }
                     ).then(res => {
                       openTaskPage(res['task'])
@@ -81,7 +81,7 @@ export default {
         hasMoreActions: false,
         createRoute: () => {
           return {
-            name: 'EscapeRoutePlanCreate'
+            name: 'AccountBackupPlanCreate'
           }
         }
       }
diff --git a/src/views/accounts/AccountBackupPlan/components/FormTypeField.vue b/src/views/accounts/AccountBackupPlan/components/FormTypeField.vue
new file mode 100644
index 000000000..aa7c62573
--- /dev/null
+++ b/src/views/accounts/AccountBackupPlan/components/FormTypeField.vue
@@ -0,0 +1,92 @@
+<template>
+  <el-tree
+    :data="iData"
+    show-checkbox
+    node-key="id"
+    :default-expand-all="false"
+    :default-checked-keys="value"
+    :props="defaultProps"
+    v-bind="$attrs"
+    @check="handleCheckChange"
+  />
+</template>
+
+<script>
+export default {
+  name: 'FormTypeField',
+  props: {
+    value: {
+      type: Array,
+      default: () => []
+    },
+    choices: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      },
+      fullChoicesTreeNodes: [
+        {
+          id: 'all',
+          label: this.$t('perms.all'),
+          children: [
+            {
+              id: 'asset',
+              label: this.$t('assets.Assets')
+            },
+            {
+              id: 'application',
+              label: this.$t('assets.Applications')
+            }
+          ]
+        }
+      ]
+    }
+  },
+  computed: {
+    choicesIDs() {
+      return this.choices.map((v) => v.value)
+    },
+    iData() {
+      this.$log.debug('choices: ', this.choicesIDs)
+      const fullTreeNodes = _.cloneDeep(this.fullChoicesTreeNodes)
+      const treeNodes = this.trimChoicesTreeNodes(fullTreeNodes)
+      this.$log.debug('choicesTreeNodes: ', treeNodes)
+      return treeNodes
+    }
+  },
+  methods: {
+    trimChoicesTreeNodes(treeNodes) {
+      const newTreeNodes = []
+      for (const treeNode of treeNodes) {
+        if (!this.choicesIDs.includes(treeNode.id)) {
+          continue
+        }
+        let children = treeNode.children || []
+        if (children.length !== 0) {
+          children = this.trimChoicesTreeNodes(children)
+          treeNode.children = children
+        }
+        newTreeNodes.push(treeNode)
+      }
+      return newTreeNodes
+    },
+    handleCheckChange(data, obj) {
+      const checkedKeys = obj.checkedKeys
+      if (checkedKeys.length !== 0) {
+        checkedKeys.push('connect')
+      }
+      this.$emit('input', checkedKeys)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/accounts/EscapeRoutePlan/fields.js b/src/views/accounts/AccountBackupPlan/fields.js
similarity index 100%
rename from src/views/accounts/EscapeRoutePlan/fields.js
rename to src/views/accounts/AccountBackupPlan/fields.js
diff --git a/src/views/accounts/EscapeRoutePlan/index.vue b/src/views/accounts/AccountBackupPlan/index.vue
similarity index 65%
rename from src/views/accounts/EscapeRoutePlan/index.vue
rename to src/views/accounts/AccountBackupPlan/index.vue
index 85ad5ba2a..760969229 100644
--- a/src/views/accounts/EscapeRoutePlan/index.vue
+++ b/src/views/accounts/AccountBackupPlan/index.vue
@@ -8,21 +8,21 @@
 
 <script>
 import { TabPage } from '@/layout/components'
-import EscapeRoutePlanList from './EscapeRoutePlanList'
+import AccountBackupPlanList from './AccountBackupPlanList'
 export default {
   name: 'Index',
   components: {
     TabPage,
-    EscapeRoutePlanList
+    AccountBackupPlanList
   },
   data() {
     return {
       config: {
-        activeMenu: 'EscapeRoutePlanList',
+        activeMenu: 'AccountBackupPlanList',
         submenu: [
           {
-            title: this.$t('xpack.EscapeRoutePlan.EscapeRoutePlan'),
-            name: 'EscapeRoutePlanList'
+            title: this.$t('xpack.AccountBackupPlan.AccountBackupPlan'),
+            name: 'AccountBackupPlanList'
           }
         ]
       }
diff --git a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionTaskList.vue b/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionTaskList.vue
deleted file mode 100644
index 241e987ee..000000000
--- a/src/views/accounts/EscapeRoutePlan/EscapeRoutePlanDetail/EscapeRoutePlanExecution/EscapeRoutePlanExecutionDetail/EscapeRoutePlanExecutionTaskList.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-  <GenericListTable :table-config="tableConfig" :header-actions="headerActions" />
-</template>
-
-<script>
-import GenericListTable from '@/layout/components/GenericListTable'
-
-export default {
-  name: 'EscapeRoutePlanExecutionTaskList',
-  components: {
-    GenericListTable
-  },
-  props: {
-    object: {
-      type: Object,
-      required: true,
-      default: () => ({})
-    }
-  },
-  data() {
-    return {
-      tableConfig: {
-        url: `/api/v1/xpack/assets/escape-execution-subtask/?plan_execution_id=${this.object.id}`,
-        columns: [
-          'is_success', 'reason', 'timedelta', 'date_start', 'actions'
-        ],
-        columnsMeta: {
-          is_success: {
-            label: this.$t('xpack.ChangeAuthPlan.Success')
-          },
-          timedelta: {
-            label: this.$t('xpack.ChangeAuthPlan.TimeDelta'),
-            width: '90px',
-            formatter: function(row) {
-              return row.timedelta.toFixed(2) + 's'
-            }
-          },
-          actions: {
-            formatterArgs: {
-              hasDelete: false,
-              hasUpdate: false,
-              hasClone: false,
-              extraActions: [
-                {
-                  name: 'retry',
-                  type: 'info',
-                  title: this.$t('xpack.ChangeAuthPlan.Retry'),
-                  callback: function({ row, tableData }) {
-                    this.$axios.put(
-                      `/api/v1/assets/escape-execution-subtask/${row.id}/`,
-                    ).then(res => {
-                      window.open(`/#/ops/celery/task/${res.task}/log/`, '_blank', 'toolbar=yes, width=900, height=600')
-                    })
-                  }.bind(this)
-                }
-              ]
-            }
-          }
-        }
-      },
-      headerActions: {
-        hasSearch: true,
-        hasRefresh: true,
-        hasLeftActions: true,
-        hasRightActions: true,
-        hasExport: false,
-        hasImport: false,
-        hasCreate: false,
-        hasBulkDelete: false,
-        hasBulkUpdate: false
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>