From 7c701899b2ecc165dcf0b87ef57aa451b20025cc Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 22 Mar 2024 16:43:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=BB=98=E8=AE=A4=E5=B1=95=E7=A4=BA10?=
 =?UTF-8?q?=E4=B8=AA=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=94=AF=E6=8C=81=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E6=BB=9A=E5=8A=A8=E5=B1=95=E7=A4=BA=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=EF=BC=9B=E7=82=B9=E5=87=BB=E6=94=B6?=
 =?UTF-8?q?=E8=97=8F=E6=95=B0=E6=8D=AE=E8=AF=A5=E6=95=B0=E6=8D=AE=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E7=BD=AE=E9=A1=B6=EF=BC=9B=E6=9C=AA=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E7=9A=84=E5=8F=AF=E6=8B=96=E6=9B=B3=E5=8F=98=E6=9B=B4=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E5=B7=B2=E6=94=B6=E8=97=8F=E7=9A=84=E6=8C=89?=
 =?UTF-8?q?=E4=BB=8E=E6=94=B6=E8=97=8F=E6=97=B6=E9=97=B4=E4=BB=8E=E6=97=A9?=
 =?UTF-8?q?=E5=88=B0=E6=99=9A=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/aside/comp/AdvanceFilter.vue | 38 +++++++++++++++++----
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index f6f5c52..f9dc8d2 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup>
-import { favorite, getConditionList, unfavorite,sort } from "@/api/home/filter";
+import { favorite, getConditionList, unfavorite, sort } from "@/api/home/filter";
 import { asideMap } from "@/config/aside";
 import { useInfiniteScroll } from "@vueuse/core";
 import { debounce } from "lodash-es";
 import { onMounted, reactive, ref, watch } from "vue";
 import type { FilterSearchParam } from "/#/api";
 import type { Filter, FilterEntity } from "/#/home";
-import { VueDraggable } from 'vue-draggable-plus'
+import { VueDraggable } from "vue-draggable-plus";
 
 defineOptions({ name: "AdvanceFilter" });
 
@@ -74,7 +74,6 @@ useInfiniteScroll(
   { distance: 10, interval: 300, canLoadMore: () => false }
 );
 const showClick = () => {
-  console.log("showClick");
   inputHandler("");
 };
 
@@ -110,7 +109,7 @@ async function featchList() {
 // 转换服务器数据格式
 function generateFilterEntityList(data) {
   const filterEntityList = data.map((item) => {
-    const { searchname, iztop, ocrUsersearchchildList, id } = item;
+    const { searchname, iztop, ocrUsersearchchildList, id, reorder } = item;
 
     const list = ocrUsersearchchildList.map((item) => {
       const { searchfield, searchvalue } = item;
@@ -133,6 +132,7 @@ function generateFilterEntityList(data) {
       favorite: iztop,
       isDefaultFilter: false,
       filterList: list,
+      reorder,
     };
   });
 
@@ -145,6 +145,11 @@ function selectHandler(item: FilterEntity) {
 }
 
 const inputHandler = debounce((word) => {
+  if (word) {
+    pagination.pageSize = 300;
+  } else {
+    pagination.pageSize = 10;
+  }
   keyword.value = word;
   featchList().then((list) => {
     let dataArr: FilterEntity[] = [];
@@ -157,8 +162,12 @@ const inputHandler = debounce((word) => {
         unDataArr.push(item);
       }
     });
-    data.value = dataArr;
-    unData.value = unDataArr;
+    data.value = dataArr.sort(
+      (a, b) => Number((a as any).reorder) - Number((b as any).reorder)
+    );
+    unData.value = unDataArr.sort(
+      (a, b) => Number((a as any).reorder) - Number((b as any).reorder)
+    );
   });
 }, 300);
 
@@ -171,6 +180,15 @@ function favoriteHandler(event: MouseEvent, item: any) {
   if (!isDefaultFilter) {
     item.favorite = true;
     favorite(id);
+    data.value.map((v, index) => {
+      if (v.id == id) {
+        sort(v.id, 0);
+      } else {
+        sort(v.id, index + 1);
+      }
+    });
+
+    inputHandler(keyword.value);
   }
 }
 
@@ -183,8 +201,15 @@ function unFavoriteHandler(event: MouseEvent, item) {
   if (!isDefaultFilter) {
     item.favorite = false;
     unfavorite(id);
+    inputHandler(keyword.value);
   }
 }
+
+const moveEnd = () => {
+  unData.value.map((v, index) => {
+    sort(v.id, index);
+  });
+};
 </script>
 
 <template>
@@ -248,6 +273,7 @@ function unFavoriteHandler(event: MouseEvent, item) {
                 <div v-html="item.name" />
               </li>
               <VueDraggable
+                @end="moveEnd"
                 v-model="unData"
                 filter=".draggable-li[draggable='false']"
                 class="draggable-ul"