From 6be89ba4797bcec32d54653270a1e3e1d2be2b1c Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Mon, 6 Jul 2020 18:33:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0=E7=A9=BA=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                                     | 2 ++
 src/i18n/langs/en.json                                     | 1 +
 src/views/assets/SystemUser/SystemUserDetail/AssetList.vue | 6 ++++++
 3 files changed, 9 insertions(+)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index fd3d056e3..40e85c179 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -122,6 +122,7 @@
     "TestConnection": "测试连接",
     "Type": "类型",
     "UnselectedAssets": "未选择资产",
+    "UnselectedNodes": "未选择节点",
     "UpdateAssetUserToken": "更新资产用户认证信息",
     "Username": "用户名",
     "UsernameHelpMessage": "用户名是动态的，登录资产时使用当前用户的用户名登录",
@@ -132,6 +133,7 @@
     "date_joined": "创建日期",
     "ip": "IP",
     "sshkey": "sshkey"
+
   },
   "audits": {
     "Hosts": "主机",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 7d9529181..3f877094e 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -122,6 +122,7 @@
     "TestConnection": "Test connection",
     "Type": "Type",
     "UnselectedAssets": "Unselected assets",
+    "UnselectedNodes": "Unselected nodes",
     "UpdateAssetUserToken": "Update asset user auth",
     "Username": "Username",
     "UsernameHelpMessage": "Username is dynamic, When connect asset, using current user's username",
diff --git a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
index 30235977d..841e4b7ea 100644
--- a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
+++ b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
@@ -78,6 +78,9 @@ export default {
               systemuser: this.object.id
             })
           )
+          if (data.length === 0) {
+            return this.$message.error(this.$t('assets.UnselectedAssets'))
+          }
           return this.$axios.post(relationUrl, data)
         },
         onAddSuccess: (items, that) => {
@@ -144,6 +147,9 @@ export default {
               node: v.value
             }
           })
+          if (data.length === 0) {
+            return this.$message.error(this.$t('assets.UnselectedNodes'))
+          }
           return this.$axios.post(relationUrl, data)
         },
         performDelete: (item) => {

From 657161564358be0b2f3b4d6f32be428fb6b73d7e Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Mon, 6 Jul 2020 19:27:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/NavHeader/ApiKey.vue | 2 +-
 src/views/assets/Asset/AssetList.vue       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/layout/components/NavHeader/ApiKey.vue b/src/layout/components/NavHeader/ApiKey.vue
index 2d396f9fa..cf28dbb15 100644
--- a/src/layout/components/NavHeader/ApiKey.vue
+++ b/src/layout/components/NavHeader/ApiKey.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Dialog width="60%" :visible.sync="showDialog" :title="this.$t('setting.ApiKeyList')" :show-cancel="false" :show-confirm="false">
+    <Dialog :destroy-on-close="true" width="60%" :visible.sync="showDialog" :title="this.$t('setting.ApiKeyList')" :show-cancel="false" :show-confirm="false">
       <div>
         <el-alert type="success"> {{ helpMessage }} </el-alert>
         <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
diff --git a/src/views/assets/Asset/AssetList.vue b/src/views/assets/Asset/AssetList.vue
index ef35e7baf..24882e292 100644
--- a/src/views/assets/Asset/AssetList.vue
+++ b/src/views/assets/Asset/AssetList.vue
@@ -54,6 +54,7 @@
       </Dialog>
     </div>
     <GenericUpdateFormDialog
+      v-if="updateSelectedDialogSetting.dialogSetting.dialogVisible"
       :selected-rows="updateSelectedDialogSetting.selectedRows"
       :form-setting="updateSelectedDialogSetting.formSetting"
       :dialog-setting="updateSelectedDialogSetting.dialogSetting"

From 06fc6715476ecbbfdc4513240184f5fb46603225 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Mon, 6 Jul 2020 19:35:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0Submodule=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/xpack b/src/views/xpack
index 41069df32..89f5ee148 160000
--- a/src/views/xpack
+++ b/src/views/xpack
@@ -1 +1 @@
-Subproject commit 41069df320e2c718bf6f3159c1d3efb0b2b1f4ef
+Subproject commit 89f5ee148146eed72804e22840921b16108dbb12