From b2448e2823c3c87fb1ebe01567595cea97551748 Mon Sep 17 00:00:00 2001
From: ChiveHao <chivehao@ikaros.run>
Date: Wed, 16 Oct 2024 04:42:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=99=84=E4=BB=B6=E9=A1=B5=E7=9A=84pag?=
 =?UTF-8?q?e=E5=92=8Csize=E6=B7=BB=E5=8A=A0=E5=88=B0url=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=87=8C=20(#697)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 附件页的page和size添加到url参数里

* optimize: episodes sort by seq in SubjectDetails.vue
---
 CHANGELOG.MD                                     |  5 +++++
 .../modules/content/subject/SubjectDetails.vue   |  1 +
 console/src/modules/content/subject/Subjects.vue | 16 ++++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 307507a3..fa917433 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -7,6 +7,11 @@
 ## 新特性
 
 - 管理控制台的关于页面右上角添加个复制环境信息的按钮 #691
+- 附件页的page和size添加到url参数里
+
+## 优化
+
+- 条目详情页剧集序号排序
 
 ## 问题修复
 
diff --git a/console/src/modules/content/subject/SubjectDetails.vue b/console/src/modules/content/subject/SubjectDetails.vue
index d5c71778..c7ca5b2d 100644
--- a/console/src/modules/content/subject/SubjectDetails.vue
+++ b/console/src/modules/content/subject/SubjectDetails.vue
@@ -90,6 +90,7 @@ const fetchSubjectById = async () => {
 			deleteMatchingSubjectButtonDisable.value = false;
 		}
 		if (subject.value.episodes) {
+			subject.value.episodes = subject.value.episodes.sort((a, b) => (a.sequence??0) - (b.sequence??0));
 			loadEpisodeGroupLabels();
 		}
 	}
diff --git a/console/src/modules/content/subject/Subjects.vue b/console/src/modules/content/subject/Subjects.vue
index 9c9d62fd..47d82fa5 100644
--- a/console/src/modules/content/subject/Subjects.vue
+++ b/console/src/modules/content/subject/Subjects.vue
@@ -43,6 +43,14 @@ const fetchSubjectByRouterQuery = () => {
 			| 'OTHER';
 	}
 
+	if (route.query.page !== undefined) {
+		findSubjectsCondition.value.page = route.query.page as unknown as number;
+	}
+
+	if (route.query.size !== undefined) {
+		findSubjectsCondition.value.size = route.query.size as unknown as number;
+	}
+
 	// console.log('findSubjectsCondition', findSubjectsCondition.value);
 	fetchSubjects();
 };
@@ -120,6 +128,14 @@ watch(findSubjectsCondition.value, () => {
 	if (type !== route.query.type) {
 		query.type = type;
 	}
+	const page = findSubjectsCondition.value.page;
+	if (page !== query.page) {
+		query.page = page;
+	}
+	const size = findSubjectsCondition.value.size;
+	if (size !== query.size) {
+		query.size = size;
+	}
 	router.push({ path: route.path, query });
 });