From 3e25a756e2021d593809f1fdccc7ccea3f59467f Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 24 Mar 2024 13:12:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9C=AA=E5=AE=8C=E6=88=90=20=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E6=8C=89=E7=85=A7=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=20=202594=20=E3=80=90AI=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E6=9F=A5=E9=87=8D--=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E3=80=91=E6=9C=89=E5=A4=9A=E6=9D=A1=E6=94=B6=E8=97=8F=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=97=B6=EF=BC=8C=E6=8E=92=E5=BA=8F=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E6=97=B6=E9=97=B4=E4=BB=8E=E6=97=A9=E5=88=B0?=
 =?UTF-8?q?=E6=99=9A=E6=8E=92=E5=88=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/aside/comp/AdvanceFilter.vue | 17 +++--------------
 types/home.d.ts                             |  2 ++
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index e7f5ef0..9e8bf2c 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -134,27 +134,16 @@ function generateFilterEntityList(data) {
       isDefaultFilter: false,
       filterList: list,
       reorder,
+      searchname
     };
   });
 
   return filterEntityList;
 }
-/**
- * 提取服务器返回 HTML 中文字内容，进行拼接
- * @param {string} str 包含 HTML 标签的字符串，例如 "<span style='color:#FF0000'></span>1<span style='color:#FF0000'></span>"
- * @returns {string} 返回拼接后的不包含 HTML 标签的字符串，例如 "11"
- */
-function extractTextFromHTML(str) {
-  // 定义正则表达式匹配模式
-  const regex = /<span style='color:#FF0000'><\/span>|<span style='color:#FF0000'>(.*?)<\/span>/g;
-  // 使用正则表达式的 replace 方法进行匹配和替换
-  const result = str.replace(regex, '');
-  return result;
-}
 
 function selectHandler(item: FilterEntity) {
   (popover.value as any).setShow(false);
-  currentlySelectedAdvanced.value = extractTextFromHTML(item.name)
+  currentlySelectedAdvanced.value = item.searchname
   emit("select", item.id);
 }
 
@@ -177,7 +166,7 @@ const inputHandler = debounce((word) => {
       }
     });
     data.value = dataArr.sort(
-      (a, b) => Number((a as any).reorder) - Number((b as any).reorder)
+      (a, b) => Number(new Date(a.createtime)) - Number(new Date(b.createtime))
     );
     unData.value = unDataArr.sort(
       (a, b) => Number((a as any).reorder) - Number((b as any).reorder)
diff --git a/types/home.d.ts b/types/home.d.ts
index a960b57..92643d0 100644
--- a/types/home.d.ts
+++ b/types/home.d.ts
@@ -8,6 +8,8 @@ export interface Filter {
 export interface FilterEntity {
   id: string
   name: string // 过滤名称
+  createtime: string // 创建时间
+  searchname: string // 搜索名称
   favorite: boolean// 是否收藏
   isDefaultFilter: boolean// 默认筛选
   filterList: Filter[] // 过滤项列表