From 0aa90b54d9919a27abca9f84bd649385456cd473 Mon Sep 17 00:00:00 2001
From: sijinhui <sijinhui@qq.com>
Date: Sat, 31 Aug 2024 21:17:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                 |  6 +++---
 app/app/(admin)/components/users-table.tsx | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4a8db0f10..327739ecd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ WORKDIR /app
 COPY . .
 COPY --from=deps /app/node_modules ./node_modules
 # 避免下面那个报错
-RUN mkdir -p "/app/node_modules/tiktoken" && mkdir -p "/app/node_modules/sharp"
+# RUN mkdir -p "/app/node_modules/tiktoken" && mkdir -p "/app/node_modules/sharp"
 # RUN yarn add sharp
 # ENV NEXT_SHARP_PATH /app/node_modules/sharp
 RUN yarn build
@@ -46,9 +46,9 @@ RUN rm -f .env
 ENV HOSTNAME=""
 ENV PORT=23000
 EXPOSE 23000
-EXPOSE 23001
+# EXPOSE 23001
 ENV KEEP_ALIVE_TIMEOUT=30
-ENV NEXT_SHARP_PATH /app/node_modules/sharp
+# ENV NEXT_SHARP_PATH /app/node_modules/sharp
 
 CMD wget -qO- myip.ipip.net ; if [ -n "$PROXY_URL" ]; then \
     export HOSTNAME="0.0.0.0"; \
diff --git a/app/app/(admin)/components/users-table.tsx b/app/app/(admin)/components/users-table.tsx
index 35f27e535..2cb8bcc4c 100644
--- a/app/app/(admin)/components/users-table.tsx
+++ b/app/app/(admin)/components/users-table.tsx
@@ -41,9 +41,12 @@ interface SearchTextProps {
 
 function UserTableSearchInput({ users, setUsers, setLoading }: UserInterface) {
   const [searchText, setSearchText] = useState("");
+  const [searchTrigger, setSearchTrigger] = useState(0); // 新增状态变量
+
   // 这里直接搜索，并获取数据不传递搜索的值给表格了。
   const onSearch: SearchProps["onSearch"] = (value, _e, info) => {
     setSearchText(value);
+    setSearchTrigger((prev) => prev + 1); // 更新 searchTrigger 以触发 useEffect
   };
 
   useEffect(() => {
@@ -57,18 +60,17 @@ function UserTableSearchInput({ users, setUsers, setLoading }: UserInterface) {
         if (response.ok) {
           const data = await response.json();
           setUsers(data["results"]);
-          setLoading(false);
         }
       } catch (e) {
-        setLoading(false);
         console.log("fetch user error: ", e);
       }
     };
 
-    fetchUsers();
-    // console.log(users, "users1");
+    fetchUsers().finally(() => {
+      setLoading(false); // 清理状态
+    });
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [searchText]);
+  }, [searchText, searchTrigger]);
 
   return (
     <Search