GenarrativeAI/Genarrative
11
0
Fork 0
Code Issues 15 Pull Requests 3 Actions Packages Projects 3 Releases Wiki Activity

Fix/统一修复modal样式失效 #122

Merged
kdletters merged 2 commits from fix/artagent-sub-modal-style into master 2026-08-03 17:55:48 +08:00
Conversation 6 Commits 2 Files Changed 35
+486 -169
k88936 commented 2026-07-30 16:14:58 +08:00
Member
Copy Link
Copy Source

之前遇到几次弹窗的样式不生效,bug 现在在画布agent的删除对话弹窗又出现了,
这个pr把类似的修改集中到最下层的UnifiedModal,适用于所有的modal,
一些特殊的modal有特殊处理.

画布agent的删除对话弹窗
shotmd-1785399342.jpg

之前遇到几次弹窗的样式不生效,bug 现在在画布agent的删除对话弹窗又出现了, 这个pr把类似的修改集中到最下层的UnifiedModal,适用于所有的modal, 一些特殊的modal有特殊处理. 画布agent的删除对话弹窗 ![shotmd-1785399342.jpg](/attachments/d63d7dc6-bf7e-4f13-bfe8-bc4716cd798f)
shotmd-1785399342.jpg
16 KiB
k88936 self-assigned this 2026-07-30 16:14:58 +08:00
k88936 added this to the 美术画布 project 2026-07-30 16:14:58 +08:00
k88936 requested review from kdletters 2026-07-30 16:14:59 +08:00
k88936 force-pushed fix/artagent-sub-modal-style from e1178c116c to 635d38d318 2026-07-30 18:18:42 +08:00 Compare
k88936 commented 2026-07-30 18:26:37 +08:00
Author
Member
Copy Link
Copy Source

reason: 要push 99+ 我以为自己合并错了,刚刚回退, 发现是game creater合并进来了, 实际没有问题

reason: 要push 99+ 我以为自己合并错了,刚刚回退, 发现是game creater合并进来了, 实际没有问题
kdletters commented 2026-07-30 20:59:42 +08:00
Member
Copy Link
Copy Source

复审 head a2c81f7f8，当前有 1 个阻断回归，请修复后再合并：

  1. 暗色主题会破坏 3 个固定浅色画布弹窗。 UnifiedModal 默认从 AuthUiContext 注入 platform-theme--dark 后，ImageCanvasMetadataModalView、ImageCanvasEditGenerationModalView、ImageCanvasShortcutDialogView 仍在使用固定浅色 CSS。以“图片信息”为例，panel 被强制为白底，但标题继续读取暗色主题的 --platform-text-strong: #fff，会出现白底白字；另外两个弹窗也会出现深浅样式混杂。建议这三个调用显式设置 portalTheme="light"，或者完整补齐暗色样式，并增加真实 AuthUiContext.platformTheme="dark" 的回归测试。现有新增测试只覆盖无 Provider 时回退 light，未覆盖实际暗色主题。

  2. 提交历史不符合仓库门禁。 7f36b6f0e 使用英文标题，904e9332e 中英混杂且把说明全部塞进标题，三个业务提交均没有逐行变更正文。请在合并前 squash/reword 为中文标题，并按每项变更一行补充正文。

  3. 小文案问题： EditorAgentConversationPanelView.tsx 新增的 确认删除这个对话? 使用半角问号，建议改为 确认删除这个对话吗？，并补正文断言。

