From 316b39d15b80a0c3de85658ec7a8e028b770b8d2 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Wed, 19 Jan 2022 11:23:18 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E5=A4=8D=E5=90=88=E8=B7=B3=E8=BD=AC=E9=9D=9E?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87404=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tickets/CommandConfirm/Detail/TicketDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/tickets/CommandConfirm/Detail/TicketDetail.vue b/src/views/tickets/CommandConfirm/Detail/TicketDetail.vue
index aac6a2aae..43170ef20 100644
--- a/src/views/tickets/CommandConfirm/Detail/TicketDetail.vue
+++ b/src/views/tickets/CommandConfirm/Detail/TicketDetail.vue
@@ -75,7 +75,7 @@ export default {
           key: this.$t('tickets.ApplyFromSession'),
           value: this.object.meta.apply_from_session_id,
           formatter: function(item, value) {
-            const to = { name: 'SessionDetail', params: { id: value }}
+            const to = { name: 'SessionDetail', params: { id: value }, query: { oid: vm.object.org_id }}
             return <router-link to={to}>{vm.$t('sessions.session')}</router-link>
           }
         },

From c1ddc0f8e0f08364ea9a28fa85d3c7dc61454251 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, 19 Jan 2022 12:52:08 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=BA=94=E7=94=A8=E4=BF=9D=E5=AD=98=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tickets/RequestApplicationPerm/CreateUpdate.vue  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue b/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue
index 231a39f41..bf67764a9 100644
--- a/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue
+++ b/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue
@@ -232,10 +232,14 @@ export default {
   },
   methods: {
     performSubmit(validValues) {
-      const applyCategoryType = validValues.meta.apply_category_type
-      validValues.meta.apply_category = applyCategoryType && applyCategoryType.length > 0 ? applyCategoryType[0] : ''
-      validValues.meta.apply_type = applyCategoryType && applyCategoryType.length > 0 ? applyCategoryType[1] : ''
-      delete validValues.meta['apply_category_type']
+      const validMeta = validValues.meta
+      const applyCategoryType = validMeta.apply_category_type
+      const filter = (len, field) => {
+        return applyCategoryType && applyCategoryType.length > 0 ? applyCategoryType[len] : validMeta[field]
+      }
+      validMeta.apply_category = filter(0, 'apply_category')
+      validMeta.apply_type = filter(1, 'apply_type')
+      delete validMeta['apply_category_type']
       return this.$axios['post'](`/api/v1/tickets/tickets/open/?type=apply_application`, validValues)
     }
   }

From 537887553df6fe5fafb676261d7a317cabceeead 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, 19 Jan 2022 11:18:37 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E3=80=81=E8=B4=A6=E5=8F=B7=E5=A4=87=E4=BB=BD?=
 =?UTF-8?q?=E3=80=81=E4=B8=8A=E4=BC=A0ssh=E5=AF=86=E9=92=A5=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E7=BF=BB=E8=AF=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、替换了改密计划-资产改密，密码框组件
---
 .../AccountListTable/UpdateSecretInfo.vue     | 22 +++++++------------
 src/i18n/langs/cn.json                        |  2 +-
 src/i18n/langs/en.json                        |  1 +
 .../accounts/AccountBackupPlan/fields.js      |  2 ++
 src/views/accounts/ChangeAuthPlan/fields.js   |  4 +++-
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/components/AccountListTable/UpdateSecretInfo.vue b/src/components/AccountListTable/UpdateSecretInfo.vue
index a7be3023a..a02cb400b 100644
--- a/src/components/AccountListTable/UpdateSecretInfo.vue
+++ b/src/components/AccountListTable/UpdateSecretInfo.vue
@@ -8,7 +8,7 @@
     @cancel="handleCancel()"
     v-on="$listeners"
   >
-    <el-form label-position="right" label-width="80px">
+    <el-form label-position="right" label-width="90px">
       <el-form-item :label="this.$t('assets.Hostname')">
         <el-input v-model="account.hostname" readonly />
       </el-form-item>
@@ -18,8 +18,8 @@
       <el-form-item :label="this.$t('assets.Password')">
         <el-input v-model="authInfo.password" type="password" />
       </el-form-item>
