From 590830d6199442b25f704d71f8a1d2d314a0d6f7 Mon Sep 17 00:00:00 2001
From: gc_huwumiao <2199202809@qq.com>
Date: Mon, 2 Dec 2024 16:46:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=97=A5=E5=BF=97=E7=B4=A2?=
 =?UTF-8?q?=E5=BC=95=E9=9B=86=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0addition?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=BF=9B=E8=A1=8C=E9=BB=98=E8=AE=A4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bklog/web/src/store/index.js                    | 14 ++++++++++----
 .../condition-comp/select-index-set.tsx         | 17 +++++++++++++----
 .../src/views/retrieve-v2/monitor/monitor.vue   |  2 +-
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/bklog/web/src/store/index.js b/bklog/web/src/store/index.js
index 65e2e4e522..e652dcbfaf 100644
--- a/bklog/web/src/store/index.js
+++ b/bklog/web/src/store/index.js
@@ -949,7 +949,6 @@ const store = new Vuex.Store({
       if (ids.length) {
         delete result.unionList;
         delete result.clusterParams;
-
         const payload = {
           ...result,
           ids,
@@ -957,9 +956,16 @@ const store = new Vuex.Store({
           items: ids.map(val => (list || []).find(item => item.index_set_id === val)).filter(val => val !== undefined),
           isUnionIndex,
         };
-        if (!payload.keyword && payload.items.length === 1 && payload.items[0].query_string) {
-          payload.keyword = payload.items[0].query_string;
-          payload.search_mode = 'sql';
+        if (payload.items.length === 1 && !payload.keyword && !payload.addition?.length) {
+          if (payload.items[0].query_string) {
+            payload.keyword = payload.items[0].query_string;
+            payload.search_mode = 'sql';
+            payload.addition = [];
+          } else if (payload.items[0].addition) {
+            payload.addition = payload.items[0].addition;
+            payload.search_mode = 'ui';
+            payload.keyword = '';
+          }
         }
         commit('updateIndexId', isUnionIndex ? undefined : ids[0]);
         commit('updateIndexItem', payload);
diff --git a/bklog/web/src/views/retrieve-v2/condition-comp/select-index-set.tsx b/bklog/web/src/views/retrieve-v2/condition-comp/select-index-set.tsx
index 7414670e67..e9135cdb98 100644
--- a/bklog/web/src/views/retrieve-v2/condition-comp/select-index-set.tsx
+++ b/bklog/web/src/views/retrieve-v2/condition-comp/select-index-set.tsx
@@ -366,12 +366,13 @@ export default class QueryStatement extends tsc<object> {
   @Emit('selected')
   emitSelected() {
     const ids = this.isAloneType ? this.selectAloneVal : this.selectedItemIDlist;
-    const { start_time, end_time, timezone, keyword, search_mode } = this.indexItem;
+    const { start_time, end_time, timezone, keyword, search_mode, addition } = this.indexItem;
     const payload = {
       start_time,
       end_time,
       timezone,
       ids,
+      addition: addition || [],
       keyword: keyword || '',
       search_mode,
       selectIsUnionSearch: !this.isAloneType,
@@ -379,9 +380,17 @@ export default class QueryStatement extends tsc<object> {
       isUnionIndex: !this.isAloneType,
       sort_list: [],
     };
-    if (!payload.keyword && payload.items.length === 1 && payload.items[0].query_string) {
-      payload.keyword = payload.items[0].query_string;
-      payload.search_mode = 'sql';
+
+    if (payload.items.length === 1) {
+      if (!payload.keyword && payload.items[0].query_string) {
+        payload.keyword = payload.items[0].query_string;
+        payload.search_mode = 'sql';
+        payload.addition = [];
+      } else if (!payload.addition?.length && payload.items[0].addition) {
+        payload.addition = payload.items[0].addition;
+        payload.search_mode = 'ui';
+        payload.keyword = '';
+      }
     }
     return payload;
   }
diff --git a/bklog/web/src/views/retrieve-v2/monitor/monitor.vue b/bklog/web/src/views/retrieve-v2/monitor/monitor.vue
index c5fc165679..55f8826e60 100644
--- a/bklog/web/src/views/retrieve-v2/monitor/monitor.vue
+++ b/bklog/web/src/views/retrieve-v2/monitor/monitor.vue
@@ -125,7 +125,7 @@ const getApmIndexSetList = async () => {
 const getIndexSetList = () => {
   if(!props.indexSetApi) return
   getApmIndexSetList().then(res => {
-    if(!res.length) return
+    if(!res?.length) return
     // 拉取完毕根据当前路由参数回填默认选中索引集
     store.dispatch('updateIndexItemByRoute', { route, list: res }).then(() => {
       store.dispatch('requestIndexSetFieldInfo').then(() => {

From 9a6e64785d1c66d5c2f07468d865cdf264e7f23b Mon Sep 17 00:00:00 2001
From: gc_huwumiao <2199202809@qq.com>
Date: Tue, 3 Dec 2024 11:48:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=97=A5=E5=BF=97=E7=B4=A2?=
 =?UTF-8?q?=E5=BC=95=E9=9B=86=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/retrieve-v2/condition-comp/select-index-set.tsx  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bklog/web/src/views/retrieve-v2/condition-comp/select-index-set.tsx b/bklog/web/src/views/retrieve-v2/condition-comp/select-index-set.tsx
index e9135cdb98..775b0486d2 100644
--- a/bklog/web/src/views/retrieve-v2/condition-comp/select-index-set.tsx
+++ b/bklog/web/src/views/retrieve-v2/condition-comp/select-index-set.tsx
@@ -380,13 +380,12 @@ export default class QueryStatement extends tsc<object> {
       isUnionIndex: !this.isAloneType,
       sort_list: [],
     };
-
-    if (payload.items.length === 1) {
-      if (!payload.keyword && payload.items[0].query_string) {
+    if (payload.items.length === 1 && !payload.addition.length && !payload.keyword) {
+      if (payload.items[0].query_string) {
         payload.keyword = payload.items[0].query_string;
         payload.search_mode = 'sql';
         payload.addition = [];
-      } else if (!payload.addition?.length && payload.items[0].addition) {
+      } else if (payload.items[0].addition) {
         payload.addition = payload.items[0].addition;
         payload.search_mode = 'ui';
         payload.keyword = '';