From 4689413c90f857df4d32573f0956ea9c58abaa38 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 16 May 2024 09:34:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?NEZ-3474=20fix:=20=E6=96=B0=E5=A2=9Erule?=
 =?UTF-8?q?=E7=9A=84expression=E4=B8=8B=E6=8B=89=20=E8=A1=8C=E9=AB=98?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/page/dashboard/explore/exploreHistory.scss    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/exploreHistory.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/exploreHistory.scss
index 54fdceebc..33953b43c 100644
--- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/exploreHistory.scss
+++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/exploreHistory.scss
@@ -53,6 +53,7 @@
     .query-prompt-content-title{
       max-width: 100%;
       display: inline-block;
+      line-height: 22px;
     }
     .query-prompt-content-icon{
       margin-left: 10px;

From 05fd5fd781149b75671fe38d1ffc743a77a9646a Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 16 May 2024 09:58:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?NEZ-3437=20fix:=20Agents=20state=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BB=8E=E9=A1=B5=E9=9D=A2=E8=AE=BF=E9=97=AE=20?=
 =?UTF-8?q?=E6=9C=AA=E4=BF=9D=E7=95=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/mixin/dataList.js      | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index 7fe0ed77d..6d795d626 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -838,10 +838,10 @@ export default {
           },
           jsonKey: 'val'
         },
-        state: {
+        statuses: {
           target: this.searchLabel,
           isSearchInput: true,
-          propertyName: 'state',
+          propertyName: 'statuses',
           type: 'string',
           defaultJson: {
             disabled: false,
@@ -849,9 +849,11 @@ export default {
             name: 'State',
             readonly: true,
             type: 'select',
-            val: ''
+            val: '',
+            valnum: '',
+            listStr: 'promState'
           },
-          jsonKey: 'val'
+          jsonKey: 'valnum'
         },
         dcIds: {
           target: this.searchLabel,
@@ -880,9 +882,11 @@ export default {
             name: 'Type',
             readonly: true,
             type: 'select',
-            val: ''
+            val: '',
+            valnum: '',
+            listStr: 'promType'
           },
-          jsonKey: 'val'
+          jsonKey: 'valnum'
         },
         host: {
           target: this.searchLabel,