From ffef57e9342b5b3be055cced3ac3170e58d5f7c4 Mon Sep 17 00:00:00 2001 From: lencx Date: Sun, 29 Jan 2023 23:25:23 +0800 Subject: [PATCH] fix: export buttons do not work (#274) --- src-tauri/src/app/cmd.rs | 18 ++++++++++++++---- src-tauri/src/main.rs | 10 ---------- src-tauri/src/scripts/export.js | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src-tauri/src/app/cmd.rs b/src-tauri/src/app/cmd.rs index 9b13282..241b6ba 100644 --- a/src-tauri/src/app/cmd.rs +++ b/src-tauri/src/app/cmd.rs @@ -19,19 +19,29 @@ pub fn fullscreen(app: AppHandle) { } #[command] -pub fn download(_app: AppHandle, name: String, blob: Vec) { +pub fn download(app: AppHandle, name: String, blob: Vec) { + let win = app.app_handle().get_window("core"); let path = utils::app_root().join(PathBuf::from(name)); utils::create_file(&path).unwrap(); fs::write(&path, blob).unwrap(); - utils::open_file(path); + tauri::api::dialog::message( + win.as_ref(), + "Save File", + format!("PATH: {}", path.display()), + ); } #[command] -pub fn save_file(_app: AppHandle, name: String, content: String) { +pub fn save_file(app: AppHandle, name: String, content: String) { + let win = app.app_handle().get_window("core"); let path = utils::app_root().join(PathBuf::from(name)); utils::create_file(&path).unwrap(); fs::write(&path, content).unwrap(); - utils::open_file(path); + tauri::api::dialog::message( + win.as_ref(), + "Save File", + format!("PATH: {}", path.display()), + ); } #[command] diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 919d00c..01c042f 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -46,7 +46,6 @@ async fn main() { } let mut builder = tauri::Builder::default() - // https://github.com/tauri-apps/tauri/pull/2736 .plugin(log.build()) .plugin(tauri_plugin_positioner::init()) .plugin(tauri_plugin_autostart::init( @@ -92,19 +91,10 @@ async fn main() { .on_menu_event(menu::menu_handler) .on_system_tray_event(menu::tray_handler) .on_window_event(|event| { - // https://github.com/tauri-apps/tauri/discussions/2684 if let tauri::WindowEvent::CloseRequested { api, .. } = event.event() { let win = event.window(); if win.label() == "core" { - // TODO: https://github.com/tauri-apps/tauri/issues/3084 - // event.window().hide().unwrap(); - // https://github.com/tauri-apps/tao/pull/517 - #[cfg(target_os = "macos")] event.window().minimize().unwrap(); - - // fix: https://github.com/lencx/ChatGPT/issues/93 - #[cfg(not(target_os = "macos"))] - event.window().hide().unwrap(); } else { win.close().unwrap(); } diff --git a/src-tauri/src/scripts/export.js b/src-tauri/src/scripts/export.js index 0896ca8..16734af 100644 --- a/src-tauri/src/scripts/export.js +++ b/src-tauri/src/scripts/export.js @@ -200,7 +200,7 @@ class Elements { } init() { // this.threadWrapper = document.querySelector(".cdfdFe"); - this.spacer = document.querySelector(".w-full.h-48.flex-shrink-0"); + this.spacer = document.querySelector("[class*='h-48'].w-full.flex-shrink-0"); this.thread = document.querySelector( "[class*='react-scroll-to-bottom']>[class*='react-scroll-to-bottom']>div" );