From 55ae4b93ea93a2a2c82f1fc610eca33c6ed623d7 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Mon, 20 Dec 2021 16:57:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddcbox=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=9D=90=E6=A0=87=E6=8A=A5=E9=94=99=E5=8F=8A=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF=E6=97=B6=E7=82=B9?=
 =?UTF-8?q?=E5=87=BBbox=E5=A4=96=E6=9C=AA=E5=BC=B9=E5=87=BA=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=A1=86=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF=E6=97=B6=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=88=90=E5=8A=9F=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/latlngPicker.vue       |  9 +++++++--
 .../common/popBox/topToolMoreOptions.vue         | 16 +++++++++-------
 .../src/components/common/rightBox/dcBox.vue     |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/nezha-fronted/src/components/common/latlngPicker.vue b/nezha-fronted/src/components/common/latlngPicker.vue
index 224599a5e..139d69fc7 100644
--- a/nezha-fronted/src/components/common/latlngPicker.vue
+++ b/nezha-fronted/src/components/common/latlngPicker.vue
@@ -116,8 +116,13 @@ export default {
     },
     setLatlng () {
       const lnglat = this.lnglat.split(',')
-      this.mapParam.longitude = lnglat[0]
-      this.mapParam.latitude = lnglat[1]
+      if (lnglat[0] !== 'undefined' && lnglat[1] !== 'undefined') {
+        this.mapParam.longitude = lnglat[0]
+        this.mapParam.latitude = lnglat[1]
+      } else {
+        this.mapParam.longitude = '-33.9257813'
+        this.mapParam.latitude = '55.5761251'
+      }
       this.$emit('lnglatChange', this.lnglat, this.zoom)
     },
     getAttribute () {
diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
index 8e617c80b..1a3383a90 100644
--- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
+++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
@@ -268,13 +268,15 @@ export default {
     },
     closeDialog () {
       this.importBox.show = false
-      this.$nextTick(() => {
-        this.importResult = null
-        this.importFileList = []
-        this.importFile = null
-        this.importBox.value = 1
-        this.importBox.record = 'all'
-      })
+      setTimeout(() => {
+        this.$nextTick(() => {
+          this.importResult = null
+          this.importFileList = []
+          this.importFile = null
+          this.importBox.value = 1
+          this.importBox.record = 'all'
+        })
+      }, 200)
     },
     downloadTemplate () {
       const language = localStorage.getItem('nz-language') || 'en' // 初始未选择默认 en 英文
diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue
index ac63c8dcc..7f2d1306c 100644
--- a/nezha-fronted/src/components/common/rightBox/dcBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-clickoutside="{obj:editDc, func:clickOutside}" class="right-box right-box-dc">
+  <div v-clickoutside="{obj:editDc, func: esc}" class="right-box right-box-dc">
       <!-- begin--标题-->
       <div class="right-box__header">
         <div class="header__title">{{editDc.id ? ($t("config.dc.editDc")) : $t("config.dc.createDc")}}</div>

From 87317ae07a7c335c6488b677c53ada3a6909a1bc Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 20 Dec 2021 17:28:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?NEZ-1402=20=E5=AF=B9=E5=8F=AF=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E8=A7=86=E5=9B=BE=E6=A8=A1=E5=9D=97=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=BF=9B=E8=A1=8C=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/detailView/nzDetailView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/detailView/nzDetailView.vue b/nezha-fronted/src/components/common/detailView/nzDetailView.vue
index 11eeb2372..a4625f0bb 100644
--- a/nezha-fronted/src/components/common/detailView/nzDetailView.vue
+++ b/nezha-fronted/src/components/common/detailView/nzDetailView.vue
@@ -9,7 +9,7 @@
           <div class="top-tool-left" style="min-width: 300px">
             <slot name="top-tool-left"></slot>
             <div v-if="showLayout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20" :class="{'project-search alert-table asset-table endpoint-table': searchRight}">
-              <search-input ref="searchInput" :from="from" :inTransform="bottomBox.inTransform" :searchMsg="searchMsg" @search="search"></search-input>
+              <search-input ref="searchInput" :from="from" :position="from" :inTransform="bottomBox.inTransform" :searchMsg="searchMsg" @search="search"></search-input>
             </div>
           </div>
           <div :class="{'top-tool-main-right-to-left': bottomBox.showSubList}" class="top-tool-right">