feat: 完成指令系统 (fix #179)

Author: zty012

crates/project_graph/src/fonts.rs

@@ -3,36 +3,47 @@ pub fn setup_custom_fonts(ctx: &egui::Context) {
     let mut fonts = egui::FontDefinitions::empty();
 
     // 在桌面平台上尝试加载系统字体
-    #[cfg(desktop)]
+    #[cfg(linux)]
     {
         use font_kit::family_name::FamilyName;
         use font_kit::handle::Handle;
         use font_kit::properties::Properties;
         use font_kit::source::SystemSource;
 
         let source = SystemSource::new();
-        if let Ok(handle) = source.select_best_match(
-            &[FamilyName::SansSerif, FamilyName::Title("system-ui".into())],
-            &Properties::new(),
-        ) {
-            let font_data = match handle {
-                Handle::Path { path, .. } => std::fs::read(path).ok(),
-                Handle::Memory { bytes, .. } => Some(bytes.to_vec()),
+
+        let mut load_system_font =
+            |family_names: &[FamilyName], egui_family: egui::FontFamily, key: &str| {
+                if let Ok(handle) = source.select_best_match(family_names, &Properties::new()) {
+                    let font_data = match handle {
+                        Handle::Path { path, .. } => std::fs::read(path).ok(),
+                        Handle::Memory { bytes, .. } => Some(bytes.to_vec()),
+                    };
+
+                    if let Some(data) = font_data {
+                        fonts
+                            .font_data
+                            .insert(key.to_owned(), egui::FontData::from_owned(data).into());
+                        // 将字体插入到对应家族的最前端（最高优先级）
+                        fonts
+                            .families
+                            .get_mut(&egui_family)
+                            .unwrap()
+                            .insert(0, key.to_owned());
+                    }
+                }
             };
 
-            if let Some(data) = font_data {
-                fonts.font_data.insert(
-                    "system_ui".to_owned(),
-                    egui::FontData::from_owned(data).into(),
-                );
-                // 插入到首位：最高优先级
-                fonts
-                    .families
-                    .get_mut(&egui::FontFamily::Proportional)
-                    .unwrap()
-                    .insert(0, "system_ui".to_owned());
-            }
-        }
+        load_system_font(
+            &[FamilyName::Title("system-ui".into()), FamilyName::SansSerif],
+            egui::FontFamily::Proportional,
+            "system_ui",
+        );
+        load_system_font(
+            &[FamilyName::Monospace],
+            egui::FontFamily::Monospace,
+            "system_mono",
+        );
     }
     // 在不支持使用 font-kit 的平台上，使用内置的 MiSans 字体作为替代
     #[cfg(any(wasm, android))]

crates/project_graph/src/stage/structs.rs

@@ -14,11 +14,11 @@ pub trait EntityTrait {
 #[derive(knus::Decode, Debug)]
 pub struct Text {
     #[knus(argument, default = nanoid!())]
-    pub id: String,
+    id: String,
     #[knus(child, default = KdlPos2 { x: 0.0, y: 0.0 })]
-    pub pos: KdlPos2,
+    pos: KdlPos2,
     #[knus(child, unwrap(argument), default = String::new())]
-    pub val: String,
+    val: String,
 
     text_width: std::sync::OnceLock<f32>,
 }

crates/project_graph/src/terminal.rs

@@ -1,35 +1,115 @@
-use crate::stage::{
-    Stage,
-    structs::{Entity, Text},
-};
+use egui::Margin;
+
+use crate::stage::{Stage, structs::Entity};
 
 pub struct Terminal {
     input: String,
+    history: Vec<HistoryItem>,
 }
 
 impl Terminal {
     pub fn new() -> Self {
         Terminal {
             input: String::new(),
+            history: Vec::new(),
         }
     }
 
     pub fn ui(&mut self, ui: &mut egui::Ui, stage: &mut Stage) {
-        ui.heading("Terminal");
-        ui.separator();
-        ui.text_edit_multiline(&mut self.input);
-        if ui.button("execute").clicked() {
-            match knus::parse::<Vec<Entity>>("terminal_input.kdl", &self.input) {
-                Ok(doc) => {
-                    for entity in doc {
-                        stage.context.add(entity.into());
+        egui::ScrollArea::vertical()
+            .stick_to_bottom(true)
+            .show(ui, |ui| {
+                // 历史记录
+                for item in &self.history {
+                    match item {
+                        HistoryItem::In(cmd) => {
+                            for (i, line) in cmd.lines().enumerate() {
+                                let prefix = if i == 0 { "> " } else { "  " };
+                                ui.label(
+                                    egui::RichText::new(format!("{}{}", prefix, line))
+                                        .color(egui::Color32::LIGHT_BLUE)
+                                        .font(egui::FontId::monospace(14.0)),
+                                );
+                            }
+                        }
+                        HistoryItem::Out(output) => {
+                            ui.label(
+                                egui::RichText::new(output)
+                                    .color(egui::Color32::WHITE)
+                                    .font(egui::FontId::monospace(14.0)),
+                            );
+                        }
+                        HistoryItem::Err(err) => {
+                            ui.label(
+                                egui::RichText::new(err)
+                                    .color(egui::Color32::LIGHT_RED)
+                                    .font(egui::FontId::monospace(14.0)),
+                            );
+                        }
                     }
                 }
-                Err(e) => {
-                    log::error!("{:?}", miette::Report::new(e));
-                }
-            }
-            self.input.clear();
-        }
+
+                // 输入框
+                ui.horizontal(|ui| {
+                    ui.label(
+                        egui::RichText::new(">")
+                            .color(egui::Color32::LIGHT_BLUE)
+                            .font(egui::FontId::monospace(14.0)),
+                    );
+
+                    let response = ui.add(
+                        egui::TextEdit::multiline(&mut self.input)
+                            .id(ui.make_persistent_id("terminal_input"))
+                            .desired_width(f32::INFINITY)
+                            .desired_rows(1)
+                            .lock_focus(true)
+                            .text_color(egui::Color32::LIGHT_BLUE)
+                            .font(egui::FontId::monospace(14.0))
+                            .margin(Margin::ZERO)
+                            .frame(false),
+                    );
+                    if response.has_focus()
+                        && ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Enter))
+                    {
+                        let modifiers = ui.input(|i| i.modifiers);
+                        if !modifiers.shift && !modifiers.ctrl && !modifiers.alt {
+                            self.history
+                                .push(HistoryItem::In(self.input.clone().trim().to_string()));
+                            match knus::parse::<Vec<Entity>>("terminal_input.kdl", &self.input) {
+                                Ok(doc) => {
+                                    for entity in doc {
+                                        stage.context.add(entity.into());
+                                    }
+                                }
+                                Err(e) => {
+                                    // log::error!("{:?}", miette::Report::new(e.into()));
+                                    self.history.push(HistoryItem::Err(get_plain_report_string(
+                                        miette::Report::new(e),
+                                    )));
+                                }
+                            }
+                            self.input.clear();
+                            response.request_focus();
+                        }
+                    }
+                });
+
+                ui.allocate_space(ui.available_size());
+            });
     }
 }
+
+enum HistoryItem {
+    In(String),
+    Out(String),
+    Err(String),
+}
+
+fn get_plain_report_string(report: miette::Report) -> String {
+    let mut out = String::new();
+    // 创建一个不带颜色的渲染处理器
+    miette::GraphicalReportHandler::new_themed(miette::GraphicalTheme::unicode_nocolor())
+        .render_report(&mut out, report.as_ref())
+        .unwrap();
+    out
+}