7 changed files with 182 additions and 87 deletions

No files matched your search

+5
View File
@@ -1,4 +1,9 @@
#!/bin/sh #!/bin/sh
. "$(dirname "$0")/_/husky.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" pnpm commitlint --edit "$1"
+7 -5
View File
@@ -537,7 +537,7 @@ export default {
retry: 'Retry', retry: 'Retry',
retryAll: 'Retry all', retryAll: 'Retry all',
remove: 'Remove', 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', invalidType: 'Only MP4, MOV, MKV, WEBM are allowed',
oversize: 'File exceeds 500MB and was not queued', oversize: 'File exceeds 500MB and was not queued',
overallProgress: 'Overall progress', overallProgress: 'Overall progress',
@@ -554,19 +554,21 @@ export default {
resumeMatched: 'Matched {count} file(s) and resumed', resumeMatched: 'Matched {count} file(s) and resumed',
resumeUnmatched: '{count} session(s) could not match local files; pick again manually', resumeUnmatched: '{count} session(s) could not match local files; pick again manually',
createTitle: 'Create episodes in batch', 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', colSource: 'Source file',
colNumber: 'Episode No.', colNumber: 'Episode No.',
colTitle: 'Title', colTitle: 'Title',
colFree: 'Free', colFree: 'Pricing',
labelFree: 'Free',
labelPaid: 'Paid',
colResult: 'Result', colResult: 'Result',
numberConflict: 'Episode number conflict',
missingVideo: 'Missing video URL', missingVideo: 'Missing video URL',
createOk: 'Created', createOk: 'Created',
createFailed: 'Create failed', createFailed: 'Create failed',
createAllSuccess: 'All episodes created', createAllSuccess: 'All episodes created',
createPartial: 'Some episodes failed; you can retry', createPartial: 'Some episodes failed; you can retry',
fixConflict: 'Resolve episode number conflicts first', submitCreate: 'Create',
submitCreate: 'Submit',
retryFailed: 'Retry failed', retryFailed: 'Retry failed',
status: { status: {
waiting: 'Waiting', waiting: 'Waiting',
+7 -5
View File
@@ -531,7 +531,7 @@ export default {
retry: '重试', retry: '重试',
retryAll: '全部重试', retryAll: '全部重试',
remove: '移除', remove: '移除',
hint: '支持 MP4 / MOV / MKV / WEBM,单文件不超过 500MB;可一次多选,同时上传 2 个,其余自动排队。', hint: '支持 MP4 / MOV / MKV / WEBM,单文件不超过 500MB',
invalidType: '仅支持 MP4、MOV、MKV、WEBM', invalidType: '仅支持 MP4、MOV、MKV、WEBM',
oversize: '文件超过 500MB,未入队', oversize: '文件超过 500MB,未入队',
overallProgress: '总进度', overallProgress: '总进度',
@@ -546,19 +546,21 @@ export default {
resumeMatched: '已匹配 {count} 个文件并开始续传', resumeMatched: '已匹配 {count} 个文件并开始续传',
resumeUnmatched: '有 {count} 个会话无法匹配本地文件,请手动重选', resumeUnmatched: '有 {count} 个会话无法匹配本地文件,请手动重选',
createTitle: '批量创建分集', createTitle: '批量创建分集',
createHint:
'标题取视频文件名,集号自动顺延分配;免费集数由短剧管理中的「免费集数」配置决定,超出部分为收费集;创建后可在分集编辑中修改',
colSource: '源文件', colSource: '源文件',
colNumber: '集号', colNumber: '集号',
colTitle: '标题', colTitle: '标题',
colFree: '免费', colFree: '收费类型',
labelFree: '免费',
labelPaid: '收费',
colResult: '结果', colResult: '结果',
numberConflict: '集号冲突',
missingVideo: '缺少视频地址', missingVideo: '缺少视频地址',
createOk: '已创建', createOk: '已创建',
createFailed: '创建失败', createFailed: '创建失败',
createAllSuccess: '全部分集已创建', createAllSuccess: '全部分集已创建',
createPartial: '部分分集创建失败,可重试', createPartial: '部分分集创建失败,可重试',
fixConflict: '请先解决集号冲突', submitCreate: '创建',
submitCreate: '提交创建',
retryFailed: '重试失败项', retryFailed: '重试失败项',
status: { status: {
waiting: '等待中', waiting: '等待中',
@@ -15,6 +15,9 @@ import BatchUploadDialog from './upload/BatchUploadDialog.vue'
import EpisodeFormDialog from './upload/EpisodeFormDialog.vue' import EpisodeFormDialog from './upload/EpisodeFormDialog.vue'
import { listPendingSessions } from './upload/uploadSessions' import { listPendingSessions } from './upload/uploadSessions'
const DEFAULT_PAGE_SIZE = 100
const PAGE_SIZE_OPTIONS = [50, 100, 200]
const route = useRoute() const route = useRoute()
const { can } = useRbac() const { can } = useRbac()
const { t } = useI18n() const { t } = useI18n()
@@ -23,6 +26,8 @@ const loading = ref(false)
const dramas = ref([]) const dramas = ref([])
const episodes = ref([]) const episodes = ref([])
const selectedDramaId = ref(undefined) const selectedDramaId = ref(undefined)
const pageIndex = ref(1)
const pageSize = ref(DEFAULT_PAGE_SIZE)
const batchUploadVisible = ref(false) const batchUploadVisible = ref(false)
const previewVisible = ref(false) const previewVisible = ref(false)
const previewEpisode = ref(null) const previewEpisode = ref(null)
@@ -34,6 +39,17 @@ const existingEpisodeNumbers = computed(() =>
episodes.value.map((item) => Number(item.number)).filter((n) => Number.isFinite(n)) episodes.value.map((item) => Number(item.number)).filter((n) => Number.isFinite(n))
) )
const pagedEpisodes = computed(() => {
const start = (pageIndex.value - 1) * pageSize.value
return episodes.value.slice(start, start + pageSize.value)
})
const showPagination = computed(() => {
const total = episodes.value.length
if (total <= 0) return false
return Math.ceil(total / pageSize.value) > 1
})
async function loadDramas() { async function loadDramas() {
const res = await pageDramasApi({ pageIndex: 1, pageSize: 200 }) const res = await pageDramasApi({ pageIndex: 1, pageSize: 200 })
dramas.value = res.data?.list || [] dramas.value = res.data?.list || []
@@ -55,11 +71,19 @@ async function loadEpisodes() {
try { try {
const res = await listEpisodesApi(selectedDramaId.value) const res = await listEpisodesApi(selectedDramaId.value)
episodes.value = res.data || [] episodes.value = res.data || []
clampPageIndex()
} finally { } finally {
loading.value = false loading.value = false
} }
} }
/** 刷新后若当前页越界(如删除末页最后一条),夹到最后一页。 */
function clampPageIndex() {
const total = episodes.value.length
const maxPage = Math.max(1, Math.ceil(total / pageSize.value) || 1)
if (pageIndex.value > maxPage) pageIndex.value = maxPage
}
function nextNumber() { function nextNumber() {
return episodes.value.reduce((max, item) => Math.max(max, item.number || 0), 0) + 1 return episodes.value.reduce((max, item) => Math.max(max, item.number || 0), 0) + 1
} }
@@ -122,10 +146,24 @@ function stopThumb(event) {
} }
} }
function episodeIndexInFullList(row) {
return episodes.value.findIndex((item) => item.id === row.id)
}
function canMoveUp(row) {
return episodeIndexInFullList(row) > 0
}
function canMoveDown(row) {
const index = episodeIndexInFullList(row)
return index >= 0 && index < episodes.value.length - 1
}
/** 上移/下移后把新顺序整表提交,由后端重排 sort。 */ /** 上移/下移后把新顺序整表提交,由后端重排 sort。 */
async function move(index, offset) { async function move(row, offset) {
const index = episodeIndexInFullList(row)
const target = index + offset const target = index + offset
if (target < 0 || target >= episodes.value.length) return if (index < 0 || target < 0 || target >= episodes.value.length) return
const next = [...episodes.value] const next = [...episodes.value]
const [moved] = next.splice(index, 1) const [moved] = next.splice(index, 1)
next.splice(target, 0, moved) next.splice(target, 0, moved)
@@ -135,10 +173,15 @@ async function move(index, offset) {
} }
async function onDramaChange() { async function onDramaChange() {
pageIndex.value = 1
await loadEpisodes() await loadEpisodes()
openBatchIfPendingSessions() openBatchIfPendingSessions()
} }
function handleSizeChange() {
pageIndex.value = 1
}
/** 进入页面或切换短剧时,若有 24h 内未完成上传则打开批量上传弹窗以提示续传。 */ /** 进入页面或切换短剧时,若有 24h 内未完成上传则打开批量上传弹窗以提示续传。 */
function openBatchIfPendingSessions() { function openBatchIfPendingSessions() {
if (!selectedDramaId.value || !can('episode:upload')) return if (!selectedDramaId.value || !can('episode:upload')) return
@@ -202,11 +245,10 @@ onMounted(async () => {
<div class="episode-toolbar" <div class="episode-toolbar"
><div ><div
><h2>剧集列表({{ episodes.length }})</h2><p>按列表顺序播放</p></div ><h2>剧集列表({{ episodes.length }})</h2><p>按列表顺序播放</p></div
></div ></div>
>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="episodes" :data="pagedEpisodes"
row-key="id" row-key="id"
empty-text="该短剧暂无剧集" empty-text="该短剧暂无剧集"
class="drama-el-table episode-el-table" class="drama-el-table episode-el-table"
@@ -278,7 +320,7 @@ onMounted(async () => {
></el-table-column ></el-table-column
> >
<el-table-column label="操作" width="250" fixed="right" <el-table-column label="操作" width="250" fixed="right"
><template #default="{ row, $index }" ><template #default="{ row }"
><div class="table-actions" ><div class="table-actions"
><el-button ><el-button
v-if="can('episode:upload')" v-if="can('episode:upload')"
@@ -289,14 +331,14 @@ onMounted(async () => {
><el-button ><el-button
v-if="can('episode:sort')" v-if="can('episode:sort')"
size="small" size="small"
:disabled="$index === 0" :disabled="!canMoveUp(row)"
@click="move($index, -1)" @click="move(row, -1)"
>上移</el-button >上移</el-button
><el-button ><el-button
v-if="can('episode:sort')" v-if="can('episode:sort')"
size="small" size="small"
:disabled="$index === episodes.length - 1" :disabled="!canMoveDown(row)"
@click="move($index, 1)" @click="move(row, 1)"
>下移</el-button >下移</el-button
><el-button ><el-button
v-if="can('episode:upload')" v-if="can('episode:upload')"
@@ -309,6 +351,17 @@ onMounted(async () => {
></el-table-column ></el-table-column
> >
</el-table> </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="episodes.length"
:pager-count="7"
layout="total, sizes, prev, pager, next, jumper"
background
@size-change="handleSizeChange"
/></div>
</section> </section>
<EpisodeFormDialog <EpisodeFormDialog
ref="formDialogRef" ref="formDialogRef"
@@ -337,6 +390,7 @@ onMounted(async () => {
:drama-id="selectedDramaId" :drama-id="selectedDramaId"
:next-episode-number="batchNextNumber" :next-episode-number="batchNextNumber"
:default-unlock-coin="selectedDrama?.unlockCoin ?? 0" :default-unlock-coin="selectedDrama?.unlockCoin ?? 0"
:free-episodes="selectedDrama?.freeEpisodes ?? 0"
:existing-numbers="existingEpisodeNumbers" :existing-numbers="existingEpisodeNumbers"
@refreshed="loadEpisodes" @refreshed="loadEpisodes"
@created="onBatchEpisodesCreated" @created="onBatchEpisodesCreated"
@@ -12,13 +12,20 @@ import { useUploadQueue } from './useUploadQueue'
import { MAX_VIDEO_SIZE, VIDEO_ACCEPT_ATTR, VIDEO_EXTENSIONS } from './videoLimit' import { MAX_VIDEO_SIZE, VIDEO_ACCEPT_ATTR, VIDEO_EXTENSIONS } from './videoLimit'
import type { UploadSessionRecord } from './uploadSessions' import type { UploadSessionRecord } from './uploadSessions'
const props = defineProps<{ const props = withDefaults(
modelValue: boolean defineProps<{
dramaId: string | number modelValue: boolean
nextEpisodeNumber: number dramaId: string | number
defaultUnlockCoin: number nextEpisodeNumber: number
existingNumbers: number[] defaultUnlockCoin: number
}>() existingNumbers: number[]
/** 所属短剧免费集数;不传默认 0 */
freeEpisodes?: number
}>(),
{
freeEpisodes: 0
}
)
const emit = defineEmits<{ const emit = defineEmits<{
'update:modelValue': [value: boolean] 'update:modelValue': [value: boolean]
@@ -272,6 +279,7 @@ function onEpisodesCreated(): void {
:done-items="queue.doneItems.value" :done-items="queue.doneItems.value"
:next-episode-number="nextEpisodeNumber" :next-episode-number="nextEpisodeNumber"
:default-unlock-coin="defaultUnlockCoin" :default-unlock-coin="defaultUnlockCoin"
:free-episodes="freeEpisodes"
:existing-numbers="existingNumbers" :existing-numbers="existingNumbers"
@settled="emit('refreshed')" @settled="emit('refreshed')"
@created="onEpisodesCreated" @created="onEpisodesCreated"
@@ -1,5 +1,5 @@
<!-- Author: fruit.com.cn --> <!-- Author: fruit.com.cn -->
<!-- 批量创建分集:自然排序预填集号与标题,冲突标红,失败可重试 --> <!-- 批量创建分集确认清单:标题取文件名,集号自动顺延,失败可重试 -->
<script setup lang="ts"> <script setup lang="ts">
import { ref, watch } from 'vue' import { ref, watch } from 'vue'
@@ -8,14 +8,21 @@ import { createEpisodeApi } from '@/api/admin/episode'
import { useI18n } from '@/hooks/web/useI18n' import { useI18n } from '@/hooks/web/useI18n'
import type { UploadQueueItem } from './useUploadQueue' import type { UploadQueueItem } from './useUploadQueue'
const props = defineProps<{ const props = withDefaults(
modelValue: boolean defineProps<{
dramaId: string | number modelValue: boolean
doneItems: UploadQueueItem[] dramaId: string | number
nextEpisodeNumber: number doneItems: UploadQueueItem[]
defaultUnlockCoin: number nextEpisodeNumber: number
existingNumbers: number[] defaultUnlockCoin: number
}>() existingNumbers: number[]
/** 所属短剧免费集数;不传默认 0 */
freeEpisodes?: number
}>(),
{
freeEpisodes: 0
}
)
const emit = defineEmits<{ const emit = defineEmits<{
'update:modelValue': [value: boolean] 'update:modelValue': [value: boolean]
@@ -37,7 +44,7 @@ interface EpisodeDraft {
error: string error: string
} }
const DRAFT_STATUS = 'draft' const PUBLISHED_STATUS = 'published'
const rows = ref<EpisodeDraft[]>([]) const rows = ref<EpisodeDraft[]>([])
const submitting = ref(false) const submitting = ref(false)
@@ -51,22 +58,39 @@ function compareNatural(left: string, right: string): number {
return left.localeCompare(right, undefined, { numeric: true, sensitivity: 'base' }) 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 { function buildRows(): void {
const sorted = [...props.doneItems].sort((left, right) => const sorted = [...props.doneItems].sort((left, right) =>
compareNatural(baseName(left.fileName), baseName(right.fileName)) compareNatural(baseName(left.fileName), baseName(right.fileName))
) )
let number = props.nextEpisodeNumber const used = new Set(props.existingNumbers)
rows.value = sorted.map((item) => ({ let cursor = props.nextEpisodeNumber
key: item.id, const freeLimit = props.freeEpisodes
sourceName: item.fileName, rows.value = sorted.map((item) => {
number: number++, const number = nextFreeNumber(cursor, used)
title: baseName(item.fileName), used.add(number)
isFree: true, cursor = number + 1
videoUrl: item.url || '', const isFree = number <= freeLimit
durationSec: item.durationSec || 0, return {
saved: false, key: item.id,
error: '' sourceName: item.fileName,
})) number,
title: baseName(item.fileName),
isFree,
videoUrl: item.url || '',
durationSec: item.durationSec || 0,
saved: false,
error: ''
}
})
} }
watch( 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 { function errorText(error: unknown): string {
if (error instanceof Error && error.message) return error.message if (error instanceof Error && error.message) return error.message
return t('episodeBatch.createFailed') return t('episodeBatch.createFailed')
@@ -96,12 +114,12 @@ async function createOne(row: EpisodeDraft): Promise<void> {
await createEpisodeApi({ await createEpisodeApi({
dramaId: props.dramaId as unknown as number, dramaId: props.dramaId as unknown as number,
number: row.number, number: row.number,
title: row.title.trim(), title: baseName(row.sourceName),
durationSec: row.durationSec, durationSec: row.durationSec,
videoUrl: row.videoUrl, videoUrl: row.videoUrl,
isFree: row.isFree, isFree: row.isFree,
unlockCoin: row.isFree ? 0 : props.defaultUnlockCoin, unlockCoin: row.isFree ? 0 : props.defaultUnlockCoin,
status: DRAFT_STATUS status: PUBLISHED_STATUS
}) })
row.saved = true row.saved = true
row.error = '' row.error = ''
@@ -112,10 +130,6 @@ async function createOne(row: EpisodeDraft): Promise<void> {
async function submit(): Promise<void> { async function submit(): Promise<void> {
if (submitting.value) return if (submitting.value) return
if (rows.value.some((row) => conflictOf(row))) {
ElMessage.warning(t('episodeBatch.fixConflict'))
return
}
submitting.value = true submitting.value = true
try { try {
for (const row of rows.value) { for (const row of rows.value) {
@@ -150,6 +164,7 @@ function hasFailed(): boolean {
:close-on-click-modal="false" :close-on-click-modal="false"
@update:model-value="emit('update:modelValue', $event)" @update:model-value="emit('update:modelValue', $event)"
> >
<p class="create-episode-hint">{{ t('episodeBatch.createHint') }}</p>
<div class="create-episode-head"> <div class="create-episode-head">
<span>{{ t('episodeBatch.colSource') }}</span> <span>{{ t('episodeBatch.colSource') }}</span>
<span>{{ t('episodeBatch.colNumber') }}</span> <span>{{ t('episodeBatch.colNumber') }}</span>
@@ -162,24 +177,16 @@ function hasFailed(): boolean {
v-for="row in rows" v-for="row in rows"
:key="row.key" :key="row.key"
class="create-episode-row" 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> <b class="create-episode-source" :title="row.sourceName">{{ row.sourceName }}</b>
<el-input-number <span class="create-episode-number">{{ row.number }}</span>
v-model="row.number" <span class="create-episode-title" :title="row.title">{{ row.title }}</span>
:min="1" <span class="create-episode-free" :class="row.isFree ? 'is-free' : 'is-paid'">
:max="999" {{ row.isFree ? t('episodeBatch.labelFree') : t('episodeBatch.labelPaid') }}
:disabled="row.saved" </span>
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-result"> <span class="create-episode-result">
{{ {{ row.saved ? t('episodeBatch.createOk') : row.error }}
row.saved
? t('episodeBatch.createOk')
: row.error || (conflictOf(row) ? t('episodeBatch.numberConflict') : '')
}}
</span> </span>
</div> </div>
</div> </div>
@@ -193,14 +200,33 @@ function hasFailed(): boolean {
</template> </template>
<style scoped> <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-head,
.create-episode-row { .create-episode-row {
display: grid; 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; gap: 8px;
align-items: center; 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 { .create-episode-head {
margin-bottom: 8px; margin-bottom: 8px;
color: var(--el-text-color-secondary); color: var(--el-text-color-secondary);
@@ -215,26 +241,22 @@ function hasFailed(): boolean {
overflow: auto; overflow: auto;
} }
.create-episode-source { .create-episode-source,
.create-episode-title {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.create-episode-number {
font-variant-numeric: tabular-nums;
}
.create-episode-result { .create-episode-result {
color: var(--el-text-color-secondary); color: var(--el-text-color-secondary);
font-size: 12px; 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 { .create-episode-row.is-saved .create-episode-result {
color: var(--el-color-success); color: var(--el-color-success);
} }
@@ -108,6 +108,8 @@ const canRemove = computed(
margin-top: 8px; margin-top: 8px;
display: flex; display: flex;
gap: 8px; gap: 8px;
justify-content: flex-end;
margin-left: auto;
} }
.upload-task-row.is-failed { .upload-task-row.is-failed {