From 581d23a3f2092d204fdfc6a0fcb8074edb5fbf71 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Mon, 15 Jun 2020 15:37:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[fix]=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Asset/AssetDetail/Detail.vue        | 12 ++----------
 .../CommandFilter/CommandFilterDetail/Detail.vue     | 12 ++----------
 .../assets/SystemUser/SystemUserDetail/AssetList.vue | 12 ++----------
 3 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/src/views/assets/Asset/AssetDetail/Detail.vue b/src/views/assets/Asset/AssetDetail/Detail.vue
index f01a9c76b..7c524d3e6 100644
--- a/src/views/assets/Asset/AssetDetail/Detail.vue
+++ b/src/views/assets/Asset/AssetDetail/Detail.vue
@@ -130,11 +130,7 @@ export default {
           items.map(v => {
             newData.push(v.value)
           })
-          return this.$axios.patch(relationUrl, { nodes: newData }).then(res => {
-            this.$message.success(this.$t('common.updateSuccessMsg'))
-          }).catch(err => {
-            this.$message.error(this.$t('common.updateErrorMsg' + ' ' + err))
-          })
+          return this.$axios.patch(relationUrl, { nodes: newData })
         },
         performDelete: (item) => {
           const itemId = item.value
@@ -146,11 +142,7 @@ export default {
             }
           })
           const relationUrl = `/api/v1/assets/assets/${this.object.id}/`
-          return this.$axios.patch(relationUrl, { nodes: newData }).then(res => {
-            this.$message.success(this.$t('common.updateSuccessMsg'))
-          }).catch(err => {
-            this.$message.error(this.$t('common.updateErrorMsg' + ' ' + err))
-          })
+          return this.$axios.patch(relationUrl, { nodes: newData })
         }
       },
       labelConfig: {
diff --git a/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue b/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue
index bf94e403c..a35d80e03 100644
--- a/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue
+++ b/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue
@@ -55,11 +55,7 @@ export default {
           items.map(v => {
             newData.push(v.value)
           })
-          return this.$axios.patch(relationUrl, { system_users: newData }).then(res => {
-            this.$message.success(this.$t('common.updateSuccessMsg'))
-          }).catch(err => {
-            this.$message.error(this.$t('common.updateErrorMsg' + ' ' + err))
-          })
+          return this.$axios.patch(relationUrl, { system_users: newData })
         },
         performDelete: (item) => {
           const itemId = item.value
@@ -71,11 +67,7 @@ export default {
             }
           })
           const relationUrl = `/api/v1/assets/cmd-filters/${this.object.id}/`
-          return this.$axios.patch(relationUrl, { system_users: newData }).then(res => {
-            this.$message.success(this.$t('common.deleteSuccessMsg'))
-          }).catch(err => {
-            this.$message.error(this.$t('common.deleteErrorMsg' + ' ' + err))
-          })
+          return this.$axios.patch(relationUrl, { system_users: newData })
         }
       }
     }
diff --git a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
index 2c8fcb332..62a34f0d7 100644
--- a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
+++ b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
@@ -127,21 +127,13 @@ export default {
               node: v.value
             }
           })
-          return this.$axios.post(relationUrl, data).then(res => {
-            this.$message.success(this.$t('common.updateSuccessMsg'))
-          }).catch(err => {
-            this.$message.error(this.$t('common.updateErrorMsg' + ' ' + err))
-          })
+          return this.$axios.post(relationUrl, data)
         },
         performDelete: (item) => {
           const itemId = item.value
           const objectId = this.object.id
           const relationUrl = `/api/v1/assets/system-users-nodes-relations/?systemuser=${objectId}&node=${itemId}`
-          return this.$axios.delete(relationUrl).then(res => {
-            this.$message.success(this.$t('common.updateSuccessMsg'))
-          }).catch(err => {
-            this.$message.error(this.$t('common.updateErrorMsg' + ' ' + err))
-          })
+          return this.$axios.delete(relationUrl)
         }
       }
     }

From a0ca717aa246e546464f19f1513189f228a85ac0 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Mon, 15 Jun 2020 16:31:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[fix]=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BATr?=
 =?UTF-8?q?ee=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataZTree/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/AutoDataZTree/index.vue b/src/components/AutoDataZTree/index.vue
index 88fe39457..140ea396b 100644
--- a/src/components/AutoDataZTree/index.vue
+++ b/src/components/AutoDataZTree/index.vue
@@ -209,6 +209,7 @@ export default {
       if (!parentNode) {
         return
       }
+      this.zTree.expandNode(parentNode, true, false, true, false)
       // http://localhost/api/v1/assets/nodes/85aa4ee2-0bd9-41db-9079-aa3646448d0c/children/
       const url = `${this.treeSetting.nodeUrl}${parentNode.meta.node.id}/children/`
       this.$axios.post(url, {}).then(data => {