Merge branch 'dhk-2' into 'master'
Dhk 2 See merge request knowledge-base-bj/deerflow-server!16
This commit is contained in:
commit
b81f64a253
18 files changed
+3806
-375
No files matched your search
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,950 @@
|
|||||||
|
# Open Canvas 模式需求拆解文档
|
||||||
|
|
||||||
|
## 1. 文档目标
|
||||||
|
|
||||||
|
本文档用于指导 DeerFlow 在现有架构中新增一个 `open-canvas` 风格的 Canvas 模式。
|
||||||
|
|
||||||
|
目标不是直接照搬 `langchain-ai/open-canvas` 的 Next.js + LangGraph.js 实现,而是在当前项目技术栈内完成一套等价能力的实现:
|
||||||
|
|
||||||
|
- 前端:基于 `React 19 + Vite + react-router-dom`
|
||||||
|
- 后端:基于 `Python + FastAPI + LangGraph`
|
||||||
|
- 模型层:支持云模型与本地模型自由配置
|
||||||
|
- 状态层:支持结构化 artifact、版本历史、局部改写、快速动作、画布编辑
|
||||||
|
|
||||||
|
本文档重点是把需求拆成“可实现、可排期、可验收”的阶段性任务。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. 最终目标
|
||||||
|
|
||||||
|
### 2.1 用户视角目标
|
||||||
|
|
||||||
|
用户进入一个新的 Canvas 工作模式后,可以获得与 open-canvas 接近的体验:
|
||||||
|
|
||||||
|
- 左侧是聊天区,右侧是 Canvas 编辑区
|
||||||
|
- 可以从空白文本或代码模板快速开始
|
||||||
|
- 可以通过聊天让 AI 生成一份结构化 artifact
|
||||||
|
- 可以对 artifact 整体重写,也可以对选中的局部内容进行改写
|
||||||
|
- artifact 支持版本历史切换
|
||||||
|
- artifact 支持文本和代码两种主要类型
|
||||||
|
- 支持快速动作,例如扩写、压缩、改风格、改语气、加注释、修 bug、换语言
|
||||||
|
- 支持启用 Web 搜索增强
|
||||||
|
- 支持切换模型
|
||||||
|
- 支持使用本地模型,例如 Ollama 或 OpenAI-compatible 本地服务
|
||||||
|
|
||||||
|
### 2.2 工程视角目标
|
||||||
|
|
||||||
|
新增的 Canvas 模式需要满足以下工程原则:
|
||||||
|
|
||||||
|
- 不破坏现有 DeerFlow 工作区
|
||||||
|
- 不影响现有基于 `artifacts: string[]` 的文件产物功能
|
||||||
|
- 可逐阶段上线
|
||||||
|
- 前后端状态协议清晰
|
||||||
|
- 可兼容现有 LangGraph 线程、消息流、认证和模型接口
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. 范围定义
|
||||||
|
|
||||||
|
### 3.1 本次需求包含
|
||||||
|
|
||||||
|
- 前端新增 `open-canvas` 专用目录
|
||||||
|
- 在 [PageRoutes.tsx](../src/pages/PageRoutes.tsx) 中引入新的 Canvas 路由
|
||||||
|
- 前端新增 Canvas 页面、上下文、组件、状态管理
|
||||||
|
- 后端新增 Canvas 专用线程状态字段
|
||||||
|
- 后端新增 Canvas Agent 图或在现有 Agent 体系中新增 Canvas 模式分支
|
||||||
|
- 模型配置统一为 DeerFlow 后端配置驱动
|
||||||
|
- 支持本地大模型配置与模型列表动态下发
|
||||||
|
- 支持结构化 artifact 的保存、读取、更新、版本切换
|
||||||
|
|
||||||
|
### 3.2 本次需求不包含
|
||||||
|
|
||||||
|
- 一次性复刻 open-canvas 全部 UI 细节
|
||||||
|
- 完整照搬 Supabase 鉴权体系
|
||||||
|
- 直接复用 open-canvas 的 Next.js API Route
|
||||||
|
- 直接运行 open-canvas 的 LangGraph.js 后端
|
||||||
|
- 首阶段就实现所有快捷动作、所有富文本效果、所有搜索增强能力
|
||||||
|
|
||||||
|
### 3.3 迁移原则
|
||||||
|
|
||||||
|
- 借鉴 open-canvas 的能力模型,不直接迁移其运行时架构
|
||||||
|
- 前端尽量复用其交互设计和数据结构
|
||||||
|
- 后端以 Python 实现同等能力
|
||||||
|
- 配置以 DeerFlow 为真源,不以 open-canvas 的 TS 文件为真源
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. 总体设计思路
|
||||||
|
|
||||||
|
### 4.1 前端设计思路
|
||||||
|
|
||||||
|
在现有 `frontend-web/src` 下新增一个专用目录,例如:
|
||||||
|
|
||||||
|
```text
|
||||||
|
src/
|
||||||
|
open-canvas/
|
||||||
|
pages/
|
||||||
|
routes/
|
||||||
|
components/
|
||||||
|
contexts/
|
||||||
|
hooks/
|
||||||
|
types/
|
||||||
|
api/
|
||||||
|
utils/
|
||||||
|
constants/
|
||||||
|
```
|
||||||
|
|
||||||
|
建议将 Canvas 模式作为一个独立的页面子系统接入,而不是把现有工作区页面强行改造成 Canvas。
|
||||||
|
|
||||||
|
建议路由形式:
|
||||||
|
|
||||||
|
- `/canvas`
|
||||||
|
- `/canvas/:threadId`
|
||||||
|
|
||||||
|
也可以挂在现有页面布局下,例如:
|
||||||
|
|
||||||
|
- `/workspace/canvas`
|
||||||
|
- `/workspace/canvas/:threadId`
|
||||||
|
|
||||||
|
推荐优先采用独立一级功能路由:
|
||||||
|
|
||||||
|
- 逻辑更清晰
|
||||||
|
- 状态隔离更容易
|
||||||
|
- 不容易污染现有 `workspace` 功能
|
||||||
|
|
||||||
|
### 4.2 后端设计思路
|
||||||
|
|
||||||
|
后端不建议直接改造现有通用 Agent 去同时承担全部 Canvas 行为,而是建议采用以下两种方案之一:
|
||||||
|
|
||||||
|
#### 方案 A:新增独立 Canvas Assistant
|
||||||
|
|
||||||
|
- 新增 `canvas_agent`
|
||||||
|
- 使用单独的 LangGraph 状态定义
|
||||||
|
- 前端调用时通过 `assistant_id=canvas_agent`
|
||||||
|
|
||||||
|
优点:
|
||||||
|
|
||||||
|
- 与现有 `lead_agent` 隔离
|
||||||
|
- 风险更低
|
||||||
|
- 更容易对齐 open-canvas 的图结构
|
||||||
|
|
||||||
|
缺点:
|
||||||
|
|
||||||
|
- 会产生一套新的 Agent 图维护成本
|
||||||
|
|
||||||
|
#### 方案 B:在现有 Lead Agent 中增加 Canvas 模式分支
|
||||||
|
|
||||||
|
- 在 thread metadata 或 configurable 中增加 `ui_mode=canvas`
|
||||||
|
- Agent 根据模式进入 Canvas 路径
|
||||||
|
|
||||||
|
优点:
|
||||||
|
|
||||||
|
- 统一入口
|
||||||
|
|
||||||
|
缺点:
|
||||||
|
|
||||||
|
- 会显著增加现有 Agent 复杂度
|
||||||
|
- 容易影响现有聊天和文件产物模式
|
||||||
|
|
||||||
|
推荐先做方案 A。
|
||||||
|
|
||||||
|
### 4.3 模型配置设计思路
|
||||||
|
|
||||||
|
模型配置统一以 DeerFlow 后端 `config.yaml` 为真源。
|
||||||
|
|
||||||
|
前端不维护固定模型常量列表,而是通过 `/api/models` 获取模型能力元数据。
|
||||||
|
|
||||||
|
为了实现 open-canvas 风格体验,需要后端模型接口至少返回:
|
||||||
|
|
||||||
|
- `name`
|
||||||
|
- `display_name`
|
||||||
|
- `provider`
|
||||||
|
- `supports_thinking`
|
||||||
|
- `supports_reasoning_effort`
|
||||||
|
- `supports_vision`
|
||||||
|
- `supports_tool_calling`
|
||||||
|
- `supports_artifact_editing`
|
||||||
|
- `supports_code_editing`
|
||||||
|
- `temperature_range`
|
||||||
|
- `max_tokens_range`
|
||||||
|
- `base_url_source` 或 provider 标识
|
||||||
|
- `is_local`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. 与当前项目的关键差异
|
||||||
|
|
||||||
|
### 5.1 当前 DeerFlow 现状
|
||||||
|
|
||||||
|
当前 DeerFlow 线程状态中的 artifact 主要是文件路径列表:
|
||||||
|
|
||||||
|
- `artifacts: string[]`
|
||||||
|
|
||||||
|
这更接近“生成文件产物”的工作模式。
|
||||||
|
|
||||||
|
前端当前 artifact 面板也主要是:
|
||||||
|
|
||||||
|
- 文件列表
|
||||||
|
- 文件详情
|
||||||
|
- 文件下载/预览
|
||||||
|
|
||||||
|
### 5.2 open-canvas 的关键能力
|
||||||
|
|
||||||
|
open-canvas 的核心不是“生成文件”,而是“维护一个结构化的当前文档对象”:
|
||||||
|
|
||||||
|
- 一个 conversation 对应一个主 artifact
|
||||||
|
- artifact 具有类型、标题、内容、版本
|
||||||
|
- 用户可以选中部分内容让 AI 改写
|
||||||
|
- 每次改写都会生成新版本
|
||||||
|
|
||||||
|
### 5.3 需要新增的核心能力
|
||||||
|
|
||||||
|
为支持 Canvas 模式,需要在 DeerFlow 中新增一套结构化 artifact 状态:
|
||||||
|
|
||||||
|
- 当前 artifact
|
||||||
|
- 当前版本索引
|
||||||
|
- 历史版本列表
|
||||||
|
- 选区信息
|
||||||
|
- 当前编辑模式
|
||||||
|
- 快速动作状态
|
||||||
|
- Web 搜索结果状态
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. 分阶段实施方案
|
||||||
|
|
||||||
|
以下为推荐的 8 个阶段,每个阶段都可单独开发、联调和验收。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. 阶段一:前端路由与目录骨架
|
||||||
|
|
||||||
|
### 7.1 目标
|
||||||
|
|
||||||
|
在不影响现有页面的前提下,建立 Canvas 模式的前端骨架。
|
||||||
|
|
||||||
|
### 7.2 需求
|
||||||
|
|
||||||
|
- 新增 `src/open-canvas/` 目录
|
||||||
|
- 新增 Canvas 页面路由
|
||||||
|
- 将路由接入 [PageRoutes.tsx](../src/pages/PageRoutes.tsx)
|
||||||
|
- 提供 Canvas 首页和 Canvas Thread 页
|
||||||
|
- 支持空状态展示
|
||||||
|
|
||||||
|
### 7.3 建议目录
|
||||||
|
|
||||||
|
```text
|
||||||
|
src/open-canvas/
|
||||||
|
api/
|
||||||
|
threads.ts
|
||||||
|
runs.ts
|
||||||
|
models.ts
|
||||||
|
components/
|
||||||
|
layout/
|
||||||
|
chat/
|
||||||
|
canvas/
|
||||||
|
artifacts/
|
||||||
|
quick-actions/
|
||||||
|
selectors/
|
||||||
|
contexts/
|
||||||
|
CanvasThreadContext.tsx
|
||||||
|
CanvasGraphContext.tsx
|
||||||
|
CanvasUIContext.tsx
|
||||||
|
hooks/
|
||||||
|
useCanvasThread.ts
|
||||||
|
useCanvasStream.ts
|
||||||
|
useCanvasArtifact.ts
|
||||||
|
pages/
|
||||||
|
CanvasHomePage.tsx
|
||||||
|
CanvasThreadPage.tsx
|
||||||
|
routes/
|
||||||
|
OpenCanvasRoutes.tsx
|
||||||
|
types/
|
||||||
|
artifact.ts
|
||||||
|
thread.ts
|
||||||
|
model.ts
|
||||||
|
utils/
|
||||||
|
artifact.ts
|
||||||
|
selection.ts
|
||||||
|
stream.ts
|
||||||
|
constants/
|
||||||
|
index.ts
|
||||||
|
```
|
||||||
|
|
||||||
|
### 7.4 路由建议
|
||||||
|
|
||||||
|
- 在 `PageRoutes.tsx` 中新增 `canvas/*`
|
||||||
|
- 在 `src/open-canvas/routes/OpenCanvasRoutes.tsx` 中维护子路由
|
||||||
|
|
||||||
|
建议形式:
|
||||||
|
|
||||||
|
```text
|
||||||
|
/canvas
|
||||||
|
/canvas/:threadId
|
||||||
|
```
|
||||||
|
|
||||||
|
### 7.5 验收标准
|
||||||
|
|
||||||
|
- 能访问 Canvas 首页
|
||||||
|
- 能访问指定 thread 的 Canvas 页面
|
||||||
|
- 不影响现有 `workspace/*` 与 `strategy/*`
|
||||||
|
- 页面有独立布局骨架
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 8. 阶段二:前端 Canvas 布局与交互容器
|
||||||
|
|
||||||
|
### 8.1 目标
|
||||||
|
|
||||||
|
先做出“左聊天、右画布”的基础容器,不接真实 AI 改写逻辑。
|
||||||
|
|
||||||
|
### 8.2 需求
|
||||||
|
|
||||||
|
- 左侧聊天区
|
||||||
|
- 右侧画布区
|
||||||
|
- 支持面板拖拽或折叠
|
||||||
|
- 初始空状态
|
||||||
|
- 支持“快速开始”:
|
||||||
|
- 新建空白文本 artifact
|
||||||
|
- 新建代码 artifact
|
||||||
|
|
||||||
|
### 8.3 组件拆分建议
|
||||||
|
|
||||||
|
- `CanvasShell`
|
||||||
|
- `CanvasSidebar`
|
||||||
|
- `CanvasChatPanel`
|
||||||
|
- `CanvasArtifactPanel`
|
||||||
|
- `CanvasEmptyState`
|
||||||
|
- `QuickStartActions`
|
||||||
|
|
||||||
|
### 8.4 快速开始能力
|
||||||
|
|
||||||
|
用户进入空线程时可以选择:
|
||||||
|
|
||||||
|
- 开始写文章
|
||||||
|
- 开始写代码
|
||||||
|
- 从模板开始
|
||||||
|
|
||||||
|
首版模板可只做最小集:
|
||||||
|
|
||||||
|
- 空白文档
|
||||||
|
- HTML 模板
|
||||||
|
- React 组件模板
|
||||||
|
- Python 脚本模板
|
||||||
|
|
||||||
|
### 8.5 验收标准
|
||||||
|
|
||||||
|
- 页面可稳定展示双栏布局
|
||||||
|
- 快速开始能创建前端本地 artifact 状态
|
||||||
|
- 代码和文本可分别进入不同渲染器
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 9. 阶段三:结构化 Artifact 数据模型
|
||||||
|
|
||||||
|
### 9.1 目标
|
||||||
|
|
||||||
|
定义 DeerFlow 的 Canvas Artifact 协议,作为前后端统一契约。
|
||||||
|
|
||||||
|
### 9.2 核心要求
|
||||||
|
|
||||||
|
需要支持以下能力:
|
||||||
|
|
||||||
|
- 文本 artifact
|
||||||
|
- 代码 artifact
|
||||||
|
- 标题
|
||||||
|
- 当前版本索引
|
||||||
|
- 版本历史
|
||||||
|
- 当前选中版本切换
|
||||||
|
- 后续支持局部高亮编辑
|
||||||
|
|
||||||
|
### 9.3 建议数据结构
|
||||||
|
|
||||||
|
```ts
|
||||||
|
type CanvasArtifact = {
|
||||||
|
currentIndex: number;
|
||||||
|
contents: Array<CanvasArtifactText | CanvasArtifactCode>;
|
||||||
|
};
|
||||||
|
|
||||||
|
type CanvasArtifactText = {
|
||||||
|
index: number;
|
||||||
|
type: "text";
|
||||||
|
title: string;
|
||||||
|
fullMarkdown: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
type CanvasArtifactCode = {
|
||||||
|
index: number;
|
||||||
|
type: "code";
|
||||||
|
title: string;
|
||||||
|
language: string;
|
||||||
|
code: string;
|
||||||
|
};
|
||||||
|
```
|
||||||
|
|
||||||
|
### 9.4 线程状态建议新增字段
|
||||||
|
|
||||||
|
前端与后端需共同支持:
|
||||||
|
|
||||||
|
- `artifact`
|
||||||
|
- `highlighted_text`
|
||||||
|
- `highlighted_code`
|
||||||
|
- `canvas_mode`
|
||||||
|
- `web_search_enabled`
|
||||||
|
- `web_search_results`
|
||||||
|
- `quick_action_id`
|
||||||
|
|
||||||
|
### 9.5 与现有 `artifacts: string[]` 的关系
|
||||||
|
|
||||||
|
建议保留现有 `artifacts: string[]` 不动。
|
||||||
|
|
||||||
|
新增字段:
|
||||||
|
|
||||||
|
- `artifact` 用于 Canvas 主文档
|
||||||
|
- `artifacts` 继续用于文件产物
|
||||||
|
|
||||||
|
这样可以兼容未来“Canvas 生成网页文件、导出文件、保存文件”的场景。
|
||||||
|
|
||||||
|
### 9.6 验收标准
|
||||||
|
|
||||||
|
- 前端类型定义完成
|
||||||
|
- 后端状态字段设计完成
|
||||||
|
- 确认与现有线程状态兼容
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 10. 阶段四:后端线程状态与 API 扩展
|
||||||
|
|
||||||
|
### 10.1 目标
|
||||||
|
|
||||||
|
让后端线程状态可以安全存储和返回 Canvas Artifact。
|
||||||
|
|
||||||
|
### 10.2 需求
|
||||||
|
|
||||||
|
- 扩展 Python `ThreadState`
|
||||||
|
- 扩展状态序列化逻辑
|
||||||
|
- 确保 `/api/threads/*` 返回结构化 `artifact`
|
||||||
|
- 确保 LangGraph 流中可带上 `artifact` 更新
|
||||||
|
|
||||||
|
### 10.3 后端改造点
|
||||||
|
|
||||||
|
建议关注以下模块:
|
||||||
|
|
||||||
|
- `packages/harness/deerflow/agents/thread_state.py`
|
||||||
|
- 线程 state serializer
|
||||||
|
- `app/gateway/routers/threads.py`
|
||||||
|
- 流事件适配层
|
||||||
|
|
||||||
|
### 10.4 注意事项
|
||||||
|
|
||||||
|
- 旧线程没有 `artifact` 字段时必须兼容
|
||||||
|
- 状态更新不能破坏现有消息结构
|
||||||
|
- 必须确保 JSON 可序列化
|
||||||
|
|
||||||
|
### 10.5 验收标准
|
||||||
|
|
||||||
|
- 新建线程可写入 `artifact`
|
||||||
|
- 读取线程时可返回 `artifact`
|
||||||
|
- 不影响现有线程读取
|
||||||
|
- 前端能从线程 state 中恢复 Canvas 内容
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 11. 阶段五:Canvas 专用 Agent 图
|
||||||
|
|
||||||
|
### 11.1 目标
|
||||||
|
|
||||||
|
实现与 open-canvas 类似的 AI 路由能力。
|
||||||
|
|
||||||
|
### 11.2 推荐方案
|
||||||
|
|
||||||
|
新增 `canvas_agent`,单独维护图逻辑。
|
||||||
|
|
||||||
|
### 11.3 节点拆分建议
|
||||||
|
|
||||||
|
首版建议至少拆成这些节点:
|
||||||
|
|
||||||
|
- `route_user_intent`
|
||||||
|
- `reply_general_input`
|
||||||
|
- `generate_artifact`
|
||||||
|
- `rewrite_artifact`
|
||||||
|
- `update_highlighted_text`
|
||||||
|
- `update_highlighted_code`
|
||||||
|
- `generate_followup`
|
||||||
|
|
||||||
|
二期可加:
|
||||||
|
|
||||||
|
- `rewrite_artifact_theme`
|
||||||
|
- `rewrite_code_theme`
|
||||||
|
- `change_length`
|
||||||
|
- `change_reading_level`
|
||||||
|
- `translate_artifact`
|
||||||
|
- `add_comments`
|
||||||
|
- `add_logs`
|
||||||
|
- `fix_bugs`
|
||||||
|
- `port_language`
|
||||||
|
- `web_search_enrich`
|
||||||
|
|
||||||
|
### 11.4 路由逻辑要求
|
||||||
|
|
||||||
|
系统需要能判断:
|
||||||
|
|
||||||
|
- 用户是在闲聊
|
||||||
|
- 用户要新生成 artifact
|
||||||
|
- 用户要整体重写当前 artifact
|
||||||
|
- 用户要局部修改当前 artifact
|
||||||
|
- 用户要执行某个快捷动作
|
||||||
|
|
||||||
|
### 11.5 状态输入要求
|
||||||
|
|
||||||
|
节点需要读取:
|
||||||
|
|
||||||
|
- 当前消息历史
|
||||||
|
- 当前 artifact
|
||||||
|
- 当前选区
|
||||||
|
- 当前模型配置
|
||||||
|
- Web 搜索开关
|
||||||
|
|
||||||
|
### 11.6 输出要求
|
||||||
|
|
||||||
|
节点输出必须能更新:
|
||||||
|
|
||||||
|
- `messages`
|
||||||
|
- `artifact`
|
||||||
|
- `web_search_results`
|
||||||
|
- `followup`
|
||||||
|
|
||||||
|
### 11.7 验收标准
|
||||||
|
|
||||||
|
- 能根据输入创建新 artifact
|
||||||
|
- 能根据输入整体改写 artifact
|
||||||
|
- 能保留版本历史
|
||||||
|
- 能在改写后返回自然语言 followup
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 12. 阶段六:前端流式同步与版本管理
|
||||||
|
|
||||||
|
### 12.1 目标
|
||||||
|
|
||||||
|
让前端能像 open-canvas 一样在流式过程中更新画布与聊天。
|
||||||
|
|
||||||
|
### 12.2 需求
|
||||||
|
|
||||||
|
- 复用现有 LangGraph stream client
|
||||||
|
- 在 Canvas 模式中解析 `artifact` 更新
|
||||||
|
- 支持流式文本更新
|
||||||
|
- 支持版本切换
|
||||||
|
- 支持断线后恢复线程状态
|
||||||
|
|
||||||
|
### 12.3 前端状态层建议
|
||||||
|
|
||||||
|
- `CanvasThreadContext`:线程基础信息
|
||||||
|
- `CanvasGraphContext`:消息、artifact、streaming 状态
|
||||||
|
- `CanvasUIContext`:面板、编辑态、选中态
|
||||||
|
|
||||||
|
### 12.4 关键能力
|
||||||
|
|
||||||
|
- 当前版本切换
|
||||||
|
- 新版本创建后自动定位到最新版本
|
||||||
|
- 手动编辑内容后保存
|
||||||
|
- 流结束后线程状态持久化
|
||||||
|
|
||||||
|
### 12.5 验收标准
|
||||||
|
|
||||||
|
- 发送消息时聊天和画布可同步更新
|
||||||
|
- 版本数会增加
|
||||||
|
- 切换历史版本稳定
|
||||||
|
- 刷新页面后线程状态能恢复
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 13. 阶段七:局部选区改写
|
||||||
|
|
||||||
|
### 13.1 目标
|
||||||
|
|
||||||
|
实现 Canvas 模式最关键的差异化能力之一:选中局部内容进行 AI 改写。
|
||||||
|
|
||||||
|
### 13.2 文本选区需求
|
||||||
|
|
||||||
|
- 支持在 Markdown 文本中选择一段文本
|
||||||
|
- 记录选区位置与原始文本
|
||||||
|
- 用户发出修改请求后,仅重写该选区
|
||||||
|
- 将选区结果合并为新版本 artifact
|
||||||
|
|
||||||
|
### 13.3 代码选区需求
|
||||||
|
|
||||||
|
- 支持在代码编辑器中选择一段代码
|
||||||
|
- 记录 start/end index 或行列信息
|
||||||
|
- AI 只返回替换片段
|
||||||
|
- 前端或后端负责将新片段拼接回完整代码
|
||||||
|
|
||||||
|
### 13.4 实现建议
|
||||||
|
|
||||||
|
首版建议:
|
||||||
|
|
||||||
|
- 文本:前端记录纯文本字符位置
|
||||||
|
- 代码:使用 CodeMirror selection 信息
|
||||||
|
|
||||||
|
不建议首版就做复杂块级富文本局部编辑。
|
||||||
|
|
||||||
|
### 13.5 风险
|
||||||
|
|
||||||
|
- Markdown 渲染态与源码态位置映射复杂
|
||||||
|
- 富文本块级位置难维护
|
||||||
|
- 流式更新中选区同步容易错位
|
||||||
|
|
||||||
|
### 13.6 首版折中方案
|
||||||
|
|
||||||
|
首版文本只基于 `fullMarkdown` 纯文本改写,不做 BlockNote 富文本块定位。
|
||||||
|
|
||||||
|
### 13.7 验收标准
|
||||||
|
|
||||||
|
- 文本局部改写成功
|
||||||
|
- 代码局部改写成功
|
||||||
|
- 原内容未改动部分保持不变
|
||||||
|
- 新版本正确入历史
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 14. 阶段八:快捷动作系统
|
||||||
|
|
||||||
|
### 14.1 目标
|
||||||
|
|
||||||
|
实现 open-canvas 风格的快捷动作体系。
|
||||||
|
|
||||||
|
### 14.2 首批推荐动作
|
||||||
|
|
||||||
|
文本类:
|
||||||
|
|
||||||
|
- 扩写
|
||||||
|
- 精简
|
||||||
|
- 改正式语气
|
||||||
|
- 改口语语气
|
||||||
|
- 改阅读难度
|
||||||
|
- 翻译
|
||||||
|
|
||||||
|
代码类:
|
||||||
|
|
||||||
|
- 加注释
|
||||||
|
- 加日志
|
||||||
|
- 修复 bug
|
||||||
|
- 优化代码
|
||||||
|
- 转换语言
|
||||||
|
|
||||||
|
### 14.3 设计方式
|
||||||
|
|
||||||
|
快捷动作不要直接写死在 UI,建议配置化:
|
||||||
|
|
||||||
|
- `id`
|
||||||
|
- `label`
|
||||||
|
- `type`
|
||||||
|
- `applicable_to`
|
||||||
|
- `prompt_template`
|
||||||
|
|
||||||
|
### 14.4 后端设计
|
||||||
|
|
||||||
|
快捷动作可通过:
|
||||||
|
|
||||||
|
- 前端传 `quick_action_id`
|
||||||
|
- 后端路由节点根据动作 id 选择 prompt
|
||||||
|
|
||||||
|
### 14.5 验收标准
|
||||||
|
|
||||||
|
- 文本动作可执行
|
||||||
|
- 代码动作可执行
|
||||||
|
- 结果进入新版本
|
||||||
|
- 不同动作提示词可扩展
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 15. 阶段九:模型配置统一与本地模型支持
|
||||||
|
|
||||||
|
### 15.1 目标
|
||||||
|
|
||||||
|
让 Canvas 模式支持和主系统统一的模型选择,并且能自由配置本地大模型。
|
||||||
|
|
||||||
|
### 15.2 原则
|
||||||
|
|
||||||
|
- 后端 `config.yaml` 为真源
|
||||||
|
- 前端只展示后端暴露的模型信息
|
||||||
|
- 不维护一份脱离后端的前端常量模型表
|
||||||
|
|
||||||
|
### 15.3 本地模型支持范围
|
||||||
|
|
||||||
|
建议优先支持两类:
|
||||||
|
|
||||||
|
- `Ollama`
|
||||||
|
- OpenAI-compatible 本地服务
|
||||||
|
- LM Studio
|
||||||
|
- vLLM
|
||||||
|
- LocalAI
|
||||||
|
- one-api 风格代理
|
||||||
|
|
||||||
|
### 15.4 后端配置建议
|
||||||
|
|
||||||
|
后端模型配置应至少支持:
|
||||||
|
|
||||||
|
- `name`
|
||||||
|
- `display_name`
|
||||||
|
- `use`
|
||||||
|
- `model`
|
||||||
|
- `api_key`
|
||||||
|
- `base_url`
|
||||||
|
- `supports_vision`
|
||||||
|
- `supports_thinking`
|
||||||
|
- `supports_tool_calling`
|
||||||
|
- `is_local`
|
||||||
|
- `canvas_capabilities`
|
||||||
|
|
||||||
|
### 15.5 Canvas 模式额外要求
|
||||||
|
|
||||||
|
由于不是所有模型都适合 Canvas 改写任务,建议增加能力标识:
|
||||||
|
|
||||||
|
- `supports_canvas_generation`
|
||||||
|
- `supports_canvas_rewrite`
|
||||||
|
- `supports_canvas_code_edit`
|
||||||
|
- `supports_streaming_text`
|
||||||
|
- `supports_streaming_tool_calls`
|
||||||
|
|
||||||
|
### 15.6 与 open-canvas 的关系
|
||||||
|
|
||||||
|
可以借鉴其命名习惯和能力分层,但不建议直接依赖其 `packages/shared/src/models.ts` 作为配置源。
|
||||||
|
|
||||||
|
### 15.7 验收标准
|
||||||
|
|
||||||
|
- 前端模型选择器可显示后端返回模型
|
||||||
|
- 可切换本地模型
|
||||||
|
- Canvas 模式能用本地模型生成和改写
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 16. 阶段十:Web 搜索增强
|
||||||
|
|
||||||
|
### 16.1 目标
|
||||||
|
|
||||||
|
实现类似 open-canvas 的可选 Web 搜索增强。
|
||||||
|
|
||||||
|
### 16.2 需求
|
||||||
|
|
||||||
|
- UI 提供 Web 搜索开关
|
||||||
|
- 后端在需要时走搜索节点
|
||||||
|
- 搜索结果写入线程状态
|
||||||
|
- 结果可在画布旁侧栏展示
|
||||||
|
|
||||||
|
### 16.3 首版建议
|
||||||
|
|
||||||
|
只做:
|
||||||
|
|
||||||
|
- 开关
|
||||||
|
- 搜索结果列表
|
||||||
|
- 搜索结果用于生成 artifact
|
||||||
|
|
||||||
|
暂不做复杂网页抓取编辑链路。
|
||||||
|
|
||||||
|
### 16.4 验收标准
|
||||||
|
|
||||||
|
- 打开搜索后可返回搜索结果
|
||||||
|
- 搜索结果可参与 artifact 生成
|
||||||
|
- 结果展示不阻塞主画布
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 17. 阶段十一:持久化、导出与文件产物联动
|
||||||
|
|
||||||
|
### 17.1 目标
|
||||||
|
|
||||||
|
让 Canvas 文档与 DeerFlow 原有文件能力协同。
|
||||||
|
|
||||||
|
### 17.2 需求
|
||||||
|
|
||||||
|
- artifact 持久化在线程 state 中
|
||||||
|
- 可手动导出为文件
|
||||||
|
- 可生成真实 HTML/Markdown/代码文件到现有 outputs
|
||||||
|
- Canvas artifact 与 `artifacts: string[]` 可双向关联
|
||||||
|
|
||||||
|
### 17.3 推荐能力
|
||||||
|
|
||||||
|
- 导出 Markdown
|
||||||
|
- 导出代码文件
|
||||||
|
- 另存为 artifact file
|
||||||
|
- 从 artifact file 回填到 Canvas
|
||||||
|
|
||||||
|
### 17.4 验收标准
|
||||||
|
|
||||||
|
- 当前版本可导出
|
||||||
|
- 导出文件可在现有文件面板查看
|
||||||
|
- 文件型 artifact 和 Canvas artifact 能共存
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 18. 推荐开发顺序
|
||||||
|
|
||||||
|
建议严格按以下顺序推进:
|
||||||
|
|
||||||
|
1. 路由和目录骨架
|
||||||
|
2. Canvas 页面布局
|
||||||
|
3. 前端 artifact 数据模型
|
||||||
|
4. 后端线程状态扩展
|
||||||
|
5. 新建 Canvas Agent 图
|
||||||
|
6. 前后端流式同步
|
||||||
|
7. 整体生成与整体改写
|
||||||
|
8. 局部选区改写
|
||||||
|
9. 快捷动作
|
||||||
|
10. 本地模型支持完善
|
||||||
|
11. Web 搜索增强
|
||||||
|
12. 导出与文件联动
|
||||||
|
|
||||||
|
不要先做局部改写和快捷动作,否则前面的状态与路由契约不稳定,返工会很多。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 19. 里程碑定义
|
||||||
|
|
||||||
|
### M1:页面可进入
|
||||||
|
|
||||||
|
- 路由接通
|
||||||
|
- 双栏布局完成
|
||||||
|
- 本地 mock artifact 可渲染
|
||||||
|
|
||||||
|
### M2:后端状态打通
|
||||||
|
|
||||||
|
- 线程可保存结构化 artifact
|
||||||
|
- 页面刷新后能恢复
|
||||||
|
|
||||||
|
### M3:AI 生成可用
|
||||||
|
|
||||||
|
- 可新建文本/代码 artifact
|
||||||
|
- 可整体改写
|
||||||
|
- 可产生版本历史
|
||||||
|
|
||||||
|
### M4:核心体验可用
|
||||||
|
|
||||||
|
- 选区改写可用
|
||||||
|
- 快捷动作可用
|
||||||
|
- 模型切换可用
|
||||||
|
|
||||||
|
### M5:增强能力完整
|
||||||
|
|
||||||
|
- 本地模型支持完善
|
||||||
|
- Web 搜索增强
|
||||||
|
- 导出和文件联动
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 20. 风险与难点
|
||||||
|
|
||||||
|
### 20.1 最大难点
|
||||||
|
|
||||||
|
- 结构化 artifact 状态从无到有
|
||||||
|
- 局部选区改写的精确性
|
||||||
|
- 流式状态与版本管理的一致性
|
||||||
|
- 不破坏现有 DeerFlow 文件型 artifact 体系
|
||||||
|
|
||||||
|
### 20.2 技术风险
|
||||||
|
|
||||||
|
- 线程 state JSON 结构过大
|
||||||
|
- 大模型对局部改写指令遵循不稳定
|
||||||
|
- 本地模型 tool calling 与流式能力差异大
|
||||||
|
- 文本渲染态与源码态位置映射复杂
|
||||||
|
|
||||||
|
### 20.3 规避建议
|
||||||
|
|
||||||
|
- 首版只支持 Markdown 源码态编辑,不做复杂富文本编辑
|
||||||
|
- 首版只支持文本和代码两种 artifact 类型
|
||||||
|
- 首版先做整体生成和整体改写,再做局部改写
|
||||||
|
- 本地模型先支持“能生成、能重写”的最小能力,不强求与顶级闭源模型完全同效
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 21. 验收总清单
|
||||||
|
|
||||||
|
### 21.1 前端
|
||||||
|
|
||||||
|
- 有独立 Canvas 路由
|
||||||
|
- 有专用目录和模块边界
|
||||||
|
- 双栏布局可用
|
||||||
|
- 文本和代码两类 artifact 可渲染
|
||||||
|
- 历史版本可切换
|
||||||
|
- 选区改写可交互
|
||||||
|
- 快捷动作可触发
|
||||||
|
- 模型可切换
|
||||||
|
|
||||||
|
### 21.2 后端
|
||||||
|
|
||||||
|
- 线程状态支持 `artifact`
|
||||||
|
- 新增 `canvas_agent` 或等价模式
|
||||||
|
- 生成、重写、局部改写可用
|
||||||
|
- 流式返回稳定
|
||||||
|
- 模型列表接口支持 Canvas 能力元数据
|
||||||
|
|
||||||
|
### 21.3 本地模型
|
||||||
|
|
||||||
|
- 可配置 Ollama
|
||||||
|
- 可配置 OpenAI-compatible 本地服务
|
||||||
|
- 前端可见并可切换
|
||||||
|
- 至少能完成文本生成和整体改写
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 22. 推荐首版最小可交付范围
|
||||||
|
|
||||||
|
如果要控制风险,建议首版只交付以下内容:
|
||||||
|
|
||||||
|
- 新增 `canvas/*` 路由
|
||||||
|
- 双栏布局
|
||||||
|
- 结构化 `artifact`
|
||||||
|
- `canvas_agent`
|
||||||
|
- 文本/代码 artifact 新建
|
||||||
|
- 整体生成
|
||||||
|
- 整体改写
|
||||||
|
- 历史版本切换
|
||||||
|
- 后端模型动态加载
|
||||||
|
- Ollama 或本地 OpenAI-compatible 至少一种可用
|
||||||
|
|
||||||
|
先不要把以下内容放进首版强制目标:
|
||||||
|
|
||||||
|
- 富文本块级精确编辑
|
||||||
|
- 全量快捷动作
|
||||||
|
- 复杂 Web 搜索增强
|
||||||
|
- 多 artifact 并行管理
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 23. 后续实施建议
|
||||||
|
|
||||||
|
建议下一步基于本文档继续输出两份落地文档:
|
||||||
|
|
||||||
|
### 23.1 前端实施清单
|
||||||
|
|
||||||
|
逐文件列出:
|
||||||
|
|
||||||
|
- 要新建哪些文件
|
||||||
|
- 哪些组件可复用
|
||||||
|
- 哪些页面要接入路由
|
||||||
|
- 哪些状态要从现有 hooks 抽离
|
||||||
|
|
||||||
|
### 23.2 后端实施清单
|
||||||
|
|
||||||
|
逐模块列出:
|
||||||
|
|
||||||
|
- 要改哪些 Python 文件
|
||||||
|
- 新增哪些状态字段
|
||||||
|
- 新增哪些 Agent 节点
|
||||||
|
- 哪些 API 需要扩展
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 24. 结论
|
||||||
|
|
||||||
|
这个需求很大,但完全可拆。
|
||||||
|
|
||||||
|
正确做法不是“先抄 UI”,而是按下面的主线推进:
|
||||||
|
|
||||||
|
- 先建前端 Canvas 子系统
|
||||||
|
- 再建结构化 artifact 状态
|
||||||
|
- 再建 Canvas Agent 图
|
||||||
|
- 再补局部改写和快捷动作
|
||||||
|
- 最后统一本地模型能力
|
||||||
|
|
||||||
|
只要按本文档阶段推进,这个需求是可以落地的,而且能和你现在的 DeerFlow 架构保持长期兼容。
|
||||||
@@ -31,23 +31,25 @@ function BreadcrumbItem({ className, ...props }: React.ComponentProps<"li">) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function BreadcrumbLink({
|
const BreadcrumbLink = React.forwardRef<
|
||||||
asChild,
|
HTMLAnchorElement,
|
||||||
className,
|
React.ComponentProps<"a"> & {
|
||||||
...props
|
asChild?: boolean;
|
||||||
}: React.ComponentProps<"a"> & {
|
}
|
||||||
asChild?: boolean;
|
>(({ asChild, className, ...props }, ref) => {
|
||||||
}) {
|
|
||||||
const Comp = asChild ? Slot : "a";
|
const Comp = asChild ? Slot : "a";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Comp
|
<Comp
|
||||||
|
ref={ref}
|
||||||
data-slot="breadcrumb-link"
|
data-slot="breadcrumb-link"
|
||||||
className={cn("hover:text-foreground transition-colors", className)}
|
className={cn("hover:text-foreground transition-colors", className)}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
BreadcrumbLink.displayName = "BreadcrumbLink";
|
||||||
|
|
||||||
function BreadcrumbPage({ className, ...props }: React.ComponentProps<"span">) {
|
function BreadcrumbPage({ className, ...props }: React.ComponentProps<"span">) {
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -37,20 +37,18 @@ const buttonVariants = cva(
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
function Button({
|
const Button = React.forwardRef<
|
||||||
className,
|
HTMLButtonElement,
|
||||||
variant = "default",
|
React.ComponentProps<"button"> &
|
||||||
size = "default",
|
VariantProps<typeof buttonVariants> & {
|
||||||
asChild = false,
|
asChild?: boolean;
|
||||||
...props
|
}
|
||||||
}: React.ComponentProps<"button"> &
|
>(({ className, variant = "default", size = "default", asChild = false, ...props }, ref) => {
|
||||||
VariantProps<typeof buttonVariants> & {
|
|
||||||
asChild?: boolean;
|
|
||||||
}) {
|
|
||||||
const Comp = asChild ? Slot : "button";
|
const Comp = asChild ? Slot : "button";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Comp
|
<Comp
|
||||||
|
ref={ref}
|
||||||
data-slot="button"
|
data-slot="button"
|
||||||
{...(variant !== undefined && { "data-variant": variant })}
|
{...(variant !== undefined && { "data-variant": variant })}
|
||||||
{...(size !== undefined && { "data-size": size })}
|
{...(size !== undefined && { "data-size": size })}
|
||||||
@@ -58,6 +56,8 @@ function Button({
|
|||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
Button.displayName = "Button";
|
||||||
|
|
||||||
export { Button, buttonVariants };
|
export { Button, buttonVariants };
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
|
import * as React from "react";
|
||||||
import * as CollapsiblePrimitive from "@radix-ui/react-collapsible";
|
import * as CollapsiblePrimitive from "@radix-ui/react-collapsible";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
@@ -10,28 +11,37 @@ function Collapsible({
|
|||||||
return <CollapsiblePrimitive.Root data-slot="collapsible" {...props} />;
|
return <CollapsiblePrimitive.Root data-slot="collapsible" {...props} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
function CollapsibleTrigger({
|
const CollapsibleTrigger = React.forwardRef<
|
||||||
className,
|
React.ElementRef<typeof CollapsiblePrimitive.CollapsibleTrigger>,
|
||||||
...props
|
React.ComponentPropsWithoutRef<typeof CollapsiblePrimitive.CollapsibleTrigger>
|
||||||
}: React.ComponentProps<typeof CollapsiblePrimitive.CollapsibleTrigger>) {
|
>(({ className, ...props }, ref) => {
|
||||||
return (
|
return (
|
||||||
<CollapsiblePrimitive.CollapsibleTrigger
|
<CollapsiblePrimitive.CollapsibleTrigger
|
||||||
|
ref={ref}
|
||||||
data-slot="collapsible-trigger"
|
data-slot="collapsible-trigger"
|
||||||
className={cn("cursor-pointer", className)}
|
className={cn("cursor-pointer", className)}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
function CollapsibleContent({
|
CollapsibleTrigger.displayName =
|
||||||
...props
|
CollapsiblePrimitive.CollapsibleTrigger.displayName;
|
||||||
}: React.ComponentProps<typeof CollapsiblePrimitive.CollapsibleContent>) {
|
|
||||||
|
const CollapsibleContent = React.forwardRef<
|
||||||
|
React.ElementRef<typeof CollapsiblePrimitive.CollapsibleContent>,
|
||||||
|
React.ComponentPropsWithoutRef<typeof CollapsiblePrimitive.CollapsibleContent>
|
||||||
|
>(({ ...props }, ref) => {
|
||||||
return (
|
return (
|
||||||
<CollapsiblePrimitive.CollapsibleContent
|
<CollapsiblePrimitive.CollapsibleContent
|
||||||
|
ref={ref}
|
||||||
data-slot="collapsible-content"
|
data-slot="collapsible-content"
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
CollapsibleContent.displayName =
|
||||||
|
CollapsiblePrimitive.CollapsibleContent.displayName;
|
||||||
|
|
||||||
export { Collapsible, CollapsibleTrigger, CollapsibleContent };
|
export { Collapsible, CollapsibleTrigger, CollapsibleContent };
|
||||||
@@ -12,11 +12,20 @@ function Dialog({
|
|||||||
return <DialogPrimitive.Root data-slot="dialog" {...props} />;
|
return <DialogPrimitive.Root data-slot="dialog" {...props} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
function DialogTrigger({
|
const DialogTrigger = React.forwardRef<
|
||||||
...props
|
React.ElementRef<typeof DialogPrimitive.Trigger>,
|
||||||
}: React.ComponentProps<typeof DialogPrimitive.Trigger>) {
|
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Trigger>
|
||||||
return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />;
|
>(({ ...props }, ref) => {
|
||||||
}
|
return (
|
||||||
|
<DialogPrimitive.Trigger
|
||||||
|
ref={ref}
|
||||||
|
data-slot="dialog-trigger"
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
DialogTrigger.displayName = DialogPrimitive.Trigger.displayName;
|
||||||
|
|
||||||
function DialogPortal({
|
function DialogPortal({
|
||||||
...props
|
...props
|
||||||
@@ -24,18 +33,22 @@ function DialogPortal({
|
|||||||
return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />;
|
return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
function DialogClose({
|
const DialogClose = React.forwardRef<
|
||||||
...props
|
React.ElementRef<typeof DialogPrimitive.Close>,
|
||||||
}: React.ComponentProps<typeof DialogPrimitive.Close>) {
|
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Close>
|
||||||
return <DialogPrimitive.Close data-slot="dialog-close" {...props} />;
|
>(({ ...props }, ref) => {
|
||||||
}
|
return <DialogPrimitive.Close ref={ref} data-slot="dialog-close" {...props} />;
|
||||||
|
});
|
||||||
|
|
||||||
function DialogOverlay({
|
DialogClose.displayName = DialogPrimitive.Close.displayName;
|
||||||
className,
|
|
||||||
...props
|
const DialogOverlay = React.forwardRef<
|
||||||
}: React.ComponentProps<typeof DialogPrimitive.Overlay>) {
|
React.ElementRef<typeof DialogPrimitive.Overlay>,
|
||||||
|
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
|
||||||
|
>(({ className, ...props }, ref) => {
|
||||||
return (
|
return (
|
||||||
<DialogPrimitive.Overlay
|
<DialogPrimitive.Overlay
|
||||||
|
ref={ref}
|
||||||
data-slot="dialog-overlay"
|
data-slot="dialog-overlay"
|
||||||
className={cn(
|
className={cn(
|
||||||
"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",
|
"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",
|
||||||
@@ -44,20 +57,21 @@ function DialogOverlay({
|
|||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
function DialogContent({
|
DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
|
||||||
className,
|
|
||||||
children,
|
const DialogContent = React.forwardRef<
|
||||||
showCloseButton = true,
|
React.ElementRef<typeof DialogPrimitive.Content>,
|
||||||
...props
|
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & {
|
||||||
}: React.ComponentProps<typeof DialogPrimitive.Content> & {
|
showCloseButton?: boolean;
|
||||||
showCloseButton?: boolean;
|
}
|
||||||
}) {
|
>(({ className, children, showCloseButton = true, ...props }, ref) => {
|
||||||
return (
|
return (
|
||||||
<DialogPortal data-slot="dialog-portal">
|
<DialogPortal data-slot="dialog-portal">
|
||||||
<DialogOverlay />
|
<DialogOverlay />
|
||||||
<DialogPrimitive.Content
|
<DialogPrimitive.Content
|
||||||
|
ref={ref}
|
||||||
data-slot="dialog-content"
|
data-slot="dialog-content"
|
||||||
className={cn(
|
className={cn(
|
||||||
"bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 outline-none sm:max-w-lg",
|
"bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 outline-none sm:max-w-lg",
|
||||||
@@ -78,7 +92,9 @@ function DialogContent({
|
|||||||
</DialogPrimitive.Content>
|
</DialogPrimitive.Content>
|
||||||
</DialogPortal>
|
</DialogPortal>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
DialogContent.displayName = DialogPrimitive.Content.displayName;
|
||||||
|
|
||||||
function DialogHeader({ className, ...props }: React.ComponentProps<"div">) {
|
function DialogHeader({ className, ...props }: React.ComponentProps<"div">) {
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -20,25 +20,29 @@ function DropdownMenuPortal({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function DropdownMenuTrigger({
|
const DropdownMenuTrigger = React.forwardRef<
|
||||||
...props
|
React.ElementRef<typeof DropdownMenuPrimitive.Trigger>,
|
||||||
}: React.ComponentProps<typeof DropdownMenuPrimitive.Trigger>) {
|
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Trigger>
|
||||||
|
>(({ ...props }, ref) => {
|
||||||
return (
|
return (
|
||||||
<DropdownMenuPrimitive.Trigger
|
<DropdownMenuPrimitive.Trigger
|
||||||
|
ref={ref}
|
||||||
data-slot="dropdown-menu-trigger"
|
data-slot="dropdown-menu-trigger"
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
function DropdownMenuContent({
|
DropdownMenuTrigger.displayName = DropdownMenuPrimitive.Trigger.displayName;
|
||||||
className,
|
|
||||||
sideOffset = 4,
|
const DropdownMenuContent = React.forwardRef<
|
||||||
...props
|
React.ElementRef<typeof DropdownMenuPrimitive.Content>,
|
||||||
}: React.ComponentProps<typeof DropdownMenuPrimitive.Content>) {
|
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content>
|
||||||
|
>(({ className, sideOffset = 4, ...props }, ref) => {
|
||||||
return (
|
return (
|
||||||
<DropdownMenuPrimitive.Portal>
|
<DropdownMenuPrimitive.Portal>
|
||||||
<DropdownMenuPrimitive.Content
|
<DropdownMenuPrimitive.Content
|
||||||
|
ref={ref}
|
||||||
data-slot="dropdown-menu-content"
|
data-slot="dropdown-menu-content"
|
||||||
sideOffset={sideOffset}
|
sideOffset={sideOffset}
|
||||||
className={cn(
|
className={cn(
|
||||||
@@ -49,7 +53,9 @@ function DropdownMenuContent({
|
|||||||
/>
|
/>
|
||||||
</DropdownMenuPrimitive.Portal>
|
</DropdownMenuPrimitive.Portal>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName;
|
||||||
|
|
||||||
function DropdownMenuGroup({
|
function DropdownMenuGroup({
|
||||||
...props
|
...props
|
||||||
@@ -59,17 +65,16 @@ function DropdownMenuGroup({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function DropdownMenuItem({
|
const DropdownMenuItem = React.forwardRef<
|
||||||
className,
|
React.ElementRef<typeof DropdownMenuPrimitive.Item>,
|
||||||
inset,
|
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> & {
|
||||||
variant = "default",
|
inset?: boolean;
|
||||||
...props
|
variant?: "default" | "destructive";
|
||||||
}: React.ComponentProps<typeof DropdownMenuPrimitive.Item> & {
|
}
|
||||||
inset?: boolean;
|
>(({ className, inset, variant = "default", ...props }, ref) => {
|
||||||
variant?: "default" | "destructive";
|
|
||||||
}) {
|
|
||||||
return (
|
return (
|
||||||
<DropdownMenuPrimitive.Item
|
<DropdownMenuPrimitive.Item
|
||||||
|
ref={ref}
|
||||||
data-slot="dropdown-menu-item"
|
data-slot="dropdown-menu-item"
|
||||||
data-inset={inset}
|
data-inset={inset}
|
||||||
data-variant={variant}
|
data-variant={variant}
|
||||||
@@ -80,7 +85,9 @@ function DropdownMenuItem({
|
|||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName;
|
||||||
|
|
||||||
function DropdownMenuCheckboxItem({
|
function DropdownMenuCheckboxItem({
|
||||||
className,
|
className,
|
||||||
@@ -198,16 +205,15 @@ function DropdownMenuSub({
|
|||||||
return <DropdownMenuPrimitive.Sub data-slot="dropdown-menu-sub" {...props} />;
|
return <DropdownMenuPrimitive.Sub data-slot="dropdown-menu-sub" {...props} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
function DropdownMenuSubTrigger({
|
const DropdownMenuSubTrigger = React.forwardRef<
|
||||||
className,
|
React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>,
|
||||||
inset,
|
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> & {
|
||||||
children,
|
inset?: boolean;
|
||||||
...props
|
}
|
||||||
}: React.ComponentProps<typeof DropdownMenuPrimitive.SubTrigger> & {
|
>(({ className, inset, children, ...props }, ref) => {
|
||||||
inset?: boolean;
|
|
||||||
}) {
|
|
||||||
return (
|
return (
|
||||||
<DropdownMenuPrimitive.SubTrigger
|
<DropdownMenuPrimitive.SubTrigger
|
||||||
|
ref={ref}
|
||||||
data-slot="dropdown-menu-sub-trigger"
|
data-slot="dropdown-menu-sub-trigger"
|
||||||
data-inset={inset}
|
data-inset={inset}
|
||||||
className={cn(
|
className={cn(
|
||||||
@@ -220,14 +226,18 @@ function DropdownMenuSubTrigger({
|
|||||||
<ChevronRightIcon className="ml-auto size-4" />
|
<ChevronRightIcon className="ml-auto size-4" />
|
||||||
</DropdownMenuPrimitive.SubTrigger>
|
</DropdownMenuPrimitive.SubTrigger>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
function DropdownMenuSubContent({
|
DropdownMenuSubTrigger.displayName =
|
||||||
className,
|
DropdownMenuPrimitive.SubTrigger.displayName;
|
||||||
...props
|
|
||||||
}: React.ComponentProps<typeof DropdownMenuPrimitive.SubContent>) {
|
const DropdownMenuSubContent = React.forwardRef<
|
||||||
|
React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,
|
||||||
|
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>
|
||||||
|
>(({ className, ...props }, ref) => {
|
||||||
return (
|
return (
|
||||||
<DropdownMenuPrimitive.SubContent
|
<DropdownMenuPrimitive.SubContent
|
||||||
|
ref={ref}
|
||||||
data-slot="dropdown-menu-sub-content"
|
data-slot="dropdown-menu-sub-content"
|
||||||
className={cn(
|
className={cn(
|
||||||
"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-lg",
|
"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-lg",
|
||||||
@@ -236,7 +246,10 @@ function DropdownMenuSubContent({
|
|||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
DropdownMenuSubContent.displayName =
|
||||||
|
DropdownMenuPrimitive.SubContent.displayName;
|
||||||
|
|
||||||
export {
|
export {
|
||||||
DropdownMenu,
|
DropdownMenu,
|
||||||
|
|||||||
@@ -11,23 +11,29 @@ function HoverCard({
|
|||||||
return <HoverCardPrimitive.Root data-slot="hover-card" {...props} />;
|
return <HoverCardPrimitive.Root data-slot="hover-card" {...props} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
function HoverCardTrigger({
|
const HoverCardTrigger = React.forwardRef<
|
||||||
...props
|
React.ElementRef<typeof HoverCardPrimitive.Trigger>,
|
||||||
}: React.ComponentProps<typeof HoverCardPrimitive.Trigger>) {
|
React.ComponentPropsWithoutRef<typeof HoverCardPrimitive.Trigger>
|
||||||
|
>(({ ...props }, ref) => {
|
||||||
return (
|
return (
|
||||||
<HoverCardPrimitive.Trigger data-slot="hover-card-trigger" {...props} />
|
<HoverCardPrimitive.Trigger
|
||||||
|
ref={ref}
|
||||||
|
data-slot="hover-card-trigger"
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
function HoverCardContent({
|
HoverCardTrigger.displayName = HoverCardPrimitive.Trigger.displayName;
|
||||||
className,
|
|
||||||
align = "center",
|
const HoverCardContent = React.forwardRef<
|
||||||
sideOffset = 4,
|
React.ElementRef<typeof HoverCardPrimitive.Content>,
|
||||||
...props
|
React.ComponentPropsWithoutRef<typeof HoverCardPrimitive.Content>
|
||||||
}: React.ComponentProps<typeof HoverCardPrimitive.Content>) {
|
>(({ className, align = "center", sideOffset = 4, ...props }, ref) => {
|
||||||
return (
|
return (
|
||||||
<HoverCardPrimitive.Portal data-slot="hover-card-portal">
|
<HoverCardPrimitive.Portal data-slot="hover-card-portal">
|
||||||
<HoverCardPrimitive.Content
|
<HoverCardPrimitive.Content
|
||||||
|
ref={ref}
|
||||||
data-slot="hover-card-content"
|
data-slot="hover-card-content"
|
||||||
align={align}
|
align={align}
|
||||||
sideOffset={sideOffset}
|
sideOffset={sideOffset}
|
||||||
@@ -39,6 +45,8 @@ function HoverCardContent({
|
|||||||
/>
|
/>
|
||||||
</HoverCardPrimitive.Portal>
|
</HoverCardPrimitive.Portal>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
HoverCardContent.displayName = HoverCardPrimitive.Content.displayName;
|
||||||
|
|
||||||
export { HoverCard, HoverCardTrigger, HoverCardContent };
|
export { HoverCard, HoverCardTrigger, HoverCardContent };
|
||||||
@@ -24,16 +24,15 @@ function SelectValue({
|
|||||||
return <SelectPrimitive.Value data-slot="select-value" {...props} />;
|
return <SelectPrimitive.Value data-slot="select-value" {...props} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
function SelectTrigger({
|
const SelectTrigger = React.forwardRef<
|
||||||
className,
|
React.ElementRef<typeof SelectPrimitive.Trigger>,
|
||||||
size = "default",
|
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger> & {
|
||||||
children,
|
size?: "sm" | "default";
|
||||||
...props
|
}
|
||||||
}: React.ComponentProps<typeof SelectPrimitive.Trigger> & {
|
>(({ className, size = "default", children, ...props }, ref) => {
|
||||||
size?: "sm" | "default";
|
|
||||||
}) {
|
|
||||||
return (
|
return (
|
||||||
<SelectPrimitive.Trigger
|
<SelectPrimitive.Trigger
|
||||||
|
ref={ref}
|
||||||
data-slot="select-trigger"
|
data-slot="select-trigger"
|
||||||
data-size={size}
|
data-size={size}
|
||||||
className={cn(
|
className={cn(
|
||||||
@@ -48,18 +47,18 @@ function SelectTrigger({
|
|||||||
</SelectPrimitive.Icon>
|
</SelectPrimitive.Icon>
|
||||||
</SelectPrimitive.Trigger>
|
</SelectPrimitive.Trigger>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
function SelectContent({
|
SelectTrigger.displayName = SelectPrimitive.Trigger.displayName;
|
||||||
className,
|
|
||||||
children,
|
const SelectContent = React.forwardRef<
|
||||||
position = "item-aligned",
|
React.ElementRef<typeof SelectPrimitive.Content>,
|
||||||
align = "center",
|
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
|
||||||
...props
|
>(({ className, children, position = "item-aligned", align = "center", ...props }, ref) => {
|
||||||
}: React.ComponentProps<typeof SelectPrimitive.Content>) {
|
|
||||||
return (
|
return (
|
||||||
<SelectPrimitive.Portal>
|
<SelectPrimitive.Portal>
|
||||||
<SelectPrimitive.Content
|
<SelectPrimitive.Content
|
||||||
|
ref={ref}
|
||||||
data-slot="select-content"
|
data-slot="select-content"
|
||||||
className={cn(
|
className={cn(
|
||||||
"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border shadow-md",
|
"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border shadow-md",
|
||||||
@@ -85,7 +84,9 @@ function SelectContent({
|
|||||||
</SelectPrimitive.Content>
|
</SelectPrimitive.Content>
|
||||||
</SelectPrimitive.Portal>
|
</SelectPrimitive.Portal>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
SelectContent.displayName = SelectPrimitive.Content.displayName;
|
||||||
|
|
||||||
function SelectLabel({
|
function SelectLabel({
|
||||||
className,
|
className,
|
||||||
@@ -100,13 +101,13 @@ function SelectLabel({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function SelectItem({
|
const SelectItem = React.forwardRef<
|
||||||
className,
|
React.ElementRef<typeof SelectPrimitive.Item>,
|
||||||
children,
|
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
|
||||||
...props
|
>(({ className, children, ...props }, ref) => {
|
||||||
}: React.ComponentProps<typeof SelectPrimitive.Item>) {
|
|
||||||
return (
|
return (
|
||||||
<SelectPrimitive.Item
|
<SelectPrimitive.Item
|
||||||
|
ref={ref}
|
||||||
data-slot="select-item"
|
data-slot="select-item"
|
||||||
className={cn(
|
className={cn(
|
||||||
"focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-pointer items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
|
"focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-pointer items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
|
||||||
@@ -125,7 +126,9 @@ function SelectItem({
|
|||||||
<SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
|
<SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
|
||||||
</SelectPrimitive.Item>
|
</SelectPrimitive.Item>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
SelectItem.displayName = SelectPrimitive.Item.displayName;
|
||||||
|
|
||||||
function SelectSeparator({
|
function SelectSeparator({
|
||||||
className,
|
className,
|
||||||
|
|||||||
@@ -10,17 +10,23 @@ function Sheet({ ...props }: React.ComponentProps<typeof SheetPrimitive.Root>) {
|
|||||||
return <SheetPrimitive.Root data-slot="sheet" {...props} />;
|
return <SheetPrimitive.Root data-slot="sheet" {...props} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
function SheetTrigger({
|
const SheetTrigger = React.forwardRef<
|
||||||
...props
|
React.ElementRef<typeof SheetPrimitive.Trigger>,
|
||||||
}: React.ComponentProps<typeof SheetPrimitive.Trigger>) {
|
React.ComponentPropsWithoutRef<typeof SheetPrimitive.Trigger>
|
||||||
return <SheetPrimitive.Trigger data-slot="sheet-trigger" {...props} />;
|
>(({ ...props }, ref) => {
|
||||||
}
|
return <SheetPrimitive.Trigger ref={ref} data-slot="sheet-trigger" {...props} />;
|
||||||
|
});
|
||||||
|
|
||||||
function SheetClose({
|
SheetTrigger.displayName = SheetPrimitive.Trigger.displayName;
|
||||||
...props
|
|
||||||
}: React.ComponentProps<typeof SheetPrimitive.Close>) {
|
const SheetClose = React.forwardRef<
|
||||||
return <SheetPrimitive.Close data-slot="sheet-close" {...props} />;
|
React.ElementRef<typeof SheetPrimitive.Close>,
|
||||||
}
|
React.ComponentPropsWithoutRef<typeof SheetPrimitive.Close>
|
||||||
|
>(({ ...props }, ref) => {
|
||||||
|
return <SheetPrimitive.Close ref={ref} data-slot="sheet-close" {...props} />;
|
||||||
|
});
|
||||||
|
|
||||||
|
SheetClose.displayName = SheetPrimitive.Close.displayName;
|
||||||
|
|
||||||
function SheetPortal({
|
function SheetPortal({
|
||||||
...props
|
...props
|
||||||
@@ -28,12 +34,13 @@ function SheetPortal({
|
|||||||
return <SheetPrimitive.Portal data-slot="sheet-portal" {...props} />;
|
return <SheetPrimitive.Portal data-slot="sheet-portal" {...props} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
function SheetOverlay({
|
const SheetOverlay = React.forwardRef<
|
||||||
className,
|
React.ElementRef<typeof SheetPrimitive.Overlay>,
|
||||||
...props
|
React.ComponentPropsWithoutRef<typeof SheetPrimitive.Overlay>
|
||||||
}: React.ComponentProps<typeof SheetPrimitive.Overlay>) {
|
>(({ className, ...props }, ref) => {
|
||||||
return (
|
return (
|
||||||
<SheetPrimitive.Overlay
|
<SheetPrimitive.Overlay
|
||||||
|
ref={ref}
|
||||||
data-slot="sheet-overlay"
|
data-slot="sheet-overlay"
|
||||||
className={cn(
|
className={cn(
|
||||||
"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",
|
"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",
|
||||||
@@ -42,20 +49,21 @@ function SheetOverlay({
|
|||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
function SheetContent({
|
SheetOverlay.displayName = SheetPrimitive.Overlay.displayName;
|
||||||
className,
|
|
||||||
children,
|
const SheetContent = React.forwardRef<
|
||||||
side = "right",
|
React.ElementRef<typeof SheetPrimitive.Content>,
|
||||||
...props
|
React.ComponentPropsWithoutRef<typeof SheetPrimitive.Content> & {
|
||||||
}: React.ComponentProps<typeof SheetPrimitive.Content> & {
|
side?: "top" | "right" | "bottom" | "left";
|
||||||
side?: "top" | "right" | "bottom" | "left";
|
}
|
||||||
}) {
|
>(({ className, children, side = "right", ...props }, ref) => {
|
||||||
return (
|
return (
|
||||||
<SheetPortal>
|
<SheetPortal>
|
||||||
<SheetOverlay />
|
<SheetOverlay />
|
||||||
<SheetPrimitive.Content
|
<SheetPrimitive.Content
|
||||||
|
ref={ref}
|
||||||
data-slot="sheet-content"
|
data-slot="sheet-content"
|
||||||
className={cn(
|
className={cn(
|
||||||
"bg-background data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 flex flex-col gap-4 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500",
|
"bg-background data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 flex flex-col gap-4 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500",
|
||||||
@@ -79,7 +87,9 @@ function SheetContent({
|
|||||||
</SheetPrimitive.Content>
|
</SheetPrimitive.Content>
|
||||||
</SheetPortal>
|
</SheetPortal>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
SheetContent.displayName = SheetPrimitive.Content.displayName;
|
||||||
|
|
||||||
function SheetHeader({ className, ...props }: React.ComponentProps<"div">) {
|
function SheetHeader({ className, ...props }: React.ComponentProps<"div">) {
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -397,15 +397,15 @@ function SidebarGroup({ className, ...props }: React.ComponentProps<"div">) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function SidebarGroupLabel({
|
const SidebarGroupLabel = React.forwardRef<
|
||||||
className,
|
HTMLDivElement,
|
||||||
asChild = false,
|
React.ComponentProps<"div"> & { asChild?: boolean }
|
||||||
...props
|
>(({ className, asChild = false, ...props }, ref) => {
|
||||||
}: React.ComponentProps<"div"> & { asChild?: boolean }) {
|
|
||||||
const Comp = asChild ? Slot : "div";
|
const Comp = asChild ? Slot : "div";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Comp
|
<Comp
|
||||||
|
ref={ref}
|
||||||
data-slot="sidebar-group-label"
|
data-slot="sidebar-group-label"
|
||||||
data-sidebar="group-label"
|
data-sidebar="group-label"
|
||||||
className={cn(
|
className={cn(
|
||||||
@@ -416,17 +416,19 @@ function SidebarGroupLabel({
|
|||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
function SidebarGroupAction({
|
SidebarGroupLabel.displayName = "SidebarGroupLabel";
|
||||||
className,
|
|
||||||
asChild = false,
|
const SidebarGroupAction = React.forwardRef<
|
||||||
...props
|
HTMLButtonElement,
|
||||||
}: React.ComponentProps<"button"> & { asChild?: boolean }) {
|
React.ComponentProps<"button"> & { asChild?: boolean }
|
||||||
|
>(({ className, asChild = false, ...props }, ref) => {
|
||||||
const Comp = asChild ? Slot : "button";
|
const Comp = asChild ? Slot : "button";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Comp
|
<Comp
|
||||||
|
ref={ref}
|
||||||
data-slot="sidebar-group-action"
|
data-slot="sidebar-group-action"
|
||||||
data-sidebar="group-action"
|
data-sidebar="group-action"
|
||||||
className={cn(
|
className={cn(
|
||||||
@@ -439,7 +441,9 @@ function SidebarGroupAction({
|
|||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
SidebarGroupAction.displayName = "SidebarGroupAction";
|
||||||
|
|
||||||
function SidebarGroupContent({
|
function SidebarGroupContent({
|
||||||
className,
|
className,
|
||||||
@@ -499,69 +503,79 @@ const sidebarMenuButtonVariants = cva(
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
function SidebarMenuButton({
|
const SidebarMenuButton = React.forwardRef<
|
||||||
asChild = false,
|
HTMLButtonElement,
|
||||||
isActive = false,
|
React.ComponentProps<"button"> & {
|
||||||
variant = "default",
|
asChild?: boolean;
|
||||||
size = "default",
|
isActive?: boolean;
|
||||||
tooltip,
|
tooltip?: string | React.ComponentProps<typeof TooltipContent>;
|
||||||
className,
|
} & VariantProps<typeof sidebarMenuButtonVariants>
|
||||||
...props
|
>(
|
||||||
}: React.ComponentProps<"button"> & {
|
(
|
||||||
asChild?: boolean;
|
{
|
||||||
isActive?: boolean;
|
asChild = false,
|
||||||
tooltip?: string | React.ComponentProps<typeof TooltipContent>;
|
isActive = false,
|
||||||
} & VariantProps<typeof sidebarMenuButtonVariants>) {
|
variant = "default",
|
||||||
const Comp = asChild ? Slot : "button";
|
size = "default",
|
||||||
const { isMobile, state } = useSidebar();
|
tooltip,
|
||||||
|
className,
|
||||||
|
...props
|
||||||
|
},
|
||||||
|
ref,
|
||||||
|
) => {
|
||||||
|
const Comp = asChild ? Slot : "button";
|
||||||
|
const { isMobile, state } = useSidebar();
|
||||||
|
|
||||||
const button = (
|
const button = (
|
||||||
<Comp
|
<Comp
|
||||||
data-slot="sidebar-menu-button"
|
ref={ref}
|
||||||
data-sidebar="menu-button"
|
data-slot="sidebar-menu-button"
|
||||||
data-size={size}
|
data-sidebar="menu-button"
|
||||||
data-active={isActive}
|
data-size={size}
|
||||||
className={cn(sidebarMenuButtonVariants({ variant, size }), className)}
|
data-active={isActive}
|
||||||
{...props}
|
className={cn(sidebarMenuButtonVariants({ variant, size }), className)}
|
||||||
/>
|
{...props}
|
||||||
);
|
|
||||||
|
|
||||||
if (!tooltip) {
|
|
||||||
return button;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeof tooltip === "string") {
|
|
||||||
tooltip = {
|
|
||||||
children: tooltip,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Tooltip>
|
|
||||||
<TooltipTrigger asChild>{button}</TooltipTrigger>
|
|
||||||
<TooltipContent
|
|
||||||
side="right"
|
|
||||||
align="center"
|
|
||||||
hidden={state !== "collapsed" || isMobile}
|
|
||||||
{...tooltip}
|
|
||||||
/>
|
/>
|
||||||
</Tooltip>
|
);
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function SidebarMenuAction({
|
if (!tooltip) {
|
||||||
className,
|
return button;
|
||||||
asChild = false,
|
}
|
||||||
showOnHover = false,
|
|
||||||
...props
|
if (typeof tooltip === "string") {
|
||||||
}: React.ComponentProps<"button"> & {
|
tooltip = {
|
||||||
asChild?: boolean;
|
children: tooltip,
|
||||||
showOnHover?: boolean;
|
};
|
||||||
}) {
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>{button}</TooltipTrigger>
|
||||||
|
<TooltipContent
|
||||||
|
side="right"
|
||||||
|
align="center"
|
||||||
|
hidden={state !== "collapsed" || isMobile}
|
||||||
|
{...tooltip}
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
SidebarMenuButton.displayName = "SidebarMenuButton";
|
||||||
|
|
||||||
|
const SidebarMenuAction = React.forwardRef<
|
||||||
|
HTMLButtonElement,
|
||||||
|
React.ComponentProps<"button"> & {
|
||||||
|
asChild?: boolean;
|
||||||
|
showOnHover?: boolean;
|
||||||
|
}
|
||||||
|
>(({ className, asChild = false, showOnHover = false, ...props }, ref) => {
|
||||||
const Comp = asChild ? Slot : "button";
|
const Comp = asChild ? Slot : "button";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Comp
|
<Comp
|
||||||
|
ref={ref}
|
||||||
data-slot="sidebar-menu-action"
|
data-slot="sidebar-menu-action"
|
||||||
data-sidebar="menu-action"
|
data-sidebar="menu-action"
|
||||||
className={cn(
|
className={cn(
|
||||||
@@ -579,7 +593,9 @@ function SidebarMenuAction({
|
|||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
SidebarMenuAction.displayName = "SidebarMenuAction";
|
||||||
|
|
||||||
function SidebarMenuBadge({
|
function SidebarMenuBadge({
|
||||||
className,
|
className,
|
||||||
@@ -670,21 +686,19 @@ function SidebarMenuSubItem({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function SidebarMenuSubButton({
|
const SidebarMenuSubButton = React.forwardRef<
|
||||||
asChild = false,
|
HTMLAnchorElement,
|
||||||
size = "md",
|
React.ComponentProps<"a"> & {
|
||||||
isActive = false,
|
asChild?: boolean;
|
||||||
className,
|
size?: "sm" | "md";
|
||||||
...props
|
isActive?: boolean;
|
||||||
}: React.ComponentProps<"a"> & {
|
}
|
||||||
asChild?: boolean;
|
>(({ asChild = false, size = "md", isActive = false, className, ...props }, ref) => {
|
||||||
size?: "sm" | "md";
|
|
||||||
isActive?: boolean;
|
|
||||||
}) {
|
|
||||||
const Comp = asChild ? Slot : "a";
|
const Comp = asChild ? Slot : "a";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Comp
|
<Comp
|
||||||
|
ref={ref}
|
||||||
data-slot="sidebar-menu-sub-button"
|
data-slot="sidebar-menu-sub-button"
|
||||||
data-sidebar="menu-sub-button"
|
data-sidebar="menu-sub-button"
|
||||||
data-size={size}
|
data-size={size}
|
||||||
@@ -700,7 +714,9 @@ function SidebarMenuSubButton({
|
|||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
SidebarMenuSubButton.displayName = "SidebarMenuSubButton";
|
||||||
|
|
||||||
export {
|
export {
|
||||||
Sidebar,
|
Sidebar,
|
||||||
|
|||||||
@@ -40,28 +40,31 @@ const tabsListVariants = cva(
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
function TabsList({
|
const TabsList = React.forwardRef<
|
||||||
className,
|
React.ElementRef<typeof TabsPrimitive.List>,
|
||||||
variant = "default",
|
React.ComponentPropsWithoutRef<typeof TabsPrimitive.List> &
|
||||||
...props
|
VariantProps<typeof tabsListVariants>
|
||||||
}: React.ComponentProps<typeof TabsPrimitive.List> &
|
>(({ className, variant = "default", ...props }, ref) => {
|
||||||
VariantProps<typeof tabsListVariants>) {
|
|
||||||
return (
|
return (
|
||||||
<TabsPrimitive.List
|
<TabsPrimitive.List
|
||||||
|
ref={ref}
|
||||||
data-slot="tabs-list"
|
data-slot="tabs-list"
|
||||||
data-variant={variant}
|
data-variant={variant}
|
||||||
className={cn(tabsListVariants({ variant }), className)}
|
className={cn(tabsListVariants({ variant }), className)}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
function TabsTrigger({
|
TabsList.displayName = TabsPrimitive.List.displayName;
|
||||||
className,
|
|
||||||
...props
|
const TabsTrigger = React.forwardRef<
|
||||||
}: React.ComponentProps<typeof TabsPrimitive.Trigger>) {
|
React.ElementRef<typeof TabsPrimitive.Trigger>,
|
||||||
|
React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
|
||||||
|
>(({ className, ...props }, ref) => {
|
||||||
return (
|
return (
|
||||||
<TabsPrimitive.Trigger
|
<TabsPrimitive.Trigger
|
||||||
|
ref={ref}
|
||||||
data-slot="tabs-trigger"
|
data-slot="tabs-trigger"
|
||||||
className={cn(
|
className={cn(
|
||||||
"focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:outline-ring text-foreground/60 hover:text-foreground dark:text-muted-foreground dark:hover:text-foreground relative inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap transition-all group-data-[orientation=vertical]/tabs:w-full group-data-[orientation=vertical]/tabs:justify-start focus-visible:ring-[3px] focus-visible:outline-1 disabled:pointer-events-none disabled:opacity-50 group-data-[variant=default]/tabs-list:data-[state=active]:shadow-sm group-data-[variant=line]/tabs-list:data-[state=active]:shadow-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
|
"focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:outline-ring text-foreground/60 hover:text-foreground dark:text-muted-foreground dark:hover:text-foreground relative inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap transition-all group-data-[orientation=vertical]/tabs:w-full group-data-[orientation=vertical]/tabs:justify-start focus-visible:ring-[3px] focus-visible:outline-1 disabled:pointer-events-none disabled:opacity-50 group-data-[variant=default]/tabs-list:data-[state=active]:shadow-sm group-data-[variant=line]/tabs-list:data-[state=active]:shadow-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
|
||||||
@@ -73,19 +76,24 @@ function TabsTrigger({
|
|||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
function TabsContent({
|
TabsTrigger.displayName = TabsPrimitive.Trigger.displayName;
|
||||||
className,
|
|
||||||
...props
|
const TabsContent = React.forwardRef<
|
||||||
}: React.ComponentProps<typeof TabsPrimitive.Content>) {
|
React.ElementRef<typeof TabsPrimitive.Content>,
|
||||||
|
React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
|
||||||
|
>(({ className, ...props }, ref) => {
|
||||||
return (
|
return (
|
||||||
<TabsPrimitive.Content
|
<TabsPrimitive.Content
|
||||||
|
ref={ref}
|
||||||
data-slot="tabs-content"
|
data-slot="tabs-content"
|
||||||
className={cn("flex-1 outline-none", className)}
|
className={cn("flex-1 outline-none", className)}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
TabsContent.displayName = TabsPrimitive.Content.displayName;
|
||||||
|
|
||||||
export { Tabs, TabsList, TabsTrigger, TabsContent, tabsListVariants };
|
export { Tabs, TabsList, TabsTrigger, TabsContent, tabsListVariants };
|
||||||
@@ -28,21 +28,29 @@ function Tooltip({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function TooltipTrigger({
|
const TooltipTrigger = React.forwardRef<
|
||||||
...props
|
React.ElementRef<typeof TooltipPrimitive.Trigger>,
|
||||||
}: React.ComponentProps<typeof TooltipPrimitive.Trigger>) {
|
React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Trigger>
|
||||||
return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />;
|
>(({ ...props }, ref) => {
|
||||||
}
|
return (
|
||||||
|
<TooltipPrimitive.Trigger
|
||||||
|
ref={ref}
|
||||||
|
data-slot="tooltip-trigger"
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
function TooltipContent({
|
TooltipTrigger.displayName = TooltipPrimitive.Trigger.displayName;
|
||||||
className,
|
|
||||||
sideOffset,
|
const TooltipContent = React.forwardRef<
|
||||||
children,
|
React.ElementRef<typeof TooltipPrimitive.Content>,
|
||||||
...props
|
React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
|
||||||
}: React.ComponentProps<typeof TooltipPrimitive.Content>) {
|
>(({ className, sideOffset, children, ...props }, ref) => {
|
||||||
return (
|
return (
|
||||||
<TooltipPrimitive.Portal>
|
<TooltipPrimitive.Portal>
|
||||||
<TooltipPrimitive.Content
|
<TooltipPrimitive.Content
|
||||||
|
ref={ref}
|
||||||
data-slot="tooltip-content"
|
data-slot="tooltip-content"
|
||||||
sideOffset={sideOffset ?? 4}
|
sideOffset={sideOffset ?? 4}
|
||||||
className={cn(
|
className={cn(
|
||||||
@@ -55,6 +63,8 @@ function TooltipContent({
|
|||||||
</TooltipPrimitive.Content>
|
</TooltipPrimitive.Content>
|
||||||
</TooltipPrimitive.Portal>
|
</TooltipPrimitive.Portal>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
TooltipContent.displayName = TooltipPrimitive.Content.displayName;
|
||||||
|
|
||||||
export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };
|
export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };
|
||||||
@@ -179,82 +179,80 @@ export function RecentChatList() {
|
|||||||
className="group/side-menu-item"
|
className="group/side-menu-item"
|
||||||
>
|
>
|
||||||
<SidebarMenuButton isActive={isActive} asChild>
|
<SidebarMenuButton isActive={isActive} asChild>
|
||||||
<div>
|
<Link
|
||||||
<Link
|
className="text-muted-foreground block w-full whitespace-nowrap group-hover/side-menu-item:overflow-hidden"
|
||||||
className="text-muted-foreground block w-full whitespace-nowrap group-hover/side-menu-item:overflow-hidden"
|
href={pathOfThread(thread)}
|
||||||
href={pathOfThread(thread)}
|
>
|
||||||
|
{titleOfThread(thread)}
|
||||||
|
</Link>
|
||||||
|
</SidebarMenuButton>
|
||||||
|
{env.NEXT_PUBLIC_STATIC_WEBSITE_ONLY !== "true" && (
|
||||||
|
<DropdownMenu>
|
||||||
|
<DropdownMenuTrigger asChild>
|
||||||
|
<SidebarMenuAction
|
||||||
|
showOnHover
|
||||||
|
className="bg-background/50 hover:bg-background"
|
||||||
|
>
|
||||||
|
<MoreHorizontal />
|
||||||
|
<span className="sr-only">{t.common.more}</span>
|
||||||
|
</SidebarMenuAction>
|
||||||
|
</DropdownMenuTrigger>
|
||||||
|
<DropdownMenuContent
|
||||||
|
className="w-48 rounded-lg"
|
||||||
|
side={"right"}
|
||||||
|
align={"start"}
|
||||||
>
|
>
|
||||||
{titleOfThread(thread)}
|
<DropdownMenuItem
|
||||||
</Link>
|
onSelect={() =>
|
||||||
{env.NEXT_PUBLIC_STATIC_WEBSITE_ONLY !== "true" && (
|
handleRenameClick(
|
||||||
<DropdownMenu>
|
thread.thread_id,
|
||||||
<DropdownMenuTrigger asChild>
|
titleOfThread(thread),
|
||||||
<SidebarMenuAction
|
)
|
||||||
showOnHover
|
}
|
||||||
className="bg-background/50 hover:bg-background"
|
>
|
||||||
>
|
<Pencil className="text-muted-foreground" />
|
||||||
<MoreHorizontal />
|
<span>{t.common.rename}</span>
|
||||||
<span className="sr-only">{t.common.more}</span>
|
</DropdownMenuItem>
|
||||||
</SidebarMenuAction>
|
<DropdownMenuItem
|
||||||
</DropdownMenuTrigger>
|
onSelect={() => handleShare(thread)}
|
||||||
<DropdownMenuContent
|
>
|
||||||
className="w-48 rounded-lg"
|
<Share2 className="text-muted-foreground" />
|
||||||
side={"right"}
|
<span>{t.common.share}</span>
|
||||||
align={"start"}
|
</DropdownMenuItem>
|
||||||
>
|
<DropdownMenuSub>
|
||||||
|
<DropdownMenuSubTrigger>
|
||||||
|
<Download className="text-muted-foreground" />
|
||||||
|
<span>{t.common.export}</span>
|
||||||
|
</DropdownMenuSubTrigger>
|
||||||
|
<DropdownMenuSubContent>
|
||||||
<DropdownMenuItem
|
<DropdownMenuItem
|
||||||
onSelect={() =>
|
onSelect={() =>
|
||||||
handleRenameClick(
|
handleExport(thread, "markdown")
|
||||||
thread.thread_id,
|
|
||||||
titleOfThread(thread),
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Pencil className="text-muted-foreground" />
|
<FileText className="text-muted-foreground" />
|
||||||
<span>{t.common.rename}</span>
|
<span>{t.common.exportAsMarkdown}</span>
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
<DropdownMenuItem
|
<DropdownMenuItem
|
||||||
onSelect={() => handleShare(thread)}
|
onSelect={() =>
|
||||||
|
handleExport(thread, "json")
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<Share2 className="text-muted-foreground" />
|
<FileJson className="text-muted-foreground" />
|
||||||
<span>{t.common.share}</span>
|
<span>{t.common.exportAsJSON}</span>
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
<DropdownMenuSub>
|
</DropdownMenuSubContent>
|
||||||
<DropdownMenuSubTrigger>
|
</DropdownMenuSub>
|
||||||
<Download className="text-muted-foreground" />
|
<DropdownMenuSeparator />
|
||||||
<span>{t.common.export}</span>
|
<DropdownMenuItem
|
||||||
</DropdownMenuSubTrigger>
|
onSelect={() => handleDelete(thread.thread_id)}
|
||||||
<DropdownMenuSubContent>
|
>
|
||||||
<DropdownMenuItem
|
<Trash2 className="text-muted-foreground" />
|
||||||
onSelect={() =>
|
<span>{t.common.delete}</span>
|
||||||
handleExport(thread, "markdown")
|
</DropdownMenuItem>
|
||||||
}
|
</DropdownMenuContent>
|
||||||
>
|
</DropdownMenu>
|
||||||
<FileText className="text-muted-foreground" />
|
)}
|
||||||
<span>{t.common.exportAsMarkdown}</span>
|
|
||||||
</DropdownMenuItem>
|
|
||||||
<DropdownMenuItem
|
|
||||||
onSelect={() =>
|
|
||||||
handleExport(thread, "json")
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<FileJson className="text-muted-foreground" />
|
|
||||||
<span>{t.common.exportAsJSON}</span>
|
|
||||||
</DropdownMenuItem>
|
|
||||||
</DropdownMenuSubContent>
|
|
||||||
</DropdownMenuSub>
|
|
||||||
<DropdownMenuSeparator />
|
|
||||||
<DropdownMenuItem
|
|
||||||
onSelect={() => handleDelete(thread.thread_id)}
|
|
||||||
>
|
|
||||||
<Trash2 className="text-muted-foreground" />
|
|
||||||
<span>{t.common.delete}</span>
|
|
||||||
</DropdownMenuItem>
|
|
||||||
</DropdownMenuContent>
|
|
||||||
</DropdownMenu>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</SidebarMenuButton>
|
|
||||||
</SidebarMenuItem>
|
</SidebarMenuItem>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
ArrowLeftIcon,
|
ArrowLeftIcon,
|
||||||
@@ -17,13 +17,6 @@ import {
|
|||||||
} from "@/components/ai-elements/prompt-input";
|
} from "@/components/ai-elements/prompt-input";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
import {
|
|
||||||
Select,
|
|
||||||
SelectContent,
|
|
||||||
SelectItem,
|
|
||||||
SelectTrigger,
|
|
||||||
SelectValue,
|
|
||||||
} from "@/components/ui/select";
|
|
||||||
import { Textarea } from "@/components/ui/textarea";
|
import { Textarea } from "@/components/ui/textarea";
|
||||||
import { ArtifactsProvider } from "@/components/workspace/artifacts";
|
import { ArtifactsProvider } from "@/components/workspace/artifacts";
|
||||||
import {
|
import {
|
||||||
@@ -120,7 +113,7 @@ export default function NewAgentPage() {
|
|||||||
model_name: chatModelInput || undefined,
|
model_name: chatModelInput || undefined,
|
||||||
},
|
},
|
||||||
onToolEnd() {
|
onToolEnd() {
|
||||||
// setup_agent never actually executes in this flow — it gets
|
// setup_agent never actually executes in this flow 鈥?it gets
|
||||||
// intercepted by SetupAgentApprovalMiddleware and the form is filled
|
// intercepted by SetupAgentApprovalMiddleware and the form is filled
|
||||||
// from the approval ToolMessage payload (handleApproveSetupAgent).
|
// from the approval ToolMessage payload (handleApproveSetupAgent).
|
||||||
// No agent record is fetched/refreshed during chat.
|
// No agent record is fetched/refreshed during chat.
|
||||||
@@ -156,7 +149,7 @@ export default function NewAgentPage() {
|
|||||||
if (!name) {
|
if (!name) {
|
||||||
// Names are display-only and may collide, so a timestamped placeholder
|
// Names are display-only and may collide, so a timestamped placeholder
|
||||||
// is safe to send to the backend just to satisfy the required-field
|
// is safe to send to the backend just to satisfy the required-field
|
||||||
// validation. Intentionally NOT written back into the visible input —
|
// validation. Intentionally NOT written back into the visible input 鈥?
|
||||||
// the user wants the name box to stay blank while they chat, and we
|
// the user wants the name box to stay blank while they chat, and we
|
||||||
// refill it later (with the model's proposed name) on setup_agent
|
// refill it later (with the model's proposed name) on setup_agent
|
||||||
// approval.
|
// approval.
|
||||||
@@ -245,7 +238,7 @@ export default function NewAgentPage() {
|
|||||||
// Chat is purely a discussion channel. The agent record is only
|
// Chat is purely a discussion channel. The agent record is only
|
||||||
// created when the user explicitly clicks Save (top-right). If the
|
// created when the user explicitly clicks Save (top-right). If the
|
||||||
// model proposes a config via setup_agent, our approval handler
|
// model proposes a config via setup_agent, our approval handler
|
||||||
// prefills the form locally — it does NOT persist anything.
|
// prefills the form locally 鈥?it does NOT persist anything.
|
||||||
await ensureThreadExists();
|
await ensureThreadExists();
|
||||||
await sendMessage(threadId, { text: trimmed, files: [] });
|
await sendMessage(threadId, { text: trimmed, files: [] });
|
||||||
},
|
},
|
||||||
@@ -255,7 +248,7 @@ export default function NewAgentPage() {
|
|||||||
const handleApproveSetupAgent = useCallback(
|
const handleApproveSetupAgent = useCallback(
|
||||||
async (payload: SetupAgentApprovalPayload) => {
|
async (payload: SetupAgentApprovalPayload) => {
|
||||||
// Approving the model's setup_agent proposal **does not** persist
|
// Approving the model's setup_agent proposal **does not** persist
|
||||||
// anything — it only mirrors the proposal into the form so the user
|
// anything 鈥?it only mirrors the proposal into the form so the user
|
||||||
// can review it. Creation/update happens later when the user clicks
|
// can review it. Creation/update happens later when the user clicks
|
||||||
// the top-right Save button.
|
// the top-right Save button.
|
||||||
const proposedName = payload.name?.trim() ?? "";
|
const proposedName = payload.name?.trim() ?? "";
|
||||||
@@ -338,22 +331,23 @@ export default function NewAgentPage() {
|
|||||||
<span className="text-muted-foreground text-xs">
|
<span className="text-muted-foreground text-xs">
|
||||||
当前对话模型
|
当前对话模型
|
||||||
</span>
|
</span>
|
||||||
<Select
|
<select
|
||||||
value={chatModelInput}
|
value={chatModelInput}
|
||||||
onValueChange={setChatModelInput}
|
onChange={(event) =>
|
||||||
|
setChatModelInput(event.currentTarget.value)
|
||||||
|
}
|
||||||
disabled={isModelsLoading || thread.isLoading}
|
disabled={isModelsLoading || thread.isLoading}
|
||||||
|
className="border-input bg-background h-7 min-w-[10rem] rounded-md border px-2 text-xs shadow-xs outline-none"
|
||||||
>
|
>
|
||||||
<SelectTrigger className="h-7 w-auto min-w-[10rem] gap-2 px-2 text-xs">
|
<option value="" disabled>
|
||||||
<SelectValue placeholder="选择模型" />
|
选择模型
|
||||||
</SelectTrigger>
|
</option>
|
||||||
<SelectContent>
|
{models.map((model) => (
|
||||||
{models.map((model) => (
|
<option key={model.name} value={model.name}>
|
||||||
<SelectItem key={model.name} value={model.name}>
|
{model.display_name || model.name}
|
||||||
{model.display_name || model.name}
|
</option>
|
||||||
</SelectItem>
|
))}
|
||||||
))}
|
</select>
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
</div>
|
</div>
|
||||||
<PromptInput
|
<PromptInput
|
||||||
onSubmit={({ text }) => void handleChatSubmit(text)}
|
onSubmit={({ text }) => void handleChatSubmit(text)}
|
||||||
@@ -405,22 +399,21 @@ export default function NewAgentPage() {
|
|||||||
|
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<label className="text-sm font-medium">模型</label>
|
<label className="text-sm font-medium">模型</label>
|
||||||
<Select
|
<select
|
||||||
value={modelInput}
|
value={modelInput}
|
||||||
onValueChange={setModelInput}
|
onChange={(event) => setModelInput(event.currentTarget.value)}
|
||||||
disabled={isModelsLoading}
|
disabled={isModelsLoading}
|
||||||
|
className="border-input bg-background h-9 w-full rounded-md border px-3 text-sm shadow-xs outline-none"
|
||||||
>
|
>
|
||||||
<SelectTrigger className="w-full">
|
<option value="" disabled>
|
||||||
<SelectValue placeholder="选择模型" />
|
选择模型
|
||||||
</SelectTrigger>
|
</option>
|
||||||
<SelectContent>
|
{models.map((model) => (
|
||||||
{models.map((model) => (
|
<option key={model.name} value={model.name}>
|
||||||
<SelectItem key={model.name} value={model.name}>
|
{model.display_name || model.name}
|
||||||
{model.display_name || model.name}
|
</option>
|
||||||
</SelectItem>
|
))}
|
||||||
))}
|
</select>
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
<p className="text-muted-foreground text-xs">
|
<p className="text-muted-foreground text-xs">
|
||||||
该专家被使用时调用的模型。
|
该专家被使用时调用的模型。
|
||||||
</p>
|
</p>
|
||||||
|
|||||||
@@ -1,14 +1,12 @@
|
|||||||
import { Navigate, Route, Routes } from "react-router-dom";
|
import { Navigate, Route, Routes } from "react-router-dom";
|
||||||
import type { ReactNode } from "react";
|
|
||||||
import { Toaster } from "sonner";
|
import { Toaster } from "sonner";
|
||||||
|
|
||||||
import { getStoredAuth } from "@/core/auth";
|
import { getStoredAuth } from "@/core/auth";
|
||||||
import { RouteBaseProvider } from "@/core/route-base";
|
import { RouteBaseProvider } from "@/core/route-base";
|
||||||
import { SubtasksProvider } from "@/core/tasks/context";
|
import { SidebarProvider } from "@/components/ui/sidebar";
|
||||||
import { ArtifactsProvider } from "@/components/workspace/artifacts";
|
|
||||||
import { PromptInputProvider } from "@/components/ai-elements/prompt-input";
|
|
||||||
|
|
||||||
import GeneralQA from "@/strategy-components/components/qa/GeneralQA";
|
import GeneralQA from "@/strategy-components/components/qa/GeneralQA";
|
||||||
|
import { ChatRuntime } from "./WorkspaceRoutes";
|
||||||
import AgentsPage from "./AgentsPage";
|
import AgentsPage from "./AgentsPage";
|
||||||
import ChatsPage from "./ChatsPage";
|
import ChatsPage from "./ChatsPage";
|
||||||
import ChatPage from "./ChatPage";
|
import ChatPage from "./ChatPage";
|
||||||
@@ -18,19 +16,10 @@ import ScheduledTasksPage from "./ScheduledTasksPage";
|
|||||||
import ScheduledTaskRunDetailPage from "./ScheduledTaskRunDetailPage";
|
import ScheduledTaskRunDetailPage from "./ScheduledTaskRunDetailPage";
|
||||||
import RecommendedQuestionsPage from "./RecommendedQuestionsPage";
|
import RecommendedQuestionsPage from "./RecommendedQuestionsPage";
|
||||||
|
|
||||||
function ChatRuntime({ children }: { children: ReactNode }) {
|
|
||||||
return (
|
|
||||||
<SubtasksProvider>
|
|
||||||
<ArtifactsProvider>
|
|
||||||
<PromptInputProvider>{children}</PromptInputProvider>
|
|
||||||
</ArtifactsProvider>
|
|
||||||
</SubtasksProvider>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function StrategyRoutes() {
|
export default function StrategyRoutes() {
|
||||||
return (
|
return (
|
||||||
<RouteBaseProvider value="/page/strategy">
|
<RouteBaseProvider value="/page/strategy">
|
||||||
|
<SidebarProvider>
|
||||||
<div className="h-full w-full overflow-hidden">
|
<div className="h-full w-full overflow-hidden">
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route index element={<Navigate to="qa/general" replace />} />
|
<Route index element={<Navigate to="qa/general" replace />} />
|
||||||
@@ -89,6 +78,7 @@ export default function StrategyRoutes() {
|
|||||||
/>
|
/>
|
||||||
</Routes>
|
</Routes>
|
||||||
</div>
|
</div>
|
||||||
|
</SidebarProvider>
|
||||||
<Toaster position="top-center" />
|
<Toaster position="top-center" />
|
||||||
</RouteBaseProvider>
|
</RouteBaseProvider>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ export function WorkspaceLayout({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function ChatRuntime({ children }: { children: ReactNode }) {
|
export function ChatRuntime({ children }: { children: ReactNode }) {
|
||||||
return (
|
return (
|
||||||
<SubtasksProvider>
|
<SubtasksProvider>
|
||||||
<ArtifactsProvider>
|
<ArtifactsProvider>
|
||||||
|
|||||||
Reference in new issue
Block a user