Merge remote-tracking branch 'origin/dev/main' into dev/main

src/components/article/edit-modal.tsx

@@ -85,7 +85,7 @@ export default function ArticleEditModal(props: Props) {
 		}
 		const save = props.type == 'news' ? article.save : regenerate
 		setState({loading: true})
-		save(title, groups, props.id && props.id > 0 ? props.id : undefined).then(() => {
+		save(title, groups[0][0].content, groups.slice(1), props.id && props.id > 0 ? props.id : undefined).then(() => {
 			props.onClose?.(true)
 		}).catch(e => {
 			setState({error: e.data || '保存失败,请重试!'})
@@ -111,7 +111,7 @@ export default function ArticleEditModal(props: Props) {
 		if (typeof (props.id) != 'undefined') {
 			if (props.id > 0) {
 				article.getById(props.id).then(res => {
-					setGroups(rebuildGroups(res.content_group))
+					setGroups(rebuildGroups([[{content: res.metahuman_text, type: "text"}], ...res.content_group]))
 					setTitle(res.title)
 				})
 			} else {

src/pages/library/components/video-detail.tsx

@@ -51,11 +51,11 @@ export default function VideoDetail({video, onClose,autoPlay}: Props) {
 			</div>
 			<div className="flex justify-end modal-control-footer">
 				<div className="flex gap-4">
-					<button disabled={state.pushing} className="text-gray-400 hover:text-gray-800 " type="text" onClick={pushToRoom}>一键推流</button>
+					<button disabled={state.pushing} className="text-gray-400 hover:text-gray-800 " type="button" onClick={pushToRoom}>一键推流</button>
 					<button disabled={state.exporting} className="text-gray-400 hover:text-gray-800 " onClick={downloadVideo}
-					        type="text">下载视频
+					        type="button">下载视频
 					</button>
-					<button onClick={onClose} type="text" className="text-gray-800 hover:text-blue-500">关闭</button>
+					<button onClick={onClose} type="button" className="text-gray-800 hover:text-blue-500">关闭</button>
 				</div>
 			</div>
 		</Modal>

src/pages/library/index.tsx

@@ -71,6 +71,7 @@ export default function LibraryIndex() {
 		autoPlay: boolean
 	}>()
 	const handleAllCheckedChange = (checked: boolean) => {
+		if (!data) return;
 		setCheckedIdArray(checked ? data.list.map(v => v.id) : [])
 		setState({
 			checkedAll: !state.checkedAll
@@ -158,6 +159,7 @@ export default function LibraryIndex() {
                 className='bg-gray-300 hover:bg-gray-400 text-white'
 				icon={<IconDelete className=""/>}
 				title={`你确定要删除选择的 ${checkedIdArray.length} 条视频吗？`}
+				emptyMessage={'请选择要删除的视频'}
 				confirmMessage={'删除后需重新生成视频'}
 				onProcess={deleteHistories}
 			>批量删除</ButtonBatch>}
@@ -167,6 +169,7 @@ export default function LibraryIndex() {
 				className='bg-[#4096ff] hover:bg-blue-600 text-white'
 				icon={<IconArrowRight className={'text-white'}/>}
 				onProcess={push2room}
+				emptyMessage={'请选择要推流的视频'}
 			>一键推流</ButtonBatch>}
 		</div>
 	</>)

src/service/api/article.ts

@@ -20,9 +20,10 @@ export function getById(id: Id) {
 	return post<ArticleDetail>({url: '/article/detail/' + id})
 }
 
-export function save(title: string, content_group: BlockContent[][], id?: number) {
+export function save(title: string, metahuman_text: string, content_group: BlockContent[][], id?: number) {
 	return post<{ content: string }>(id && id > 0 ? '/article/modify' : '/article/create/new', {
 		title,
+		metahuman_text,
 		content_group,
 		id
 	})

src/service/api/video.ts

@@ -21,11 +21,12 @@ export function deleteHistories(ids: Id[]) {
  * @param content_group
  * @param article_id
  */
-export function regenerate(title: string, content_group: BlockContent[][], article_id?: Id) {
+export function regenerate(title: string, metahuman_text: string, content_group: BlockContent[][], article_id?: Id) {
 	return post<{ content: string }>({
 		url: '/video/regenerate',
 		data: {
 			title,
+			metahuman_text,
 			content_group,
 			article_id
 		}

src/types/core.d.ts

@@ -31,6 +31,7 @@ declare interface ArticleContentGroup {
 declare interface ArticleDetail {
 	id: number;
 	title: string;
+	metahuman_text: string;
 	content_group: BlockContent[][]
 }