Skip to content

一分钟搭建影视站,支持Docker等部署方式

fix(live): 测活工具条取消/清除合并为同一操作位,版本 2.10.1

bestZwei9719fd514358
diff --git a/package-lock.json b/package-lock.json
index 600dad8..4a2ecb0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "libretv",
- "version": "2.10.0",
+ "version": "2.10.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "libretv",
- "version": "2.10.0",
+ "version": "2.10.1",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@tanstack/react-query": "^5.59.0",
diff --git a/package.json b/package.json
index 5c8d2aa..a9a1175 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "libretv",
- "version": "2.10.0",
+ "version": "2.10.1",
"private": true,
"description": "免费在线视频搜索与观看平台(Next.js 重构版)",
"license": "AGPL-3.0-or-later",
diff --git a/src/components/live-channel-list.tsx b/src/components/live-channel-list.tsx
index 33bd974..3aa1d3d 100644
--- a/src/components/live-channel-list.tsx
+++ b/src/components/live-channel-list.tsx
@@ -274,34 +274,35 @@ export function LiveChannelList({ channels, groups, currentUrl, onSelect, onFilt
onClick={() => void probe(filtered)}
title="探测当前列表频道是否可播(分片级校验;量大时自动分批排队跑完,结果 6 小时内有效)"
>
- ⚡ 测活
+ 测活
</button>
- {probeResults.size > 0 && (
+ {/* 同一操作位按时机切换:测活中=取消(保留已完成结果);空闲且有结果=清除全部 */}
+ {isProbing ? (
<button
className="btn-ghost !py-1 !px-2 text-xs"
- disabled={isProbing}
- onClick={() => {
- clearProbe();
- setAliveFilter('off');
- }}
- title="清除全部测活结果,并取消可用性筛选"
+ onClick={cancelProbe}
+ title="中止本次测活,已完成的结果会保留"
>
- ✕ 清除
+ 取消
</button>
- )}
- {isProbing && probeProgress && (
- <>
- <span className="text-[10px] text-faint whitespace-nowrap">
- 探测中 {formatProbeProgress(probeProgress)}
- </span>
+ ) : (
+ probeResults.size > 0 && (
<button
className="btn-ghost !py-1 !px-2 text-xs"
- onClick={cancelProbe}
- title="中止本次测活,已完成的结果会保留"
+ onClick={() => {
+ clearProbe();
+ setAliveFilter('off');
+ }}
+ title="清除全部测活结果,并取消可用性筛选"
>
- 取消
+ 清除
</button>
- </>
+ )
+ )}
+ {isProbing && probeProgress && (
+ <span className="text-[10px] text-faint whitespace-nowrap">
+ 探测中 {formatProbeProgress(probeProgress)}
+ </span>
)}
{probeHint && (
<span className="text-[10px] text-faint">{probeHint}</span>