Merge remote-tracking branch 'origin/master' into editor-agent-refactored

Browse Source

# Conflicts:
#	docs/README.md
#	src/components/image-editor/EditorAgentConversation/EditorAgentConversationPanelView.tsx
#	src/components/image-editor/EditorAgentConversation/useEditorAgentConversation.ts
#	src/components/image-editor/EditorAgentConversationPanelView.test.tsx
#	src/components/image-editor/ImageCanvasStageView.tsx

...

This commit is contained in:

王德宇

2026-07-17 17:32:08 +08:00

parent 2829344d3d 387a1c26e3

commit 9c75ef6af9

272 changed files with 1697 additions and 1300 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

docs/technical/【前端架构】图片画布编辑器MVP接入方案-2026-06-11.md

+4 -4

File diff suppressed because one or more lines are too long