Skip to content

merge from upstream #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
htmambo wants to merge 2 commits into from
Closed

merge from upstream #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9f0e90
fix(db_view): 修正节点操作状态判断逻辑
feigeCode Mar 18, 2026
08fc2dd
refactor(sql_editor): 移除压缩查询按钮
feigeCode Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions crates/db_view/src/db_tree_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2487,15 +2487,16 @@ impl DbTreeView {
) -> PopupMenu {
// 判断节点是否处于可操作状态：
// - 连接必须激活
// - 非 Connection 节点还需要 children_loaded（即节点已展开加载过）
// - Database 节点还需要 children_loaded（即节点已展开加载过）
// - 其余节点（Table、TablesFolder 等）只需连接激活即可
let conn_active = node
Comment on lines 2488 to 2492
.connection_id
.parse::<i64>()
.ok()
.map(|conn_id| cx.global::<ActiveConnections>().is_active(conn_id))
.unwrap_or(false);
let is_active = conn_active
&& (node.node_type == DbNodeType::Connection || node.children_loaded);
&& (node.node_type != DbNodeType::Database || node.children_loaded);

// 尝试从 plugin 获取菜单
let registry = cx.global::<DatabaseViewPluginRegistry>();
Expand Down
7 changes: 0 additions & 7 deletions crates/db_view/src/sql_editor_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,13 +1129,6 @@ impl SqlEditorTab {
.icon(IconName::Plus)
.on_click(cx.listener(Self::handle_save_query)),
)
.child(
Button::new("compress-query")
.with_size(Size::Small)
.ghost()
.label(t!("Query.compress"))
.on_click(cx.listener(Self::handle_compress_query)),
),
)
.child(
// Editor
Expand Down
Loading