Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme

# Conflicts:
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue

nezha-fronted/src/components/common/alert/alertLabel.vue

@@ -257,8 +257,7 @@ export default {
     type: {},
     // labelLoading:{},
     that: {},
-    detailList: Boolean,
-    alertTableDialog: Boolean
+    detailList: Boolean
   },
   data () {
     return {
@@ -296,8 +295,8 @@ export default {
       const self = this
       return function (position) {
         const clientHeight = (document.body.clientHeight < document.documentElement.clientHeight) ? document.body.clientHeight : document.documentElement.clientHeight
-        const dialog = document.getElementsByClassName('el-dialog')[2] // 获取元素类名为 el-dialog的元素数组第二个
-        const dialogHeight = dialog.clientHeight // 获取元素窗口
+        const dialog = document.querySelector('#dialog-alert-massage .el-dialog')
+        const dialogHeight = dialog.getBoundingClientRect()
         const leftOffSetView = this.detailList ? -80 : 10
         const topOffSetView = this.detailList ? 0 : 0
         const leftOffSet = this.detailList ? -80 : 10
@@ -308,10 +307,10 @@ export default {
             left: `${position.left + position.width + leftOffSet}px`,
             top: `${position.top - elHeight + topOffSet}px`
           }
-        } else if (dialogHeight && this.alertTableDialog) { // dialogHeight 为获取的元素窗口,this.alertTableDialog // 为了判断是alertMessageTable页面使用的组件
+        } else if (dialogHeight) {
           return {
-            left: `${position.left + position.width - 40}px`,
-            top: `${position.top - 95}px`
+            left: `${position.left + position.width + 10 - dialogHeight.x}px`,
+            top: `${position.top - dialogHeight.y}px`
           }
         } else {
           return {