1

src/views/var/varChange/VarChange.vue

@@ -314,7 +314,7 @@ const confirmConfig = (configList: any) => {
             }
           }
           // 没有选择过滤字段时
-          if (!item.filterMapFiled) {
+          if (!item.filterFiled) {
             item.filterMapFiled = null
             item.filterScripts = []
             item.filterFiled = null

src/views/var/varChange/components/ConfigFormItem.vue

@@ -75,11 +75,12 @@
   <el-col>
     <el-form-item label="过滤字段">
       <el-select
-        v-model="item.filterMapFiled"
+        v-model="item.filterFiled"
         style="width: 260px"
         filterable
         placeholder="请选择"
         clearable
+        value-key="filedName"
         @change="filterMapFieldChange"
       >
         <el-option-group
@@ -91,7 +92,7 @@
             v-for="itm in group.filedPojos"
             :key="itm.filedName"
             :label="itm.fliedTitle"
-            :value="itm.filedName"
+            :value="itm"
           />
         </el-option-group>
       </el-select>
@@ -195,14 +196,15 @@ watch(
 
 const filterMapFieldChange = (e) => {
   if (e) {
-    // 找到匹配的过滤字段
-    getFilterMapFieldsFlatList.value.some((items) => {
-      if (items.filedName == e) {
-        props.item.filterFiled = items
-        return true
-      }
-      return false
-    })
+    // console.log('匹配当前字段')
+    // // 找到匹配的过滤字段
+    // getFilterMapFieldsFlatList.value.some((items) => {
+    //   if (items.filedName == e) {
+    //     props.item.filterFiled = items
+    //     return true
+    //   }
+    //   return false
+    // })
     // 如果没有脚本，设置一个空的脚本
     if (!props.item?.filterScripts || props.item?.filterScripts?.length == 0) {
       props.item.filterScripts = [
@@ -213,9 +215,7 @@ const filterMapFieldChange = (e) => {
       ]
     }
   } else {
-    // 置空
-    props.item.filterFiled = null
-    props.item.filterScripts = []
+    //
   }
 }