From 8850a478a6b768de782986aa03a6573812709e88 Mon Sep 17 00:00:00 2001
From: nanasikeai <nanasikeai@gmail.com>
Date: Wed, 22 Jan 2025 10:01:29 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E7=AD=96=E7=95=A5=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84=EF=BC=8C=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=B8=B8=E9=87=8F=20--bug=3D137401917?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../step2/components/event-info-table.vue     | 25 +++---
 .../components/step2/components/valueItem.vue | 84 ++++++++++++++++++-
 .../components/step2/index.vue                |  7 --
 .../strategy-manage/strategy-create/index.vue | 16 +++-
 4 files changed, 109 insertions(+), 23 deletions(-)

diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step2/components/event-info-table.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step2/components/event-info-table.vue
index 35ed7396..ef68f3ca 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step2/components/event-info-table.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step2/components/event-info-table.vue
@@ -127,8 +127,7 @@
   });
 
   const setTableData = (key: 'event_basic_field_configs' | 'event_data_field_configs' | 'event_evidence_field_configs') => {
-    if (isEditMode || isCloneMode) {
-      if (!props.data[key].length || !tableData.value[key].length) return;
+    if ((isEditMode || isCloneMode) && props.data[key].length && tableData.value[key].length) {
       // 编辑填充参数
       tableData.value[key] = tableData.value[key].map((item) => {
         const editItem = props.data[key].find(edItem => edItem.field_name === item.field_name);
@@ -137,7 +136,10 @@
             field_name: item.field_name,
             display_name: item.display_name,
             is_priority: editItem.is_priority,
-            map_config: editItem.map_config,
+            map_config: {
+              target_value: editItem.map_config?.target_value,
+              source_field: editItem.map_config?.source_field || editItem.map_config?.target_value, // 固定值赋值，用于反显
+            },
             description: editItem.description,
             example: item.example,
             prefix: '',
@@ -151,15 +153,16 @@
     switch (key) {
     case 'event_basic_field_configs':
       // 根据select填充event_basic_field_configs参数
-      if (!tableData.value[key].length || !props.select.length) return;
-      props.select.forEach((item) => {
-        if (fieldMap[item.raw_name]) {
-          const field = tableData.value[key].find(fieldItem => fieldItem.field_name === fieldMap[item.raw_name]);
-          if (field && field.map_config) {
-            field.map_config.source_field = item.display_name;
+      if (tableData.value[key].length && props.select.length) {
+        props.select.forEach((item) => {
+          if (fieldMap[item.raw_name]) {
+            const field = tableData.value[key].find(fieldItem => fieldItem.field_name === fieldMap[item.raw_name]);
+            if (field && field.map_config) {
+              field.map_config.source_field = item.display_name;
+            }
           }
-        }
-      });
+        });
+      }
       break;
     case 'event_data_field_configs':
       if (!props.select.length) return;
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step2/components/valueItem.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step2/components/valueItem.vue
index 7e193a12..6a55aaff 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step2/components/valueItem.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step2/components/valueItem.vue
@@ -25,14 +25,17 @@
               :default-value="config.map_config.source_field"
               style="width: 100%;"
               theme="background">
-              <bk-select v-model="config.map_config.source_field">
+              <bk-select
+                v-model="config.map_config.source_field"
+                @select="(value: string) => handlerSelect(value, config)">
                 <bk-option
-                  v-for="(selectItem, index) in select"
+                  v-for="(selectItem, index) in localSelect"
                   :key="index"
                   :label="selectItem.display_name"
                   :value="selectItem.display_name" />
                 <template #extension>
                   <div
+                    v-if="!showAddCount"
                     style=" color: #63656e;text-align: center;flex: 1; cursor: pointer;"
                     @click="() => showAddCount = true">
                     <audit-icon
@@ -40,6 +43,26 @@
                       type="plus-circle" />
                     <span>{{ t('自定义常量') }}</span>
                   </div>
+                  <div
+                    v-else
+                    style="
+                      display: flex;
+                      width: 100%;
+                      padding: 0 5px;
+                      align-items: center;
+                    ">
+                    <bk-input
+                      v-model="countValue"
+                      :placeholder="t('请输入')" />
+                    <audit-icon
+                      style=" padding: 0 5px;font-size: 15px; color: #2caf5e;cursor: pointer;"
+                      type="check-line"
+                      @click="confirmAddCount" />
+                    <audit-icon
+                      style="font-size: 15px; color: #c4c6cc; cursor: pointer;"
+                      type="close"
+                      @click="() => showAddCount = false" />
+                  </div>
                 </template>
               </bk-select>
             </select-verify>
@@ -49,12 +72,13 @@
               v-model="config.map_config.source_field"
               style="width: 100%;">
               <bk-option
-                v-for="(selectItem, index) in select"
+                v-for="(selectItem, index) in localSelect"
                 :key="index"
                 :label="selectItem.display_name"
                 :value="selectItem.display_name" />
               <template #extension>
                 <div
+                  v-if="!showAddCount"
                   style=" color: #63656e;text-align: center;flex: 1; cursor: pointer;"
                   @click="() => showAddCount = true">
                   <audit-icon
@@ -62,6 +86,26 @@
                     type="plus-circle" />
                   <span>{{ t('自定义常量') }}</span>
                 </div>
+                <div
+                  v-else
+                  style="
+                      display: flex;
+                      width: 100%;
+                      padding: 0 5px;
+                      align-items: center;
+                    ">
+                  <bk-input
+                    v-model="countValue"
+                    :placeholder="t('请输入')" />
+                  <audit-icon
+                    style=" padding: 0 5px;font-size: 15px; color: #2caf5e;cursor: pointer;"
+                    type="check-line"
+                    @click="confirmAddCount" />
+                  <audit-icon
+                    style="font-size: 15px; color: #c4c6cc; cursor: pointer;"
+                    type="close"
+                    @click="() => showAddCount = false" />
+                </div>
               </template>
             </bk-select>
             <!-- 无需配置 -->
@@ -99,7 +143,8 @@
 </template>
 
 <script setup lang='ts'>
-  import { computed, ref } from 'vue';
+  import _ from 'lodash';
+  import { computed, ref, watch } from 'vue';
   import { useI18n } from 'vue-i18n';
 
   import DatabaseTableFieldModel from '@model/strategy/database-table-field';
@@ -121,6 +166,8 @@
   const { t } = useI18n();
   const selectVerifyRef = ref();
   const showAddCount = ref(false);
+  const countValue = ref('');
+  const localSelect = ref<Array<DatabaseTableFieldModel>>([]);
 
   const requiredField = ['raw_event_id', 'event_time', 'event_source', 'operator'];
   const optionalField = ['event_content', 'event_type'];
@@ -133,6 +180,35 @@
     return initKey;
   });
 
+  const handlerSelect = (value: string, config: StrategyFieldEvent['event_basic_field_configs'][0]) => {
+    // 如果是固定值 给target_value赋值
+    const selectItem = localSelect.value.find(item => item.raw_name === value);
+    if (selectItem && !selectItem.table && config.map_config) {
+      // eslint-disable-next-line no-param-reassign
+      config.map_config.target_value = value;
+    }
+  };
+
+  const confirmAddCount = () => {
+    if (_.trim(countValue.value)) {
+      localSelect.value.push({
+        table: '',
+        raw_name: countValue.value,
+        display_name: countValue.value,
+        field_type: '',
+        aggregate: null,
+        remark: '', // 备注s
+      });
+    }
+    showAddCount.value = false;
+  };
+
+  watch(() => props.select, (data) => {
+    localSelect.value = _.cloneDeep(data);
+  }, {
+    immediate: true,
+  });
+
   defineExpose<Exposes>({
     getValue() {
       if (!selectVerifyRef.value) {
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step2/index.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step2/index.vue
index 8caffcbc..d66c4bf4 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step2/index.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step2/index.vue
@@ -207,13 +207,6 @@
   const handleNext = () => {
     Promise.all([formRef.value.validate(), eventRef.value.getValue()]).then(() => {
       const params: IFormData = Object.assign({}, formData.value, eventRef.value.getData());
-      params.event_basic_field_configs = params.event_basic_field_configs.map((item) => {
-        if (item.map_config && !item.map_config.source_field && !item.map_config.target_value) {
-          // eslint-disable-next-line no-param-reassign
-          delete item.map_config;
-        }
-        return item;
-      });
       emits('nextStep', 3, params);
     });
   };
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/index.vue b/src/frontend/src/views/strategy-manage/strategy-create/index.vue
index 755dd5fd..49e8c003 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/index.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/index.vue
@@ -53,6 +53,7 @@
 
 <script setup lang='ts'>
   import { InfoBox } from 'bkui-vue';
+  import _ from 'lodash';
   import {
     computed,
     onMounted,
@@ -231,7 +232,20 @@
 
   // 提交
   const handleSubmit = () => {
-    const params = { ...formData.value };
+    const params = _.cloneDeep(formData.value);
+    // 处理event_basic_field_configs
+    params.event_basic_field_configs = params.event_basic_field_configs.map((item) => {
+      if (item.map_config) {
+        if (!item.map_config.source_field && !item.map_config.target_value) {
+          // eslint-disable-next-line no-param-reassign
+          delete item.map_config;
+        } else if (item.map_config.source_field && item.map_config.target_value) {
+          // eslint-disable-next-line no-param-reassign
+          item.map_config.source_field = undefined;
+        }
+      }
+      return item;
+    });
     // ai策略
     if (controlTypeId.value !== 'BKM') {
       InfoBox({

From 3f88736ad3b098a8865ba0ae87d5c56ccc8d4b4e Mon Sep 17 00:00:00 2001
From: nanasikeai <nanasikeai@gmail.com>
Date: Wed, 22 Jan 2025 10:02:31 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E9=A2=84=E6=9C=9F=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=EF=BC=8C=E8=A2=AB=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5hover=20-?=
 =?UTF-8?q?-bug=3D137401785?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customize/components/expected-results/add-fields.vue      | 4 ++++
 .../customize/components/scheme-input/link-table/detail.vue   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/add-fields.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/add-fields.vue
index a6a5407a..45e9657a 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/add-fields.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/add-fields.vue
@@ -58,6 +58,10 @@
                 <bk-radio
                   v-for="item in localAggregateList"
                   :key="item.value"
+                  v-bk-tooltips="{
+                    disabled: !item.disabled,
+                    content: t('已添加')
+                  }"
                   :disabled="item.disabled"
                   :label="item.value">
                   {{ item.label }}
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/link-table/detail.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/link-table/detail.vue
index 577f7181..5c982d14 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/link-table/detail.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/link-table/detail.vue
@@ -45,7 +45,7 @@
     <div class="detail-wrapper">
       <div style="display: flex; justify-content: space-between;">
         <div>
-          <span>{{ t('连表预览') }}</span>
+          <span>{{ t('联表预览') }}</span>
           <audit-icon
             v-bk-tooltips="t('联表中，将自动生成各个原始表的字母别名，用于后续选择字段的简略标识')"
             style=" margin-left: 9px; font-size: 14px;color: #c4c6cc; cursor: pointer;"

From 8f701e8b7e84163ae02cdcad974909b36ab2423f Mon Sep 17 00:00:00 2001
From: nanasikeai <nanasikeai@gmail.com>
Date: Wed, 22 Jan 2025 10:45:23 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E9=A2=84=E6=9C=9F=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=EF=BC=8C=E5=AD=97=E6=AE=B5=E6=90=9C=E7=B4=A0=20--bug=3D1374014?=
 =?UTF-8?q?15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expected-results/add-fields.vue           | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/add-fields.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/add-fields.vue
index 45e9657a..0bab0ede 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/add-fields.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/add-fields.vue
@@ -20,6 +20,7 @@
             <!-- 搜索框 -->
             <div class="field-pop-select-search">
               <bk-input
+                v-model="searchKey"
                 behavior="simplicity"
                 class="mb8">
                 <template #prefix>
@@ -32,7 +33,7 @@
             <div class="field-pop-select-list">
               <scroll-faker>
                 <div
-                  v-for="(item, index) in tableFields"
+                  v-for="(item, index) in renderFieldList"
                   :key="item.raw_name"
                   class="field-pop-select-item"
                   :class="[selectIndex === index ? 'select-item-active' : '']"
@@ -90,11 +91,16 @@
   </bk-popover>
 </template>
 <script setup lang="ts">
-  import { ref, watch } from 'vue';
+  import { computed, ref, watch } from 'vue';
   import { useI18n } from 'vue-i18n';
 
   import DatabaseTableFieldModel from '@model/strategy/database-table-field';
 
+  import useDebouncedRef from '@hooks/use-debounced-ref';
+
+  import { encodeRegexp } from '@utils/assist';
+
+
   interface Emits {
     (e: 'addExpectedResult', item: DatabaseTableFieldModel): void;
   }
@@ -114,6 +120,16 @@
   const localAggregateList = ref<Array<Record<string, any>>>([]);
   const formData = ref<DatabaseTableFieldModel>(new DatabaseTableFieldModel());
 
+  const searchKey = useDebouncedRef('');
+
+  const renderFieldList = computed(() => props.tableFields.reduce((result, item) => {
+    const reg = new RegExp(encodeRegexp(searchKey.value), 'i');
+    if (reg.test(item.raw_name) || reg.test(item.display_name)) {
+      result.push(item);
+    }
+    return result;
+  }, [] as Array<DatabaseTableFieldModel>));
+
   const fieldAggregateMap = {
     string: ['COUNT', 'DISCOUNT'],
     double: ['SUM', 'AVG', 'MIN', 'MAX', 'COUNT'],

From 8a68e4f9f289ca1d6fe22383f1b209a3dca5bea8 Mon Sep 17 00:00:00 2001
From: nanasikeai <nanasikeai@gmail.com>
Date: Wed, 22 Jan 2025 11:35:09 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E5=88=B7=E6=96=B0=E8=81=94=E8=A1=A8?=
 =?UTF-8?q?=20--bug=3D137400341?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheme-input/link-table/index.vue          | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/link-table/index.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/link-table/index.vue
index 3d3c90db..105cfd90 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/link-table/index.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/link-table/index.vue
@@ -33,6 +33,15 @@
             :key="dataSheetIndex"
             :label="dataSheet.name"
             :value="dataSheet.uid" />
+          <template #extension>
+            <div
+              class="refresh"
+              @click="fetchLinkTableAll">
+              <audit-icon
+                type="refresh" />
+              {{ t('刷新联表') }}
+            </div>
+          </template>
         </bk-select>
       </span>
     </bk-form-item>
@@ -121,6 +130,7 @@
   const {
     loading,
     data,
+    run: fetchLinkTableAll,
   } = useRequest(LinkDataManageService.fetchLinkTableAll, {
     defaultValue: [],
     manual: true,
@@ -170,3 +180,11 @@
     },
   });
 </script>
+<style lang="postcss" scoped>
+.refresh {
+  padding: 0 12px;
+  margin: auto;
+  color: #979ba5;
+  cursor: pointer;
+}
+</style>

From 424cf0c5a4fa6649d6d9adfaa6dbbc1a2be08434 Mon Sep 17 00:00:00 2001
From: nanasikeai <nanasikeai@gmail.com>
Date: Wed, 22 Jan 2025 11:44:09 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E5=B7=B2=E5=AD=98=E5=9C=A8=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=97=A0=E6=B3=95=E8=A2=AB=E4=BD=BF=E7=94=A8=20--bug?=
 =?UTF-8?q?=3D137400045?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/link-data-manage/link-data-create/index.vue    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/frontend/src/views/link-data-manage/link-data-create/index.vue b/src/frontend/src/views/link-data-manage/link-data-create/index.vue
index b3b7c8c5..f017a134 100644
--- a/src/frontend/src/views/link-data-manage/link-data-create/index.vue
+++ b/src/frontend/src/views/link-data-manage/link-data-create/index.vue
@@ -104,7 +104,6 @@
   import { useI18n } from 'vue-i18n';
 
   import linkDataManageService from '@service/link-data-manage';
-  import StrategyManageService from '@service/strategy-manage';
 
   import LinkDataDetailModel from '@model/link-data/link-data-detail';
 
@@ -242,12 +241,12 @@
   // 获取标签列表
   const {
     loading: tagLoading,
-  } = useRequest(StrategyManageService.fetchStrategyTags, {
+  } = useRequest(linkDataManageService.fetchLinkTableTags, {
     defaultValue: [],
     manual: true,
     onSuccess(data) {
       tagData.value = data.reduce((res, item) => {
-        if (item.tag_id !== '-1') {
+        if (item.tag_id !== '-2') {
           res.push({
             id: item.tag_id,
             name: item.tag_name,