fix(short-drama-agent-front): 修复拆解进度展示与问题交互

This commit is contained in:
GJ committed 2026-10-17 10:21:44 +08:00
1 parent 3414cc8232
commit db91a4b871
19 files changed
+870 -150

No files matched your search

@@ -19,7 +19,7 @@ const props = withDefaults(
loading: boolean
/** 状态读取错误。 */
error: string
/** 是否展示运行与完成说明,已有消息及详细快照的页面可关闭。 */
/** 是否展示运行、完成和错误详情;关闭后由调用方单独呈现问题。 */
showStatusHint?: boolean
}>(),
{ title: '制作任务', showStatusHint: true }
@@ -28,9 +28,35 @@ const props = withDefaults(
const emit = defineEmits<{ refresh: []; dismiss: [] }>()
const percentage = computed(() => executionPercentage(props.execution?.current ?? 0, props.execution?.total ?? 0))
const result = computed(() => props.execution?.result ?? {})
/** 拆解任务的单位和结果文案与镜头素材任务分开。 */
const breakdownTask = computed(() => props.execution?.workflowName === 'breakdown')
/** 执行完成不等于业务校验通过,明确保留待修复状态。 */
const breakdownInvalid = computed(() => {
const validation = result.value.storyboardShotValidation
return (
breakdownTask.value &&
validation &&
typeof validation === 'object' &&
'valid' in validation &&
validation.valid === false
)
})
/** 后端提供的进度单位,避免把抽取完成误报为整个拆解完成。 */
const progressLabel = computed(() =>
props.execution?.metadata?.progressUnit === 'extraction_tasks'
? '抽取任务'
: props.execution?.metadata?.progressUnit === 'storyboard_episodes'
? '分镜剧集'
: '已处理'
)
/** 后端执行终态与业务审核结果共同决定可读状态。 */
const statusLabel = computed(() => {
const labels = { pending: '等待开始', running: '执行中', completed: '已完成', failed: '失败' }
return props.execution ? labels[props.execution.status] : ''
return props.execution
? props.execution.status === 'completed' && breakdownInvalid.value
? '执行结束 · 校验未通过'
: labels[props.execution.status]
: ''
})
const finished = computed(() => ['completed', 'failed'].includes(props.execution?.status ?? ''))
/** 是否为剧本创作任务,避免使用镜头素材的提示文案。 */
@@ -48,7 +74,7 @@ const staleMotionPlanCount = computed(() => {
/** 视频流程结束但含过期候选时使用警告标签,不显示全成功的绿色状态。 */
const statusType = computed(() =>
props.execution?.status === 'completed'
? videoQuality.value && staleMotionPlanCount.value > 0
? breakdownInvalid.value || (videoQuality.value && staleMotionPlanCount.value > 0)
? 'warning'
: 'success'
: props.execution?.status === 'failed'
@@ -162,11 +188,19 @@ function isInputMode(value: unknown, inputMode: string): boolean {
class="mt-4"
/>
<p class="mt-3 text-xs">
<template v-if="execution.total > 0">已处理 {{ execution.current }} / {{ execution.total }}</template>
<template v-if="execution.total > 0"
>{{ progressLabel }} {{ execution.current }} / {{ execution.total }}</template
>
<template v-else>{{
finished ? '本次任务已结束' : scriptCreation ? '正在创作剧本' : '正在准备本次任务'
finished
? '本次任务已结束'
: breakdownTask
? '拆解进行中,等待下一阶段结果'
: scriptCreation
? '正在创作剧本'
: '正在准备本次任务'
}}</template>
<template v-if="execution.currentResourceId && !scriptCreation">
<template v-if="execution.currentResourceId && !scriptCreation && !breakdownTask">
· 当前镜头 <code>{{ execution.currentResourceId }}</code></template
>
</p>
@@ -183,27 +217,31 @@ function isInputMode(value: unknown, inputMode: string): boolean {
<ContextNotice
v-else-if="execution.status === 'completed' && showStatusHint"
:type="
keyframeEdit
? result.passed === true
? 'success'
: result.validationSkipped === true
? 'info'
: 'warning'
: videoQuality && staleMotionPlanCount > 0
? 'warning'
: keyframeQuality &&
(!keyframeCounts || keyframeCounts.repairFailed + keyframeCounts.failed > 0)
breakdownInvalid
? 'warning'
: keyframeEdit
? result.passed === true
? 'success'
: result.validationSkipped === true
? 'info'
: 'warning'
: videoQuality && staleMotionPlanCount > 0
? 'warning'
: 'success'
: keyframeQuality &&
(!keyframeCounts || keyframeCounts.repairFailed + keyframeCounts.failed > 0)
? 'warning'
: 'success'
"
:show-icon="false"
class="mt-3"
>
<p>
{{
scriptCreation
? '剧本创作任务已结束,可查看最新剧本内容。'
: '本轮任务已结束,可查看最新镜头资产状态。'
breakdownTask
? '剧本拆解已结束,请查看候选与校验结果。'
: scriptCreation
? '剧本创作任务已结束,可查看最新剧本内容。'
: '本轮任务已结束,可查看最新镜头资产状态。'
}}
</p>
<p v-if="videoQuality" class="mt-2 text-xs">
@@ -237,12 +275,17 @@ function isInputMode(value: unknown, inputMode: string): boolean {
>
<template v-else>后端首帧质量统计不完整,请查看任务详情并刷新核对。</template>
</p>
<p v-else-if="!videoQuality && !scriptCreation" class="mt-2 text-xs">
<p v-else-if="!videoQuality && !scriptCreation && !breakdownTask" class="mt-2 text-xs">
共 {{ result.total ?? execution.total }} · 生成 {{ result.generated ?? execution.current }} · 跳过
{{ result.skipped ?? 0 }} · 阻塞 {{ result.blocked ?? 0 }} · 失败 {{ result.failed ?? 0 }}
</p>
</ContextNotice>
<ContextNotice v-else-if="execution.status === 'failed'" type="error" :show-icon="false" class="mt-3">
<ContextNotice
v-else-if="execution.status === 'failed' && showStatusHint"
type="error"
:show-icon="false"
class="mt-3"
>
<p>{{ execution.error || '制作任务执行失败。' }}</p>
<p class="mt-2 text-xs">
{{
+113
View File
@@ -0,0 +1,113 @@
import { onScopeDispose, ref, watch, type Ref } from 'vue'
import { workflowExecutionApi } from './execution-api'
import type { WorkflowExecution } from './execution.types'
import { errorMessage } from '../../lib/http'
/**
* 进入项目时读取最新任务,并订阅任务变化;不定时刷新页面或完整快照。
* @param projectId 当前项目编号
* @param workflowName 需要发现的工作流
* @param enabled 是否由当前观察器承担任务发现
* @param receive 接收属于当前项目的真实任务
* @returns 发现状态、错误及手动重读入口
*/
export function useWorkflowDiscovery(
projectId: Ref<string>,
workflowName: string,
enabled: boolean,
receive: (record: WorkflowExecution) => void
) {
/** 首次任务发现尚未结束。 */
const loading = ref(false)
/** 发现或订阅读取错误。 */
const error = ref('')
/** 当前项目订阅,项目切换和卸载时关闭。 */
let source: EventSource | undefined
/** 当前只读查询的取消控制器。 */
let controller: AbortController | undefined
/** 项目版本,拒绝旧项目与卸载后的迟到消息。 */
let version = 0
/** 组件是否已销毁。 */
let disposed = false
/**
* 接收前验证身份与必需状态字段,空结果不伪造任务。
* @param value 后端响应或事件内容
* @param id 本次观察的项目编号
*/
function accept(value: unknown, id: string) {
if (value === null) return
const record = value as WorkflowExecution | undefined
if (
!record ||
typeof record.id !== 'string' ||
!record.id ||
record.projectId !== id ||
record.workflowName !== workflowName ||
!['pending', 'running', 'completed', 'failed'].includes(record.status)
)
throw new Error('后台任务发现结果与当前项目或工作流不匹配。')
receive(record)
}
/** 重新发现服务端任务,不创建或重试任何生成任务。 */
async function refresh() {
if (disposed || !enabled || !projectId.value) return
const current = version
const id = projectId.value
controller?.abort()
controller = new AbortController()
const signal = controller.signal
loading.value = true
try {
const record = await workflowExecutionApi.latest(id, workflowName, signal)
if (disposed || signal.aborted || current !== version) return
accept(record, id)
error.value = ''
} catch (cause) {
if (!disposed && !signal.aborted && current === version) error.value = errorMessage(cause)
} finally {
if (!disposed && !signal.aborted && current === version) loading.value = false
}
}
watch(
projectId,
id => {
version++
source?.close()
controller?.abort()
source = undefined
loading.value = false
error.value = ''
if (!enabled || !id) return
const current = version
void refresh()
if (typeof EventSource === 'undefined') return
source = new EventSource(workflowExecutionApi.eventsUrl(id, workflowName))
source.addEventListener('message', event => {
if (disposed || current !== version) return
try {
accept(JSON.parse(event.data), id)
error.value = ''
loading.value = false
} catch (cause) {
error.value = errorMessage(cause)
}
})
source.addEventListener('error', () => {
if (disposed || current !== version) return
error.value = '后台任务状态订阅暂时断开,正在重新连接。'
loading.value = false
})
},
{ immediate: true }
)
onScopeDispose(() => {
disposed = true
version++
controller?.abort()
source?.close()
})
return { loading, error, refresh }
}
+20
View File
@@ -3,6 +3,26 @@ import type { WorkflowExecution } from './execution.types'
/** WorkflowExecution 查询接口;数据库状态是任务进度的权威来源。 */
export const workflowExecutionApi = {
/**
* 按项目发现最新后台任务,不依赖本地保存的句柄。
* @param projectId 当前正式项目编号
* @param workflowName 工作流名称
* @param signal 取消过期查询
* @returns 服务端最新任务,无记录时为 null
*/
latest: (projectId: string, workflowName: string, signal?: AbortSignal) =>
request<WorkflowExecution | null>(
`/projects/${encodeURIComponent(projectId)}/workflow-executions/latest?${new URLSearchParams({ workflowName })}`,
{ signal }
),
/**
* 项目任务发现事件地址,连接只观察状态,不启动任务。
* @param projectId 当前正式项目编号
* @param workflowName 工作流名称
* @returns 同源或已配置 API 服务的 SSE 地址
*/
eventsUrl: (projectId: string, workflowName: string) =>
`${(import.meta.env.VITE_API_BASE_URL || '/api').replace(/\/$/, '')}/projects/${encodeURIComponent(projectId)}/workflow-executions/events?${new URLSearchParams({ workflowName })}`,
get: (executionId: string, signal?: AbortSignal) =>
request<WorkflowExecution>(`/workflow-executions/${encodeURIComponent(executionId)}`, { signal })
}
+123 -13
View File
@@ -2,6 +2,8 @@ import { computed, onScopeDispose, reactive, ref, watch, type Ref } from 'vue'
import { usePolling } from '../../composables/usePolling'
import { workflowExecutionApi } from './execution-api'
import { useActionMessage } from '../../components/ui/useActionMessage'
import { useWorkflowDiscovery } from './discovery'
import type { WorkflowExecution } from './execution.types'
const storagePrefix = 'short-drama:workflow-execution'
@@ -18,8 +20,14 @@ interface ExecutionActivity {
}
/** 活动状态按项目和工作流共同隔离。 */
const executionActivity = reactive<Record<string, ExecutionActivity>>({})
/** 同项目布局与页面共用最近的真实记录,终态到达时同步解除旧运行提示。 */
const executionRecords = reactive<Record<string, WorkflowExecution>>({})
/** 同任务可能有页面和弹窗多个观察器,真实终态仅通知一次。 */
const announcedExecutions = new Set<string>()
/** 同项目页面共享发现状态,避免未挂载发现器的子页误认为没有后台任务。 */
const discoveryActivity = reactive<Record<string, { loading: boolean; error: string }>>({})
/** 子页重读入口复用项目布局的发现器,避免额外建立订阅。 */
const discoveryReaders = new Map<string, () => Promise<void>>()
/**
* 检查项目是否仍有已跟踪且未结束的后台任务。
@@ -45,6 +53,14 @@ export function executionStageLabel(stage: string | null) {
resumeGeneration: '恢复分集剧本生成',
resumeRewrite: '恢复剧本改写',
breakdown: '拆解剧本',
subject_ready: '主体已整理完成',
subject_candidate_ready: '主体候选已就绪',
storyboard_plan_ready: '分镜规划已生成',
storyboard_shots_progress: '分镜镜头生成进度',
storyboard_shots_pending_quality: '分镜镜头等待质量审核',
storyboard_ready: '分镜已通过结构检查',
storyboard_persisted: '正式分镜已保存',
storyboard_quality_blocked: '分镜质量需要处理',
storyboardRegenerate: '重生成单集镜头',
storyboardDirection: '生成导演设计',
storyboardVisualState: '生成即时状态',
@@ -96,8 +112,18 @@ function savedExecutionId(projectId: string, workflowName: string) {
return localStorage.getItem(storageKey(projectId, workflowName)) ?? ''
}
/** 跟踪一个项目最近的持久化任务;刷新页面后从本地句柄恢复,状态仍从后端读取。 */
export function useWorkflowExecution(projectId: Ref<string>, workflowName: string) {
/**
* 跟踪持久化任务,项目布局可开启服务端发现并在其它页面共享句柄。
* @param projectId 正式项目编号
* @param workflowName 工作流名称
* @param options 当前观察器是否承担服务端任务发现
* @returns 任务记录、活动锁和读取入口
*/
export function useWorkflowExecution(
projectId: Ref<string>,
workflowName: string,
options: { discover?: boolean } = {}
) {
/** 状态反馈与应用其它操作共用消息层。 */
const message = useActionMessage()
/** 仅通知本会话观察到运行或主动启动的任务,不重放旧完成记录。 */
@@ -137,12 +163,19 @@ export function useWorkflowExecution(projectId: Ref<string>, workflowName: strin
const key = computed(() => executionId.value)
const query = usePolling(
key,
async (id, signal) => {
async (id, signal): Promise<WorkflowExecution | null> => {
if (!id) return null
const targetProjectId = projectId.value
const record = await workflowExecutionApi.get(id, signal)
if (record.projectId !== targetProjectId || record.workflowName !== workflowName || record.id !== id)
throw new Error('后台任务与当前项目或工作流不匹配,请刷新核对。')
const known = query.data.value
if (
known?.id === id &&
(['completed', 'failed'].includes(known.status) ||
Date.parse(known.updatedAt) > Date.parse(record.updatedAt))
)
return known
const activity = executionActivity[storageKey(targetProjectId, workflowName)]
if (
!signal.aborted &&
@@ -153,10 +186,19 @@ export function useWorkflowExecution(projectId: Ref<string>, workflowName: strin
) {
activity.terminal = ['completed', 'failed'].includes(record.status)
activity.active = !activity.terminal
executionRecords[storageKey(targetProjectId, workflowName)] = record
}
return record
},
computed(() => (executionId.value && !terminal.value ? 1_500 : false))
computed(() => (executionId.value && !terminal.value && !options.discover ? 1_500 : false))
)
/** 其它观察器读取到新阶段或终态时同步本地展示,拒绝不同任务的迟到结果。 */
watch(
() => executionRecords[storageKey(projectId.value, workflowName)],
record => {
if (record?.id === executionId.value) query.data.value = record
},
{ flush: 'sync' }
)
watch(
() => query.data.value?.status,
@@ -204,14 +246,15 @@ export function useWorkflowExecution(projectId: Ref<string>, workflowName: strin
)
return
}
const failures = [
'staleMotionPlan',
'failed',
'repairFailed',
'exhausted',
'providerFailed',
'submissionFailed'
].some(field => typeof result[field] === 'number' && Number(result[field]) > 0)
const storyboardValidation = result.storyboardShotValidation
const failures =
(storyboardValidation &&
typeof storyboardValidation === 'object' &&
'valid' in storyboardValidation &&
storyboardValidation.valid === false) ||
['staleMotionPlan', 'failed', 'repairFailed', 'exhausted', 'providerFailed', 'submissionFailed'].some(
field => typeof result[field] === 'number' && Number(result[field]) > 0
)
message[failures ? 'warning' : 'info'](
failures
? '本轮任务已结束,部分结果未通过或执行失败,请查看任务记录。'
@@ -255,11 +298,78 @@ export function useWorkflowExecution(projectId: Ref<string>, workflowName: strin
function dismiss() {
if (active.value) return
delete executionActivity[storageKey(projectId.value, workflowName)]
delete executionRecords[storageKey(projectId.value, workflowName)]
if (projectId.value && typeof localStorage !== 'undefined')
localStorage.removeItem(storageKey(projectId.value, workflowName))
executionId.value = ''
terminal.value = false
}
return { executionId, query, active, track, dismiss }
/**
* 服务端消息立即恢复项目活动锁,终态与旧版本消息不得被迟到响应覆盖。
* @param record 当前项目的后台任务记录
*/
function receiveDiscovered(record: WorkflowExecution) {
const known = query.data.value
if (
known &&
(Date.parse(record.createdAt) < Date.parse(known.createdAt) ||
(record.id === known.id &&
(['completed', 'failed'].includes(known.status) ||
Date.parse(record.updatedAt) < Date.parse(known.updatedAt))))
)
return
const activityKey = storageKey(record.projectId, workflowName)
const finished = ['completed', 'failed'].includes(record.status)
const activity = executionActivity[activityKey]
if (activity?.id === record.id && activity.terminal && !finished) return
executionActivity[activityKey] = {
projectId: record.projectId,
id: record.id,
active: !finished,
terminal: finished
}
if (typeof localStorage !== 'undefined') localStorage.setItem(activityKey, record.id)
executionId.value = record.id
terminal.value = finished
query.data.value = record
executionRecords[activityKey] = record
}
/** 由项目布局负责一条发现连接,子页继续共享真实任务句柄。 */
const discovery = useWorkflowDiscovery(projectId, workflowName, options.discover === true, receiveDiscovered)
if (options.discover) {
watch(
projectId,
(id, previous) => {
if (previous) discoveryReaders.delete(storageKey(previous, workflowName))
discoveryReaders.set(storageKey(id, workflowName), discovery.refresh)
},
{ immediate: true }
)
onScopeDispose(() => {
const discoveryKey = storageKey(projectId.value, workflowName)
if (discoveryReaders.get(discoveryKey) === discovery.refresh) {
discoveryReaders.delete(discoveryKey)
delete discoveryActivity[discoveryKey]
}
})
}
if (options.discover)
watch(
[discovery.loading, discovery.error],
([loading, error]) => {
discoveryActivity[storageKey(projectId.value, workflowName)] = { loading, error }
},
{ immediate: true, flush: 'sync' }
)
/** 当前项目的任务发现是否仍在读取。 */
const discovering = computed(() => discoveryActivity[storageKey(projectId.value, workflowName)]?.loading ?? false)
/** 当前项目发现错误,由子页提供明确重读入口。 */
const discoveryError = computed(() => discoveryActivity[storageKey(projectId.value, workflowName)]?.error ?? '')
/** 手动重读复用项目级发现连接,不重发生成请求。 */
async function discover() {
await discoveryReaders.get(storageKey(projectId.value, workflowName))?.()
}
return { executionId, query, active, track, dismiss, discovering, discoveryError, discover }
}