Merge branch 'feature_first_pages' of Web/contentCooper into master

src/views/publishContent/weCom/components/videoSelectModal/index.tsx

@@ -57,7 +57,7 @@ const VideoSelectModal: React.FC<VideoSelectModalProps> = ({ planType, visible,
 			setLoading(false);
 		});
 		if (res && res.code === 0) {
-			const mappedVideos = res.data.objs.map(video => ({ ...video, scene: 0 as const }));
+			const mappedVideos = res.data.objs.map(video => ({ ...video, scene: videoList.find(v => v.videoId === video.videoId)?.scene || 0 as 0 | 1 }));
 			setVideoList(mappedVideos);
 			setVideoListAll(old => [...old, ...mappedVideos]);
 			setTotal(res.data.totalSize);
@@ -98,7 +98,11 @@ const VideoSelectModal: React.FC<VideoSelectModalProps> = ({ planType, visible,
 
 	const handleOk = () => {
 		const selectedVideos = videoListAll.filter(video => selectedVideoIds.has(video.videoId));
-		onOk(selectedVideos);
+		// 去重
+		const uniqueSelectedVideos = selectedVideos.filter((video, index, self) =>
+			index === self.findIndex((t) => t.videoId === video.videoId)
+		);
+		onOk(uniqueSelectedVideos);
 	};
 
 	const playVideo = (video: WeVideoItem) => {
@@ -139,6 +143,7 @@ const VideoSelectModal: React.FC<VideoSelectModalProps> = ({ planType, visible,
 				width={800}
 				placement="right"
 				loading={loading}
+				destroyOnClose
 				styles={{ footer: { textAlign: 'right', padding: '10px 24px' } }}
 				footer={
 					<div className="flex justify-between items-center">