From 489c0e38fc2ec588ebc5ba44d1abf577ae84d5aa Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 9 Jun 2022 17:27:45 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1908=20fix=EF=BC=9Aasset=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=BF=E7=94=A8=E5=BC=95=E5=AF=BC=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common.scss              |  8 ++++++++
 .../src/components/common/mixin/editRigthBox.js       | 11 +++++++----
 .../src/components/common/rightBox/asset/assetBox.vue |  4 ++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss
index 8f7447974..ba73b39be 100644
--- a/nezha-fronted/src/assets/css/common.scss
+++ b/nezha-fronted/src/assets/css/common.scss
@@ -421,4 +421,12 @@ input, textarea {
   float: unset;
   font-size: 10px;
   margin-left: 190px;
+  .message-next-continue{
+    color: $--color-text-primary;
+    font-weight: 400;
+  }
+  .message-next-content{
+    color: $--color-text-link;
+    font-weight: 600;
+  }
 }
diff --git a/nezha-fronted/src/components/common/mixin/editRigthBox.js b/nezha-fronted/src/components/common/mixin/editRigthBox.js
index b1e37f64e..4aea2c325 100644
--- a/nezha-fronted/src/components/common/mixin/editRigthBox.js
+++ b/nezha-fronted/src/components/common/mixin/editRigthBox.js
@@ -5,7 +5,8 @@ export default {
       messageParams: {
         route: '',
         params: {}
-      }
+      },
+      closeMessage: ''
     }
   },
   mounted () {
@@ -16,17 +17,18 @@ export default {
     }
   },
   methods: {
-    messageShow (msg, route, params, showNext = false) {
+    messageShow (msg, route, params, showNext = false, nextText = 'setup.next') {
       this.messageParams.route = route
       this.messageParams.params = params
-      this.$message({
+      this.closeMessage = this.$message({
         duration: 2000,
         dangerouslyUseHTMLString: true,
         type: 'success',
-        message: `<div>${msg} <span id="assetAdd" class="message-next ${showNext ? '' : 'hidden'}">Next</span></div>`,
+        message: `<div>${msg} <span class="message-next ${showNext ? '' : 'hidden'}"><span class="message-next-continue">${this.$t('overall.continue')}</span> <span id="assetAdd" class="message-next-content">${this.$t(nextText)}</span></span></div>`,
         onClose: () => {
           const assetAdd = document.getElementById('assetAdd')
           assetAdd.removeEventListener('click', this.saveNext)
+          this.closeMessage = ''
         }
       })
       const assetAdd = document.getElementById('assetAdd')
@@ -37,6 +39,7 @@ export default {
         path: this.messageParams.route,
         query: this.messageParams.params
       })
+      this.closeMessage.close()
     }
   },
   destroyed () {
diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index c6277bb85..42d004030 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -743,7 +743,7 @@ export default {
             this.$put(this.url, params).then(res => {
               this.prevent_opt.save = false
               if (res.code === 200) {
-                this.messageShow(this.$t('tip.saveSuccess'), '/endpoint', { assetId: res.data.id }, false)
+                this.messageShow(this.$t('tip.saveSuccess'), '/endpoint', { assetId: res.data.id }, true, 'guide.addEndpoint')
                 this.esc(true)
               } else {
                 this.$message.error(res.msg)
@@ -753,7 +753,7 @@ export default {
             this.$post(this.url, params).then(res => {
               this.prevent_opt.save = false
               if (res.code === 200) {
-                this.messageShow(this.$t('tip.saveSuccess'), '/endpoint', { assetId: res.data.id }, false)
+                this.messageShow(this.$t('tip.saveSuccess'), '/endpoint', { assetId: res.data.id }, true, 'guide.addEndpoint')
                 this.esc(true)
               } else {
                 this.$message.error(res.msg)