tangwang · tangwang
Showing 8 changed files Show diff stats
docs/搜索API对接指南.md
docs/搜索API速查表.md
docs/系统设计文档.md
docs/索引字段说明v2.md
frontend/base.html
frontend/static/js/app.js
frontend/static/js/app_base.js
search/es_query_builder.py
@@ -136,7 +136,7 @@ curl -X POST &quot;http://120.76.41.98:6002/search/&quot; \
 #### 1. 精确匹配过滤器 (filters)
-用于精确匹配或多值匹配（OR 逻辑）。
+用于精确匹配或多值匹配。对于普通字段，数组表示 OR 逻辑（匹配任意一个值）；对于 specifications 字段，按维度分组处理（见下文）。
 **格式**:
 ```json
@@ -181,7 +181,7 @@ curl -X POST &quot;http://120.76.41.98:6002/search/&quot; \
 ```
 查询规格名称为"color"且值为"white"的商品。
-**多个规格过滤（OR 逻辑）**:
+**多个规格过滤（按维度分组）**:
 ```json
 {
   "filters": {
@@ -192,7 +192,26 @@ curl -X POST &quot;http://120.76.41.98:6002/search/&quot; \
   }
 }
 ```
-查询满足任意一个规格的商品（color=white **或** size=256GB）。
+查询同时满足所有规格的商品（color=white **且** size=256GB）。
+
+**相同维度的多个值（OR 逻辑）**:
+```json
+{
+  "filters": {
+    "specifications": [
+      {"name": "size", "value": "3"},
+      {"name": "size", "value": "4"},
+      {"name": "size", "value": "5"},
+      {"name": "color", "value": "green"}
+    ]
+  }
+}
+```
+查询满足 (size=3 **或** size=4 **或** size=5) **且** color=green 的商品。
+
+**过滤逻辑说明**:
+- **不同维度**（不同的 `name`）之间是 **AND** 关系（求交集）
+- **相同维度**（相同的 `name`）的多个值之间是 **OR** 关系（求并集）
 **常用过滤字段**:
 - `category_name`: 类目名称
@@ -707,9 +726,9 @@ curl -X POST &quot;http://120.76.41.98:6002/search/&quot; \
 }
 ```
-### 场景7：多个规格过滤（OR逻辑）
+### 场景7：多个规格过滤（不同维度AND，相同维度OR）
-**需求**: 搜索"手机"，筛选color为"white"或size为"256GB"的商品
+**需求**: 搜索"手机"，筛选color为"white"且size为"256GB"的商品
 ```json
 {
@@ -725,6 +744,24 @@ curl -X POST &quot;http://120.76.41.98:6002/search/&quot; \
 }
 ```
+**需求**: 搜索"手机"，筛选size为"3"、"4"或"5"，且color为"green"的商品
+
+```json
+{
+  "query": "手机",
+  "size": 20,
+  "language": "zh",
+  "filters": {
+    "specifications": [
+      {"name": "size", "value": "3"},
+      {"name": "size", "value": "4"},
+      {"name": "size", "value": "5"},
+      {"name": "color", "value": "green"}
+    ]
+  }
+}
+```
+
 ### 场景8：规格分面搜索
 **需求**: 搜索"手机"，获取所有规格的分面统计
@@ -41,7 +41,7 @@ POST /search/
 }
 ```
-**多个规格（OR）**:
+**多个规格（按维度分组）**:
 ```bash
 {
   "filters": {
@@ -52,6 +52,7 @@ POST /search/
   }
 }
 ```
+说明：不同维度（不同name）是AND关系，相同维度（相同name）的多个值是OR关系。
 ---
@@ -480,7 +480,8 @@ laptop AND (gaming OR professional) ANDNOT cheap
      - 范围过滤：`{"min_price": {"gte": 50, "lte": 200}}`
      - **Specifications嵌套过滤**：
        - 单个规格：`{"specifications": {"name": "color", "value": "white"}}`
-       - 多个规格（OR）：`{"specifications": [{"name": "color", "value": "white"}, {"name": "size", "value": "256GB"}]}`
+       - 多个规格：`{"specifications": [{"name": "color", "value": "white"}, {"name": "size", "value": "256GB"}]}`
+       - 过滤逻辑：不同维度（不同name）是AND关系，相同维度（相同name）的多个值是OR关系
        - 使用ES的`nested`查询实现
    - **text_recall**: 文本相关性召回
      - 同时搜索中英文字段（`title_zh/en`, `brief_zh/en`, `description_zh/en`, `vendor_zh/en`, `category_path_zh/en`, `category_name_zh/en`, `tags`）
