From 7869aa380c56b4bfb2d5377815af8590c4a2604a Mon Sep 17 00:00:00 2001
From: nanasikeai <nanasikeai@gmail.com>
Date: Tue, 14 Jan 2025 15:13:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E8=A7=84=E5=88=99=E5=AE=A1?=
 =?UTF-8?q?=E8=AE=A1=EF=BC=8C=E9=A2=84=E6=9C=9F=E6=95=B0=E6=8D=AE=E4=B8=8E?=
 =?UTF-8?q?=E9=A3=8E=E9=99=A9=E5=8F=91=E7=8E=B0=E8=A7=84=E5=88=99=E8=81=94?=
 =?UTF-8?q?=E8=B0=83=20--story=3D120928207?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/domain/model/strategy/common-data.ts  |   2 +
 .../model/strategy/database-table-field.ts    |  15 +-
 .../src/domain/service/strategy-manage.ts     |   7 -
 .../src/domain/source/strategy-manage.ts      |  30 ---
 .../expected-results/add-fields.vue           |  13 +-
 .../components/expected-results/index.vue     |   9 +
 .../rules/components/field-item.vue           | 192 +++++++++++++-----
 .../customize/components/rules/index.vue      |  66 +++++-
 .../components/scheme-input/event-log.vue     |  10 +-
 .../scheme-input/link-table/detail.vue        |   2 +-
 .../step1/components/customize/index.vue      | 118 +++++++----
 .../components/step1/index.vue                |  18 +-
 12 files changed, 323 insertions(+), 159 deletions(-)

diff --git a/src/frontend/src/domain/model/strategy/common-data.ts b/src/frontend/src/domain/model/strategy/common-data.ts
index 78911c15..5ed59de7 100644
--- a/src/frontend/src/domain/model/strategy/common-data.ts
+++ b/src/frontend/src/domain/model/strategy/common-data.ts
@@ -36,6 +36,7 @@ export default class CommonData {
   link_table_join_type: Array<ItemType>;
   link_table_table_type: Array<ItemType>;
   rule_audit_aggregate_type: Array<ItemType>;
+  rule_audit_condition_operator: Array<ItemType>;
 
   constructor(payload = {} as CommonData) {
     this.offset_unit = payload.offset_unit || [];
@@ -52,6 +53,7 @@ export default class CommonData {
     this.link_table_join_type = payload.link_table_join_type || [];
     this.link_table_table_type = payload.link_table_table_type || [];
     this.rule_audit_aggregate_type = payload.rule_audit_aggregate_type || [];
+    this.rule_audit_condition_operator = payload.rule_audit_condition_operator || [];
   }
 }
 
diff --git a/src/frontend/src/domain/model/strategy/database-table-field.ts b/src/frontend/src/domain/model/strategy/database-table-field.ts
index 7e728bba..0a827a96 100644
--- a/src/frontend/src/domain/model/strategy/database-table-field.ts
+++ b/src/frontend/src/domain/model/strategy/database-table-field.ts
@@ -18,15 +18,16 @@ export default class DatabaseTableField {
   table: string; // RT ID
   raw_name: string; // bkbase 字段名
   display_name: string; // 展示名称 -- 用于 AS 别名，查询中唯一
-  type: string; // 字段类型 -- 来自 bkbase
-  aggregate?: string; // 聚合函数 -- 聚合算法
+  field_type: string; // 字段类型 -- 来自 bkbase
+  aggregate: string | null; // 聚合函数 -- 聚合算法
   remark: string; // 备注
 
   constructor(payload = {} as DatabaseTableField) {
-    this.table = payload.table;
-    this.raw_name = payload.raw_name;
-    this.display_name = payload.display_name;
-    this.type = payload.type;
-    this.remark = payload.remark;
+    this.table = payload.table || '';
+    this.raw_name = payload.raw_name || '';
+    this.display_name = payload.display_name || '';
+    this.field_type = payload.field_type || '';
+    this.aggregate = payload.aggregate || null;
+    this.remark = payload.remark || '';
   }
 }
diff --git a/src/frontend/src/domain/service/strategy-manage.ts b/src/frontend/src/domain/service/strategy-manage.ts
index 56290fd5..ddd19e5a 100644
--- a/src/frontend/src/domain/service/strategy-manage.ts
+++ b/src/frontend/src/domain/service/strategy-manage.ts
@@ -15,7 +15,6 @@
   to the current version of the project delivered to anyone in the future.
 */
 import SearchModel from '@model/es-query/search';
-import DatabaseTableFieldModel from '@model/strategy/database-table-field';
 import StrategyModel from '@model/strategy/strategy';
 import StrategyFieldEvent from '@model/strategy/strategy-field-event';
 
@@ -148,12 +147,6 @@ export default {
   /**
    * @desc 获取表字段对应的规则和枚举值列表
    */
-  fetchFiledRules(params: {
-    field: DatabaseTableFieldModel;
-  }) {
-    return StrategySource.gethFiledRules(params)
-      .then(({ data }) => data);
-  },
   /**
    * @desc 获取表格下的rt字段
    */
diff --git a/src/frontend/src/domain/source/strategy-manage.ts b/src/frontend/src/domain/source/strategy-manage.ts
index eb87cbb8..e2e34010 100644
--- a/src/frontend/src/domain/source/strategy-manage.ts
+++ b/src/frontend/src/domain/source/strategy-manage.ts
@@ -18,7 +18,6 @@ import type SearchModel from '@model/es-query/search';
 import type AiopsDetailModel from '@model/strategy/aiops-detail';
 import type AiopsPlanModel from '@model/strategy/aiops-plan';
 import type CommonDataModel from '@model/strategy/common-data';
-import type DatabaseTableFieldModel from '@model/strategy/database-table-field';
 import type StrategyModel from '@model/strategy/strategy';
 import type StrategyFieldEvent from '@model/strategy/strategy-field-event';
 // import type StrategyFieldModel from '@model/strategy/strategy-field';
@@ -158,35 +157,6 @@ class Strategy extends ModuleBase {
       params,
     });
   }
