From 890adec7fddfe9d5f5da4511343ac6e8341d46b3 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期一, 16 十二月 2024 10:34:41 +0800
Subject: [PATCH] 可改变大小

---
 src/hooks/useQueryTable.ts |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/hooks/useQueryTable.ts b/src/hooks/useQueryTable.ts
index 34d0a6e..c768863 100644
--- a/src/hooks/useQueryTable.ts
+++ b/src/hooks/useQueryTable.ts
@@ -10,6 +10,7 @@
  * @param restoreOrigin
  * @param isTree 鏄惁鏄� ParentID 鏋勫缓鏍戠殑鏁扮粍
  * @param isChildTree 鏄惁鏄� Children 鏋勫缓鐨勬爲鐨勬暟缁�
+ * @param filterFunc 棰濆杩囨护鏉′欢
  * @returns
  */
 export const useQueryTable = (
@@ -17,7 +18,8 @@
 	queryParams: Ref<Object>,
 	restoreOrigin: () => void | Promise<void>,
 	isTree?: Boolean,
-	isChildTree = false
+	isChildTree = false,
+	filterFunc?:(key:string,item,queryStr:string)=>boolean
 ) => {
 	const displayTableData = ref(null as any[]);
 
@@ -33,7 +35,8 @@
 	};
 
 	const handleQueryTable = () => {
-		if (checkQueryParamsIsEmpty()) {
+		const isEmpty = checkQueryParamsIsEmpty();
+		if (isEmpty) {
 			return restoreOrigin();
 		}
 		const convertData = isChildTree ? flatten(tableData.value) : tableData.value;
@@ -49,7 +52,7 @@
 				const toSearchStr = String(item[key]).toLowerCase();
 				const searchStr = queryStr.trim().toLowerCase();
 				const isMatch = toSearchStr.includes(searchStr);
-				return isMatch
+				return isMatch || filterFunc?.(key,item,queryStr);
 			});
 		});
 		displayTableData.value = filterTableData;
@@ -64,7 +67,7 @@
 		  };
 
 	const checkQueryParamsIsEmpty = () => {
-		return Object.values(queryParams.value).every((objectValue) => objectValue === '' || objectValue === null);
+		return Object.values(queryParams.value).every((objectValue) => objectValue === '' || objectValue === null || objectValue===undefined);
 	};
 
 	watch(

--
Gitblit v1.9.3