From b9212c14de969c9d7ec79dd0d732ca01fae1f1ed Mon Sep 17 00:00:00 2001
From: callmeyan <yaclty2@gmail.com>
Date: Fri, 27 Dec 2024 19:28:10 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20fixed:=20=E4=BF=AE=E5=A4=8D=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=AF=A6=E6=83=85=E5=AE=BD=E5=BA=A6=E4=B8=8D=E8=B6=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/index.scss          |  7 +++++++
 src/components/icons/index.tsx |  6 ++++++
 src/pages/news/index.tsx       | 10 +++++-----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/assets/index.scss b/src/assets/index.scss
index b7b010d..4fad8d0 100644
--- a/src/assets/index.scss
+++ b/src/assets/index.scss
@@ -71,6 +71,13 @@ body {
     padding-right: 0;
     padding-left: 0;
   }
+  .news-detail{
+    video{
+      width: 100%;
+      max-width: 100%;
+      max-height: 400px;
+    }
+  }
 }
 .news-detail-content-container{
   margin-right: -30px;
diff --git a/src/components/icons/index.tsx b/src/components/icons/index.tsx
index 4c80765..79de615 100644
--- a/src/components/icons/index.tsx
+++ b/src/components/icons/index.tsx
@@ -90,6 +90,12 @@ export const IconAddText = ({style, className}: IconProps) => (
 	</svg>
 )
 
+export const IconVideo = ({style, className}: IconProps) => (
+	<svg className={`svg-icon ${className || ''} icon-video`} style={style} xmlns="http://www.w3.org/2000/svg"
+	     width="1em" height="1em" viewBox="0 0 21 21" version="1.1">
+		<path fill-rule="evenodd" clip-rule="evenodd" d="M18 1.00268e-07C18.5046 -0.000159579 18.9906 0.190406 19.3605 0.533497C19.7305 0.876588 19.9572 1.34684 19.995 1.85L20 2V16C20.0002 16.5046 19.8096 16.9906 19.4665 17.3605C19.1234 17.7305 18.6532 17.9572 18.15 17.995L18 18H2C1.49542 18.0002 1.00943 17.8096 0.639452 17.4665C0.269471 17.1234 0.0428434 16.6532 0.00500021 16.15L1.00268e-07 16V2C-0.000159579 1.49542 0.190406 1.00943 0.533497 0.639452C0.876588 0.269471 1.34684 0.0428434 1.85 0.00500021L2 1.00268e-07H18ZM18 2H2V16H18V2ZM8.34 4.638L8.858 4.868L9.196 5.028L9.583 5.218L10.013 5.436L10.483 5.686L10.99 5.966L11.256 6.118L11.774 6.423L12.248 6.715L12.678 6.988L13.058 7.241L13.538 7.571L13.902 7.834L13.997 7.904C14.1513 8.01883 14.2767 8.16816 14.363 8.34005C14.4494 8.51194 14.4943 8.70164 14.4943 8.894C14.4943 9.08636 14.4494 9.27606 14.363 9.44795C14.2767 9.61984 14.1513 9.76917 13.997 9.884L13.674 10.119L13.234 10.427L12.878 10.666L12.473 10.929L12.02 11.212L11.521 11.512L10.987 11.821L10.478 12.103L10.007 12.353L9.577 12.573L9.191 12.761L8.569 13.049L8.339 13.149C8.16242 13.2251 7.97051 13.2589 7.77856 13.2476C7.58662 13.2364 7.39995 13.1805 7.23346 13.0843C7.06696 12.9881 6.92524 12.8544 6.8196 12.6937C6.71396 12.5331 6.64732 12.35 6.625 12.159L6.567 11.594L6.535 11.22L6.493 10.556L6.47 10.048L6.455 9.493L6.451 9.199L6.449 8.894C6.449 8.68733 6.451 8.48733 6.455 8.294L6.47 7.739L6.493 7.232L6.52 6.775L6.55 6.374L6.625 5.63C6.64719 5.43882 6.71376 5.25547 6.81939 5.09458C6.92502 4.93369 7.0668 4.79972 7.2334 4.70335C7.4 4.60698 7.58682 4.55089 7.77896 4.53954C7.97109 4.5282 8.16321 4.56191 8.34 4.638ZM8.951 7.139L8.515 6.921L8.486 7.408L8.464 7.959L8.451 8.569L8.449 8.894L8.451 9.219L8.464 9.828L8.474 10.111L8.5 10.631L8.515 10.866L8.949 10.648L9.436 10.392L9.971 10.098L10.255 9.936L10.806 9.61L11.3 9.304L11.736 9.024L11.932 8.894L11.525 8.624L11.059 8.33C10.7938 8.16584 10.5261 8.00582 10.256 7.85L9.973 7.689L9.439 7.395L8.951 7.139Z" fill="black"/>
+	</svg>
+)
 
 export const IconAddImage = ({style, className}: IconProps) => (
 	<svg className={`svg-icon ${className || ''} icon-delete`} style={style} xmlns="http://www.w3.org/2000/svg"
diff --git a/src/pages/news/index.tsx b/src/pages/news/index.tsx
index d6cd9db..1232164 100644
--- a/src/pages/news/index.tsx
+++ b/src/pages/news/index.tsx
@@ -2,6 +2,7 @@ import React, {useMemo, useRef, useState} from "react";
 import {Checkbox, Divider, Empty, Modal, Space} from "antd";
 import {useRequest} from "ahooks";
 import {CloseOutlined} from "@ant-design/icons"
+import {clsx} from "clsx";
 
 import SearchPanel from "@/pages/news/components/search-panel.tsx";
 import {getById, getList} from "@/service/api/news.ts";
@@ -9,7 +10,6 @@ import {showLoading} from "@/components/message.ts";
 import {formatTime} from "@/util/strings.ts";
 import ButtonPushNews2Article from "@/pages/news/components/button-push-news2article.tsx";
 import ButtonNewsDownload from "@/pages/news/components/button-news-download.tsx";
-import {clsx} from "clsx";
 import InfiniteScroller, {InfiniteScrollerRef} from "@/components/scoller/infinite-scroller.tsx";
 import ButtonToTop from "@/components/scoller/button-to-top.tsx";
 import {useIndexArrayCache} from "@/hooks/useCache.ts";
@@ -94,7 +94,7 @@ export default function NewsIndex() {
             footer={null} onCancel={() => setActiveNews(undefined)}
         >
             <div className="news-detail pl-16 pr-1 flex pb-5">
-                <div className="px-4 py-6 bg-white">
+                <div className="px-4 py-6 bg-white flex-1">
                     <div className="new-title text-2xl">{activeNews?.title}</div>
                     <div className="info mt-2 mb-2 text-sm flex gap-3">
                         <span className="source text-blue-400">{activeNews?.media_name}</span>
@@ -104,7 +104,7 @@ export default function NewsIndex() {
                     <div className="overflow-auto leading-7 text-base news-detail-content-container"
                          style={{maxHeight: 500}} dangerouslySetInnerHTML={{__html: activeNews?.content || ''}}></div>
                 </div>
-                <div className="actions ml-2">
+                <div className="actions ml-3">
                     <div className="close">
                         <CloseOutlined className="text-xl text-gray-400 hover:text-gray-800"
                                        onClick={() => setActiveNews(undefined)}/>
@@ -113,7 +113,7 @@ export default function NewsIndex() {
                         <Checkbox
                             checked={checkedId.includes(activeNews!.id)}
                             onChange={() => handleCheckChange(activeNews!.id)}
-                        ><span>选择</span></Checkbox>
+                        ><span className="ml-[-4px]">选择</span></Checkbox>
                     </div>
                 </div>
             </div>
@@ -134,7 +134,7 @@ export default function NewsIndex() {
 				</div>
 			</div>
 			<InfiniteScroller
-				className="grid grid-cols-3 gap-4 lg:grid-cols-4 pb-2"
+				className="grid grid-cols-2 gap-4 xl:grid-cols-4 md:grid-cols-3 pb-2"
 				pagination={data?.pagination}
 				loading={loading}
 				ref={scrollerRef}