验证情况：相关测试 120 项、npm run typecheck、npm run check:encoding、git diff --check 均通过；Gitea 当前 4 项 CI 全绿且无冲突。另有 6 个本次修改的 src/components/common/*.test.tsx 不在默认 Vitest include 中，手工定向运行可以通过，但 CI 实际不会执行这些断言，建议一并修正覆盖范围。

复审 head `a2c81f7f8`，当前有 1 个阻断回归，请修复后再合并： 1. **暗色主题会破坏 3 个固定浅色画布弹窗。** `UnifiedModal` 默认从 `AuthUiContext` 注入 `platform-theme--dark` 后，`ImageCanvasMetadataModalView`、`ImageCanvasEditGenerationModalView`、`ImageCanvasShortcutDialogView` 仍在使用固定浅色 CSS。以“图片信息”为例，panel 被强制为白底，但标题继续读取暗色主题的 `--platform-text-strong: #fff`，会出现白底白字；另外两个弹窗也会出现深浅样式混杂。建议这三个调用显式设置 `portalTheme="light"`，或者完整补齐暗色样式，并增加真实 `AuthUiContext.platformTheme="dark"` 的回归测试。现有新增测试只覆盖无 Provider 时回退 light，未覆盖实际暗色主题。 2. **提交历史不符合仓库门禁。** `7f36b6f0e` 使用英文标题，`904e9332e` 中英混杂且把说明全部塞进标题，三个业务提交均没有逐行变更正文。请在合并前 squash/reword 为中文标题，并按每项变更一行补充正文。 3. **小文案问题：** `EditorAgentConversationPanelView.tsx` 新增的 `确认删除这个对话?` 使用半角问号，建议改为 `确认删除这个对话吗？`，并补正文断言。 验证情况：相关测试 120 项、`npm run typecheck`、`npm run check:encoding`、`git diff --check` 均通过；Gitea 当前 4 项 CI 全绿且无冲突。另有 6 个本次修改的 `src/components/common/*.test.tsx` 不在默认 Vitest include 中，手工定向运行可以通过，但 CI 实际不会执行这些断言，建议一并修正覆盖范围。
k88936 force-pushed fix/artagent-sub-modal-style from a2c81f7f83 to 1410493667 2026-07-31 11:23:07 +08:00 Compare
k88936 commented 2026-07-31 11:24:09 +08:00
Author
Member
Copy Link
Copy Source

reason: 补充commit正文

reason: 补充commit正文
kdletters force-pushed fix/artagent-sub-modal-style from a6829c3fd6 to b92b9803c9 2026-07-31 20:07:54 +08:00 Compare
kdletters added 1 commit 2026-07-31 20:14:59 +08:00
统一修复Modal Portal主题继承
Project CI / Repository checks (pull_request) Successful in 1m18s
Details
Project CI / Backend tests (pull_request) Successful in 3m59s
Details
Project CI / Native shell tests (pull_request) Successful in 10m52s
Details
Project CI / Frontend tests (pull_request) Successful in 4m19s
Details
bd4baf66b1 
在UnifiedModal集中解析Portal主题并支持显式覆盖
梳理危险确认、图片预览、报告和工具弹窗的主题边界
修复固定浅色画布弹窗与Agent菜单的主题回归
将相关公共组件测试纳入默认Vitest收集范围
同步Platform UI Kit、画布Agent与共享记忆文档
kdletters force-pushed fix/artagent-sub-modal-style from b92b9803c9 to bd4baf66b1 2026-07-31 20:14:59 +08:00 Compare
kdletters approved these changes 2026-08-03 17:43:59 +08:00
Dismissed
kdletters added 1 commit 2026-08-03 17:44:03 +08:00
Merge branch 'master' into fix/artagent-sub-modal-style
Project CI / Repository checks (pull_request) Successful in 59s
Details
Project CI / Frontend tests (pull_request) Successful in 3m9s
Details
Project CI / Backend tests (pull_request) Successful in 3m56s
Details
Project CI / Native shell tests (pull_request) Successful in 11m42s
Details
e2c7ba4687
kdletters dismissed kdletters's review 2026-08-03 17:44:03 +08:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

kdletters approved these changes 2026-08-03 17:44:11 +08:00
Dismissed
kdletters scheduled this pull request to auto merge when all checks succeed 2026-08-03 17:44:29 +08:00
kdletters approved these changes 2026-08-03 17:44:36 +08:00
kdletters merged commit e6b3199490 into master 2026-08-03 17:55:48 +08:00
kdletters deleted branch fix/artagent-sub-modal-style 2026-08-03 17:55:48 +08:00
Sign in to join this conversation.
Reviewers
No Reviewers
kdletters
Labels
Clear labels
Compat/Breaking
Breaking change that won't be backward compatible
 Kind/Bug
Something is not working
 Kind/Documentation
Documentation changes
 Kind/Enhancement
Improve existing functionality
 Kind/Feature
New functionality
 Kind/Security
This is security issue
 Kind/Testing
Issue or pull request related to testing
Priority
Critical
1
The priority is critical
Priority
High
2
The priority is high
Priority
Low
4
The priority is low
Priority
Medium
3
The priority is medium
Reviewed
Confirmed
1
Issue has been confirmed
Reviewed
Duplicate
2
This issue or pull request already exists
Reviewed
Invalid
3
Invalid issue
Reviewed
Won't Fix
3
This issue won't be fixed
Status
Abandoned
3
Somebody has started to work on this but abandoned work
Status
Blocked
1
Something is blocking this issue or pull request
Status
Need More Info
2
Feedback is required to reproduce issue or to continue work
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project 美术画布
Assignees
Clear assignees
HuangJiaJia JenkenB k88936 (王德宇) kdletters (段舒康) laura2008 (王乐) lhk229 (孔令弘) Loer (农洛儿) loong suzmii (董羽秦) taobaisu (叶东旭) wuxiangwanzi (王子民) YixuanLiu ziyu
No Assignees k88936
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: GenarrativeAI/Genarrative#122
Delete Branch "fix/artagent-sub-modal-style"

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?