chickliu/quark-auto-save
1
0
Fork 0
mirror of https://github.com/Cp0204/quark-auto-save.git synced 2026-01-12 15:20:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

为追剧日历添加状态筛选功能

Browse Source
This commit is contained in:
x1ao4 2025-11-24 23:39:02 +08:00
parent b520378d26
commit 85da3ec023
2 changed files with 73 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/static/css/main.css
View File

@ -8402,7 +8402,17 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) {
box-sizing: border-box;
}
/* 任务数量指示器悬停时显示文本光标，和其他标题框一致 */
.tasklist-count-single-digit {
width: 32px;
padding: 0;
}
.tasklist-count-number {
cursor: text;
user-select: text;
}
.calendar-filter-row {
margin-bottom: 20px; /* 桌面端保持与下方组件净间距 8px（抵消分类与控制按钮的 -12px 上移） */
}

75
app/templates/index.html
View File

@ -1062,7 +1062,7 @@
class="tasklist-count-indicator ml-2"
:class="{'tasklist-count-single-digit': tasklistVisibleCount < 10}"
:title="`共${tasklistVisibleCount}个任务`">
{{ tasklistVisibleCount }}
<span class="tasklist-count-number">{{ tasklistVisibleCount }}</span>
</div>
<!-- 视图切换按钮：列表视图 与 海报视图 -->
<div class="ml-2">
@ -1950,8 +1950,8 @@
<!-- 追剧日历内容 -->
<div v-else>
<!-- 顶部筛选和导航 -->
<div class="row calendar-filter-row" style="margin-bottom: 20px;">
<div class="col-lg-6 col-md-6 mb-2 mb-md-0">
<div class="row tasklist-filter-row calendar-filter-row">
<div class="col-xl-4 col-lg-4 col-md-6 mb-2 mb-lg-0">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">名称筛选</span>
@ -1962,13 +1962,13 @@
</div>
</div>
</div>
<div class="col-lg-6 col-md-6">
<div class="col-xl-4 col-lg-4 col-md-6 mb-2 mb-lg-0">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">任务筛选</span>
</div>
<div class="position-relative" style="flex: 1;">
<select class="form-control task-filter-select" v-model="calendar.taskFilter" style="padding-left: 8px !important; text-indent: 0 !important; display: flex !important; align-items: center !important; line-height: 1.5 !important; padding-right: 24px !important;">
<select class="form-control task-filter-select" v-model="calendar.taskFilter" style="padding-left: 8px !important; text-indent: 0 !important; display: flex !important; align-items: center !important; line-height: 1.5 !important; padding-right: 8px !important;">
<option value="">全部</option>
<option v-for="task in calendar.taskNames" :value="task" v-html="task"></option>
</select>
@ -1978,6 +1978,30 @@
</div>
</div>
</div>
<div class="col-xl-4 col-lg-4 col-md-6 mb-2 mb-lg-0">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">状态筛选</span>
</div>
<div class="position-relative" style="flex: 1;">
<select class="form-control task-filter-select"
v-model="calendar.statusFilter"
style="padding-left: 8px !important; text-indent: 0 !important; display: flex !important; align-items: center !important; line-height: 1.5 !important; padding-right: 8px !important;">
<option value="">全部</option>
<option value="incomplete">未完成</option>
<option value="ongoing">进行中</option>
<option value="completed">已完成</option>
<option value="airing">播出中</option>
<option value="finale">本季终</option>
<option value="ended">已完结</option>
<option value="unmatched">未匹配</option>
</select>
</div>
<div class="input-group-append">
<button type="button" class="btn btn-outline-secondary filter-btn-square" @click="clearCalendarFilter('statusFilter')"><i class="bi bi-x-lg"></i></button>
</div>
</div>
</div>
</div>
<!-- 分类按钮和视图切换 -->
@ -3257,6 +3281,13 @@
selectedType: (localStorage.getItem('calendar_selected_type') || 'all'),
nameFilter: '',
taskFilter: '',
statusFilter: (() => {
try {
return localStorage.getItem('calendar_status_filter') || '';
} catch (e) {
return '';
}
})(),
taskNames: [],
viewMode: (localStorage.getItem('calendar_view_mode') === 'month' || localStorage.getItem('calendar_view_mode') === 'poster')
? localStorage.getItem('calendar_view_mode')
@ -3381,6 +3412,9 @@
if (this.calendar.taskFilter && this.calendar.taskFilter.trim() !== '') {
list = list.filter(t => (t.task_name || '') === this.calendar.taskFilter);
}
if (this.calendar.statusFilter && this.calendar.statusFilter.trim() !== '') {
list = list.filter(t => this.filterTaskByStatus(t, this.calendar.statusFilter));
}
// 按匹配状态和任务名称拼音排序：匹配的项目在前，未匹配的项目在后
try {
list.sort((a, b) => {
@ -3650,6 +3684,14 @@
this.initializeCalendarDates();
}
},
'calendar.statusFilter': function(newVal, oldVal) {
if (this.calendar.viewMode === 'month') {
this.initializeCalendarDates();
}
try {
localStorage.setItem('calendar_status_filter', newVal || '');
} catch (e) {}
},
taskStatusFilter(newValue) {
try {
localStorage.setItem('tasklist_status_filter', newValue || '');
@ -4403,9 +4445,10 @@
return contentType === this.tasklist.selectedType;
} catch (e) { return true; }
},
tasklistFilterByStatus(task) {
// 统一的状态筛选逻辑（任务列表与追剧日历共用）
filterTaskByStatus(task, filterValue) {
try {
const filter = this.taskStatusFilter || '';
const filter = filterValue || '';
if (!filter) return true;
if (!task) return false;
const taskName = task.taskname || task.task_name || '';
@ -4436,6 +4479,9 @@
return true;
}
},
tasklistFilterByStatus(task) {
return this.filterTaskByStatus(task, this.taskStatusFilter);
},
getTasklistFullStatus(task) {
try {
if (!task) return '';
@ -5009,10 +5055,9 @@
// 先进行基础筛选
let filteredEpisodes = this.calendar.episodes.filter(episode => {
// 根据筛选条件过滤
if (this.calendar.selectedType !== 'all') {
// 通过剧集名称匹配任务，获取内容类型
const matchedTask = this.findTaskByShowName(episode.show_name);
const episodeContentType = matchedTask ? matchedTask.content_type : 'other';
if (this.calendar.selectedType !== 'all') {
const episodeContentType = matchedTask ? (matchedTask.content_type || 'other') : 'other';
if (episodeContentType !== this.calendar.selectedType) {
return false;
}
@ -5029,13 +5074,17 @@
// 任务筛选：检查任务名称
if (this.calendar.taskFilter && this.calendar.taskFilter.trim() !== '') {
const matchedTask = this.findTaskByShowName(episode.show_name);
const taskName = matchedTask ? matchedTask.task_name : '';
const taskName = matchedTask ? (matchedTask.task_name || matchedTask.taskname || '') : '';
if (taskName !== this.calendar.taskFilter) {
return false;
}
}
// 状态筛选：复用任务列表逻辑
if (!this.filterTaskByStatus(matchedTask, this.calendar.statusFilter)) {
return false;
}
return episode.air_date === date;
});
@ -5990,6 +6039,8 @@
this.calendar.nameFilter = '';
} else if (filterType === 'taskFilter') {
this.calendar.taskFilter = '';
} else if (filterType === 'statusFilter') {
this.calendar.statusFilter = '';
}
},