-      <el-form-item :label="this.$t('assets.SSHKey')">
-        <input type="file" @change="onPrivateKeyLoaded">
+      <el-form-item :label="this.$t('assets.SSHSecretKey')">
+        <UploadKey @input="getFile" />
       </el-form-item>
       <el-form-item :label="this.$t('assets.Passphrase')">
         <el-input v-model="authInfo.passphrase" type="password" />
@@ -30,10 +30,12 @@
 
 <script>
 import Dialog from '@/components/Dialog'
+import { UploadKey } from '@/components'
 export default {
   name: 'UpdateSecretInfo',
   components: {
-    Dialog
+    Dialog,
+    UploadKey
   },
   props: {
     account: {
@@ -78,16 +80,8 @@ export default {
     handleCancel() {
       this.$emit('update:visible', false)
     },
-    onPrivateKeyLoaded(e) {
-      const vm = this
-      // TODO 校验文件类型
-      const reader = new FileReader()
-      reader.onload = function() {
-        vm.authInfo.private_key = this.result
-      }
-      reader.readAsText(
-        e.target.files[0]
-      )
+    getFile(file) {
+      this.authInfo.private_key = file
     }
   }
 }
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index cad8cc79d..081720a6e 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -224,7 +224,7 @@
     "sshKeyFingerprint": "SSH 指纹",
     "ip": "IP",
     "sshkey": "sshkey",
-    "SSHKey": "SSH 密钥",
+    "SSHSecretKey": "SSH 密钥",
     "GroupsHelpMessage": "请输入用户组，多个用户组使用逗号分隔（需填写已存在的用户组）",
     "HomeHelpMessage": "默认家目录 /home/系统用户名: /home/username",
     "Home": "家目录",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 964b28490..5ce1491e4 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -219,6 +219,7 @@
     "sshKeyFingerprint": "SSH fingerprint",
     "ip": "IP",
     "sshkey": "sshkey",
+    "SSHSecretKey": "SSh key",
     "GroupsHelpMessage": "Please fill in user groups, separated by commas if there are multiple user groups(Please fill in the existing user groups)",
     "HomeHelpMessage": "Default home directory: /home/system username",
     "Home": "Home",
diff --git a/src/views/accounts/AccountBackupPlan/fields.js b/src/views/accounts/AccountBackupPlan/fields.js
index 33c513a37..4b66d7795 100644
--- a/src/views/accounts/AccountBackupPlan/fields.js
+++ b/src/views/accounts/AccountBackupPlan/fields.js
@@ -10,6 +10,8 @@ var validatorInterval = (rule, value, callback) => {
 
 function getFields() {
   const recipients = {
+    label: i18n.t('xpack.ChangeAuthPlan.Addressee'),
+    helpText: i18n.t('xpack.ChangeAuthPlan.OnlyMailSend'),
     el: {
       value: [],
       ajax: {
diff --git a/src/views/accounts/ChangeAuthPlan/fields.js b/src/views/accounts/ChangeAuthPlan/fields.js
index acebb09f9..38598f058 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, UploadKey } from '@/components'
-import { Select2 } from '@/components/FormFields/Select2'
+import { Select2, UpdateToken } from '@/components/FormFields'
 import { Required } from '@/components/DataForm/rules'
 
 var validatorInterval = (rule, value, callback) => {
@@ -104,6 +104,8 @@ function getFields() {
   }
 
   const passphrase = {
+    label: i18n.t('assets.Passphrase'),
+    component: UpdateToken,
     hidden: (formValue) => {
       return formValue.is_ssh_key === false
     }

From 29631b1eaf882661c844b4916a49390aeb68ee77 Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Wed, 19 Jan 2022 18:51:13 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9IP(Doamin)=20->=20?=
 =?UTF-8?q?IP(Host)=E7=BF=BB=E8=AF=91=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 5ce1491e4..43c28f0f2 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -224,7 +224,7 @@
     "HomeHelpMessage": "Default home directory: /home/system username",
     "Home": "Home",
     "LinuxUserAffiliateGroup": "Linux user affiliate group",
-    "ipDomain": "IP(Domain)",
+    "ipDomain": "IP(Host)",
     "HostProtocol": "Host Protocol",
     "DatabaseProtocol": "Database Protocol",
     "RDBProtocol": "RDS Protocol",