From f92523c333fb9a6f4baa66329f577148bf13cf1a Mon Sep 17 00:00:00 2001
From: callmeyan <yaclty2@gmail.com>
Date: Sun, 22 Dec 2024 23:11:17 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=85=A8=E9=80=89=E9=80=BB=E8=BE=91,?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/button-batch.tsx                |  1 +
 src/components/form/tag-select.tsx             | 18 ++++++++++++++++--
 .../news/components/button-delete-batch.tsx    |  3 ++-
 .../components/button-push-news2article.tsx    |  3 ++-
 .../news/components/button-push2video.tsx      |  3 ++-
 src/pages/news/components/edit-search-form.tsx | 17 ++++++++++++-----
 src/pages/news/edit.tsx                        |  2 +-
 .../video/components/button-push2room.tsx      |  1 +
 src/routes/layout/dashboard-layout.tsx         |  4 ++--
 9 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/src/components/button-batch.tsx b/src/components/button-batch.tsx
index 1df5ab6..12bc966 100644
--- a/src/components/button-batch.tsx
+++ b/src/components/button-batch.tsx
@@ -41,6 +41,7 @@ export default function ButtonBatch(
 		}
 	}
 	const handleBtnClick = () => {
+		if(loading) return;
 		if (selected.length == 0) {
 			showToast(emptyMessage, 'warning')
 			return;
diff --git a/src/components/form/tag-select.tsx b/src/components/form/tag-select.tsx
index 68a688f..be41ad6 100644
--- a/src/components/form/tag-select.tsx
+++ b/src/components/form/tag-select.tsx
@@ -3,12 +3,14 @@ import {Checkbox, Popover} from "antd";
 import {useBoolean, useClickAway} from "ahooks";
 import {CaretUpOutlined} from "@ant-design/icons";
 
+type ValueType = Id[][];
+type ValueFunc = (prev:ValueType)=>ValueType;
 const TagSelect = (props: {
 	options: OptionItem[];
 	onChange: (values: Id[][]) => void;
 	className?: string;
 }) => {
-	const [selectValues, _setSelectValues] = React.useState<Id[][]>([])
+	const [selectValues, __setSelectValues] = React.useState<ValueType>([])
 	const [checkedAll, _setCheckedAll] = React.useState<boolean>(false)
 	const [visible, {set}] = useBoolean(false);
 	const allValues = useMemo(()=>{
@@ -21,6 +23,18 @@ const TagSelect = (props: {
 		})
 		return values
 	},[props.options])
+	const _setSelectValues = (values: (ValueType | ValueFunc)) => {
+		if(typeof values == 'function'){
+			__setSelectValues((prev)=>{
+				const data = values(prev);
+				props.onChange(data)
+				return data
+			})
+		}else{
+			__setSelectValues(values)
+			props.onChange(values)
+		}
+	}
 	const handleAllChanged = (checked: boolean) => {
 		_setCheckedAll(checked)
 		const values:Id[][] = []
@@ -99,7 +113,7 @@ const TagSelect = (props: {
 				     set(!visible)
 			     }}
 			>
-				<span>{checkedAll ? '全部来源' : '来源'}</span>
+				<span>{checkedAll || selectValues.length == 0 ? '全部来源' : '来源'}</span>
 				<CaretUpOutlined className={`ml-2 arrow-icon ${visible ? 'rotate-0' : 'rotate-180'}`}/>
 			</div>
 			<div className={`options-list-container absolute ${visible ? 'block' : 'hidden'}`}>
diff --git a/src/pages/news/components/button-delete-batch.tsx b/src/pages/news/components/button-delete-batch.tsx
index 63b67ea..14912b9 100644
--- a/src/pages/news/components/button-delete-batch.tsx
+++ b/src/pages/news/components/button-delete-batch.tsx
@@ -21,6 +21,7 @@ export default function ButtonDeleteBatch(props: { ids: Id[]; }) {
 		})
 	}
 	const onPushClick = () => {
+		if(loading) return;
 		if (props.ids.length === 0) {
 			showToast('请选择要删除的新闻', 'warning')
 			return
@@ -35,7 +36,7 @@ export default function ButtonDeleteBatch(props: { ids: Id[]; }) {
 	return (
 		<div>
 			<button
-				loading={loading}
+				disabled={loading}
 				onClick={onPushClick}
 				className='bg-gray-300 hover:bg-gray-400 text-white'
 			>
diff --git a/src/pages/news/components/button-push-news2article.tsx b/src/pages/news/components/button-push-news2article.tsx
index 333f621..6c27020 100644
--- a/src/pages/news/components/button-push-news2article.tsx
+++ b/src/pages/news/components/button-push-news2article.tsx
@@ -21,6 +21,7 @@ export default function ButtonPushNews2Article(props: { ids: Id[]; }) {
 		})
 	}
 	const onPushClick = () => {
+		if(loading) return;
 		if (props.ids.length === 0) {
 			showToast('请选择要推入编辑的新闻', 'warning')
 			return
@@ -34,7 +35,7 @@ export default function ButtonPushNews2Article(props: { ids: Id[]; }) {
 	}
 	return (
 		<button
-			loading={loading}
+			disabled={loading}
 			onClick={onPushClick}
 			className='bg-[#4096ff] hover:bg-blue-600 text-white'
 		>
diff --git a/src/pages/news/components/button-push2video.tsx b/src/pages/news/components/button-push2video.tsx
index b2cd512..bb42ca1 100644
--- a/src/pages/news/components/button-push2video.tsx
+++ b/src/pages/news/components/button-push2video.tsx
@@ -17,6 +17,7 @@ export default function ButtonPush2Video(props: { ids: Id[]; onSuccess?: () => v
 		})
 	}
 	const onPushClick = () => {
+		if(loading) return;
 		if (props.ids.length === 0) {
 			showToast('请选择要开播的新闻', 'warning')
 			return
@@ -31,7 +32,7 @@ export default function ButtonPush2Video(props: { ids: Id[]; onSuccess?: () => v
 		<div>
 			<button
 				type="primary"
-				loading={loading}
+				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 ee66dd7..6550741 100644
--- a/src/pages/news/components/edit-search-form.tsx
+++ b/src/pages/news/components/edit-search-form.tsx
@@ -1,6 +1,5 @@
-import {Button, Input} from "antd";
+import {Input} from "antd";
 import {SearchOutlined} from "@ant-design/icons";
-import ArticleCascader from "@/pages/news/components/article-cascader.tsx";
 import React, {useState} from "react";
 import {useSetState} from "ahooks";
 import useArticleTags from "@/hooks/useArticleTags.ts";
@@ -10,13 +9,14 @@ export default function EditSearchForm(props: {
 	onSubmit: (values: ApiArticleSearchParams) => void;
 }) {
 	const articleTags = useArticleTags()
-	const [tags, setTags] = useState<Id[][]>([]);
+	const [tags, _setTags] = useState<Id[][]>([]);
 	const [params, setParams] = useSetState<ApiArticleSearchParams>({
 		pagination: {limit: 10, page: 1},
 	});
 
-	const handleSubmit = () => {
-		params.tags = tags.length == 0 ? undefined : tags.map(it => {
+	const handleSubmit = (_tags?:Id[][]) => {
+		const __tags = _tags || tags;
+		params.tags = __tags.length == 0 ? undefined : __tags.map(it => {
 			if (Array.isArray(it)) {
 				return {
 					level1: it[0],
@@ -28,6 +28,7 @@ export default function EditSearchForm(props: {
 				}
 			}
 		});
+		console.log('tags',params.tags)
 		props.onSubmit({
 			...params,
 			pagination: {
@@ -36,6 +37,12 @@ export default function EditSearchForm(props: {
 			}
 		})
 	}
+	const setTags = (_tags: Id[][])=>{
+		console.log(_tags)
+
+		_setTags(_tags)
+		handleSubmit(_tags)
+	}
 
 	return (
 		<div className="search-form-input flex gap-2 items-center">
diff --git a/src/pages/news/edit.tsx b/src/pages/news/edit.tsx
index b89673f..ab384d5 100644
--- a/src/pages/news/edit.tsx
+++ b/src/pages/news/edit.tsx
@@ -70,7 +70,7 @@ export default function NewEdit() {
 			<div className="news-list-container mt-2">
 				<div className="controls flex justify-end mb-3 gap-2">
 					<Space>
-						<span>总共 {data?.list.length} 条</span>
+						<span>总共 {data?.list?.length || 0} 条</span>
 						<span className={'text-blue-500'}>已选 {selectedRowKeys.length} 条</span>
 					</Space>
 					<div>
diff --git a/src/pages/video/components/button-push2room.tsx b/src/pages/video/components/button-push2room.tsx
index 1024e3a..eb91d88 100644
--- a/src/pages/video/components/button-push2room.tsx
+++ b/src/pages/video/components/button-push2room.tsx
@@ -23,6 +23,7 @@ export default function ButtonPush2Room(props: { ids: Id[]; list: VideoInfo[];on
 		})
 	}
 	const onPushClick = () => {
+		if(loading) return;
 		if (props.ids.length === 0) {
 			showToast('请选择要推流的新闻', 'warning')
 			return
diff --git a/src/routes/layout/dashboard-layout.tsx b/src/routes/layout/dashboard-layout.tsx
index 88dd9f9..1d23b09 100644
--- a/src/routes/layout/dashboard-layout.tsx
+++ b/src/routes/layout/dashboard-layout.tsx
@@ -34,8 +34,8 @@ const NavigationUserContainer = () => {
 		},
 	];
 	const UserButton = () => (<div
-		className={`flex items-center rounded-3xl ${user ? 'bg-[#e3eeff]' : 'bg-primary-blue'} p-0.5 pr-2 cursor-pointer rounded`}>
-		<UserAvatar className="user-avatar size-6"/>
+		className={`flex items-center rounded-3xl ${user ? 'bg-[#e3eeff]' : 'bg-primary-blue'} p-1 pr-2 cursor-pointer rounded`}>
+		<UserAvatar className="user-avatar size-7"/>
 		{user ? <span className={"username ml-2 text-sm"}>{hidePhone(user.nickname)}</span> : (
 			<span className="text-sm mx-2 text-white">登录</span>
 		)}