From 889400c9abdb21f0c3e5f654e86f2acad87b314c Mon Sep 17 00:00:00 2001
From: JenniferW <1627055433@qq.com>
Date: Thu, 14 Aug 2025 16:24:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E4=BA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/intention/Step2.vue | 81 ++++++++++++++---------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/src/views/order/intention/Step2.vue b/src/views/order/intention/Step2.vue
index b0a0b0c..cdb0711 100644
--- a/src/views/order/intention/Step2.vue
+++ b/src/views/order/intention/Step2.vue
@@ -330,7 +330,7 @@ const selectedCompareList = computed(() =>
 
 // 生成对比表格数据 - 采用query.vue的实现
 const compareTableData = computed(() => {
-  if (selectedCompareList.value.length <= 1) return [];
+  if (selectedCompareList.value.length === 0) return [];
 
   // 需要对比的参数列表
   const paramsToCompare = [
@@ -566,28 +566,34 @@ const allValues = ref([]);
 const initializeValues = () => {
   const values = [];
   allFields.forEach((field) => {
-    const uniqueValues = [...new Set(mockData.map((item) => item[field.key]))];
+    const uniqueValues = [
+      ...new Set(
+        mockData.map((item) => item[field.key] ?? "") // 将null转换为空字符串
+      ),
+    ];
     uniqueValues.forEach((value) => {
-      values.push({
-        value: String(value),
-        fieldKey: field.key,
-        fieldLabel: field.label,
-        weight: fieldValueMap[field.key]?.includes(String(value)) ? 2 : 1,
-      });
+      // 过滤空值，避免空提示
+      if (value !== "") {
+        values.push({
+          value: String(value),
+          fieldKey: field.key,
+          fieldLabel: field.label,
+          weight: fieldValueMap[field.key]?.includes(String(value)) ? 2 : 1,
+        });
+      }
     });
   });
   allValues.value = values;
 };
 
-// 从query.vue引入的查询相关方法
 const getCurrentInputPart = () => {
-  const parts = currentInput.value.split(";");
+  const parts = currentInput.value.split(/[;；]/);
   return parts[parts.length - 1].trim();
 };
 
 const handleKeydown = (e) => {
   // 检查是否按下了分号键
-  if (e.key === ";" || e.keyCode === 186) {
+  if (e.key === ";" || e.key === "；" || e.keyCode === 186) {
     handleSemicolon(e);
   }
 };
@@ -616,7 +622,7 @@ const findCursorConditionIndex = () => {
 
   const cursorPos = inputEl.selectionStart;
   const inputValue = currentInput.value;
-  const parts = inputValue.split(";");
+  const parts = inputValue.split(/[;；]/);
 
   let currentLength = 0;
   for (let i = 0; i < parts.length; i++) {
@@ -1001,9 +1007,7 @@ const selectSuggestion = (item) => {
       }
     } else {
       // 无字段时直接处理值
-      parts[targetIndex] = targetPart
-        ? `${targetPart}${item.label}`
-        : item.label;
+      parts[targetIndex] = item.label;
     }
   }
 
@@ -1096,7 +1100,7 @@ const hideSuggestions = () => {
 const parseConditions = (input) => {
   const conditions = [];
   const parts = input
-    .split(";")
+    .split(/[;；]/) // 同时匹配中英文分号
     .map((part) => part.trim())
     .filter((part) => part);
 
@@ -1175,7 +1179,11 @@ const filterData = (conditions) => {
 
 // 检查单个条件
 const checkCondition = (fieldValue, conditionValue) => {
-  // 支持的运算符
+  // 将null转换为空字符串处理
+  const processedValue = fieldValue ?? "";
+  const processedCondition = conditionValue ?? "";
+
+  // 后续逻辑使用processedValue和processedCondition
   const operators = [
     { symbol: ">=", func: (a, b) => a >= b },
     { symbol: "<=", func: (a, b) => a <= b },
@@ -1185,30 +1193,29 @@ const checkCondition = (fieldValue, conditionValue) => {
     { symbol: "=", func: (a, b) => a == b },
   ];
 
-  // 查找是否使用了运算符
   for (const op of operators) {
-    if (conditionValue.startsWith(op.symbol)) {
-      const value = conditionValue.substring(op.symbol.length).trim();
-      // 尝试转换为数字进行比较
-      if (!isNaN(Number(fieldValue)) && !isNaN(Number(value))) {
-        return op.func(Number(fieldValue), Number(value));
+    if (processedCondition.startsWith(op.symbol)) {
+      const value = processedCondition.substring(op.symbol.length).trim();
+      if (!isNaN(Number(processedValue)) && !isNaN(Number(value))) {
+        return op.func(Number(processedValue), Number(value));
       }
-      // 字符串比较
-      return op.func(String(fieldValue), value);
+      return op.func(String(processedValue), value);
     }
   }
 
-  // 没有运算符，默认包含即可
-  return String(fieldValue)
+  return String(processedValue)
     .toLowerCase()
-    .includes(conditionValue.toLowerCase());
+    .includes(processedCondition.toLowerCase());
 };
 
 // 移除单个条件
 const removeCondition = (index) => {
-  const parts = currentInput.value.split(";");
+  const parts = currentInput.value.split(/[;；]/); // 同时匹配中英文分号
   parts.splice(index, 1);
-  currentInput.value = parts.join(";").replace(/;;+/g, ";").trim();
+  currentInput.value = parts
+    .join(";")
+    .replace(/[;；]+/g, ";")
+    .trim();
   parsedConditions.value = parseConditions(currentInput.value);
   filteredData.value = filterData(parsedConditions.value).map((item) => ({
     ...item,
@@ -1257,15 +1264,6 @@ onMounted(() => {
       showSuggestions.value = false;
     }
   });
-
-  // 只有已选车型才自动查询，否则等待用户选择
-  if (props.form.selectedCarType) {
-    // 使用新的查询方式，自动填充车型条件
-    currentInput.value = `车型:${props.form.selectedCarType}`;
-    setTimeout(() => {
-      handleSearch();
-    }, 100);
-  }
 });
 
 // 监听输入框宽度变化
@@ -1830,11 +1828,10 @@ function onNextStep() {
   background: #f5f7fa !important;
 }
 
-// 从query.vue整合的样式
 .search-box-container {
   max-width: 1200px;
   margin: 0 auto;
-  padding: 20px;
+  padding: 0 20px;
 }
 
 .search-box {
@@ -1982,8 +1979,8 @@ function onNextStep() {
 }
 
 .results-section {
-  margin-top: 30px;
   overflow: hidden;
+  padding: 0 10px;
 }
 
 .results-table {