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

fix: #1789 标题设置 UI 控件 + #1790 空模板时间线不显示刻度 #1791

Merged
auto-approve-bot merged 1 commits from fix/1789-1790-title-ui-and-timeline into develop 2026-09-08 11:53:48 +08:00
Conversation 4 Commits 1 Files Changed 7
+204
xiaoxia commented 2026-09-08 11:43:23 +08:00
Owner
Copy Link
Copy Source

改动说明

#1789 标题设置中字号滑块和样式切换无效

  • 新增 TitleSettingsSection 组件，提供完整的标题配置 UI：
    • AI 自动选择开关
    • 标题文本输入
    • 位置选择（顶部/居中/底部）
    • 字体预设选择（思源黑体/思源宋体/苹方等）
    • 字号滑块（12-72px）
    • 颜色预设 + 自定义颜色选择器
  • ClipPropertiesPanel 集成标题设置区块（位于字幕设置上方）
  • RightPanel / EditingPlanner 透传 titleConfig / onTitleConfigChange
  • 添加颜色预设 CSS 样式

#1790 新建模板时时间线自动显示时间

  • generateRulerMarks 在 totalDuration <= 0 时返回空数组，避免空模板显示时间刻度

改动文件

  • 新增: apps/web/src/pages/editing-planner/components/clip-properties/TitleSettingsSection.tsx
  • 修改: ClipPropertiesPanel.tsx, RightPanel.tsx, EditingPlanner.tsx, clipProperties.ts, EditingPlanner.css, utils/timeline.ts
## 改动说明 ### #1789 标题设置中字号滑块和样式切换无效 - 新增 `TitleSettingsSection` 组件，提供完整的标题配置 UI： - AI 自动选择开关 - 标题文本输入 - 位置选择（顶部/居中/底部） - 字体预设选择（思源黑体/思源宋体/苹方等） - 字号滑块（12-72px） - 颜色预设 + 自定义颜色选择器 - `ClipPropertiesPanel` 集成标题设置区块（位于字幕设置上方） - `RightPanel` / `EditingPlanner` 透传 `titleConfig` / `onTitleConfigChange` - 添加颜色预设 CSS 样式 ### #1790 新建模板时时间线自动显示时间 - `generateRulerMarks` 在 `totalDuration <= 0` 时返回空数组，避免空模板显示时间刻度 ## 改动文件 - 新增: `apps/web/src/pages/editing-planner/components/clip-properties/TitleSettingsSection.tsx` - 修改: `ClipPropertiesPanel.tsx`, `RightPanel.tsx`, `EditingPlanner.tsx`, `clipProperties.ts`, `EditingPlanner.css`, `utils/timeline.ts`
xiaoxia added 1 commit 2026-09-08 11:43:23 +08:00
fix: #1789 标题设置 UI 控件 + #1790 空模板时间线不显示刻度
CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 0s
Details
CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 1s
Details
CI/CD Pipeline / Unit Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Integration Tests (pull_request) Has been skipped
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 / 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 / Retag skipped Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Retag skipped 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 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 1m41s
Details
CI/CD Pipeline / PR Build Web Image (pull_request) Successful in 1m55s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 1m56s
Details
PR Automation / Auto Approve on CI Green (pull_request) Successful in 2m6s
Details
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m21s
Details
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 2m23s
Details
CI/CD Pipeline / Validate - Style (pull_request) Successful in 2m29s
Details
AI Code Review / AI Code Review (pull_request) Successful in 6m43s
Details
CI/CD Pipeline / Validate - Security (pull_request) Successful in 9m40s
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 3s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 8m17s
Details
ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 6s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 1m17s
Details
fcb863e38d 
#1789:
- 新增 TitleSettingsSection 组件（字号滑块/字体预设/位置/颜色/文本输入）
- ClipPropertiesPanel 集成标题设置区块
- RightPanel/EditingPlanner 透传 titleConfig/onTitleConfigChange
- 添加颜色预设 CSS 样式

#1790:
- generateRulerMarks 在 totalDuration<=0 时返回空数组，避免空模板显示时间刻度
auto-approve-bot approved these changes 2026-09-08 11:45:30 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot approved these changes 2026-09-08 11:45:30 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
gitea-actions bot commented 2026-09-08 11:45:44 +08:00
Copy Link
Copy Source

🚀 预览环境已部署

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

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

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

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

🚀 **预览环境已部署** | 项目 | 详情 | |------|------| | PR号 | #1791 | | 预览链接 | [https://pr-1791.preview.xiaoxiajianji.com](https://pr-1791.preview.xiaoxiajianji.com) | | API环境 | staging | > 💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。 > > 🔄 每次提交新代码后预览环境会自动更新。 > > 🗑️ PR 关闭或合并后，预览环境会自动清理。
auto-approve-bot merged commit 7997f083a5 into develop 2026-09-08 11:53:48 +08:00
auto-approve-bot deleted branch fix/1789-1790-title-ui-and-timeline 2026-09-08 11:53:48 +08:00
gitea-actions bot commented 2026-09-08 11:55:04 +08:00
Copy Link
Copy Source

🗑️ 预览环境已清理

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

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

🗑️ **预览环境已清理** PR #1791 已关闭或合并，对应的预览环境已被清理。 > 如有需要，可以重新打开 PR 来重新生成预览环境。
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#1791
Delete Branch "fix/1789-1790-title-ui-and-timeline"

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?