9 changed files with 284 additions and 101 deletions

No files matched your search

+5
View File
@@ -1,4 +1,9 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
if grep -qiE "(co-authored-by|generated with|assisted by).*(cursor|claude|codex|gpt|copilot|ai)" "$1"; then
echo "commit message contains AI attribution, remove it before committing" >&2
exit 1
fi
pnpm commitlint --edit "$1"
+10 -3
View File
@@ -1,10 +1,17 @@
// Author: fruit.com.cn
import request from '@/axios'
import type { EpisodeItem, EpisodeSaveData } from './types'
import type { EpisodeItem, EpisodeSaveData, PageResult } from './types'
export const listEpisodesApi = (dramaId: number, status?: string) => {
return request.get<EpisodeItem[]>({ url: '/admin/episodes', params: { dramaId, status } })
export interface EpisodePageParams {
dramaId: number
status?: string
pageIndex?: number
pageSize?: number
}
export const listEpisodesApi = (params: EpisodePageParams) => {
return request.get<PageResult<EpisodeItem>>({ url: '/admin/episodes', params })
}
export const createEpisodeApi = (data: EpisodeSaveData) => {
+7 -5
View File
@@ -537,7 +537,7 @@ export default {
retry: 'Retry',
retryAll: 'Retry all',
remove: 'Remove',
hint: 'Supports MP4 / MOV / MKV / WEBM, max 500MB each; multi-select allowed, 2 upload in parallel, the rest queue automatically.',
hint: 'Supports MP4 / MOV / MKV / WEBM, max 500MB each',
invalidType: 'Only MP4, MOV, MKV, WEBM are allowed',
oversize: 'File exceeds 500MB and was not queued',
overallProgress: 'Overall progress',
@@ -554,19 +554,21 @@ export default {
resumeMatched: 'Matched {count} file(s) and resumed',
resumeUnmatched: '{count} session(s) could not match local files; pick again manually',
createTitle: 'Create episodes in batch',
createHint:
'Title uses the video file name; episode numbers are assigned automatically. Free vs paid follows the drama free-episode count; episodes beyond that are paid. You can edit them later in episode settings.',
colSource: 'Source file',
colNumber: 'Episode No.',
colTitle: 'Title',
colFree: 'Free',
colFree: 'Pricing',
labelFree: 'Free',
labelPaid: 'Paid',
colResult: 'Result',
numberConflict: 'Episode number conflict',
missingVideo: 'Missing video URL',
createOk: 'Created',
createFailed: 'Create failed',
createAllSuccess: 'All episodes created',
createPartial: 'Some episodes failed; you can retry',
fixConflict: 'Resolve episode number conflicts first',
submitCreate: 'Submit',
submitCreate: 'Create',
retryFailed: 'Retry failed',
status: {
waiting: 'Waiting',
+7 -5
View File
@@ -531,7 +531,7 @@ export default {
retry: '重试',
retryAll: '全部重试',
remove: '移除',
hint: '支持 MP4 / MOV / MKV / WEBM,单文件不超过 500MB;可一次多选,同时上传 2 个,其余自动排队。',
hint: '支持 MP4 / MOV / MKV / WEBM,单文件不超过 500MB',
invalidType: '仅支持 MP4、MOV、MKV、WEBM',
oversize: '文件超过 500MB,未入队',
overallProgress: '总进度',
@@ -546,19 +546,21 @@ export default {
resumeMatched: '已匹配 {count} 个文件并开始续传',
resumeUnmatched: '有 {count} 个会话无法匹配本地文件,请手动重选',
createTitle: '批量创建分集',
createHint:
'标题取视频文件名,集号自动顺延分配;免费集数由短剧管理中的「免费集数」配置决定,超出部分为收费集;创建后可在分集编辑中修改',
colSource: '源文件',
colNumber: '集号',
colTitle: '标题',
colFree: '免费',
colFree: '收费类型',
labelFree: '免费',
labelPaid: '收费',
colResult: '结果',
numberConflict: '集号冲突',
missingVideo: '缺少视频地址',
createOk: '已创建',
createFailed: '创建失败',
createAllSuccess: '全部分集已创建',
createPartial: '部分分集创建失败,可重试',
fixConflict: '请先解决集号冲突',
submitCreate: '提交创建',
submitCreate: '创建',
retryFailed: '重试失败项',
status: {
waiting: '等待中',
+6 -3
View File
@@ -560,13 +560,16 @@ body {
gap: 6px;
}
.drama-select {
.drama-select,
.status-select {
width: 100%;
}
.drama-select .el-input__wrapper {
.drama-select .el-input__wrapper,
.status-select .el-input__wrapper {
box-shadow: 0 0 0 1px #efedf3 inset !important;
}
.drama-select .el-input__inner {
.drama-select .el-input__inner,
.status-select .el-input__inner {
font-size: 13px;
}
@@ -15,6 +15,11 @@ import BatchUploadDialog from './upload/BatchUploadDialog.vue'
import EpisodeFormDialog from './upload/EpisodeFormDialog.vue'
import { listPendingSessions } from './upload/uploadSessions'
/** 排序/批量建集需要全集快照,单次请求不超过接口 pageSize 上限。 */
const SNAPSHOT_PAGE_SIZE = 200
const DEFAULT_PAGE_SIZE = 100
const PAGE_SIZE_OPTIONS = [50, 100, 200]
const route = useRoute()
const { can } = useRbac()
const { t } = useI18n()
@@ -22,18 +27,29 @@ const { t } = useI18n()
const loading = ref(false)
const dramas = ref([])
const episodes = ref([])
const total = ref(0)
const selectedDramaId = ref(undefined)
const statusFilter = ref(undefined)
const pageIndex = ref(1)
const pageSize = ref(DEFAULT_PAGE_SIZE)
const batchUploadVisible = ref(false)
const previewVisible = ref(false)
const previewEpisode = ref(null)
const formDialogRef = ref()
/** 上移/下移与批量建集用的全集快照。 */
const snapshotEpisodes = ref([])
const batchNextNumber = computed(() => nextNumber())
const selectedDrama = computed(() => dramas.value.find((item) => item.id === selectedDramaId.value))
const existingEpisodeNumbers = computed(() =>
episodes.value.map((item) => Number(item.number)).filter((n) => Number.isFinite(n))
snapshotEpisodes.value.map((item) => Number(item.number)).filter((n) => Number.isFinite(n))
)
const showPagination = computed(() => {
if (total.value <= 0) return false
return Math.ceil(total.value / pageSize.value) > 1
})
async function loadDramas() {
const res = await pageDramasApi({ pageIndex: 1, pageSize: 200 })
dramas.value = res.data?.list || []
@@ -49,23 +65,73 @@ async function loadDramas() {
async function loadEpisodes() {
if (!selectedDramaId.value) {
episodes.value = []
total.value = 0
snapshotEpisodes.value = []
return
}
loading.value = true
try {
const res = await listEpisodesApi(selectedDramaId.value)
episodes.value = res.data || []
const res = await listEpisodesApi({
dramaId: selectedDramaId.value,
status: statusFilter.value || undefined,
pageIndex: pageIndex.value,
pageSize: pageSize.value
})
episodes.value = res.data?.list || []
total.value = res.data?.total || 0
await clampOrRetreatPage()
} finally {
loading.value = false
}
}
function nextNumber() {
return episodes.value.reduce((max, item) => Math.max(max, item.number || 0), 0) + 1
/** 拉当前剧全集快照,供排序与批量建集集号计算。不过滤 status,按页取完。 */
async function refreshSnapshot() {
if (!selectedDramaId.value) {
snapshotEpisodes.value = []
return
}
const collected = []
let page = 1
let totalCount = 0
do {
const res = await listEpisodesApi({
dramaId: selectedDramaId.value,
pageIndex: page,
pageSize: SNAPSHOT_PAGE_SIZE
})
const list = res.data?.list || []
totalCount = Number(res.data?.total || 0)
collected.push(...list)
if (!list.length) break
page += 1
} while (collected.length < totalCount)
snapshotEpisodes.value = collected
}
function openBatchUpload() {
/**
* 删除后若当前页空且仍有数据,回退上一页再拉;否则夹页。
*/
async function clampOrRetreatPage() {
const maxPage = Math.max(1, Math.ceil(total.value / pageSize.value) || 1)
if (episodes.value.length === 0 && total.value > 0 && pageIndex.value > 1) {
pageIndex.value = Math.min(pageIndex.value - 1, maxPage)
await loadEpisodes()
return
}
if (pageIndex.value > maxPage) {
pageIndex.value = maxPage
await loadEpisodes()
}
}
function nextNumber() {
return snapshotEpisodes.value.reduce((max, item) => Math.max(max, item.number || 0), 0) + 1
}
async function openBatchUpload() {
if (!selectedDramaId.value) return
await refreshSnapshot()
batchUploadVisible.value = true
}
@@ -73,7 +139,8 @@ async function onBatchEpisodesCreated() {
await loadEpisodes()
}
function openCreate() {
async function openCreate() {
await refreshSnapshot()
formDialogRef.value?.openCreate()
}
@@ -94,6 +161,9 @@ async function confirmDelete(row) {
}
await deleteEpisodeApi(row.id)
ElMessage.success('剧集已删除')
if (episodes.value.length === 1 && pageIndex.value > 1) {
pageIndex.value -= 1
}
await loadEpisodes()
}
@@ -122,11 +192,32 @@ function stopThumb(event) {
}
}
/** 上移/下移后把新顺序整表提交,由后端重排 sort。 */
async function move(index, offset) {
function pageLocalIndex(row) {
return episodes.value.findIndex((item) => item.id === row.id)
}
function globalIndex(row) {
const local = pageLocalIndex(row)
if (local < 0) return -1
return (pageIndex.value - 1) * pageSize.value + local
}
function canMoveUp(row) {
return globalIndex(row) > 0
}
function canMoveDown(row) {
const index = globalIndex(row)
return index >= 0 && index < total.value - 1
}
/** 上移/下移后把快照新顺序整表提交,由后端重排 sort。 */
async function move(row, offset) {
await refreshSnapshot()
const index = snapshotEpisodes.value.findIndex((item) => item.id === row.id)
const target = index + offset
if (target < 0 || target >= episodes.value.length) return
const next = [...episodes.value]
if (index < 0 || target < 0 || target >= snapshotEpisodes.value.length) return
const next = [...snapshotEpisodes.value]
const [moved] = next.splice(index, 1)
next.splice(target, 0, moved)
await sortEpisodesApi(next.map((item) => item.id))
@@ -135,10 +226,26 @@ async function move(index, offset) {
}
async function onDramaChange() {
pageIndex.value = 1
statusFilter.value = undefined
await loadEpisodes()
openBatchIfPendingSessions()
}
function onStatusChange() {
pageIndex.value = 1
loadEpisodes()
}
function handleSizeChange() {
pageIndex.value = 1
loadEpisodes()
}
function handlePageChange() {
loadEpisodes()
}
/** 进入页面或切换短剧时,若有 24h 内未完成上传则打开批量上传弹窗以提示续传。 */
function openBatchIfPendingSessions() {
if (!selectedDramaId.value || !can('episode:upload')) return
@@ -177,7 +284,7 @@ onMounted(async () => {
<span class="episode-context-label">当前短剧</span>
<b class="episode-context-title">{{ selectedDrama?.title || '暂无短剧' }}</b>
<small class="episode-context-count"
>共 {{ selectedDrama?.episodes ?? episodes.length }} 集 · 收藏
>共 {{ selectedDrama?.episodes ?? total }} 集 · 收藏
{{ formatCount(selectedDrama?.favoriteCount ?? 0) }} · 热度
{{ formatCount(selectedDrama?.views ?? 0) }}</small
>
@@ -197,11 +304,23 @@ onMounted(async () => {
:value="item.id"
/>
</el-select>
<span class="episode-context-label">状态</span>
<el-select
v-model="statusFilter"
clearable
placeholder="全部状态"
class="status-select"
@change="onStatusChange"
>
<el-option label="草稿" value="draft" />
<el-option label="已上线" value="published" />
<el-option label="已下线" value="offline" />
</el-select>
</div>
</div>
<div class="episode-toolbar"
><div
><h2>剧集列表({{ episodes.length }})</h2><p>按列表顺序播放</p></div
><h2>剧集列表({{ total }})</h2><p>按列表顺序播放</p></div
></div
>
<el-table
@@ -278,7 +397,7 @@ onMounted(async () => {
></el-table-column
>
<el-table-column label="操作" width="250" fixed="right"
><template #default="{ row, $index }"
><template #default="{ row }"
><div class="table-actions"
><el-button
v-if="can('episode:upload')"
@@ -289,14 +408,14 @@ onMounted(async () => {
><el-button
v-if="can('episode:sort')"
size="small"
:disabled="$index === 0"
@click="move($index, -1)"
:disabled="!canMoveUp(row)"
@click="move(row, -1)"
>上移</el-button
><el-button
v-if="can('episode:sort')"
size="small"
:disabled="$index === episodes.length - 1"
@click="move($index, 1)"
:disabled="!canMoveDown(row)"
@click="move(row, 1)"
>下移</el-button
><el-button
v-if="can('episode:upload')"
@@ -309,6 +428,18 @@ onMounted(async () => {
></el-table-column
>
</el-table>
<div v-if="showPagination" class="pagination"
><el-pagination
v-model:current-page="pageIndex"
v-model:page-size="pageSize"
:page-sizes="PAGE_SIZE_OPTIONS"
:total="total"
:pager-count="7"
layout="total, sizes, prev, pager, next, jumper"
background
@size-change="handleSizeChange"
@current-change="handlePageChange"
/></div>
</section>
<EpisodeFormDialog
ref="formDialogRef"
@@ -337,6 +468,7 @@ onMounted(async () => {
:drama-id="selectedDramaId"
:next-episode-number="batchNextNumber"
:default-unlock-coin="selectedDrama?.unlockCoin ?? 0"
:free-episodes="selectedDrama?.freeEpisodes ?? 0"
:existing-numbers="existingEpisodeNumbers"
@refreshed="loadEpisodes"
@created="onBatchEpisodesCreated"
@@ -12,13 +12,20 @@ import { useUploadQueue } from './useUploadQueue'
import { MAX_VIDEO_SIZE, VIDEO_ACCEPT_ATTR, VIDEO_EXTENSIONS } from './videoLimit'
import type { UploadSessionRecord } from './uploadSessions'
const props = defineProps<{
modelValue: boolean
dramaId: string | number
nextEpisodeNumber: number
defaultUnlockCoin: number
existingNumbers: number[]
}>()
const props = withDefaults(
defineProps<{
modelValue: boolean
dramaId: string | number
nextEpisodeNumber: number
defaultUnlockCoin: number
existingNumbers: number[]
/** 所属短剧免费集数;不传默认 0 */
freeEpisodes?: number
}>(),
{
freeEpisodes: 0
}
)
const emit = defineEmits<{
'update:modelValue': [value: boolean]
@@ -272,6 +279,7 @@ function onEpisodesCreated(): void {
:done-items="queue.doneItems.value"
:next-episode-number="nextEpisodeNumber"
:default-unlock-coin="defaultUnlockCoin"
:free-episodes="freeEpisodes"
:existing-numbers="existingNumbers"
@settled="emit('refreshed')"
@created="onEpisodesCreated"
@@ -1,5 +1,5 @@
<!-- Author: fruit.com.cn -->
<!-- 批量创建分集:自然排序预填集号与标题,冲突标红,失败可重试 -->
<!-- 批量创建分集确认清单:标题取文件名,集号自动顺延,失败可重试 -->
<script setup lang="ts">
import { ref, watch } from 'vue'
@@ -8,14 +8,21 @@ import { createEpisodeApi } from '@/api/admin/episode'
import { useI18n } from '@/hooks/web/useI18n'
import type { UploadQueueItem } from './useUploadQueue'
const props = defineProps<{
modelValue: boolean
dramaId: string | number
doneItems: UploadQueueItem[]
nextEpisodeNumber: number
defaultUnlockCoin: number
existingNumbers: number[]
}>()
const props = withDefaults(
defineProps<{
modelValue: boolean
dramaId: string | number
doneItems: UploadQueueItem[]
nextEpisodeNumber: number
defaultUnlockCoin: number
existingNumbers: number[]
/** 所属短剧免费集数;不传默认 0 */
freeEpisodes?: number
}>(),
{
freeEpisodes: 0
}
)
const emit = defineEmits<{
'update:modelValue': [value: boolean]
@@ -37,7 +44,7 @@ interface EpisodeDraft {
error: string
}
const DRAFT_STATUS = 'draft'
const PUBLISHED_STATUS = 'published'
const rows = ref<EpisodeDraft[]>([])
const submitting = ref(false)
@@ -51,22 +58,39 @@ function compareNatural(left: string, right: string): number {
return left.localeCompare(right, undefined, { numeric: true, sensitivity: 'base' })
}
/** 从起点起跳过已占用集号,返回下一个可用值。 */
function nextFreeNumber(start: number, used: Set<number>): number {
let candidate = start
while (used.has(candidate)) {
candidate += 1
}
return candidate
}
function buildRows(): void {
const sorted = [...props.doneItems].sort((left, right) =>
compareNatural(baseName(left.fileName), baseName(right.fileName))
)
let number = props.nextEpisodeNumber
rows.value = sorted.map((item) => ({
key: item.id,
sourceName: item.fileName,
number: number++,
title: baseName(item.fileName),
isFree: true,
videoUrl: item.url || '',
durationSec: item.durationSec || 0,
saved: false,
error: ''
}))
const used = new Set(props.existingNumbers)
let cursor = props.nextEpisodeNumber
const freeLimit = props.freeEpisodes
rows.value = sorted.map((item) => {
const number = nextFreeNumber(cursor, used)
used.add(number)
cursor = number + 1
const isFree = number <= freeLimit
return {
key: item.id,
sourceName: item.fileName,
number,
title: baseName(item.fileName),
isFree,
videoUrl: item.url || '',
durationSec: item.durationSec || 0,
saved: false,
error: ''
}
})
}
watch(
@@ -76,12 +100,6 @@ watch(
}
)
function conflictOf(row: EpisodeDraft): boolean {
if (row.saved) return false
const duplicated = rows.value.filter((item) => item.number === row.number).length > 1
return duplicated || props.existingNumbers.includes(Number(row.number))
}
function errorText(error: unknown): string {
if (error instanceof Error && error.message) return error.message
return t('episodeBatch.createFailed')
@@ -96,12 +114,12 @@ async function createOne(row: EpisodeDraft): Promise<void> {
await createEpisodeApi({
dramaId: props.dramaId as unknown as number,
number: row.number,
title: row.title.trim(),
title: baseName(row.sourceName),
durationSec: row.durationSec,
videoUrl: row.videoUrl,
isFree: row.isFree,
unlockCoin: row.isFree ? 0 : props.defaultUnlockCoin,
status: DRAFT_STATUS
status: PUBLISHED_STATUS
})
row.saved = true
row.error = ''
@@ -112,10 +130,6 @@ async function createOne(row: EpisodeDraft): Promise<void> {
async function submit(): Promise<void> {
if (submitting.value) return
if (rows.value.some((row) => conflictOf(row))) {
ElMessage.warning(t('episodeBatch.fixConflict'))
return
}
submitting.value = true
try {
for (const row of rows.value) {
@@ -150,6 +164,7 @@ function hasFailed(): boolean {
:close-on-click-modal="false"
@update:model-value="emit('update:modelValue', $event)"
>
<p class="create-episode-hint">{{ t('episodeBatch.createHint') }}</p>
<div class="create-episode-head">
<span>{{ t('episodeBatch.colSource') }}</span>
<span>{{ t('episodeBatch.colNumber') }}</span>
@@ -162,24 +177,16 @@ function hasFailed(): boolean {
v-for="row in rows"
:key="row.key"
class="create-episode-row"
:class="{ 'is-conflict': conflictOf(row), 'is-saved': row.saved }"
:class="{ 'is-saved': row.saved }"
>
<b class="create-episode-source" :title="row.sourceName">{{ row.sourceName }}</b>
<el-input-number
v-model="row.number"
:min="1"
:max="999"
:disabled="row.saved"
controls-position="right"
/>
<el-input v-model="row.title" maxlength="100" :disabled="row.saved" />
<el-switch v-model="row.isFree" :disabled="row.saved" />
<span class="create-episode-number">{{ row.number }}</span>
<span class="create-episode-title" :title="row.title">{{ row.title }}</span>
<span class="create-episode-free" :class="row.isFree ? 'is-free' : 'is-paid'">
{{ row.isFree ? t('episodeBatch.labelFree') : t('episodeBatch.labelPaid') }}
</span>
<span class="create-episode-result">
{{
row.saved
? t('episodeBatch.createOk')
: row.error || (conflictOf(row) ? t('episodeBatch.numberConflict') : '')
}}
{{ row.saved ? t('episodeBatch.createOk') : row.error }}
</span>
</div>
</div>
@@ -193,14 +200,33 @@ function hasFailed(): boolean {
</template>
<style scoped>
.create-episode-hint {
margin: 0 0 12px;
color: var(--el-text-color-secondary);
font-size: 13px;
line-height: 1.5;
}
.create-episode-head,
.create-episode-row {
display: grid;
grid-template-columns: minmax(120px, 1.2fr) 120px minmax(140px, 1.4fr) 48px minmax(80px, 0.8fr);
grid-template-columns: minmax(120px, 1.2fr) 72px minmax(140px, 1.4fr) 56px minmax(80px, 0.8fr);
gap: 8px;
align-items: center;
}
.create-episode-free {
font-size: 12px;
}
.create-episode-free.is-free {
color: var(--el-color-success);
}
.create-episode-free.is-paid {
color: var(--el-color-warning);
}
.create-episode-head {
margin-bottom: 8px;
color: var(--el-text-color-secondary);
@@ -215,26 +241,22 @@ function hasFailed(): boolean {
overflow: auto;
}
.create-episode-source {
.create-episode-source,
.create-episode-title {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.create-episode-number {
font-variant-numeric: tabular-nums;
}
.create-episode-result {
color: var(--el-text-color-secondary);
font-size: 12px;
}
.create-episode-row.is-conflict :deep(.el-input-number) {
box-shadow: 0 0 0 1px var(--el-color-danger) inset;
border-radius: 4px;
}
.create-episode-row.is-conflict .create-episode-result {
color: var(--el-color-danger);
}
.create-episode-row.is-saved .create-episode-result {
color: var(--el-color-success);
}
@@ -108,6 +108,8 @@ const canRemove = computed(
margin-top: 8px;
display: flex;
gap: 8px;
justify-content: flex-end;
margin-left: auto;
}
.upload-task-row.is-failed {