-  // 获取表字段对应的规则和枚举值列表
-  gethFiledRules(params: {
-    field: DatabaseTableFieldModel;
-  }) {
-    // return Request.get<{
-    //    rulesList: Array<Record<string, any>>,
-    //    enumList:  Array<Record<string, any>>
-    //  }>(`${this.path}/strategy_database_table_fields/`, {
-    //   params,
-    // });
-    console.log(params);
-    return Promise.resolve<{
-      data: {
-        rulesList: Array<Record<string, any>>,
-        enumList:  Array<Record<string, any>>
-      }
-    }>({
-      data: {
-        rulesList: [{
-          value: '=',
-          name: '=',
-        }, {
-          value: '!',
-          name: '!',
-        }],
-        enumList: [],
-      },
-    });
-  }
   // 获取表格的字段列表
   getTableRtFields(params: {
     table_id: string
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 dd6254b7..99982d63 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
@@ -105,6 +105,14 @@
   const localAggregateList = ref<Array<Record<string, any>>>([]);
   const formData = ref<DatabaseTableFieldModel>(new DatabaseTableFieldModel());
 
+  const fieldAggregateMap = {
+    string: ['COUNT', 'DISCOUNT'],
+    double: ['SUM', 'AVG', 'MIN', 'MAX', 'COUNT'],
+    int: ['SUM', 'AVG', 'MIN', 'MAX', 'COUNT'],
+    long: ['SUM', 'AVG', 'MIN', 'MAX', 'COUNT'],
+    timestamp: ['COUNT', 'MIX', 'MAX'],
+  };
+
   const handleShowPop = () => {
     isShow.value = true;
     // 重置可选
@@ -116,9 +124,12 @@
 
   const handleSelectField = (index: number, field: DatabaseTableFieldModel) => {
     selectIndex.value = index;
+    // 每种类型字段拥有不同的聚合算法
+    // eslint-disable-next-line max-len
+    localAggregateList.value =  props.aggregateList.filter(item => fieldAggregateMap[field.field_type as keyof typeof fieldAggregateMap].includes(item.value) || item.label === '不聚和');
     // 同一字段不能重复添加同一聚合算法
     // eslint-disable-next-line max-len
-    const hasAggregate = props.expectedResultList.filter(item => (item.table + item.raw_name) === (field.table +  item.raw_name));
+    const hasAggregate = props.expectedResultList.filter(item => (item.table + item.raw_name) === (field.table +  field.raw_name));
     if (hasAggregate.length) {
       localAggregateList.value = localAggregateList.value.map((item) => {
         if (hasAggregate.some(element => element.aggregate === item.value)) {
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/index.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/index.vue
index 464a32aa..66fc19be 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/index.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/index.vue
@@ -67,6 +67,9 @@
 
   import AddFields from './add-fields.vue';
 
+  interface Expose {
+    resetFormData: () => void,
+  }
   interface Emits {
     (e: 'updateExpectedResult', value: Array<DatabaseTableFieldModel>): void;
   }
@@ -104,6 +107,12 @@
     expectedResultList.value = [];
     updateExpectedResult();
   };
+
+  defineExpose<Expose>({
+    resetFormData: () => {
+      expectedResultList.value = [];
+    },
+  });
 </script>
 <style scoped lang="postcss">
 .panel-edit {
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/components/field-item.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/components/field-item.vue
index ab6fc0c6..937a4761 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/components/field-item.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/components/field-item.vue
@@ -28,44 +28,90 @@
     <div
       v-if="index < conditions.conditions.length - 1"
       class="column-line" />
-    <bk-select
-      v-model="condition.field"
-      filterable
-      :placeholder="t('请选择字段')"
-      style="flex: 1;"
-      @change="handleSelectField">
-      <bk-option
-        v-for="item in tableFields"
-        :key="item.raw_name"
-        :label="item.display_name"
-        :value="item" />
-    </bk-select>
-    <bk-select
-      v-model="condition.operation"
-      filterable
-      :placeholder="t('请选择规则')">
-      <bk-option
-        v-for="item in ruleData.rulesList"
-        :key="item.value"
-        :label="item.name"
-        :value="item.value" />
-    </bk-select>
-    <bk-select
-      v-if="ruleData.enumList.length"
-      v-model="condition.filters"
-      filterable
-      :placeholder="t('请选择枚举值')">
-      <bk-option
-        v-for="item in ruleData.enumList"
-        :key="item.value"
-        :label="item.name"
-        :value="item.value" />
-    </bk-select>
-    <bk-input
-      v-else
-      v-model="condition.filter"
-      :placeholder="t('请输入数值')"
-      show-word-limit />
+    <!-- 字段 -->
+    <bk-form-item
+      label=""
+      label-width="0"
+      :property="`configs.where.conditions[${conditionsIndex}].conditions[${index}].field.display_name`"
+      required>
+      <bk-select
+        v-model="condition.field.display_name"
+        filterable
+        :placeholder="t('请选择字段')"
+        style="flex: 1;"
+        @change="(value: DatabaseTableFieldModel) => handleSelectField(value ,index)">
+        <bk-option
+          v-for="item in tableFields"
+          :key="item.raw_name"
+          :label="item.display_name"
+          :value="item" />
+      </bk-select>
+    </bk-form-item>
+    <!-- 连接条件 -->
+    <bk-form-item
+      label=""
+      label-width="0"
+      :property="`configs.where.conditions[${conditionsIndex}].conditions[${index}].field.aggregate`"
+      required>
+      <!-- 操作人账号特殊处理 -->
+      <bk-input
+        v-if="condition.field.raw_name ==='user_identify_src_username'"
+        v-model="condition.field.aggregate"
+        class="condition-equation"
+        :placeholder="t('请输入')" />
+      <bk-select
+        v-else
+        v-model="condition.field.aggregate"
+        filterable
+        :placeholder="t('请选择')">
+        <bk-option
+          v-for="item in conditionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value" />
+      </bk-select>
+    </bk-form-item>
+    <!-- 值 -->
+    <bk-form-item
+      label=""
+      label-width="0"
+      :property="`configs.where.conditions[${conditionsIndex}].conditions[${index}].filters`"
+      required
+      :rules="[
+        { message: '', trigger: ['change', 'blur'], validator: (value: Array<any>) => handleValidate(value) },
+      ]">
+      <bk-cascader
+        v-if="dicts[condition.field.raw_name] &&
+          dicts[condition.field.raw_name].length"
+        v-model="condition.filters"
+        class="consition-value"
+        collapse-tags
+        filterable
+        float-mode
+        id-key="value"
+        :list="dicts[condition.field.raw_name]"
+        multiple
+        name-key="label"
+        trigger="hover" />
+      <audit-user-selector
+        v-else-if="condition.field.raw_name.includes('username')"
+        v-model="condition.filters"
+        allow-create
+        class="consition-value" />
+      <bk-tag-input
+        v-else
+        v-model="condition.filters"
+        allow-create
+        class="consition-value"
+        collapse-tags
+        :content-width="350"
+        has-delete-icon
+        :input-search="false"
+        :list="dicts[condition.field && condition.field.raw_name]"
+        :loading="fieldLoading"
+        :placeholder="t('请输入并Enter结束')"
+        trigger="focus" />
+    </bk-form-item>
     <div class="icon-group">
       <audit-icon
         style="margin-right: 10px;"
@@ -78,31 +124,33 @@
   </div>
   <div
     v-if="needCondition"
-    class="condition">
+    class="condition"
+    @click="handleChangeOperator">
     {{ conditions.operator }}
   </div>
 </template>
 <script setup lang="ts">
-  // import { ref, watch } from 'vue';
-  import { computed } from 'vue';
+  import { computed, ref } from 'vue';
   import { useI18n } from 'vue-i18n';
 
   import StrategyManageService from '@service/strategy-manage';
 
+  import CommonDataModel from '@model/strategy/common-data';
   import DatabaseTableFieldModel from '@model/strategy/database-table-field';
 
   import useRequest from '@/hooks/use-request';
 
   interface Emits {
     (e: 'updateFieldItemList', value: string, conditionsIndex: number): void;
+    (e: 'updateFieldItem', value: DatabaseTableFieldModel, conditionsIndex: number, childConditionsIndex: number): void;
+    (e: 'updateOperator', value: 'and' | 'or', conditionsIndex: number): void;
   }
   interface Props {
     tableFields: Array<DatabaseTableFieldModel>
     conditions: {
       operator: 'and' | 'or';
       conditions: Array<{
-        field: DatabaseTableFieldModel | '';
-        operation: string;
+        field: DatabaseTableFieldModel;
         filter: string;
         filters: string[];
       }>
@@ -113,20 +161,32 @@
   const props = defineProps<Props>();
   const emits = defineEmits<Emits>();
   const { t } = useI18n();
+  const conditionList = ref<Array<{
+    label: string,
+    value: string
+  }>>([]);
+  const dicts = ref<Record<string, Array<any>>>({});
 
   const needCondition = computed(() => props.conditions.conditions.length > 1);
 
-  // 获取对应规则和枚举值列表
-  const {
-    data: ruleData,
-    run: fetchFiledRules,
-  } = useRequest(StrategyManageService.fetchFiledRules, {
-    defaultValue: {
-      rulesList: [],
-      enumList: [],
+  useRequest(StrategyManageService.fetchStrategyCommon, {
+    defaultValue: new CommonDataModel(),
+    manual: true,
+    onSuccess(data) {
+      conditionList.value = data.rule_audit_condition_operator;
     },
   });
 
+  // 筛选条件值
+  const {
+    run: fetchStrategyFieldValue,
+    loading: fieldLoading,
+  } = useRequest(StrategyManageService.fetchStrategyFieldValue, {
+    defaultValue: [],
+  });
+
+  const handleValidate = (value: any) => value.length > 0;
+
   const handleAdd = () => {
     emits('updateFieldItemList', 'add', props.conditionsIndex);
   };
@@ -138,10 +198,19 @@
     emits('updateFieldItemList', 'delete', props.conditionsIndex);
   };
 
-  const handleSelectField = (value: DatabaseTableFieldModel) => {
-    fetchFiledRules({
-      data: value,
-    });
+  const handleSelectField = (value: DatabaseTableFieldModel, index: number) => {
+    if (value) {
+      fetchStrategyFieldValue({
+        field_name: value.raw_name,
+      }).then((data) => {
+        dicts.value[value.raw_name] = data.filter((item: Record<string, any>) => item.id !== '');
+      });
+    }
+    emits('updateFieldItem', value, props.conditionsIndex, index);
+  };
+
+  const handleChangeOperator = () => {
+    emits('updateOperator', props.conditions.operator === 'and' ? 'or' : 'and', props.conditionsIndex);
   };
 </script>
 <style scoped lang="postcss">
@@ -151,6 +220,18 @@
   grid-template-columns: 1fr 1fr 1fr minmax(35px, auto);
   gap: 8px;
 
+  :deep(.bk-form-error) {
+    display: none;
+  }
+
+  :deep(.bk-form-item) {
+    margin-bottom: 0;
+  }
+
+  :deep(.bk-form-item.is-error .bk-tag-input-trigger) {
+    border-color: #ea3636;
+  }
+
   .row-line {
     position: absolute;
     top: 16px;
@@ -183,6 +264,7 @@
   line-height: 28px;
   color: #f5b401;
   text-align: center;
+  cursor: pointer;
   background: #fff;
   border: 1px solid #f5b401;
   border-radius: 2px;
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/index.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/index.vue
index 2cc2be2c..a1bbfd49 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/index.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/index.vue
@@ -41,12 +41,20 @@
           :conditions="conditions"
           :conditions-index="index"
           :table-fields="tableFields"
-          @update-field-item-list="handleUpdateFieldItemList" />
+          @update-field-item="handleUpdateFieldItem"
+          @update-field-item-list="handleUpdateFieldItemList"
+          @update-operator="handleUpdateOperator" />
+        <audit-icon
+          v-if="index !== 0"
+          class="delete-conditions"
+          type="delete"
+          @click="() => handleDelete(index)" />
       </div>
       <!-- 二级条件关系 -->
       <div
         v-if="needCondition"
-        class="condition">
+        class="condition"
+        @click="() => where.operator = where.operator === 'and' ? 'or' : 'and'">
         {{ where.operator }}
       </div>
     </div>
@@ -68,13 +76,15 @@
 
   import FieldItem from './components/field-item.vue';
 
+  interface Expose {
+    resetFormData: () => void,
+  }
   interface Where {
     operator: 'and' | 'or';
     conditions: Array<{
       operator: 'and' | 'or';
       conditions: Array<{
-        field: DatabaseTableFieldModel | '';
-        operation: string;
+        field: DatabaseTableFieldModel;
         filter: string;
         filters: string[];
       }>
@@ -96,8 +106,7 @@
     conditions: [{
       operator: 'and',
       conditions: [{
-        field: '',
-        operation: '',
+        field: new DatabaseTableFieldModel(),
         filter: '',
         filters: [],
       }],
@@ -105,12 +114,15 @@
   });
   const needCondition = computed(() => where.value.conditions.length > 1);
 
+  const handleDelete = (index: number) => {
+    where.value.conditions.splice(index, 1);
+  };
+
   const handleAddRuleItem = () => {
     where.value.conditions.push({
       operator: 'and',
       conditions: [{
-        field: '',
-        operation: '',
+        field: new DatabaseTableFieldModel(),
         filter: '',
         filters: [],
       }],
@@ -120,8 +132,7 @@
   const handleUpdateFieldItemList = (value: string, conditionsIndex: number) => {
     if (value === 'add') {
       where.value.conditions[conditionsIndex].conditions.push({
-        field: '',
-        operation: '',
+        field: new DatabaseTableFieldModel(),
         filter: '',
         filters: [],
       });
@@ -130,11 +141,36 @@
     }
   };
 
+  // eslint-disable-next-line max-len
+  const handleUpdateFieldItem = (value: DatabaseTableFieldModel, conditionsIndex: number, childConditionsIndex: number) => {
+    where.value.conditions[conditionsIndex].conditions[childConditionsIndex].field = value;
+  };
+
+  const handleUpdateOperator = (value: 'and' | 'or', conditionsIndex: number) => {
+    where.value.conditions[conditionsIndex].operator = value;
+  };
+
   watch(() => where.value, (data) => {
     emits('updateWhere', data);
   }, {
     deep: true,
   });
+
+  defineExpose<Expose>({
+    resetFormData: () => {
+      where.value = {
+        operator: 'and',
+        conditions: [{
+          operator: 'and',
+          conditions: [{
+            field: new DatabaseTableFieldModel(),
+            filter: '',
+            filters: [],
+          }],
+        }],
+      };
+    },
+  });
 </script>
 <style scoped lang="postcss">
 .strategy-customize-rules {
@@ -150,6 +186,7 @@
       line-height: 28px;
       color: #f5b401;
       text-align: center;
+      cursor: pointer;
       background: #fff;
       border: 1px solid #f5b401;
       border-radius: 2px;
@@ -158,6 +195,7 @@
     .rule-item {
       position: relative;
       padding: 16px;
+      padding-right: 25px;
       margin-bottom: 16px;
       background: #f5f7fa;
       flex: 1;
@@ -187,6 +225,14 @@
       .column-line-bottom {
         top: 50%;
       }
+
+      .delete-conditions {
+        position: absolute;
+        top: 5px;
+        right: 5px;
+        color: #979ba5;;
+        cursor: pointer;
+      }
     }
   }
 
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/event-log.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/event-log.vue
index 7447d42e..1a88f109 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/event-log.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/event-log.vue
@@ -19,10 +19,10 @@
     <bk-form-item
       class="no-label"
       label-width="0"
-      property="configs.data_source.system_id">
+      property="configs.data_source.system_ids">
       <span>
         <bk-select
-          v-model="formData.configs.data_source.system_id"
+          v-model="formData.configs.data_source.system_ids"
           filterable
           :loading="isSystemListLoading"
           multiple
@@ -85,7 +85,7 @@
   interface IFormData {
     configs: {
       data_source: {
-        system_id: string[],
+        system_ids: string[],
         rt_id: string,
       },
     },
@@ -96,7 +96,7 @@
   const formData = ref<IFormData>({
     configs: {
       data_source: {
-        system_id: [],
+        system_ids: [],
         rt_id: '',
       },
     },
@@ -157,7 +157,7 @@
 
   defineExpose<Expose>({
     resetFormData: () => {
-      formData.value.configs.data_source.system_id = [];
+      formData.value.configs.data_source.system_ids = [];
     },
   });
 </script>
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 18de4412..d001e15b 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
@@ -120,7 +120,7 @@
   }
   interface Props {
     linkDataDetail: LinkDataDetailModel
-    linkDataSheetId: number
+    linkDataSheetId: string
   }
 
   defineProps<Props>();
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/index.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/index.vue
index 29736f5e..589486b8 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/index.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/index.vue
@@ -65,9 +65,9 @@
         </bk-form-item>
         <bk-form-item
           :label="t('预期结果')"
-          label-width="160"
-          property="control_id">
+          label-width="160">
           <expected-results
+            ref="expectedResultsRef"
             :aggregate-list="aggregateList"
             :table-fields="tableFields"
             @update-expected-result="handleUpdateExpectedResult" />
@@ -75,9 +75,9 @@
         <bk-form-item
           :label="t('风险发现规则')"
           label-width="160"
-          property="configs.where"
           required>
           <rules-component
+            ref="rulesComponentRef"
             :table-fields="tableFields"
             @update-where="handleUpdateWhere" />
         </bk-form-item>
@@ -152,6 +152,7 @@
 </template>
 <script setup lang="ts">
   import { InfoBox } from 'bkui-vue';
+  import _ from 'lodash';
   import { h, ref, watch } from 'vue';
   import { useI18n } from 'vue-i18n';
   import { useRoute } from 'vue-router';
@@ -180,7 +181,6 @@
       operator: 'and' | 'or';
       conditions: Array<{
         field: DatabaseTableFieldModel | '';
-        operation: string;
         filter: string;
         filters: string[];
       }>
@@ -189,12 +189,12 @@
   interface IFormData {
     configs: {
       data_source: {
-        system_id: string[],
+        system_ids: string[],
         source_type: string,
         rt_id: string | string[]
         link_table: {
-          uid: number,
-          version: string,
+          uid: string,
+          version: number,
         },
       },
       config_type: string,
@@ -218,6 +218,8 @@
   const { t } = useI18n();
   const route = useRoute();
   const configRef = ref();
+  const rulesComponentRef = ref();
+  const expectedResultsRef = ref();
   const linkDataDetail = ref<LinkDataDetailModel>(new LinkDataDetailModel());
 
   const isEditMode = route.name === 'strategyEdit';
@@ -232,24 +234,24 @@
   };
 
   const initDataSource = ref<IFormData['configs']['data_source']>({
-    system_id: [],
+    system_ids: [],
     source_type: 'batch_join_source',
     rt_id: [],
     link_table: {
-      uid: 0,
-      version: '',
+      uid: '',
+      version: 0,
     },
   });
 
   const formData = ref<IFormData>({
     configs: {
       data_source: {
-        system_id: [],
+        system_ids: [],
         source_type: 'batch_join_source',
         rt_id: [],
         link_table: {
-          uid: 0,
-          version: '',
+          uid: '',
+          version: 0,
         },
       },
       config_type: '',
@@ -276,9 +278,10 @@
     manual: true,
     onSuccess() {
       ruleAuditConfigType.value = commonData.value.rule_audit_config_type;
-      aggregateList.value = commonData.value.rule_audit_aggregate_type.concat([{
+      aggregateList.value = commonData.value.rule_audit_aggregate_type;
+      aggregateList.value = aggregateList.value.concat([{
         label: '不聚和',
-        value: 'null',
+        value: null,
       }]);
     },
   });
@@ -291,23 +294,44 @@
     defaultValue: [],
   });
 
+  const setTableFields = (data: Array<{
+    field_type: string,
+    label: string,
+    value: string,
+  }>, rtId: string) => data.map(item => ({
+    table: rtId,
+    raw_name: item.value,
+    display_name: item.label,
+    field_type: item.field_type,
+    aggregate: '',
+    remark: '',
+  }));
+
   // 获取表字段
-  const {
-    run: fetDatabaseTableFields,
-  } = useRequest(StrategyManageService.fetchTableRtFields, {
-    defaultValue: [],
-    onSuccess: (data) => {
-      const rtId = formData.value.configs.data_source.rt_id;
-      tableFields.value = data.map(item => ({
-        table: Array.isArray(rtId) ? rtId[rtId.length - 1] : rtId,
-        raw_name: item.value,
-        display_name: item.label,
-        type: item.field_type,
-        aggregate: '',
-        remark: '',
-      }));
-    },
-  });
+  const fetDatabaseTableFields = (rtId: string) => {
+    StrategyManageService.fetchTableRtFields({
+      table_id: rtId,
+    }).then((data) => {
+      tableFields.value = setTableFields(data, rtId);
+    });
+  };
+
+  // 获取联表表字段
+  const fetchLinkTableFields = async (rtIdArr: string[][]) => {
+    const idArr = rtIdArr.reduce((acc, curr) => acc.concat(curr), []);
+    const fetchPromises = idArr.map(async (rtId) => {
+      const data = await  StrategyManageService.fetchTableRtFields({
+        table_id: rtId,
+      });
+      return data;
+    });
+    // 使用 Promise.all 等待所有请求完成
+    Promise.all(fetchPromises).then((data) => {
+      data.forEach((item, index) => {
+        tableFields.value.push(...setTableFields(item, idArr[index]));
+      });
+    });
+  };
 
   // 切换数据源类型： 默认使用离线模式batch_join_source，不切换类型
   const handleDataSourceType = (item: string) => {
@@ -344,6 +368,14 @@
           ...formData.value.configs.data_source,
           ...initDataSource.value,
         };
+        formData.value.configs.select = [];
+        formData.value.configs.where = {
+          operator: 'and',
+          conditions: [],
+        };
+        configRef.value.resetFormData();
+        rulesComponentRef.value.resetFormData();
+        expectedResultsRef.value.resetFormData();
         if (item !== '' && item !== 'LinkTable') {
           fetchTable({
             table_type: item,
@@ -377,6 +409,12 @@
   // 获取联表详情
   const handleUpdateLinkDataDetail = (detail: LinkDataDetailModel) => {
     linkDataDetail.value = detail;
+    // eslint-disable-next-line max-len
+    const rtIdArr = linkDataDetail.value.config.links.map(item => [item.left_table.rt_id, item.right_table.rt_id]) as string[][];
+    if (rtIdArr.length) {
+      // 联表获取表字段
+      fetchLinkTableFields(rtIdArr);
+    }
   };
 
   // 刷新联表详情
@@ -403,18 +441,26 @@
     deep: true,
   });
 
+  // 日志、资源数据、其他数据获取表字段
   watch(() => formData.value.configs.data_source.rt_id, (rtId) => {
-    if (rtId) {
-      fetDatabaseTableFields({
-        table_id: Array.isArray(rtId) ? rtId[rtId.length - 1] : rtId,
-      });
+    if (rtId && rtId.length) {
+      const rtId = formData.value.configs.data_source.rt_id;
+      fetDatabaseTableFields(Array.isArray(rtId) ? rtId[rtId.length - 1] : rtId);
     }
   });
 
   defineExpose<Expose>({
     // 获取提交参数
     getFields() {
-      return formData.value;
+      const params = _.cloneDeep(formData.value);
+      const tableIdList = params.configs.data_source.rt_id;
+      if (params.configs.config_type !== 'EventLog') {
+        params.configs.data_source = {
+          ...params.configs.data_source,
+          rt_id: (_.isArray(tableIdList) ?  _.last(tableIdList)  : tableIdList) as string,
+        };
+      }
+      return params;
     },
   });
 </script>
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/index.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/index.vue
index 2631b46f..868dd317 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/index.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/index.vue
@@ -353,22 +353,22 @@
         message: t('系统不能为空'),
         trigger: 'change',
       }],
-    'configs.data_source.result_table_id': [
+    'configs.data_source.system_ids': [
       {
         validator: (value: Array<string>) => !!value && value.length > 0,
-        message: t('资产不能为空'),
+        message: t('系统不能为空'),
         trigger: 'change',
       }],
-    'configs.data_source.data_sheet_id': [
+    'configs.data_source.rt_id': [
       {
-        validator: (value: Array<string>) => !!value,
-        message: t('其他数据不能为空'),
+        validator: (value: Array<string>) => !!value && value.length > 0,
+        message: t('不能为空'),
         trigger: 'change',
       }],
-    'configs.data_source.link_data_sheet_id': [
+    'configs.data_source.link_table.uid': [
       {
         validator: (value: Array<string>) => !!value,
-        message: t('联表数据不能为空'),
+        message: t('联表不能为空'),
         trigger: 'change',
       }],
     'configs.data_source.bk_biz_id': [
@@ -554,6 +554,10 @@
       }
       // 获取审计参数（自定义规则审计、引入模型审计）
       const fields = comRef.value.getFields();
+      // 非联表不需要link_table参数
+      if (fields.configs.config_type !== 'LinkTable') {
+        fields.configs.data_source.link_table = null;
+      }
       // 合并参数
       const params = {
         ...baseParams,

From 4a6fa3b94ac845c2ddbae55b3eeb03f4c77a8dc1 Mon Sep 17 00:00:00 2001
From: nanasikeai <nanasikeai@gmail.com>
Date: Tue, 14 Jan 2025 15:17:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E8=A7=84=E5=88=99=E5=AE=A1?=
 =?UTF-8?q?=E8=AE=A1=EF=BC=8Cstep2=E8=81=94=E8=B0=83=20--story=3D120928207?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/strategy/strategy-field-event.ts    | 10 ++-
 .../step2/components/event-info-table.vue     | 17 +++-
 .../components/step2/components/valueItem.vue | 83 +++++++++++++++----
 .../components/step2/index.vue                |  9 +-
 4 files changed, 95 insertions(+), 24 deletions(-)

diff --git a/src/frontend/src/domain/model/strategy/strategy-field-event.ts b/src/frontend/src/domain/model/strategy/strategy-field-event.ts
index 5390c923..28aa882e 100644
--- a/src/frontend/src/domain/model/strategy/strategy-field-event.ts
+++ b/src/frontend/src/domain/model/strategy/strategy-field-event.ts
@@ -19,7 +19,10 @@ type EventItem = {
   description: string
   display_name: string;
   is_priority: boolean;
-  field_mapping: string;
+  map_config?: {
+    target_value: string | undefined,
+    source_field: string | undefined,
+  };
   prefix: string;
   example?: string
 }
@@ -40,7 +43,10 @@ export default class StrategyFieldEvent {
       field_name: item.field_name,
       display_name: item.display_name,
       is_priority: item.is_priority || false,
-      field_mapping: item.field_mapping,
+      map_config: {
+        target_value: item.map_config?.target_value,
+        source_field: item.map_config?.source_field,
+      },
       description: item.description,
       example: item.example,
       prefix,
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 d1d53644..4c93c27f 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
@@ -43,6 +43,7 @@
         </div>
         <div class="value-row">
           <value-item
+            ref="valueItemRef"
             :item="item"
             :select="select" />
         </div>
@@ -51,6 +52,7 @@
   </div>
 </template>
 <script setup lang='tsx'>
+  import { ref } from 'vue';
   import { useI18n } from 'vue-i18n';
 
   import StrategyManageService from '@service/strategy-manage';
@@ -65,6 +67,7 @@
 
   interface Exposes{
     getData: () => StrategyFieldEvent,
+    getValue: () => Promise<any>;
   }
 
   interface Props {
@@ -76,6 +79,7 @@
   const props = defineProps<Props>();
 
   const { t, locale } = useI18n();
+  const valueItemRef = ref();
 
   const column = [
     { label: t('事件分组') },
@@ -101,7 +105,7 @@
             field_name: item.field_name,
             display_name: item.display_name,
             is_priority: editItem.is_priority,
-            field_mapping: item.field_mapping,
+            map_config: item.map_config,
             description: editItem.description,
             example: item.example,
             prefix: '',
@@ -122,7 +126,6 @@
       strategy_id: props.strategyId,
     },
     onSuccess: () => {
-      console.log(tableData.value);
       // 编辑填充内容（是否重点展示、字段说明）
       setEditData('event_basic_field_configs');
       setEditData('event_data_field_configs');
@@ -135,6 +138,9 @@
     getData() {
       return tableData.value;
     },
+    getValue() {
+      return Promise.all((valueItemRef.value as { getValue: () => any }[])?.map(item => item.getValue()));
+    },
   });
 </script>
 <style lang="postcss" scoped>
@@ -164,7 +170,10 @@
 
       background-color: #f5f7fa;
 
-      &:nth-child(2),
+      &:nth-child(2) {
+        width: 190px;
+      }
+
       &:nth-child(3) {
         width: 240px;
       }
@@ -174,7 +183,7 @@
       }
 
       &:nth-child(5) {
-        width: 192px;
+        width: 240px;
       }
 
       &:last-child {
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 2f8c7d5e..9ee601f1 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
@@ -10,28 +10,55 @@
         <div
           v-if="!['example', 'prefix'].includes(valueKey)"
           class="item">
-          <template v-if="valueKey === 'is_priority'">
-            <bk-switcher
-              v-model="config.is_priority"
-              theme="primary" />
-          </template>
-          <template v-else-if="valueKey === 'field_mapping'">
-            <bk-select v-model="config.field_mapping">
+          <!-- 是否重点展示 -->
+          <bk-switcher
+            v-if="valueKey === 'is_priority'"
+            v-model="config.is_priority"
+            theme="primary" />
+
+          <!-- 字段映射 -->
+          <template v-else-if="valueKey === 'map_config' && config.map_config">
+            <!-- 必填 -->
+            <select-verify
+              v-if="requiredField.includes(config.field_name)"
+              ref="selectVerifyRef"
+              :default-value="config.map_config.source_field"
+              style="width: 100%;"
+              theme="background">
+              <bk-select v-model="config.map_config.source_field">
+                <bk-option
+                  v-for="(selectItem, index) in select"
+                  :key="index"
+                  :label="selectItem.display_name"
+                  :value="selectItem.display_name" />
+              </bk-select>
+            </select-verify>
+            <!-- 选填 -->
+            <bk-select
+              v-else-if="optionalField.includes(config.field_name)"
+              v-model="config.map_config.source_field"
+              style="width: 100%;">
               <bk-option
                 v-for="(selectItem, index) in select"
                 :key="index"
                 :label="selectItem.display_name"
                 :value="selectItem.raw_name" />
             </bk-select>
+            <!-- 无需配置 -->
+            <template v-else>
+              {{ t('无需配置') }}
+            </template>
           </template>
-          <template v-else-if="valueKey === 'description'">
-            <bk-input
-              v-model="config.description"
-              autosize
-              behavior="simplicity"
-              :maxlength="100"
-              type="textarea" />
-          </template>
+
+          <!-- 描述 -->
+          <bk-input
+            v-else-if="valueKey === 'description'"
+            v-model="config.description"
+            autosize
+            behavior="simplicity"
+            :maxlength="100"
+            type="textarea" />
+
           <template v-else>
             {{ value }}
           </template>
@@ -52,11 +79,17 @@
 </template>
 
 <script setup lang='ts'>
+  import { ref } from 'vue';
   import { useI18n } from 'vue-i18n';
 
   import DatabaseTableFieldModel from '@model/strategy/database-table-field';
   import StrategyFieldEvent from '@model/strategy/strategy-field-event';
 
+  import SelectVerify from '@views/link-data-manage/link-data-create/components/components/select-verify.vue';
+
+  interface Exposes {
+    getValue: () => Promise<any>;
+  }
   interface Props {
     item: StrategyFieldEvent['event_basic_field_configs'],
     select: Array<DatabaseTableFieldModel>
@@ -65,7 +98,19 @@
   defineProps<Props>();
 
   const { t } = useI18n();
+  const selectVerifyRef = ref();
+
+  const requiredField = ['raw_event_id', 'event_time', 'event_source', 'operator'];
+  const optionalField = ['event_content', 'event_type'];
 
+  defineExpose<Exposes>({
+    getValue() {
+      if (!selectVerifyRef.value) {
+        return Promise.resolve();
+      }
+      return Promise.all((selectVerifyRef.value as { getValue: () => any }[])?.map(item => item.getValue()));
+    },
+  });
 </script>
 <style lang="postcss" scoped>
   .value-item {
@@ -73,12 +118,16 @@
 
     .item {
       display: flex;
+      height: 58px;
       padding: 12px;
       border-right: 1px solid #dcdee5;
       border-bottom: 1px solid #dcdee5;
       align-items: center;
 
-      &:nth-child(1),
+      &:nth-child(1) {
+        width: 190px;
+      }
+
       &:nth-child(2) {
         width: 240px;
         background-color: #f5f7fa;
@@ -89,7 +138,7 @@
       }
 
       &:nth-child(4) {
-        width: 192px;
+        width: 240px;
       }
 
       &:last-child {
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 59b523ea..a926639f 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
@@ -203,8 +203,15 @@
   };
 
   const handleNext = () => {
-    formRef.value.validate().then(() => {
+    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);
     });
   };

From 0a24075b8e31081ea48f94a915775b354ebcf359 Mon Sep 17 00:00:00 2001
From: nanasikeai <nanasikeai@gmail.com>
Date: Wed, 15 Jan 2025 11:47:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E7=AD=96=E7=95=A5=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=20--story=3D120594134?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/domain/model/strategy/strategy.ts     | 24 ++++++++
 .../components/expected-results/index.vue     |  4 ++
 .../rules/components/field-item.vue           | 12 ++--
 .../customize/components/rules/index.vue      | 30 +++++-----
 .../components/scheme-input/event-log.vue     |  6 +-
 .../scheme-input/link-table/index.vue         |  7 +++
 .../components/scheme-input/other.vue         |  5 ++
 .../components/scheme-input/resource-data.vue | 15 +++++
 .../step1/components/customize/index.vue      | 57 +++++++++++++------
 .../step2/components/event-info-table.vue     |  2 +-
 10 files changed, 125 insertions(+), 37 deletions(-)

diff --git a/src/frontend/src/domain/model/strategy/strategy.ts b/src/frontend/src/domain/model/strategy/strategy.ts
index 1bfb28c1..1796538b 100644
--- a/src/frontend/src/domain/model/strategy/strategy.ts
+++ b/src/frontend/src/domain/model/strategy/strategy.ts
@@ -15,6 +15,8 @@
   to the current version of the project delivered to anyone in the future.
 */
 
+import DatabaseTableFieldModel from '@model/strategy/database-table-field';
+
 import StrategyFieldEvent from '../strategy/strategy-field-event';
 
 export default class Strategy {
@@ -34,6 +36,12 @@ export default class Strategy {
     data_source?: {
       source_type: string;
       result_table_id?: string;
+      rt_id: string;
+      link_table: {
+        uid: string,
+        version: number,
+      },
+      system_ids: Array<string>,
       filter_config: Array<{
         connector: string;
         key: string;
@@ -54,6 +62,22 @@ export default class Strategy {
         }>
       }
     };
+    select: Array<DatabaseTableFieldModel>,
+    where: {
+      operator: 'and' | 'or' ;
+      conditions: Array<{
+        operator: 'and' | 'or';
+        conditions: Array<{
+          field: DatabaseTableFieldModel | '';
+          filter: string;
+          filters: string[];
+        }>
+      }>;
+    },
+    schedule_config: {
+      count_freq: string,
+      schedule_period: string,
+    },
     [key: string]: any
   };
   status: string;
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/index.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/index.vue
index 66fc19be..b8696461 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/index.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/expected-results/index.vue
@@ -69,6 +69,7 @@
 
   interface Expose {
     resetFormData: () => void,
+    setConfigs: (config: Array<DatabaseTableFieldModel>) => void;
   }
   interface Emits {
     (e: 'updateExpectedResult', value: Array<DatabaseTableFieldModel>): void;
@@ -112,6 +113,9 @@
     resetFormData: () => {
       expectedResultList.value = [];
     },
+    setConfigs(configs: Array<DatabaseTableFieldModel>) {
+      expectedResultList.value = configs;
+    },
   });
 </script>
 <style scoped lang="postcss">
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/components/field-item.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/components/field-item.vue
index 937a4761..b731da98 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/components/field-item.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/components/field-item.vue
@@ -125,8 +125,8 @@
   <div
     v-if="needCondition"
     class="condition"
-    @click="handleChangeOperator">
-    {{ conditions.operator }}
+    @click="handleChangeConnector">
+    {{ conditions.connector }}
   </div>
 </template>
 <script setup lang="ts">
@@ -143,12 +143,12 @@
   interface Emits {
     (e: 'updateFieldItemList', value: string, conditionsIndex: number): void;
     (e: 'updateFieldItem', value: DatabaseTableFieldModel, conditionsIndex: number, childConditionsIndex: number): void;
-    (e: 'updateOperator', value: 'and' | 'or', conditionsIndex: number): void;
+    (e: 'updateConnector', value: 'and' | 'or', conditionsIndex: number): void;
   }
   interface Props {
     tableFields: Array<DatabaseTableFieldModel>
     conditions: {
-      operator: 'and' | 'or';
+      connector: 'and' | 'or';
       conditions: Array<{
         field: DatabaseTableFieldModel;
         filter: string;
@@ -209,8 +209,8 @@
     emits('updateFieldItem', value, props.conditionsIndex, index);
   };
 
-  const handleChangeOperator = () => {
-    emits('updateOperator', props.conditions.operator === 'and' ? 'or' : 'and', props.conditionsIndex);
+  const handleChangeConnector = () => {
+    emits('updateConnector', props.conditions.connector === 'and' ? 'or' : 'and', props.conditionsIndex);
   };
 </script>
 <style scoped lang="postcss">
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/index.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/index.vue
index a1bbfd49..2e1f1f6b 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/index.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/rules/index.vue
@@ -41,9 +41,9 @@
           :conditions="conditions"
           :conditions-index="index"
           :table-fields="tableFields"
+          @update-connector="handleUpdateConnector"
           @update-field-item="handleUpdateFieldItem"
-          @update-field-item-list="handleUpdateFieldItemList"
-          @update-operator="handleUpdateOperator" />
+          @update-field-item-list="handleUpdateFieldItemList" />
         <audit-icon
           v-if="index !== 0"
           class="delete-conditions"
@@ -54,8 +54,8 @@
       <div
         v-if="needCondition"
         class="condition"
-        @click="() => where.operator = where.operator === 'and' ? 'or' : 'and'">
-        {{ where.operator }}
+        @click="() => where.connector = where.connector === 'and' ? 'or' : 'and'">
+        {{ where.connector }}
       </div>
     </div>
     <div
@@ -78,11 +78,12 @@
 
   interface Expose {
     resetFormData: () => void,
+    setConfigs: (config: Where) => void;
   }
   interface Where {
-    operator: 'and' | 'or';
+    connector: 'and' | 'or';
     conditions: Array<{
-      operator: 'and' | 'or';
+      connector: 'and' | 'or';
       conditions: Array<{
         field: DatabaseTableFieldModel;
         filter: string;
@@ -102,9 +103,9 @@
   const { t } = useI18n();
 
   const where = ref<Where>({
-    operator: 'and',
+    connector: 'and',
     conditions: [{
-      operator: 'and',
+      connector: 'and',
       conditions: [{
         field: new DatabaseTableFieldModel(),
         filter: '',
@@ -120,7 +121,7 @@
 
   const handleAddRuleItem = () => {
     where.value.conditions.push({
-      operator: 'and',
+      connector: 'and',
       conditions: [{
         field: new DatabaseTableFieldModel(),
         filter: '',
@@ -146,8 +147,8 @@
     where.value.conditions[conditionsIndex].conditions[childConditionsIndex].field = value;
   };
 
-  const handleUpdateOperator = (value: 'and' | 'or', conditionsIndex: number) => {
-    where.value.conditions[conditionsIndex].operator = value;
+  const handleUpdateConnector = (value: 'and' | 'or', conditionsIndex: number) => {
+    where.value.conditions[conditionsIndex].connector = value;
   };
 
   watch(() => where.value, (data) => {
@@ -159,9 +160,9 @@
   defineExpose<Expose>({
     resetFormData: () => {
       where.value = {
-        operator: 'and',
+        connector: 'and',
         conditions: [{
-          operator: 'and',
+          connector: 'and',
           conditions: [{
             field: new DatabaseTableFieldModel(),
             filter: '',
@@ -170,6 +171,9 @@
         }],
       };
     },
+    setConfigs(configs: Where) {
+      where.value = configs;
+    },
   });
 </script>
 <style scoped lang="postcss">
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/event-log.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/event-log.vue
index 1a88f109..9228b5e9 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/event-log.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/event-log.vue
@@ -65,6 +65,7 @@
 
   interface Expose {
     resetFormData: () => void,
+    setConfigs: (config: IFormData['configs']) => void;
   }
 
   interface Emits {
@@ -154,11 +155,14 @@
     immediate: true,
   });
 
-
   defineExpose<Expose>({
     resetFormData: () => {
       formData.value.configs.data_source.system_ids = [];
     },
+    setConfigs(configs: IFormData['configs']) {
+      formData.value.configs.data_source.system_ids = configs.data_source.system_ids;
+      emits('updateDataSource', formData.value.configs.data_source);
+    },
   });
 </script>
 
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 18349915..da75fa46 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
@@ -54,6 +54,7 @@
   interface Expose {
     refreshLinkData: () => void,
     resetFormData: () => void,
+    setConfigs: (config: IFormData['configs']) => void;
   }
   interface Emits {
     (e: 'updateDataSource', value: IFormData['configs']['data_source']): void,
@@ -131,5 +132,11 @@
         version: 0,
       };
     },
+    setConfigs(configs: IFormData['configs']) {
+      if (!configs.data_source.link_table) {
+        return;
+      }
+      formData.value.configs.data_source.link_table = configs.data_source.link_table;
+    },
   });
 </script>
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/other.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/other.vue
index 5f7fba9d..f1f49d09 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/other.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/other.vue
@@ -47,6 +47,7 @@
 
   interface Expose {
     resetFormData: () => void,
+    setConfigs: (config: IFormData['configs']) => void;
   }
 
   interface Emits {
@@ -100,5 +101,9 @@
     resetFormData: () => {
       formData.value.configs.data_source.rt_id = '';
     },
+    setConfigs(configs: IFormData['configs']) {
+      formData.value.configs.data_source.rt_id = configs.data_source.rt_id;
+      emits('updateDataSource', formData.value.configs.data_source);
+    },
   });
 </script>
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/resource-data.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/resource-data.vue
index b8fe0011..bbee26d3 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/resource-data.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/components/scheme-input/resource-data.vue
@@ -60,6 +60,7 @@
 
   interface Expose {
     resetFormData: () => void,
+    setConfigs: (config: FormData) => void;
   }
   interface Props {
     tableData: Array<{
@@ -124,6 +125,20 @@
     resetFormData: () => {
       formData.value.configs.data_source.rt_id = [];
     },
+    setConfigs(config: Record<string, any>) {
+      // 对tableid转换
+      props.tableData.forEach((item) => {
+        if (item.children && item.children.length) {
+          item.children.forEach((cItem) => {
+            if (cItem.value === config.data_source.rt_id) {
+              formData.value.configs.data_source.rt_id = [item.value, config.data_source.rt_id];
+            }
+          });
+        }
+      });
+      formData.value.configs.data_source.rt_id = config.data_source.rt_id;
+      handleUpdateDataSource();
+    },
   });
 </script>
 
diff --git a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/index.vue b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/index.vue
index 589486b8..86ce4b62 100644
--- a/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/index.vue
+++ b/src/frontend/src/views/strategy-manage/strategy-create/components/step1/components/customize/index.vue
@@ -37,7 +37,6 @@
               property="configs.config_type">
               <bk-select
                 v-model="configType"
-                :disabled="isEditMode || isCloneMode || isUpgradeMode"
                 filterable
                 :placeholder="t('请选择数据源类型')"
                 @change="handleDataSourceType">
@@ -59,6 +58,7 @@
           </div>
           <!-- 联表详情 -->
           <link-data-detail-component
+            v-if="formData.configs.data_source.link_table && formData.configs.data_source.link_table.uid"
             :link-data-detail="linkDataDetail"
             :link-data-sheet-id="formData.configs.data_source.link_table.uid"
             @refresh-link-data="handleRefreshLinkData" />
@@ -117,10 +117,10 @@
             <bk-form-item
               class="is-required no-label"
               label-width="0"
-              property="configs.aiops_config.count_freq"
+              property="configs.schedule_config.count_freq"
               style="margin-bottom: 12px;">
               <bk-input
-                v-model="formData.configs.aiops_config.count_freq"
+                v-model="formData.configs.schedule_config.count_freq"
                 class="schedule-input"
                 :min="1"
                 onkeypress="return( /[\d]/.test(String.fromCharCode(event.keyCode) ) )"
@@ -130,10 +130,10 @@
             <bk-form-item
               class="is-required no-label"
               label-width="0"
-              property="configs.aiops_config.schedule_period"
+              property="configs.schedule_config.schedule_period"
               style="margin-bottom: 12px;">
               <bk-select
-                v-model="formData.configs.aiops_config.schedule_period"
+                v-model="formData.configs.schedule_config.schedule_period"
                 class="schedule-select"
                 :clearable="false"
                 style="width: 68px;">
@@ -153,7 +153,7 @@
 <script setup lang="ts">
   import { InfoBox } from 'bkui-vue';
   import _ from 'lodash';
-  import { h, ref, watch } from 'vue';
+  import { h, onMounted, ref, watch } from 'vue';
   import { useI18n } from 'vue-i18n';
   import { useRoute } from 'vue-router';
 
@@ -162,6 +162,7 @@
   import LinkDataDetailModel from '@model/link-data/link-data-detail';
   import CommonDataModel from '@model/strategy/common-data';
   import DatabaseTableFieldModel from '@model/strategy/database-table-field';
+  import StrategyModel from '@model/strategy/strategy';
 
   import AuditIcon from '@components/audit-icon';
 
@@ -176,9 +177,9 @@
   import useRequest from '@/hooks/use-request';
 
   interface Where {
-    operator: 'and' | 'or' ;
+    connector: 'and' | 'or' ;
     conditions: Array<{
-      operator: 'and' | 'or';
+      connector: 'and' | 'or';
       conditions: Array<{
         field: DatabaseTableFieldModel | '';
         filter: string;
@@ -200,7 +201,7 @@
       config_type: string,
       select: Array<DatabaseTableFieldModel>,
       where: Where,
-      aiops_config: {
+      schedule_config: {
         count_freq: string,
         schedule_period: string,
       },
@@ -212,7 +213,11 @@
   interface Expose {
     getFields: () => IFormData
   }
+  interface Props {
+    editData: StrategyModel
+  }
 
+  const props = defineProps<Props>();
   const emits = defineEmits<Emits>();
 
   const { t } = useI18n();
@@ -224,7 +229,6 @@
 
   const isEditMode = route.name === 'strategyEdit';
   const isCloneMode = route.name === 'strategyClone';
-  const isUpgradeMode = route.name === 'strategyUpgrade';
 
   const configTypeMap: Record<string, any> = {
     EventLog: EventLogComponent,
@@ -257,10 +261,10 @@
       config_type: '',
       select: [],
       where: {
-        operator: 'and',
+        connector: 'and',
         conditions: [],
       },
-      aiops_config: {
+      schedule_config: {
         count_freq: '',
         schedule_period: 'hour',
       },
@@ -370,7 +374,7 @@
         };
         formData.value.configs.select = [];
         formData.value.configs.where = {
-          operator: 'and',
+          connector: 'and',
           conditions: [],
         };
         configRef.value.resetFormData();
@@ -424,17 +428,32 @@
 
   const handleSourceTypeChange = (type: string) => {
     if (type === 'stream_source') {
-      formData.value.configs.aiops_config = {
+      formData.value.configs.schedule_config = {
         count_freq: '',
         schedule_period: 'hour',
       };
     }
-    // 非周期不需要aiops_config
+    // 非周期不需要schedule_config
     formData.value.configs.data_source.source_type !== 'stream_source'
-      ? formData.value.configs.aiops_config
+      ? formData.value.configs.schedule_config
       : undefined;
   };
 
+  // 编辑
+  const  setFormdata = (editData: StrategyModel) => {
+    configType.value = editData.configs.config_type || '';
+    formData.value.configs.config_type = editData.configs.config_type || '';
+    formData.value.configs.schedule_config = editData.configs.schedule_config;
+    formData.value.configs.select = editData.configs.select;
+    expectedResultsRef.value.setConfigs(editData.configs.select);
+    rulesComponentRef.value.setConfigs(editData.configs.where);
+    fetchTable({
+      table_type: formData.value.configs.config_type,
+    }).then(() => {
+      configRef.value.setConfigs(editData.configs);
+    });
+  };
+
   watch(() => formData.value, (data) => {
     emits('updateFormData', data);
   }, {
@@ -449,6 +468,12 @@
     }
   });
 
+  onMounted(() => {
+    if (isEditMode || isCloneMode) {
+      setFormdata(props.editData);
+    }
+  });
+
   defineExpose<Expose>({
     // 获取提交参数
     getFields() {
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 4c93c27f..c2e38186 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
@@ -105,7 +105,7 @@
             field_name: item.field_name,
             display_name: item.display_name,
             is_priority: editItem.is_priority,
-            map_config: item.map_config,
+            map_config: editItem.map_config,
             description: editItem.description,
             example: item.example,
             prefix: '',