From 348d23f72cc433d68ea2e9f9d5fe02bfa4aac9c7 Mon Sep 17 00:00:00 2001
From: callmeyan <yaclty2@gmail.com>
Date: Mon, 23 Dec 2024 10:37:22 +0800
Subject: [PATCH] fixed ts build error

---
 src/components/form/tag-select.tsx                | 2 +-
 src/components/scoller/infinite-scroller.tsx      | 4 ++--
 src/pages/live/index.tsx                          | 6 +++++-
 src/pages/news/components/button-delete-batch.tsx | 2 +-
 src/pages/news/components/button-push2video.tsx   | 1 -
 src/pages/news/components/edit-search-form.tsx    | 2 +-
 src/pages/news/components/search-panel.tsx        | 3 +--
 src/pages/video/components/button-push2room.tsx   | 1 -
 src/routes/layout/dashboard-navigation.tsx        | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/components/form/tag-select.tsx b/src/components/form/tag-select.tsx
index be41ad6..32ce172 100644
--- a/src/components/form/tag-select.tsx
+++ b/src/components/form/tag-select.tsx
@@ -16,7 +16,7 @@ const TagSelect = (props: {
 	const allValues = useMemo(()=>{
 		const values:Id[][] = []
 		props.options.forEach(item=>{
-			if(item && item.children?.length > 0){
+			if(item && item.children?.length){
 				// eslint-disable-next-line no-unsafe-optional-chaining
 				values.push(...(item.children?.map(c => [item.value, c.value])))
 			}
diff --git a/src/components/scoller/infinite-scroller.tsx b/src/components/scoller/infinite-scroller.tsx
index 288c46a..c6ed587 100644
--- a/src/components/scoller/infinite-scroller.tsx
+++ b/src/components/scoller/infinite-scroller.tsx
@@ -10,7 +10,7 @@ export type InfiniteScrollerProps = {
 	rootClassName?: string;
 	style?: CSSProperties;
 	loadingPlaceholder?: React.ReactNode;
-	onCallback: (page: number, prevPage) => void;
+	onCallback?: (page: number, prevPage) => void;
 	onScroll?: (top: number) => void;
 	empty?: React.ReactNode;
 	loading?: boolean;
@@ -53,7 +53,7 @@ const InfiniteScroller = React.forwardRef<InfiniteScrollerRef, InfiniteScrollerP
 			const maxPage = Math.ceil((pagination.total || 0) / pagination.limit)
 			const currentPage = pagination.page
 			if (maxPage > currentPage) {
-				props.onCallback(currentPage + 1, currentPage)
+				props.onCallback?.(currentPage + 1, currentPage)
 			}
 		}
 	}, [inView])
diff --git a/src/pages/live/index.tsx b/src/pages/live/index.tsx
index 55a56f7..1858b65 100644
--- a/src/pages/live/index.tsx
+++ b/src/pages/live/index.tsx
@@ -222,7 +222,11 @@ export default function LiveIndex() {
 				</div>
 				<div className="">
 					<div className="live-video-list-sort-container ">
-						<InfiniteScroller ref={scrollerRef} onScroll={top => setState({showToTop: top > 30})}>
+						<InfiniteScroller
+							ref={scrollerRef}
+							onScroll={top => setState({showToTop: top > 30})}
+							onCallback={()=>{}}
+						>
 							<div className="sort-list-container flex-1">
 								<DndContext onDragEnd={(e) => {
 									const {active, over} = e;
diff --git a/src/pages/news/components/button-delete-batch.tsx b/src/pages/news/components/button-delete-batch.tsx
index 14912b9..6168c9e 100644
--- a/src/pages/news/components/button-delete-batch.tsx
+++ b/src/pages/news/components/button-delete-batch.tsx
@@ -5,7 +5,7 @@ import {push2article} from "@/service/api/news.ts";
 import {IconDelete} from "@/components/icons";
 import {useNavigate} from "react-router-dom";
 
-export default function ButtonDeleteBatch(props: { ids: Id[]; }) {
+export default function ButtonDeleteBatch(props: { ids: Id[];onSuccess?: () => void; }) {
 	const {modal} = App.useApp();
 	const [loading, setLoading] = useState(false)
 	const navigate = useNavigate();
diff --git a/src/pages/news/components/button-push2video.tsx b/src/pages/news/components/button-push2video.tsx
index bb42ca1..ce7377b 100644
--- a/src/pages/news/components/button-push2video.tsx
+++ b/src/pages/news/components/button-push2video.tsx
@@ -31,7 +31,6 @@ export default function ButtonPush2Video(props: { ids: Id[]; onSuccess?: () => v
 	return (
 		<div>
 			<button
-				type="primary"
 				disabled={loading}
 				className='bg-[#4096ff] hover:bg-blue-600 text-white'
 				onClick={onPushClick}
diff --git a/src/pages/news/components/edit-search-form.tsx b/src/pages/news/components/edit-search-form.tsx
index 6550741..1fad308 100644
--- a/src/pages/news/components/edit-search-form.tsx
+++ b/src/pages/news/components/edit-search-form.tsx
@@ -54,7 +54,7 @@ export default function EditSearchForm(props: {
 				type="text" className="rounded-3xl px-3 w-[270px]"
 				prefix={<SearchOutlined/>}
 				placeholder="请输入新闻标题关键词进行搜索"
-				onPressEnter={handleSubmit}
+				onPressEnter={()=>handleSubmit()}
 			/>
 			{/*<span className="ml-5 text-sm">来源</span>*/}
 			{/*<ArticleCascader*/}
diff --git a/src/pages/news/components/search-panel.tsx b/src/pages/news/components/search-panel.tsx
index fd5b615..76053d6 100644
--- a/src/pages/news/components/search-panel.tsx
+++ b/src/pages/news/components/search-panel.tsx
@@ -83,7 +83,7 @@ export default function SearchPanel({onSearch}: SearchPanelProps) {
 		if (tags?.length > 0) {
 			const pinnedList = pinnedTag && pinnedTag?.length > 0 ? pinnedTag : tags.map(s => s.value)
 			return pinnedList.filter(it => tags.findIndex(s => s.value == it) != -1)
-				.sort((a, b) => a - b)
+				.sort((a, b) => Number(a) - Number(b))
 				.map(it => (tags.find(s => s.value == it) as OptionItem))
 		}
 		return [] as OptionItem[];
@@ -99,7 +99,6 @@ export default function SearchPanel({onSearch}: SearchPanelProps) {
 					placeholder={'请输入新闻标题关键词进行搜索'}
 					onPressEnter={onFinish}
 					onBlur={onFinish}
-					shape="round"
 					prefix={<SearchOutlined/>}
 				/>
 				<TimeSelect
diff --git a/src/pages/video/components/button-push2room.tsx b/src/pages/video/components/button-push2room.tsx
index eb91d88..7fa2992 100644
--- a/src/pages/video/components/button-push2room.tsx
+++ b/src/pages/video/components/button-push2room.tsx
@@ -38,7 +38,6 @@ export default function ButtonPush2Room(props: { ids: Id[]; list: VideoInfo[];on
 
 		<div>
 			<button
-				type="primary"
 				disabled={loading}
 				className='bg-[#4096ff] hover:bg-blue-600 text-white'
 				onClick={onPushClick}
diff --git a/src/routes/layout/dashboard-navigation.tsx b/src/routes/layout/dashboard-navigation.tsx
index 2c0ff03..e15686a 100644
--- a/src/routes/layout/dashboard-navigation.tsx
+++ b/src/routes/layout/dashboard-navigation.tsx
@@ -42,7 +42,7 @@ export function DashboardNavigation() {
 			{NavItems.map((it, idx) => (<div key={idx} className={"flex items-center"}>
 				{user ? <NavLink to={it.path} className={clsx('nav-item cursor-pointer items-center')}>
 					<span className="menu-text ml-2">{it.name}</span>
-				</NavLink> : <div to={it.path} className={clsx('nav-item cursor-pointer items-center')}>
+				</NavLink> : <div className={clsx('nav-item cursor-pointer items-center')}>
 					<span className="menu-text ml-2">{it.name}</span>
 				</div>}
 				{idx !== NavItems.length - 1 && <IconNavigationArrow className="ml-2" />}