From e2eac8361517ce4a5e4f87ec803aceb32477ee10 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Fri, 19 Aug 2022 11:36:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0json?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormFields/UploadKey.vue                | 2 +-
 src/views/assets/Cloud/Account/AccountCreateUpdate.vue | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/FormFields/UploadKey.vue b/src/components/FormFields/UploadKey.vue
index e45ba2fba..81697c686 100644
--- a/src/components/FormFields/UploadKey.vue
+++ b/src/components/FormFields/UploadKey.vue
@@ -50,7 +50,7 @@ export default {
       const reader = new FileReader()
       reader.onload = function() {
         let result = this.result
-        if (vm.toFormat === 'object') {
+        if (vm.toFormat === 'object' && vm.fileName.endsWith('.json')) {
           result = JSON.parse(result)
         }
         vm.$emit('input', result)
diff --git a/src/views/assets/Cloud/Account/AccountCreateUpdate.vue b/src/views/assets/Cloud/Account/AccountCreateUpdate.vue
index d76c96602..0bedc8a2e 100644
--- a/src/views/assets/Cloud/Account/AccountCreateUpdate.vue
+++ b/src/views/assets/Cloud/Account/AccountCreateUpdate.vue
@@ -91,13 +91,17 @@ export default {
         const attrs = values.attrs
         for (const item of encryptedFields) {
           const value = attrs[item]
-          if (value) {
-            attrs[item] = encryptPassword(value)
+          if (!value) {
+            continue
           }
+          attrs[item] = encryptPassword(value)
         }
         const toListFields = ['ip_group']
         for (const item of toListFields) {
           let value = attrs[item]
+          if (!value) {
+            continue
+          }
           value = value?.split(',') || []
           value = value.filter((value, index) => { if (value) return true })
           attrs[item] = value