xuanchi/XCDesktop
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(remote): 修复文件传输返回按钮不刷新列表的问题，过滤回收站等系统文件

Browse Source
This commit is contained in:
ssdfasd
2026-03-10 19:09:39 +08:00
parent 2503d8be64
commit 7a39fc3bce
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/core/files/routes.ts
View File

@@ -99,7 +99,7 @@ router.get(
}), }),
) )
const visibleItems = items.filter((i): i is FileItemDTO => i !== null && !i.name.startsWith('.')) const visibleItems = items.filter((i): i is FileItemDTO => i !== null && !i.name.startsWith('.') && !i.name.startsWith('$'))
visibleItems.sort((a, b) => { visibleItems.sort((a, b) => {
if (a.type === b.type) return a.name.localeCompare(b.name) if (a.type === b.type) return a.name.localeCompare(b.name)
return a.type === 'dir' ? -1 : 1 return a.type === 'dir' ? -1 : 1
@@ -173,7 +173,7 @@ router.get(
}), }),
) )
const visibleItems = items.filter((i): i is FileItemDTO => i !== null && !i.name.startsWith('.')) const visibleItems = items.filter((i): i is FileItemDTO => i !== null && !i.name.startsWith('.') && !i.name.startsWith('$'))
visibleItems.sort((a, b) => { visibleItems.sort((a, b) => {
if (a.type === b.type) return a.name.localeCompare(b.name) if (a.type === b.type) return a.name.localeCompare(b.name)
return a.type === 'dir' ? -1 : 1 return a.type === 'dir' ? -1 : 1

3
remote/src/services/file/FileService.js
View File

@@ -186,6 +186,9 @@ class FileService {
const files = fs.readdirSync(targetDir); const files = fs.readdirSync(targetDir);
for (const name of files) { for (const name of files) {
if (name.startsWith('.')) continue;
if (name.startsWith('$')) continue;
try { try {
const itemPath = path.join(targetDir, name); const itemPath = path.join(targetDir, name);
const stat = fs.statSync(itemPath); const stat = fs.statSync(itemPath);

10
src/modules/remote/components/file-transfer/LocalFilePanel.tsx
View File

@@ -150,12 +150,10 @@ export const LocalFilePanel: React.FC<LocalFilePanelProps> = ({
: 'hover:bg-gray-100 dark:hover:bg-gray-700/50 text-gray-700 dark:text-gray-200' : 'hover:bg-gray-100 dark:hover:bg-gray-700/50 text-gray-700 dark:text-gray-200'
)} )}
> >
{file.type === 'dir' || file.path.match(/^[A-Z]:\\?$/i) ? ( {file.path.match(/^[A-Z]:\\?$/i) ? (
file.path.match(/^[A-Z]:\\?$/i) ? ( <HardDrive size={16} className="text-gray-500 dark:text-gray-400 shrink-0" />
<HardDrive size={16} className="text-blue-500 dark:text-blue-400 shrink-0" /> ) : file.type === 'dir' ? (
) : ( <Folder size={16} className="text-gray-500 dark:text-gray-400 shrink-0" />
<Folder size={16} className="text-gray-500 dark:text-gray-400 shrink-0" />
)
) : ( ) : (
<FileText size={16} className="text-gray-500 dark:text-gray-400 shrink-0" /> <FileText size={16} className="text-gray-500 dark:text-gray-400 shrink-0" />
)} )}

17
src/modules/remote/components/file-transfer/RemoteFilePanel.tsx
View File

@@ -27,7 +27,7 @@ export const RemoteFilePanel: React.FC<RemoteFilePanelProps> = ({
const [currentPath, setCurrentPath] = useState('') const [currentPath, setCurrentPath] = useState('')
const [files, setFiles] = useState<RemoteFileItem[]>([]) const [files, setFiles] = useState<RemoteFileItem[]>([])
const [loading, setLoading] = useState(false) const [loading, setLoading] = useState(false)
const [pathHistory, setPathHistory] = useState<string[]>(['']) const [pathHistory, setPathHistory] = useState<string[]>([])
const [showDrives, setShowDrives] = useState(true) const [showDrives, setShowDrives] = useState(true)
const loadDrives = useCallback(async () => { const loadDrives = useCallback(async () => {
@@ -66,7 +66,9 @@ export const RemoteFilePanel: React.FC<RemoteFilePanelProps> = ({
if (showDrives) { if (showDrives) {
return return
} }
if (pathHistory.length > 1) { if (pathHistory.length <= 1) {
loadDrives()
} else {
const newHistory = [...pathHistory] const newHistory = [...pathHistory]
newHistory.pop() newHistory.pop()
const prevPath = newHistory[newHistory.length - 1] const prevPath = newHistory[newHistory.length - 1]
@@ -74,15 +76,14 @@ export const RemoteFilePanel: React.FC<RemoteFilePanelProps> = ({
setCurrentPath(prevPath) setCurrentPath(prevPath)
onSelect(null) onSelect(null)
onPathChange?.(prevPath) onPathChange?.(prevPath)
} else { loadFiles(prevPath)
loadDrives()
} }
} }
const handleGoInto = (file: RemoteFileItem) => { const handleGoInto = (file: RemoteFileItem) => {
if (showDrives) { if (showDrives) {
const newPath = file.path + '\\' const newPath = file.path + '\\'
setPathHistory(['', newPath]) setPathHistory([newPath])
setCurrentPath(newPath) setCurrentPath(newPath)
loadFiles(newPath) loadFiles(newPath)
onPathChange?.(newPath) onPathChange?.(newPath)
@@ -105,7 +106,7 @@ export const RemoteFilePanel: React.FC<RemoteFilePanelProps> = ({
} }
const handleGoToRoot = () => { const handleGoToRoot = () => {
setPathHistory(['']) setPathHistory([])
setCurrentPath('') setCurrentPath('')
loadDrives() loadDrives()
onSelect(null) onSelect(null)
@@ -113,7 +114,7 @@ export const RemoteFilePanel: React.FC<RemoteFilePanelProps> = ({
} }
const getDisplayPath = () => { const getDisplayPath = () => {
if (showDrives) return '选择驱动器' if (showDrives) return '远程磁盘'
if (!currentPath) return '远程文件' if (!currentPath) return '远程文件'
return currentPath return currentPath
} }
@@ -181,7 +182,7 @@ export const RemoteFilePanel: React.FC<RemoteFilePanelProps> = ({
)} )}
> >
{isDrive ? ( {isDrive ? (
<HardDrive size={16} className="text-blue-500 dark:text-blue-400 shrink-0" /> <HardDrive size={16} className="text-gray-500 dark:text-gray-400 shrink-0" />
) : file.type === 'dir' ? ( ) : file.type === 'dir' ? (
<Folder size={16} className="text-gray-500 dark:text-gray-400 shrink-0" /> <Folder size={16} className="text-gray-500 dark:text-gray-400 shrink-0" />
) : ( ) : (