From 00f3767c5f26fb805c96ff3b6a687af1cfc0b139 Mon Sep 17 00:00:00 2001 From: none Date: Mon, 3 Apr 2023 09:22:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fixed:=20=E6=9C=AA=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=9A=84=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routes/index.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/routes/index.tsx b/src/routes/index.tsx index 4675617..e27405b 100644 --- a/src/routes/index.tsx +++ b/src/routes/index.tsx @@ -65,6 +65,9 @@ if (getToken()) { }); }); } else { + if (window.location.pathname !== "/login") { + window.location.href = "/login"; + } RootPage = ; } From b15766ea338ab4b8f8801ddd41f7fb419bd88229 Mon Sep 17 00:00:00 2001 From: none Date: Mon, 3 Apr 2023 09:28:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E7=9A=84=E7=BC=93=E5=AD=98=E6=B8=85=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/compenents/upload-video-button/index.tsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/compenents/upload-video-button/index.tsx b/src/compenents/upload-video-button/index.tsx index 859894b..f41c1fa 100644 --- a/src/compenents/upload-video-button/index.tsx +++ b/src/compenents/upload-video-button/index.tsx @@ -81,7 +81,7 @@ export const UploadVideoButton = (props: PropsInterface) => { minioMergeVideo( item.filename, item.uploadId, - props.categoryIds.join(','), + props.categoryIds.join(","), item.name, "mp4", item.size, @@ -119,6 +119,12 @@ export const UploadVideoButton = (props: PropsInterface) => { }, }; + const closeWin = () => { + setShowModal(false); + setFileList([]); + props.onUpdate(); + }; + return ( <>