From ac05262255d3df58be6d237715c5fe54c091c528 Mon Sep 17 00:00:00 2001 From: Takayuki Maeda Date: Thu, 7 Oct 2021 23:55:55 +0900 Subject: [PATCH] enter to execute a query --- src/components/sql_editor.rs | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/src/components/sql_editor.rs b/src/components/sql_editor.rs index eb662c2..841ec3e 100644 --- a/src/components/sql_editor.rs +++ b/src/components/sql_editor.rs @@ -148,29 +148,15 @@ impl StatefulDrawableComponent for SqlEditorComponent { .constraints(if matches!(self.focus, Focus::Table) { vec![Constraint::Length(7), Constraint::Min(1)] } else { - vec![Constraint::Percentage(50), Constraint::Percentage(50)] + vec![Constraint::Percentage(50), Constraint::Min(1)] }) .split(area); - // let editor = Paragraph::new(self.input.iter().collect::()) - // .block( - // Block::default() - // .borders(Borders::ALL) - // .title("SQL Editor") - // .style(if focused && matches!(self.focus, Focus::Editor) { - // Style::default() - // } else { - // Style::default().fg(Color::DarkGray) - // }), - // ) - // .wrap(Wrap { trim: true }); - // f.render_widget(editor, layout[0]); - - let content = StatefulParagraph::new(self.input.iter().collect::()) - .wrap(Wrap { trim: false }) + let editor = StatefulParagraph::new(self.input.iter().collect::()) + .wrap(Wrap { trim: true }) .block(Block::default().borders(Borders::ALL)); - f.render_stateful_widget(content, area, &mut self.paragraph_state); + f.render_stateful_widget(editor, layout[0], &mut self.paragraph_state); if let Some(result) = self.query_result.as_ref() { let result = Paragraph::new(result.result_str()) @@ -274,7 +260,7 @@ impl Component for SqlEditorComponent { } async fn async_event(&mut self, key: Key, pool: &Box) -> Result { - if key == self.key_config.run && matches!(self.focus, Focus::Editor) { + if key == self.key_config.enter && matches!(self.focus, Focus::Editor) { let query = self.input.iter().collect(); let result = pool.execute(&query).await?; match result {