xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 11 Pull Requests 2 Actions 1 Packages Projects Releases 7 Wiki Activity

fix: 正式生成任务传 source_edit_plan_id，仅取URL参数不回退模板ID #1477

Closed
xiaoxia wants to merge 1 commits from fix/source-edit-plan-id-v2 into develop
pull from: fix/source-edit-plan-id-v2
merge into: xiaoxia:develop
Conversation 5 Commits 1 Files Changed 6
+21 -1
xiaoxia commented 2026-08-24 10:37:31 +08:00
Owner
Copy Link
Copy Source

问题

远程 develop 被 force-push 回退，之前 PR #1473 的 source_edit_plan_id 传递链路丢失。需要重新添加正确的传递逻辑。

修复

新增 sourceEditPlanId 完整传递链路（前端→后端），仅使用 URL 的 edit_plan_id，不用 selectedTemplate（模板ID）冒充：

  1. api/tasks/types.ts: CreateGenerationTaskRequest 新增 source_edit_plan_id?: string
  2. generate-video/types.ts: UseGenerateVideoProps 新增 sourceEditPlanId?: string | null
  3. useGenerateFormState/index.ts: sourceEditPlanId = editPlanId || null（不回退到 selectedTemplate）
  4. useGenerateVideo.ts: 条件传递 source_edit_plan_id 给 createGenerationTask
  5. GeneratePage.tsx: 从 formState 解构并传递给 useGenerateVideo

useStep6Cover.ts 的 createPreview 不传 source_edit_plan_id，后端预览 API 已有 template_id+user_id 兜底逻辑。

设计原则

  • URL 有 edit_plan_id（从剪辑模板编辑器跳转）→ 直接使用
  • URL 没有 → 传 null/不传，后端正式生成 API 通过 template_id+user_id 兜底查找正确的 plan
  • selectedTemplate 是模板 ID，绝不能作为 source_edit_plan_id 传递

验证

  • TSC ✅
  • ESLint ✅（0 warnings）
  • Prettier ✅
## 问题 远程 develop 被 force-push 回退，之前 PR #1473 的 source_edit_plan_id 传递链路丢失。需要重新添加正确的传递逻辑。 ## 修复 新增 `sourceEditPlanId` 完整传递链路（前端→后端），**仅使用 URL 的 edit_plan_id，不用 selectedTemplate（模板ID）冒充**： 1. **`api/tasks/types.ts`**: `CreateGenerationTaskRequest` 新增 `source_edit_plan_id?: string` 2. **`generate-video/types.ts`**: `UseGenerateVideoProps` 新增 `sourceEditPlanId?: string | null` 3. **`useGenerateFormState/index.ts`**: `sourceEditPlanId = editPlanId || null`（不回退到 selectedTemplate） 4. **`useGenerateVideo.ts`**: 条件传递 `source_edit_plan_id` 给 `createGenerationTask` 5. **`GeneratePage.tsx`**: 从 formState 解构并传递给 `useGenerateVideo` `useStep6Cover.ts` 的 `createPreview` 不传 `source_edit_plan_id`，后端预览 API 已有 `template_id+user_id` 兜底逻辑。 ## 设计原则 - URL 有 `edit_plan_id`（从剪辑模板编辑器跳转）→ 直接使用 - URL 没有 → 传 null/不传，后端正式生成 API 通过 `template_id+user_id` 兜底查找正确的 plan - `selectedTemplate` 是模板 ID，绝不能作为 `source_edit_plan_id` 传递 ## 验证 - TSC ✅ - ESLint ✅（0 warnings） - Prettier ✅
gitea-actions bot commented 2026-08-24 10:42:42 +08:00
Copy Link
Copy Source

🚀 预览环境已部署

项目 详情
PR号 #1477
预览链接 https://pr-1477.preview.xiaoxiajianji.com
API环境 staging

💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。

🔄 每次提交新代码后预览环境会自动更新。

🗑️ PR 关闭或合并后，预览环境会自动清理。

