From 191c4fc15ff4590c12f52e72b2a7ef90a0371417 Mon Sep 17 00:00:00 2001
From: Wardenjohn <ydjohn@linux.alibaba.com>
Date: Fri, 22 Mar 2024 13:58:48 +0800
Subject: [PATCH] (feat)Add filter to hotfix description with fuzzy search

---
 sysom_server/sysom_hotfix/apps/hotfix/filters.py       | 7 ++++---
 sysom_web/src/pages/hotfix/Released/index.jsx          | 2 +-
 sysom_web/src/pages/hotfix/components/CustomDetail.jsx | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sysom_server/sysom_hotfix/apps/hotfix/filters.py b/sysom_server/sysom_hotfix/apps/hotfix/filters.py
index 07730858..990a12ec 100644
--- a/sysom_server/sysom_hotfix/apps/hotfix/filters.py
+++ b/sysom_server/sysom_hotfix/apps/hotfix/filters.py
@@ -6,14 +6,15 @@
 @Description: hotfix released list filter
 '''
 
-from django_filters.rest_framework import FilterSet, DateTimeFilter
+from django_filters.rest_framework import FilterSet, DateTimeFilter, CharFilter
 from .models import ReleasedHotfixListModule
 
 
 class HotfixReleasedFilter(FilterSet):
     released_start_time = DateTimeFilter(field_name='released_time', lookup_expr='gte')
     released_end_time = DateTimeFilter(field_name='released_time', lookup_expr='lte')
-    
+    description = CharFilter(field_name='description', lookup_expr='icontains')
+
     class Meta:
         model = ReleasedHotfixListModule
-        fields = ['hotfix_id', 'released_kernel_version', 'serious', 'fix_system']
+        fields = ['hotfix_id', 'released_kernel_version', 'serious', 'fix_system', 'description']
diff --git a/sysom_web/src/pages/hotfix/Released/index.jsx b/sysom_web/src/pages/hotfix/Released/index.jsx
index 4fd34fa5..2b83710d 100644
--- a/sysom_web/src/pages/hotfix/Released/index.jsx
+++ b/sysom_web/src/pages/hotfix/Released/index.jsx
@@ -71,7 +71,7 @@ const Released = () => {
         id: 'pages.hotfix.tooltips.description',
         defaultMessage: 'Descrption of the released hotfix',
       }),
-      search: false,
+      search: true,
       render: (_, record) => {
         return <CustomDetail
           tableText={record.description}
diff --git a/sysom_web/src/pages/hotfix/components/CustomDetail.jsx b/sysom_web/src/pages/hotfix/components/CustomDetail.jsx
index cca00ce2..6386d151 100644
--- a/sysom_web/src/pages/hotfix/components/CustomDetail.jsx
+++ b/sysom_web/src/pages/hotfix/components/CustomDetail.jsx
@@ -29,9 +29,9 @@ const CustomDetail = (props) => {
             onCancel={closeDetailModalEvent}
             footer={null}
         >
-            <p>
+            <pre>
                 { detail.length >0 ? detail : <Empty description={"暂无内容"} /> }
-            </p>
+            </pre>
         </Modal>
     </>)
 }
-- 
Gitee