@@ -593,7 +594,7 @@ ranking:
 - ✅ 语义搜索（KNN 检索）
 - ✅ 相关性排序（BM25 + 向量相似度）
 - ✅ 结果聚合（Faceted Search）
-- ✅ Specifications嵌套过滤（单个和多个规格，OR逻辑）
+- ✅ Specifications嵌套过滤（单个和多个规格，按维度分组：不同维度AND，相同维度OR）
 - ✅ Specifications嵌套分面（所有规格名称和指定规格名称）
 - ✅ SKU筛选（按维度过滤，应用层实现）
@@ -784,7 +785,7 @@ class RangeFilter(BaseModel):
 }
 ```
-**多个规格过滤（OR逻辑）**：
+**多个规格过滤（按维度分组）**：
 ```json
 {
   "specifications": [
@@ -799,7 +800,7 @@ class RangeFilter(BaseModel):
 2. Searcher 层：透传 `filters` 字典
 3. ES Query Builder：检测 `specifications` 键，构建ES `nested` 查询
    - 单个规格：构建单个 `nested` 查询
-   - 多个规格：构建多个 `nested` 查询，使用 `should` 组合（OR逻辑）
+   - 多个规格：按 name 维度分组，相同维度内使用 `should` 组合（OR逻辑），不同维度之间使用 `must` 组合（AND逻辑）
 4. 输出：ES nested 查询（`nested.path=specifications` + `bool.must=[term(name), term(value)]`）
 #### 8.3.4 响应 Facets 数据流
@@ -132,7 +132,7 @@
 }
 ```
-**多个规格过滤（OR逻辑）**:
+**多个规格过滤（按维度分组）**:
 ```json
 {
   "query": "手机",
@@ -144,21 +144,57 @@
     }
 }
 ```
+说明：不同维度（不同name）是AND关系，相同维度（相同name）的多个值是OR关系。
+
+**示例：相同维度的多个值（OR）**:
+```json
+{
+  "query": "手机",
+  "filters": {
+    "specifications": [
+      {"name": "size", "value": "3"},
+      {"name": "size", "value": "4"},
+      {"name": "size", "value": "5"},
+      {"name": "color", "value": "green"}
+    ]
+  }
+}
+```
+生成查询：(size=3 OR size=4 OR size=5) AND color=green
 **ES 查询结构**（后端自动生成）:
 ```json
 {
-    "nested": {
-      "path": "specifications",
-      "query": {
-        "bool": {
-          "must": [
-          { "term": { "specifications.name": "color" } },
-          { "term": { "specifications.value": "white" } }
-          ]
+  "filter": [
+    {
+      "nested": {
+        "path": "specifications",
+        "query": {
+          "bool": {
+            "should": [
+              {"bool": {"must": [{"term": {"specifications.name": "size"}}, {"term": {"specifications.value": "3"}}]}},
+              {"bool": {"must": [{"term": {"specifications.name": "size"}}, {"term": {"specifications.value": "4"}}]}},
+              {"bool": {"must": [{"term": {"specifications.name": "size"}}, {"term": {"specifications.value": "5"}}]}}
+            ],
+            "minimum_should_match": 1
+          }
+        }
+      }
+    },
+    {
+      "nested": {
+        "path": "specifications",
+        "query": {
+          "bool": {
+            "must": [
+              {"term": {"specifications.name": "color"}},
+              {"term": {"specifications.value": "green"}}
+            ]
+          }
+        }
       }
     }
-  }
+  ]
 }
 ```
@@ -1,89 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>店匠通用搜索 - Base Configuration</title>
-    <link rel="stylesheet" href="/static/css/style.css">
-</head>
-<body>
-    <div class="page-container">
-        <!-- Header -->
-        <header class="top-header">
-            <div class="header-left">
-                <span class="logo">Shoplazza Base Search</span>
-                <span class="product-count" id="productCount">0 products found</span>
-            </div>
-            <div class="header-right">
-                <button class="fold-btn" onclick="toggleFilters()">Fold</button>
-            </div>
-        </header>
-
-        <!-- Search Bar -->
-        <div class="search-bar">
-            <input type="text" id="searchInput" placeholder="输入搜索关键词... (支持中文、英文)"
-                   onkeypress="handleKeyPress(event)">
-            <button onclick="performSearch()" class="search-btn">搜索</button>
-        </div>
-
-        <!-- Filter Section -->
-        <div class="filter-section" id="filterSection">
-            <!-- Category Filter -->
-            <div class="filter-row">
-                <div class="filter-label">Categories:</div>
-                <div class="filter-tags" id="categoryTags"></div>
-            </div>
-
-            <!-- Vendor Filter -->
-            <div class="filter-row">
-                <div class="filter-label">Vendor:</div>
-                <div class="filter-tags" id="brandTags"></div>
-            </div>
-
-            <!-- Tags Filter -->
-            <div class="filter-row">
-                <div class="filter-label">Tags:</div>
-                <div class="filter-tags" id="supplierTags"></div>
-            </div>
-
-            <!-- Price Range Filter -->
-            <div class="filter-row">
-                <div class="filter-label">Price Range:</div>
-                <div class="filter-tags" id="priceTags"></div>
-            </div>
-
-            <!-- Clear Filters Button -->
-            <div class="filter-row">
-                <button id="clearFiltersBtn" onclick="clearAllFilters()" class="clear-filters-btn" style="display: none;">
-                    Clear All Filters
-                </button>
-            </div>
-        </div>
-
-        <!-- Results Section -->
-        <div class="results-section">
-            <div class="product-grid" id="productGrid">
-                <div class="welcome-message">
-                    <h2>Welcome to Shoplazza Base Search</h2>
-                    <p>Enter keywords to search for products</p>
-                </div>
-            </div>
-        </div>
-
-        <!-- Loading Indicator -->
-        <div id="loading" style="display: none; text-align: center; padding: 20px;">
-            <div class="spinner"></div>
-            <p>Searching...</p>
-        </div>
-
-        <!-- Debug Info (collapsible) -->
-        <div class="debug-section" id="debugSection" style="display: none;">
-            <button onclick="toggleDebug()" class="debug-toggle">Toggle Debug Info</button>
-            <div id="debugInfo" style="display: none;"></div>
-        </div>
-    </div>
-
-    <script src="/static/js/app_base.js"></script>
-</body>
-</html>
-
@@ -608,7 +608,7 @@ function displayDebugInfo(data) {
     // ES Query
     if (debugInfo.es_query) {
         html += '<div style="margin-bottom: 15px;"><strong style="font-size: 14px;">ES Query DSL:</strong>';
-        html += `<pre style="background: #f5f5f5; padding: 10px; overflow: auto; max-height: 400px;">${escapeHtml(JSON.stringify(debugInfo.es_query, null, 2))}</pre>`;
+        html += `<pre style="background: #f5f5f5; padding: 10px; overflow: auto; max-height: 400px;">${escapeHtml(customStringify(debugInfo.es_query))}</pre>`;
         html += '</div>';
     }
@@ -616,6 +616,19 @@ function displayDebugInfo(data) {
     debugInfoDiv.innerHTML = html;
 }
+// Custom JSON stringify that compresses numeric arrays (like embeddings) to single line
+function customStringify(obj) {
+    return JSON.stringify(obj, (key, value) => {
+        if (Array.isArray(value)) {
+            // Only collapse arrays that contain numbers (like embeddings)
+            if (value.every(item => typeof item === 'number')) {
+                return JSON.stringify(value);
+            }
+        }
+        return value;
+    }, 2).replace(/"\[/g, '[').replace(/\]"/g, ']');
+}
+
 // Helper functions
 function escapeHtml(text) {
     if (!text) return '';
@@ -1,590 +0,0 @@
-// SearchEngine Frontend - Modern UI (Multi-Tenant)
-
-const API_BASE_URL = 'http://localhost:6002';
-document.getElementById('apiUrl').textContent = API_BASE_URL;
-
-// Get tenant ID from input
-function getTenantId() {
-    const tenantInput = document.getElementById('tenantInput');
-    if (tenantInput) {
-        return tenantInput.value.trim();
-    }
-    return '1'; // Default fallback
-}
-
-// State Management
-let state = {
-    query: '',
-    currentPage: 1,
-    pageSize: 20,
-    totalResults: 0,
-    filters: {},
-    rangeFilters: {},
-    sortBy: '',
-    sortOrder: 'desc',
-    facets: null,
-    lastSearchData: null,
-    debug: true  // Always enable debug mode for test frontend
-};
-
-// Initialize
-document.addEventListener('DOMContentLoaded', function() {
-    console.log('SearchEngine loaded');
-    console.log('Debug mode: always enabled (test frontend)');
-    
-    document.getElementById('searchInput').focus();
-});
-
-// Keyboard handler
-function handleKeyPress(event) {
-    if (event.key === 'Enter') {
-        performSearch();
-    }
-}
-
-// Toggle filters visibility
-function toggleFilters() {
-    const filterSection = document.getElementById('filterSection');
-    filterSection.classList.toggle('hidden');
-}
-
-// Perform search
-async function performSearch(page = 1) {
-    const query = document.getElementById('searchInput').value.trim();
-    const tenantId = getTenantId();
-    
-    if (!query) {
-        alert('Please enter search keywords');
-        return;
-    }
-    
-    if (!tenantId) {
-        alert('Please enter tenant ID');
-        return;
-    }
-    
-    state.query = query;
-    state.currentPage = page;
-    state.pageSize = parseInt(document.getElementById('resultSize').value);
-    
-    const from = (page - 1) * state.pageSize;
-    
-    // Define facets (简化配置)
-        const facets = [
-        {
-            "field": "category.keyword",
-            "size": 15,
-            "type": "terms"
-        },
-        {
-            "field": "vendor.keyword",
-            "size": 15,
-            "type": "terms"
-        },
-        {
-            "field": "tags.keyword",
-            "size": 10,
-            "type": "terms"
-        },
-        {
-            "field": "min_price",
-            "type": "range",
-            "ranges": [
-                {"key": "0-50", "to": 50},
-                {"key": "50-100", "from": 50, "to": 100},
-                {"key": "100-200", "from": 100, "to": 200},
-                {"key": "200+", "from": 200}
-            ]
-        }
-    ];
-    
-    // Show loading
-    document.getElementById('loading').style.display = 'block';
-    document.getElementById('productGrid').innerHTML = '';
-    
-    try {
-        const response = await fetch(`${API_BASE_URL}/search/`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'X-Tenant-ID': tenantId,
-            },
-            body: JSON.stringify({
-                query: query,
-                size: state.pageSize,
-                from: from,
-                filters: Object.keys(state.filters).length > 0 ? state.filters : null,
-                range_filters: Object.keys(state.rangeFilters).length > 0 ? state.rangeFilters : null,
-                facets: facets,
-                sort_by: state.sortBy || null,
-                sort_order: state.sortOrder,
-                debug: state.debug
-            })
-        });
-        
-        if (!response.ok) {
-            throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-        }
-        
-        const data = await response.json();
-        state.lastSearchData = data;
-        state.totalResults = data.total;
-        state.facets = data.facets;
-        
-        displayResults(data);
-        displayFacets(data.facets);
-        displayPagination();
-        displayDebugInfo(data);
-        updateProductCount(data.total);
-        updateClearFiltersButton();
-        
-    } catch (error) {
-        console.error('Search error:', error);
-        document.getElementById('productGrid').innerHTML = `
-            <div class="error-message">
-                <strong>Search Error:</strong> ${error.message}
-                <br><br>
-                <small>Please ensure backend service is running (${API_BASE_URL})</small>
-            </div>
-        `;
-    } finally {
-        document.getElementById('loading').style.display = 'none';
-    }
-}
-
-// Display results in grid
-function displayResults(data) {
-    const grid = document.getElementById('productGrid');
-    
-    if (!data.results || data.results.length === 0) {
-        grid.innerHTML = `
-            <div class="no-results" style="grid-column: 1 / -1;">
-                <h3>No Results Found</h3>
-                <p>Try different keywords or filters</p>
-            </div>
-        `;
-        return;
-    }
-    
-    let html = '';
-    
-    data.results.forEach((spu) => {
-                const score = spu.relevance_score;
-        html += `
-            <div class="product-card">
-                <div class="product-image-wrapper">
-                    ${spu.image_url ? `
-                        <img src="${escapeHtml(spu.image_url)}" 
-                             alt="${escapeHtml(spu.title)}" 
-                             class="product-image"
-                             onerror="this.src='data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%22100%22 height=%22100%22%3E%3Crect fill=%22%23f0f0f0%22 width=%22100%22 height=%22100%22/%3E%3Ctext x=%2250%25%22 y=%2250%25%22 font-size=%2214%22 text-anchor=%22middle%22 dy=%22.3em%22 fill=%22%23999%22%3ENo Image%3C/text%3E%3C/svg%3E'">
-                    ` : `
-                        <div style="color: #ccc; font-size: 14px;">No Image</div>
-                    `}
-                </div>
-                
-                <div class="product-price">
-                    ${spu.price ? `$${spu.price.toFixed(2)}` : 'N/A'}${spu.compare_at_price && spu.compare_at_price > spu.price ? `<span style="text-decoration: line-through; color: #999; font-size: 0.9em; margin-left: 8px;">$${spu.compare_at_price.toFixed(2)}</span>` : ''}
-                </div>
-                
-                <div class="product-stock">
-                    ${spu.in_stock ? '<span style="color: green;">In Stock</span>' : '<span style="color: red;">Out of Stock</span>'}
-                    ${spu.skus && spu.skus.length > 0 ? `<span style="color: #666; font-size: 0.9em;">(${spu.skus.length} skus)</span>` : ''}
-                </div>
-                
-                                                <div class="product-title">
-                    ${escapeHtml(spu.title || 'N/A')}
-                </div>
-                
-                <div class="product-meta">${spu.vendor ? escapeHtml(spu.vendor) : ''}${spu.category ? ' | ' + escapeHtml(spu.category) : ''}                ${spu.tags ? `
-                    <div class="product-tags">
-                        Tags: ${escapeHtml(spu.tags)}
-                    </div>
-                ` : ''}
-            </div>
-        `;
-    });
-    
-    grid.innerHTML = html;
-}
-
-// Display facets as filter tags (重构版 - 标准化格式)
-function displayFacets(facets) {
-    if (!facets) return;
-    
-    facets.forEach(facet => {
-        // 根据字段名找到对应的容器
-        let containerId = null;
-        let maxDisplay = 10;
-        
-        if (facet.field === 'category.keyword') {
-            containerId = 'categoryTags';
-            maxDisplay = 10;
-        } else if (facet.field === 'vendor.keyword') {
-            containerId = 'brandTags';
-            maxDisplay = 10;
-        } else if (facet.field === 'tags.keyword') {
-            containerId = 'supplierTags';
-            maxDisplay = 8;
-        }
-        
-        if (!containerId) return;
-        
-        const container = document.getElementById(containerId);
-        if (!container) return;
-        
-        let html = '';
-        
-        // 渲染分面值
-        facet.values.slice(0, maxDisplay).forEach(facetValue => {
-            const value = facetValue.value;
-            const count = facetValue.count;
-            const selected = facetValue.selected;
-            
-            html += `
-                <span class="filter-tag ${selected ? 'active' : ''}" 
-                      onclick="toggleFilter('${escapeAttr(facet.field)}', '${escapeAttr(value)}')">
-                    ${escapeHtml(value)} (${count})
-                </span>
-            `;
-        });
-        
-        container.innerHTML = html;
-    });
-}
-
-// Toggle filter
-function toggleFilter(field, value) {
-    if (!state.filters[field]) {
-        state.filters[field] = [];
-    }
-    
-    const index = state.filters[field].indexOf(value);
-    if (index > -1) {
-        state.filters[field].splice(index, 1);
-        if (state.filters[field].length === 0) {
-            delete state.filters[field];
-        }
-    } else {
-        state.filters[field].push(value);
-    }
-    
-    performSearch(1); // Reset to page 1
-}
-
-// Handle price filter (重构版 - 使用 rangeFilters)
-function handlePriceFilter(value) {
-    if (!value) {
-        delete state.rangeFilters.price;
-    } else {
-        const priceRanges = {
-            '0-50': { lt: 50 },
-            '50-100': { gte: 50, lt: 100 },
-            '100-200': { gte: 100, lt: 200 },
-            '200+': { gte: 200 }
-        };
-        
-        if (priceRanges[value]) {
-            state.rangeFilters.price = priceRanges[value];
-        }
-    }
-    
-    performSearch(1);
-}
-
-// Handle time filter (重构版 - 使用 rangeFilters)
-function handleTimeFilter(value) {
-    if (!value) {
-        delete state.rangeFilters.create_time;
-    } else {
-        const now = new Date();
-        let fromDate;
-        
-        switch(value) {
-            case 'today':
-                fromDate = new Date(now.setHours(0, 0, 0, 0));
-                break;
-            case 'week':
-                fromDate = new Date(now.setDate(now.getDate() - 7));
-                break;
-            case 'month':
-                fromDate = new Date(now.setMonth(now.getMonth() - 1));
-                break;
-            case '3months':
-                fromDate = new Date(now.setMonth(now.getMonth() - 3));
-                break;
-            case '6months':
-                fromDate = new Date(now.setMonth(now.getMonth() - 6));
-                break;
-        }
-        
-        if (fromDate) {
-            state.rangeFilters.create_time = {
-                gte: fromDate.toISOString()
-            };
-        }
-    }
-    
-    performSearch(1);
-}
-
-// Clear all filters
-function clearAllFilters() {
-    state.filters = {};
-    state.rangeFilters = {};
-    document.getElementById('priceFilter').value = '';
-    document.getElementById('timeFilter').value = '';
-    performSearch(1);
-}
-
-// Update clear filters button visibility
-function updateClearFiltersButton() {
-    const btn = document.getElementById('clearFiltersBtn');
-    if (Object.keys(state.filters).length > 0 || Object.keys(state.rangeFilters).length > 0) {
-        btn.style.display = 'inline-block';
-    } else {
-        btn.style.display = 'none';
-    }
-}
-
-// Update product count
-function updateProductCount(total) {
-    document.getElementById('productCount').textContent = `${total.toLocaleString()} SPUs found`;
-}
-
-// Sort functions
-function setSortByDefault() {
-    // Remove active from all buttons and arrows
-    document.querySelectorAll('.sort-btn').forEach(b => b.classList.remove('active'));
-    document.querySelectorAll('.arrow-up, .arrow-down').forEach(a => a.classList.remove('active'));
-    
-    // Set default button active
-    const defaultBtn = document.querySelector('.sort-btn[data-sort=""]');
-    if (defaultBtn) defaultBtn.classList.add('active');
-    
-    state.sortBy = '';
-    state.sortOrder = 'desc';
-    
-    performSearch(1);
-}
-
-function sortByField(field, order) {
-    state.sortBy = field;
-    state.sortOrder = order;
-    
-    // Remove active from all buttons (but keep "By default" if no sort)
-    document.querySelectorAll('.sort-btn').forEach(b => b.classList.remove('active'));
-    
-    // Remove active from all arrows
-    document.querySelectorAll('.arrow-up, .arrow-down').forEach(a => a.classList.remove('active'));
-    
-    // Add active to clicked arrow
-    const activeArrow = document.querySelector(`.arrow-up[data-field="${field}"][data-order="${order}"], .arrow-down[data-field="${field}"][data-order="${order}"]`);
-    if (activeArrow) {
-        activeArrow.classList.add('active');
-    }
-    
-    performSearch(state.currentPage);
-}
-
-// Pagination
-function displayPagination() {
-    const paginationDiv = document.getElementById('pagination');
-    
-    if (state.totalResults <= state.pageSize) {
-        paginationDiv.style.display = 'none';
-        return;
-    }
-    
-    paginationDiv.style.display = 'flex';
-    
-    const totalPages = Math.ceil(state.totalResults / state.pageSize);
-    const currentPage = state.currentPage;
-    
-    let html = `
-        <button class="page-btn" onclick="goToPage(${currentPage - 1})" 
-                ${currentPage === 1 ? 'disabled' : ''}>
-            ← Previous
-        </button>
-    `;
-    
-    // Page numbers
-    const maxVisible = 5;
-    let startPage = Math.max(1, currentPage - Math.floor(maxVisible / 2));
-    let endPage = Math.min(totalPages, startPage + maxVisible - 1);
-    
-    if (endPage - startPage < maxVisible - 1) {
-        startPage = Math.max(1, endPage - maxVisible + 1);
-    }
-    
-    if (startPage > 1) {
-        html += `<button class="page-btn" onclick="goToPage(1)">1</button>`;
-        if (startPage > 2) {
-            html += `<span class="page-info">...</span>`;
-        }
-    }
-    
-    for (let i = startPage; i <= endPage; i++) {
-        html += `
-            <button class="page-btn ${i === currentPage ? 'active' : ''}" 
-                    onclick="goToPage(${i})">
-                ${i}
-            </button>
-        `;
-    }
-    
-    if (endPage < totalPages) {
-        if (endPage < totalPages - 1) {
-            html += `<span class="page-info">...</span>`;
-        }
-        html += `<button class="page-btn" onclick="goToPage(${totalPages})">${totalPages}</button>`;
-    }
-    
-    html += `
-        <button class="page-btn" onclick="goToPage(${currentPage + 1})" 
-                ${currentPage === totalPages ? 'disabled' : ''}>
-            Next →
-        </button>
-    `;
-    
-    html += `
-        <span class="page-info">
-            Page ${currentPage} of ${totalPages} (${state.totalResults.toLocaleString()} results)
-        </span>
-    `;
-    
-    paginationDiv.innerHTML = html;
-}
-
-function goToPage(page) {
-    const totalPages = Math.ceil(state.totalResults / state.pageSize);
-    if (page < 1 || page > totalPages) return;
-    
-    performSearch(page);
-    
-    // Scroll to top
-    window.scrollTo({ top: 0, behavior: 'smooth' });
-}
-
-// Display debug info
-function displayDebugInfo(data) {
-    const debugInfoDiv = document.getElementById('debugInfo');
-    
-    if (!state.debug || !data.debug_info) {
-        // If debug mode is off or no debug info, show basic query info
-        if (data.query_info) {
-            let html = '<div style="padding: 10px;">';
-            html += `<div><strong>original_query:</strong> ${escapeHtml(data.query_info.original_query || 'N/A')}</div>`;
-            html += `<div><strong>detected_language:</strong> ${getLanguageName(data.query_info.detected_language)}</div>`;
-            html += '</div>';
-            debugInfoDiv.innerHTML = html;
-        } else {
-            debugInfoDiv.innerHTML = '';
-        }
-        return;
-    }
-    
-    // Display comprehensive debug info when debug mode is on
-    const debugInfo = data.debug_info;
-    let html = '<div style="padding: 10px; font-family: monospace; font-size: 12px;">';
-    
-    // Query Analysis
-    if (debugInfo.query_analysis) {
-        html += '<div style="margin-bottom: 15px;"><strong style="font-size: 14px;">Query Analysis:</strong>';
-        html += `<div>original_query: ${escapeHtml(debugInfo.query_analysis.original_query || 'N/A')}</div>`;
-        html += `<div>normalized_query: ${escapeHtml(debugInfo.query_analysis.normalized_query || 'N/A')}</div>`;
-        html += `<div>rewritten_query: ${escapeHtml(debugInfo.query_analysis.rewritten_query || 'N/A')}</div>`;
-        html += `<div>detected_language: ${getLanguageName(debugInfo.query_analysis.detected_language)}</div>`;
-        html += `<div>domain: ${escapeHtml(debugInfo.query_analysis.domain || 'default')}</div>`;
-        html += `<div>is_simple_query: ${debugInfo.query_analysis.is_simple_query ? 'yes' : 'no'}</div>`;
-        
-        if (debugInfo.query_analysis.translations && Object.keys(debugInfo.query_analysis.translations).length > 0) {
-            html += '<div>translations: ';
-            for (const [lang, translation] of Object.entries(debugInfo.query_analysis.translations)) {
-                if (translation) {
-                    html += `${getLanguageName(lang)}: ${escapeHtml(translation)}; `;
-                }
-            }
-            html += '</div>';
-        }
-        
-        if (debugInfo.query_analysis.boolean_ast) {
-            html += `<div>boolean_ast: ${escapeHtml(debugInfo.query_analysis.boolean_ast)}</div>`;
-        }
-        
-        html += `<div>has_vector: ${debugInfo.query_analysis.has_vector ? 'enabled' : 'disabled'}</div>`;
-        html += '</div>';
-    }
-    
-    // Feature Flags
-    if (debugInfo.feature_flags) {
-        html += '<div style="margin-bottom: 15px;"><strong style="font-size: 14px;">Feature Flags:</strong>';
-        html += `<div>translation_enabled: ${debugInfo.feature_flags.translation_enabled ? 'enabled' : 'disabled'}</div>`;
-        html += `<div>embedding_enabled: ${debugInfo.feature_flags.embedding_enabled ? 'enabled' : 'disabled'}</div>`;
-        html += `<div>rerank_enabled: ${debugInfo.feature_flags.rerank_enabled ? 'enabled' : 'disabled'}</div>`;
-        html += '</div>';
-    }
-    
-    // ES Response
-    if (debugInfo.es_response) {
-        html += '<div style="margin-bottom: 15px;"><strong style="font-size: 14px;">ES Response:</strong>';
-        html += `<div>took_ms: ${debugInfo.es_response.took_ms}ms</div>`;
-        html += `<div>total_hits: ${debugInfo.es_response.total_hits}</div>`;
-        html += `<div>max_score: ${debugInfo.es_response.max_score?.toFixed(3) || 0}</div>`;
-        html += '</div>';
-    }
-    
-    // Stage Timings
-    if (debugInfo.stage_timings) {
-        html += '<div style="margin-bottom: 15px;"><strong style="font-size: 14px;">Stage Timings:</strong>';
-        for (const [stage, duration] of Object.entries(debugInfo.stage_timings)) {
-            html += `<div>${stage}: ${duration.toFixed(2)}ms</div>`;
-        }
-        html += '</div>';
-    }
-    
-    // ES Query
-    if (debugInfo.es_query) {
-        html += '<div style="margin-bottom: 15px;"><strong style="font-size: 14px;">ES Query DSL:</strong>';
-        html += `<pre style="background: #f5f5f5; padding: 10px; overflow: auto; max-height: 400px;">${escapeHtml(JSON.stringify(debugInfo.es_query, null, 2))}</pre>`;
-        html += '</div>';
-    }
-    
-    html += '</div>';
-    debugInfoDiv.innerHTML = html;
-}
-
-// Helper functions
-function escapeHtml(text) {
-    if (!text) return '';
-    const div = document.createElement('div');
-    div.textContent = text;
-    return div.innerHTML;
-}
-
-function escapeAttr(text) {
-    if (!text) return '';
-    return text.replace(/'/g, "\\'").replace(/"/g, '&quot;');
-}
-
-function formatDate(dateStr) {
-    if (!dateStr) return '';
-    try {
-        const date = new Date(dateStr);
-        return date.toLocaleDateString('zh-CN');
-    } catch {
-        return dateStr;
-    }
-}
-
-function getLanguageName(code) {
-    const names = {
-        'zh': '中文',
-        'en': 'English',
-        'ru': 'Русский',
-        'ar': 'العربية',
-        'ja': '日本語',
-        'unknown': 'Unknown'
-    };
-    return names[code] || code;
-}
@@ -373,33 +373,58 @@ class ESQueryBuilder:
                                 }
                             })
                     elif isinstance(value, list):
-                        # 多个规格过滤（OR逻辑）：[{"name": "color", "value": "green"}, ...]
-                        should_clauses = []
+                        # 多个规格过滤：按 name 分组，相同维度 OR，不同维度 AND
+                        # 例如：[{"name": "size", "value": "3"}, {"name": "size", "value": "4"}, {"name": "color", "value": "green"}]
+                        # 应该生成：(size=3 OR size=4) AND color=green
+                        from collections import defaultdict
+                        specs_by_name = defaultdict(list)
                         for spec in value:
                             if isinstance(spec, dict):
                                 name = spec.get("name")
                                 spec_value = spec.get("value")
                                 if name and spec_value:
-                                    should_clauses.append({
-                                        "nested": {
-                                            "path": "specifications",
-                                            "query": {
-                                                "bool": {
-                                                    "must": [
-                                                        {"term": {"specifications.name": name}},
-                                                        {"term": {"specifications.value": spec_value}}
-                                                    ]
-                                                }
+                                    specs_by_name[name].append(spec_value)
+                        
+                        # 为每个 name 维度生成一个过滤子句
+                        for name, values in specs_by_name.items():
+                            if len(values) == 1:
+                                # 单个值，直接生成 term 查询
+                                filter_clauses.append({
+                                    "nested": {
+                                        "path": "specifications",
+                                        "query": {
+                                            "bool": {
+                                                "must": [
+                                                    {"term": {"specifications.name": name}},
+                                                    {"term": {"specifications.value": values[0]}}
+                                                ]
                                             }
                                         }
+                                    }
+                                })
+                            else:
+                                # 多个值，使用 should (OR) 连接
+                                should_clauses = []
+                                for spec_value in values:
+                                    should_clauses.append({
+                                        "bool": {
+                                            "must": [
+                                                {"term": {"specifications.name": name}},
+                                                {"term": {"specifications.value": spec_value}}
+                                            ]
+                                        }
                                     })
-                        if should_clauses:
-                            filter_clauses.append({
-                                "bool": {
-                                    "should": should_clauses,
-                                    "minimum_should_match": 1
-                                }
-                            })
+                                filter_clauses.append({
+                                    "nested": {
+                                        "path": "specifications",
+                                        "query": {
+                                            "bool": {
+                                                "should": should_clauses,
+                                                "minimum_should_match": 1
+                                            }
+                                        }
+                                    }
+                                })
                     continue
                 # 普通字段过滤