Phase 2.7.3完成:文件上传功能实现
功能: - Tauri dialog API集成(文件选择对话框) - upload_file命令完整实现(文件复制 + 数据库注册) - 上传按钮UI(带loading状态) - 上传完成后自动刷新文件树 技术: - 添加uuid依赖(UUID v4生成) - Rust: std::fs文件复制 + rusqlite数据库注册 - Vue: @tauri-apps/api/dialog集成 - Vite: 修复dialog API外部化配置 状态:Phase 2完成100%
This commit is contained in:
1
markbase-tauri/src-tauri/Cargo.lock
generated
1
markbase-tauri/src-tauri/Cargo.lock
generated
@@ -1993,6 +1993,7 @@ dependencies = [
|
|||||||
"tauri-build",
|
"tauri-build",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"uuid",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ chrono = { version = "0.4", features = ["serde"] }
|
|||||||
anyhow = "1.0"
|
anyhow = "1.0"
|
||||||
thiserror = "1.0"
|
thiserror = "1.0"
|
||||||
rusqlite = { version = "0.30", features = ["bundled"] }
|
rusqlite = { version = "0.30", features = ["bundled"] }
|
||||||
|
uuid = { version = "1.0", features = ["v4"] }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
custom-protocol = [ "tauri/custom-protocol" ]
|
custom-protocol = [ "tauri/custom-protocol" ]
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::path::PathBuf;
|
use std::path::{Path, PathBuf};
|
||||||
use tauri::State;
|
|
||||||
use std::sync::Mutex;
|
|
||||||
use rusqlite::Connection;
|
use rusqlite::Connection;
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||||
@@ -116,10 +114,42 @@ pub async fn upload_file(
|
|||||||
target_path: String,
|
target_path: String,
|
||||||
tree_type: String,
|
tree_type: String,
|
||||||
) -> Result<FileUploadResult, String> {
|
) -> Result<FileUploadResult, String> {
|
||||||
|
use std::fs;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
let demo_dir = "/Users/accusys/momentry/var/sftpgo/data/demo";
|
||||||
|
let target_file = PathBuf::from(demo_dir).join(&target_path);
|
||||||
|
|
||||||
|
if !Path::new(&source_path).exists() {
|
||||||
|
return Err(format!("Source file not found: {}", source_path));
|
||||||
|
}
|
||||||
|
|
||||||
|
fs::copy(&source_path, &target_file)
|
||||||
|
.map_err(|e| format!("Failed to copy file: {}", e))?;
|
||||||
|
|
||||||
|
let db_path = PathBuf::from("data/users")
|
||||||
|
.join(format!("{}.sqlite", user_id));
|
||||||
|
|
||||||
|
let conn = Connection::open(&db_path)
|
||||||
|
.map_err(|e| format!("Failed to open database: {}", e))?;
|
||||||
|
|
||||||
|
let file_uuid = Uuid::new_v4().to_string();
|
||||||
|
let file_name = Path::new(&target_path)
|
||||||
|
.file_name()
|
||||||
|
.and_then(|n| n.to_str())
|
||||||
|
.unwrap_or("unknown")
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
conn.execute(
|
||||||
|
"INSERT INTO file_registry (file_uuid, original_name, file_path, file_size, registered_at, last_seen_at, status)
|
||||||
|
VALUES (?1, ?2, ?3, ?4, datetime('now'), datetime('now'), 'active')",
|
||||||
|
rusqlite::params![&file_uuid, &file_name, target_file.to_string_lossy().to_string(), fs::metadata(&target_file).map(|m| m.len() as i64).unwrap_or(0)]
|
||||||
|
).map_err(|e| format!("Failed to register file: {}", e))?;
|
||||||
|
|
||||||
Ok(FileUploadResult {
|
Ok(FileUploadResult {
|
||||||
success: true,
|
success: true,
|
||||||
message: "File uploaded successfully".to_string(),
|
message: format!("File uploaded to: {}", target_path),
|
||||||
file_id: Some("file-001".to_string()),
|
file_id: Some(file_uuid),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,8 @@ import { useRouter } from 'vue-router'
|
|||||||
import { useAppStore } from '../stores/app'
|
import { useAppStore } from '../stores/app'
|
||||||
import { invoke } from '@tauri-apps/api/tauri'
|
import { invoke } from '@tauri-apps/api/tauri'
|
||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
import { Folder, Document } from '@element-plus/icons-vue'
|
import { Folder, Document, Upload } from '@element-plus/icons-vue'
|
||||||
|
import { open } from '@tauri-apps/api/dialog'
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const appStore = useAppStore()
|
const appStore = useAppStore()
|
||||||
@@ -17,6 +18,8 @@ const treeProps = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const currentTreeType = ref('demo_library_zh')
|
const currentTreeType = ref('demo_library_zh')
|
||||||
|
const uploading = ref(false)
|
||||||
|
const uploadProgress = ref(0)
|
||||||
|
|
||||||
const navigateTo = (path) => {
|
const navigateTo = (path) => {
|
||||||
router.push(path)
|
router.push(path)
|
||||||
@@ -58,6 +61,52 @@ const handleNodeClick = async (data) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const handleUpload = async () => {
|
||||||
|
try {
|
||||||
|
const selected = await open({
|
||||||
|
multiple: false,
|
||||||
|
filters: [{
|
||||||
|
name: 'All Files',
|
||||||
|
extensions: ['*']
|
||||||
|
}]
|
||||||
|
})
|
||||||
|
|
||||||
|
if (!selected) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uploading.value = true
|
||||||
|
uploadProgress.value = 0
|
||||||
|
|
||||||
|
const sourcePath = selected
|
||||||
|
const fileName = sourcePath.split('/').pop()
|
||||||
|
const targetPath = `uploads/${fileName}`
|
||||||
|
|
||||||
|
ElMessage.info(`Uploading ${fileName}...`)
|
||||||
|
|
||||||
|
const result = await invoke('upload_file', {
|
||||||
|
userId: 'demo',
|
||||||
|
sourcePath: sourcePath,
|
||||||
|
targetPath: targetPath,
|
||||||
|
treeType: currentTreeType.value
|
||||||
|
})
|
||||||
|
|
||||||
|
uploadProgress.value = 100
|
||||||
|
|
||||||
|
if (result.success) {
|
||||||
|
ElMessage.success(result.message)
|
||||||
|
await loadTree()
|
||||||
|
} else {
|
||||||
|
ElMessage.error(result.message)
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
ElMessage.error(`Upload failed: ${error}`)
|
||||||
|
} finally {
|
||||||
|
uploading.value = false
|
||||||
|
uploadProgress.value = 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
watch(currentTreeType, () => {
|
watch(currentTreeType, () => {
|
||||||
loadTree()
|
loadTree()
|
||||||
})
|
})
|
||||||
@@ -76,10 +125,21 @@ onMounted(async () => {
|
|||||||
<template #header>
|
<template #header>
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<span>File Browser</span>
|
<span>File Browser</span>
|
||||||
<el-radio-group v-model="appStore.currentTreeType" size="small">
|
<div class="header-actions">
|
||||||
<el-radio-button label="demo_library_zh">中文版</el-radio-button>
|
<el-button
|
||||||
<el-radio-button label="demo_library_en">English</el-radio-button>
|
type="primary"
|
||||||
</el-radio-group>
|
size="small"
|
||||||
|
:icon="Upload"
|
||||||
|
:loading="uploading"
|
||||||
|
@click="handleUpload"
|
||||||
|
>
|
||||||
|
Upload File
|
||||||
|
</el-button>
|
||||||
|
<el-radio-group v-model="appStore.currentTreeType" size="small">
|
||||||
|
<el-radio-button label="demo_library_zh">中文版</el-radio-button>
|
||||||
|
<el-radio-button label="demo_library_en">English</el-radio-button>
|
||||||
|
</el-radio-group>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<div class="tree-container">
|
<div class="tree-container">
|
||||||
@@ -178,6 +238,12 @@ onMounted(async () => {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.header-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
.tree-container {
|
.tree-container {
|
||||||
height: calc(100% - 60px);
|
height: calc(100% - 60px);
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ export default defineConfig({
|
|||||||
plugins: [vue()],
|
plugins: [vue()],
|
||||||
build: {
|
build: {
|
||||||
rolldownOptions: {
|
rolldownOptions: {
|
||||||
external: ['@tauri-apps/api', '@tauri-apps/api/tauri']
|
external: ['@tauri-apps/api', '@tauri-apps/api/tauri', '@tauri-apps/api/dialog']
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user