🚀 **预览环境已部署** | 项目 | 详情 | |------|------| | PR号 | #1477 | | 预览链接 | [https://pr-1477.preview.xiaoxiajianji.com](https://pr-1477.preview.xiaoxiajianji.com) | | API环境 | staging | > 💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。 > > 🔄 每次提交新代码后预览环境会自动更新。 > > 🗑️ PR 关闭或合并后，预览环境会自动清理。
xiaoxia added 1 commit 2026-08-24 10:45:12 +08:00
fix: 正式生成任务传 source_edit_plan_id，仅取URL参数不回退模板ID
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 39s
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Unit Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / PR Build API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m28s
Details
CI/CD Pipeline / PR Build Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Unit Tests (pull_request) Successful in 1m9s
Details
AI Code Review / AI Code Review (pull_request) Successful in 1m51s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 2m8s
Details
CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 2m12s
Details
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 3m2s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m30s
Details
PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m12s
Details
CI/CD Pipeline / PR Build Web Image (pull_request) Successful in 2m39s
Details
CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 4m53s
Details
CI/CD Pipeline / Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / CI Gate (pull_request) Successful in 12s
Details
ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 15s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 24s
Details
ee69a51406 
新增 sourceEditPlanId 完整传递链路（前端→后端）：
- tasks/types.ts: CreateGenerationTaskRequest 新增 source_edit_plan_id 可选字段
- generate-video/types.ts: UseGenerateVideoProps 新增 sourceEditPlanId
- useGenerateFormState: sourceEditPlanId = editPlanId || null
  selectedTemplate 是模板 ID 不是 edit_plan_id，不能混淆
- useGenerateVideo: 条件传递 source_edit_plan_id 给 createGenerationTask
- GeneratePage: 从 formState 解构并传递给 useGenerateVideo
- useStep6Cover: createPreview 不传 source_edit_plan_id，后端通过 template_id+user_id 兜底
xiaoxia force-pushed fix/source-edit-plan-id-v2 from 3ff2666305 to ee69a51406 2026-08-24 10:45:12 +08:00 Compare
auto-approve-bot commented 2026-08-24 10:46:59 +08:00
Collaborator
Copy Link
Copy Source

代码审查结果 - PR #1477

⚠️ 问题（0个需要修改）

无

💡 建议（0个可选）

无

✅ 格式检查通过 | ✅ 逻辑审查通过 | ✅ 性能良好

🤖 由 AI 代码审查机器人自动生成 | 2026-08-24 02:46:59 | 模型:

## 代码审查结果 - PR #1477 ### ⚠️ 问题（0个需要修改） 无 ### 💡 建议（0个可选） 无 --- ✅ 格式检查通过 | ✅ 逻辑审查通过 | ✅ 性能良好 --- <sub>🤖 由 AI 代码审查机器人自动生成 | 2026-08-24 02:46:59 | 模型: </sub> <!-- AI_CODE_REVIEW_AUTO_COMMENT -->
auto-approve-bot approved these changes 2026-08-24 10:48:25 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot approved these changes 2026-08-24 10:48:25 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
xiaoxia closed this pull request 2026-08-24 10:52:36 +08:00
gitea-actions bot commented 2026-08-24 10:53:00 +08:00
Copy Link
Copy Source

🗑️ 预览环境已清理

PR #1477 已关闭或合并，对应的预览环境已被清理。

如有需要，可以重新打开 PR 来重新生成预览环境。

🗑️ **预览环境已清理** PR #1477 已关闭或合并，对应的预览环境已被清理。 > 如有需要，可以重新打开 PR 来重新生成预览环境。
Some checks are pending
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 39s
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Unit Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / PR Build API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m28s
Details
CI/CD Pipeline / PR Build Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Unit Tests (pull_request) Successful in 1m9s
Details
AI Code Review / AI Code Review (pull_request) Successful in 1m51s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 2m8s
Details
CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 2m12s
Details
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 3m2s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m30s
Details
PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m12s
Details
CI/CD Pipeline / PR Build Web Image (pull_request) Successful in 2m39s
Details
CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 4m53s
Details
CI/CD Pipeline / Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / CI Gate (pull_request) Successful in 12s
Details
ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 15s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 24s
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
auto-approve-bot
Labels
Clear labels
P0
阻塞性，必须立即处理
 P1
高优先级
 P2
中优先级
 P3
低优先级/后考虑
 architecture
架构设计
 backend
后端相关
 blocked
阻塞中
 bug
Bug修复
 ci-bug
CI本身的bug
 ci-optimization
CI优化类任务
 ci-pipeline
CI流水线/workflow相关
 cleanup
代码清理
 devops
运维/部署/CI
 documentation
文档相关
 feature
新功能
 frontend
前端相关
 question
需要讨论确认
 ready
PR CI通过，可合并
 refactor
代码重构
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
auto-approve-bot xiaoxia
No Assignees
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#1477
Delete Branch "fix/source-edit-plan-id-v2"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?