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

feat: 合并步骤4(选择标题)和步骤5(生成预览)为一个步骤 #1531

Open
xiaoxia wants to merge 1 commits from feat/merge-step4-step5 into develop
pull from: feat/merge-step4-step5
merge into: xiaoxia:develop
Conversation 3 Commits 1 Files Changed 9
+115 -125
xiaoxia commented 2026-08-28 22:18:52 +08:00
Owner
Copy Link
Copy Source

将步骤4标题设置与步骤5预览样式合并为一个步骤，步骤栏从7步变为6步。

  • 标题输入+AI生成+样式面板全部在左侧
  • 右侧实时预览播放器即时展示效果
  • 下一步校验：标题必填 + 预览已加载
将步骤4标题设置与步骤5预览样式合并为一个步骤，步骤栏从7步变为6步。 - 标题输入+AI生成+样式面板全部在左侧 - 右侧实时预览播放器即时展示效果 - 下一步校验：标题必填 + 预览已加载
xiaoxia added 1 commit 2026-08-28 22:18:53 +08:00
feat(generate): 合并步骤4(选择标题)和步骤5(生成预览)为一个步骤
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 3m53s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 5m5s
Details
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 5m51s
Details
PR Automation / Auto Approve on CI Green (pull_request) Successful in 5m55s
Details
AI Code Review / AI Code Review (pull_request) Successful in 10m3s
Details
CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 13m49s
Details
CI/CD Pipeline / Unit Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 15m48s
Details
CI/CD Pipeline / PR Build API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / PR Build Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Unit Tests (pull_request) Successful in 2m9s
Details
CI/CD Pipeline / PR Build Web Image (pull_request) Successful in 50s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m47s
Details
CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 36m27s
Details
CI/CD Pipeline / Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production API 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 30s
Details
8e227bb682 
- STEPS 从7步缩减为6步，合并后步骤名称保持"选择标题"
- Step4TitleSettings 合并原 Step5GeneratePreview 的 TitleStylePanel
  - 标题文字输入 + AI生成标题（原Step4）
  - 位置/字号/字体/颜色/粗斜体/描边阴影/样式预设（原Step5）
- 右侧实时预览播放器从 step 4-6 调整为 step 4-5
- 下一步校验增加预览就绪检查（previewReady）
- 步骤6/7重新编号为5/6（封面/确认生成）
- 删除 Step5GeneratePreview.tsx（功能已并入 Step4）
- 更新 smoke test 移除对已删除组件的引用
gitea-actions bot commented 2026-08-28 22:24:45 +08:00
Copy Link
Copy Source

🚀 预览环境已部署

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

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

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

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

🚀 **预览环境已部署** | 项目 | 详情 | |------|------| | PR号 | #1531 | | 预览链接 | [https://pr-1531.preview.xiaoxiajianji.com](https://pr-1531.preview.xiaoxiajianji.com) | | API环境 | staging | > 💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。 > > 🔄 每次提交新代码后预览环境会自动更新。 > > 🗑️ PR 关闭或合并后，预览环境会自动清理。
auto-approve-bot approved these changes 2026-08-28 23:12:07 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot approved these changes 2026-08-28 23:12:07 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
All checks were successful
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 3m53s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 5m5s
Details
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 5m51s
Details
PR Automation / Auto Approve on CI Green (pull_request) Successful in 5m55s
Details
AI Code Review / AI Code Review (pull_request) Successful in 10m3s
Required
Details
CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 13m49s
Details
CI/CD Pipeline / Unit Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 15m48s
Details
CI/CD Pipeline / PR Build API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / PR Build Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Unit Tests (pull_request) Successful in 2m9s
Details
CI/CD Pipeline / PR Build Web Image (pull_request) Successful in 50s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m47s
Details
CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 36m27s
Details
CI/CD Pipeline / Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production API 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 30s
Required
Details
This pull request has changes conflicting with the target branch.
  • apps/web/src/pages/generate/GeneratePage.tsx
  • apps/web/src/pages/generate/components/GenerateStepActions.tsx
  • apps/web/src/pages/generate/components/GenerateStepContent.tsx
  • apps/web/src/pages/generate/constants.ts
  • apps/web/src/pages/generate/hooks/useStepNavigation.ts
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feat/merge-step4-step5:feat/merge-step4-step5
git checkout feat/merge-step4-step5
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#1531
Delete Branch "feat/merge-step4-step5"

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?