app/components/pages/search/SearchResultCard.vue

@@ -6,9 +6,12 @@
         <p v-if="item.summary" class="result-summary">
           {{ item.summary }}
         </p>
-        <p v-if="item.type" class="result-type">
+        <p v-if="item.sectionType" class="result-type">
           <span>{{ $t('search.section') }}: </span>
           <span class="result-type-name">{{ typeLabel }}</span>
+          <span v-if="item.type" class="result-type-name"
+            >({{ item.type }})</span
+          >
         </p>
       </el-col>
       <el-col :span="12" class="image-col">

app/components/pages/search/SearchResults.vue

@@ -3,10 +3,13 @@
     <div class="search-results">
       <NuxtLink
         v-for="hit in paginatedHits"
-        :key="`${hit.type}-${hit.id}`"
+        :key="`${hit.sectionType}-${hit.id}`"
         :to="localePath(resolveHitLink(hit))"
       >
-        <search-result-card :item="hit" :type-label="getIndexLabel(hit.type)" />
+        <search-result-card
+          :item="hit"
+          :type-label="getIndexLabel(hit.sectionType)"
+        />
       </NuxtLink>
     </div>
 
@@ -63,7 +66,7 @@
   const items = props.searchItems;
   const filteredHits = computed(() => {
     if (props.category) {
-      return items.filter((item) => item.type === props.category);
+      return items.filter((item) => item.sectionType === props.category);
     } else {
       return items;
     }
@@ -107,19 +110,19 @@
 
     const slug = String(slugCandidate);
 
-    if (item.type === 'product') {
+    if (item.sectionType === 'product') {
       return localePath({ path: `/products/${slug}` });
     }
 
-    if (item.type === 'solution') {
+    if (item.sectionType === 'solution') {
       return localePath({ path: `/solutions/${slug}` });
     }
 
-    if (item.type === 'document') {
+    if (item.sectionType === 'document') {
       return localePath({ path: `/download/${slug}` });
     }
 
-    if (item.type === 'question') {
+    if (item.sectionType === 'question') {
       return localePath({ path: `/support/faq`, query: { focus: slug } });
     }
 

app/components/pages/search/SearchTabs.vue

@@ -32,7 +32,7 @@
   const resultCount = computed(() => {
     const map: Record<string, number> = { all: props.searchItems.length };
     for (const item of props.searchItems) {
-      map[item.type] = (map[item.type] ?? 0) + 1;
+      map[item.sectionType] = (map[item.sectionType] ?? 0) + 1;
     }
     return map;
   });

server/utils/search-converters.test.ts

@@ -17,9 +17,10 @@ describe('converters', () => {
     const result = converters.products(item);
     expect(result).toEqual({
       id: 1,
-      type: 'product',
+      sectionType: 'product',
       title: 'Hydraulic Pump',
       summary: 'High efficiency',
+      type: 'pump',
       thumbnail: '/api/assets/rand-om__-uuid-1234',
     });
   });
@@ -36,9 +37,10 @@ describe('converters', () => {
     const result = converters.solutions(item);
     expect(result).toEqual({
       id: 1,
-      type: 'solution',
+      sectionType: 'solution',
       title: 'Solution A',
       summary: 'Effective solution',
+      type: 'Type A',
       thumbnail: '/api/assets/rand-om__-uuid-5678',
     });
   });
@@ -51,13 +53,15 @@ describe('converters', () => {
         'This is a detailed explanation of how to use the product effectively.',
       products: ['Product A'],
       product_types: ['Type A'],
+      type: 'Question Type',
     };
     const result = converters.questions(item);
     expect(result).toEqual({
       id: 1,
       title: 'How to use product?',
-      summary: '',
-      type: 'question',
+      summary: undefined,
+      type: 'Question Type',
+      sectionType: 'question',
     });
   });
 
@@ -68,13 +72,15 @@ describe('converters', () => {
       products: ['Product A'],
       product_types: ['Type A'],
       fileUUID: 'TEST-UUID',
+      type: 'manual',
     };
     const result = converters.product_documents(item);
     expect(result).toEqual({
       id: 'TEST-UUID',
       title: 'User Manual',
-      summary: '',
-      type: 'document',
+      summary: undefined,
+      sectionType: 'document',
+      type: 'manual',
     });
   });
 });

server/utils/search-converters.ts

@@ -6,33 +6,35 @@ export const converters: {
 } = {
   products: (item: MeiliIndexMap['products']): SearchItemView => ({
     id: item.id,
-    type: 'product',
+    sectionType: 'product',
     title: item.name,
-    summary: item?.summary ?? '',
+    summary: item?.summary,
+    type: item?.type,
     thumbnail: item?.cover ? `/api/assets/${item.cover}` : undefined,
   }),
 
   solutions: (item: MeiliIndexMap['solutions']): SearchItemView => ({
     id: item.id,
-    type: 'solution',
+    sectionType: 'solution',
     title: item.title,
-    summary: item?.summary ?? '',
+    summary: item?.summary,
+    type: item?.type,
     thumbnail: item?.cover ? `/api/assets/${item.cover}` : undefined,
   }),
 
   questions: (item: MeiliIndexMap['questions']): SearchItemView => ({
     id: item.id,
-    type: 'question',
+    sectionType: 'question',
     title: item.title,
-    summary: '',
+    type: item?.type,
   }),
 
   product_documents: (
     item: MeiliIndexMap['product_documents']
   ): SearchItemView => ({
     id: item.fileUUID || item.id,
-    type: 'document',
+    sectionType: 'document',
     title: item.title,
-    summary: '',
+    type: item?.type,
   }),
 };

shared/types/meilisearch/meili-index.ts

@@ -57,6 +57,9 @@ export interface MeiliQuestionIndex {
   /** 问题内容 **/
   content?: string;
 
+  /** 问题类型 **/
+  type?: string;
+
   /** 相关产品 **/
   products: string[];
 
@@ -74,6 +77,9 @@ export interface MeiliProductDocumentIndex {
   /** 文档标题 **/
   title: string;
 
+  /** 文档类型 **/
+  type?: string;
+
   /** 相关产品 **/
   products: string[];
 

shared/types/views/search-item-view.ts

@@ -3,13 +3,16 @@ export interface SearchItemView {
   id: number | string;
 
   /** 条目类型 **/
-  type: 'product' | 'solution' | 'question' | 'document';
+  sectionType: 'product' | 'solution' | 'question' | 'document';
 
   /** 条目标题 **/
   title: string;
 
   /** 条目摘要 **/
-  summary: string;
+  summary?: string;
+
+  /** 条目分类 **/
+  type?: string;
 
   /** 条目预览图 **/
   thumbnail?: string;