fix: 完善数据预处理与 JSON 上传链路

frontend/src/views/data-process/DataProcessCreateView.vue

@@ -10,7 +10,7 @@ import SourceUploadStep from './create/SourceUploadStep.vue'
 import PreviewCompareStep from './create/PreviewCompareStep.vue'
 import GenerationStep from './create/GenerationStep.vue'
 import ResultEditorStep from './create/ResultEditorStep.vue'
-import { DEFAULT_SOURCE_TEXT, estimateTokenCount } from './create/previewModel'
+import { DEFAULT_SOURCE_TEXT, estimateTokenCount, isManualPreviewItem } from './create/previewModel'
 import {
   createDefaultStructuredOptions,
   createDefaultUnstructuredOptions,
@@ -21,6 +21,7 @@ import { useDataProcessGeneration } from './create/useDataProcessGeneration'
 import { useDataProcessPreviewBuild } from './create/useDataProcessPreviewBuild'
 import { useDataProcessRegeneration } from './create/useDataProcessRegeneration'
 import {
+  loadCanonicalSourceContent,
   mapDataProcessSourceFile,
   useDataProcessSourceUpload,
   validateSourceFileSelection,
@@ -33,7 +34,6 @@ import {
   deleteDataProcessPreview,
   deleteDataProcessSourceFile,
   getDataProcessPreview,
-  getDataProcessSourceContent,
   pullDataProcessExternalSource,
   testDataProcessExternalSource,
   updateDataProcessPreview,
@@ -116,7 +116,9 @@ const modelSubmitLoading = ref(false)
 let allowLeave = false
 const {
   bulkRegeneration,
+  canReturnFromGeneration,
   generation,
+  generationStarting,
   regeneratingResultId,
   resultRegenerationBusy,
   results,
@@ -189,7 +191,6 @@ const primaryActionIcon = computed(() => {
   if (currentStepId.value === 'generate' && generation.status !== 'success') return 'fa-play'
   return 'fa-arrow-right'
 })
-
 const previousStepLabel = computed(() => currentStep.value > 0
   ? WIZARD_STEPS[currentStep.value - 1].title
   : '')
@@ -290,21 +291,26 @@ function externalPayload(): DataProcessExternalSourcePayload {
 }
 
 function mapPreviewItem(item: DataProcessPreviewItem): PreviewItem {
+  const sourceLocator = item.quality_score?.source_locator
   return {
     id: String(item.id),
     sourceFileId: String(item.source_file_id),
     originalContent: item.original_content,
     editedContent: item.edited_content,
     savedEditedContent: item.edited_content,
-    sourceStart: item.source_start,
-    sourceEnd: item.source_end,
-    sourceStartLine: item.source_start_line,
-    sourceEndLine: item.source_end_line,
+    sourceStart: item.source_start ?? sourceLocator?.source_start ?? null,
+    sourceEnd: item.source_end ?? sourceLocator?.source_end ?? null,
+    sourceStartLine: item.source_start_line ?? sourceLocator?.start_line ?? null,
+    sourceEndLine: item.source_end_line ?? sourceLocator?.end_line ?? null,
     tokenCount: item.token_count,
     status: item.status,
     sourcePages: Array.isArray(item.quality_score?.source_pages)
       ? item.quality_score.source_pages.filter((value): value is number => typeof value === 'number')
       : [],
+    sourceLocator,
+    headingPath: Array.isArray(item.quality_score?.heading_path)
+      ? item.quality_score.heading_path.filter((value): value is string => typeof value === 'string')
+      : [],
     updatedAt: item.updated_at,
   }
 }
@@ -419,7 +425,6 @@ function handleFileChange(uploadFile: UploadFile) {
   const localUid = `local-${uploadFile.uid}-${Date.now()}-${uploadedFiles.value.length}`
   uploadedFiles.value.push({
     uid: localUid,
-    rawFile: raw,
     name: raw.name,
     size: raw.size,
     count: 0,
@@ -431,7 +436,7 @@ function handleFileChange(uploadFile: UploadFile) {
     previewProgress: 0,
   })
   dirty.value = true
-  enqueueSourceUpload({ uid: localUid, file: raw, extension: validation.extension })
+  enqueueSourceUpload({ uid: localUid, file: raw })
 }
 
 async function useSampleFile() {
@@ -488,11 +493,8 @@ async function handlePullData() {
     const response = await pullDataProcessExternalSource(taskId.value, externalPayload())
     const newFiles: UploadedDataFile[] = []
     for (const file of response.files) {
-      const source = await getDataProcessSourceContent(taskId.value, file.id, {
-        start_line: 1,
-        line_count: 5000,
-      })
-      newFiles.push(mapDataProcessSourceFile(file, source.content))
+      const content = await loadCanonicalSourceContent(taskId.value, file.id)
+      newFiles.push(mapDataProcessSourceFile(file, content))
     }
     uploadedFiles.value.push(...newFiles)
     externalConnected.value = true
@@ -734,9 +736,14 @@ function selectPreviewItem(id: string) {
 function updatePreviewContent(id: string, value: string) {
   const item = previewItems.value.find((entry) => entry.id === id)
   if (!item) return
+  const isManual = isManualPreviewItem(item)
   item.editedContent = value
   item.tokenCount = estimateTokenCount(value)
-  item.status = value === item.originalContent ? 'original' : item.sourceStart == null ? 'manual' : 'modified'
+  item.status = !value.trim()
+    ? 'invalid'
+    : value === item.originalContent
+      ? 'original'
+      : isManual ? 'manual' : 'modified'
   resetDownstream()
   dirty.value = true
 }
@@ -758,7 +765,7 @@ async function syncPreviewChanges() {
 
 function restorePreviewItem(id: string) {
   const item = previewItems.value.find((entry) => entry.id === id)
-  if (!item || item.sourceStart == null) return
+  if (!item || isManualPreviewItem(item)) return
   item.editedContent = item.originalContent
   item.tokenCount = estimateTokenCount(item.originalContent)
   item.status = 'original'
@@ -897,7 +904,7 @@ async function handleBack() {
     ElMessage.warning('请等待当前文件切分完成')
     return
   }
-  if (currentStepId.value === 'generate') return
+  if (currentStepId.value === 'generate' && !canReturnFromGeneration.value) return
   if (currentStep.value > 0) {
     const targetStep = WIZARD_STEPS[currentStep.value - 1]?.id
     if (!targetStep) return
@@ -1014,8 +1021,13 @@ async function initializeExistingWorkflow() {
   if (sourceTask.status === 'running') resumeStep = 'generate'
   if (resumeStep === 'preview' && !previewItems.value.length) resumeStep = 'upload'
   if (resumeStep === 'results' && sourceTask.status !== 'completed') resumeStep = 'generate'
+  if (resumeStep === 'generate' || resumeStep === 'results') {
+    const resume = resumeGeneration()
+    goToStep(resumeStep)
+    await resume
+    return
+  }
   goToStep(resumeStep)
-  if (resumeStep === 'generate' || resumeStep === 'results') await resumeGeneration()
 }
 
 onBeforeUnmount(() => {
@@ -1154,7 +1166,7 @@ onMounted(() => {
       <div class="footer-left">
         <el-button
           v-if="currentStep > 0"
-          :disabled="currentStepId === 'generate' || previewBuilding || sourceUploading"
+          :disabled="(currentStepId === 'generate' && !canReturnFromGeneration) || previewBuilding || sourceUploading"
           @click="handleBack"
         >
           <i class="fa fa-arrow-left" style="margin-right: 6px;" /> 返回：{{ previousStepLabel }}
@@ -1167,8 +1179,8 @@ onMounted(() => {
         <el-button
           class="wizard-primary-action"
           type="primary"
-          :loading="modelSubmitLoading || generation.status === 'running' || resultRegenerationBusy || (currentStepId === 'upload' && (sourceUploading || previewBuilding))"
-          :disabled="hydrating || modelSubmitLoading || Boolean(initializationError) || resultRegenerationBusy || (currentStepId === 'generate' && generation.status === 'running') || previewBuilding || sourceUploading || (currentStepId === 'upload' && hasUnfinishedUploads)"
+          :loading="modelSubmitLoading || generationStarting || generation.status === 'running' || resultRegenerationBusy || (currentStepId === 'upload' && (sourceUploading || previewBuilding))"
+          :disabled="hydrating || modelSubmitLoading || generationStarting || Boolean(initializationError) || resultRegenerationBusy || (currentStepId === 'generate' && generation.status === 'running') || previewBuilding || sourceUploading || (currentStepId === 'upload' && hasUnfinishedUploads)"
           @click="handlePrimaryAction"
         >
           {{ primaryActionLabel }} <i class="fa" :class="primaryActionIcon" style="margin-left: 6px;" />