Skip to content

fix: enhance file rename functionality #13891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ssongliu merged 1 commit into from
Sep 22, 2026
+71 −17
Merged

fix: enhance file rename functionality #13891

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 71 additions & 17 deletions frontend/src/views/host/file-management/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,13 +547,20 @@
</div>
<div class="file-name">
<el-input
v-if="fileRename.oldName === row.name && isEdit"
v-if="
isEdit &&
fileRename.oldPath === row.path &&
fileRename.tabId === item.id
"
v-model.trim="fileRename.newName"
:ref="(el) => setRenameRef(item.id, el)"
:autofocus="isEdit"
:readonly="renameSubmitting"
class="table-link table-input"
placeholder="file name"
@keydown.enter="handleRename(row)"
@compositionstart="renameComposing = true"
@compositionend="onRenameCompositionEnd($event, row)"
@keydown.enter="onRenameEnter($event, row)"
@blur="onRenameBlur($event, row)"
/>
<span v-else class="table-link" @click="open(row)" type="primary">
Expand Down Expand Up @@ -867,7 +874,10 @@ const fileEdit = reactive<{
const filePreview = reactive({ path: '', name: '', extension: '', fileType: '', imageFiles: [], currentNode: '' });
const codeReq = reactive({ path: '', expand: false, page: 1, pageSize: 100, isDetail: false });
const fileUpload = reactive({ path: '', isAppendOnly: false });
const fileRename = reactive({ path: '', oldName: '', newName: '' });
const fileRename = reactive({ path: '', oldPath: '', oldName: '', newName: '', tabId: '' });
const renameSubmitting = ref(false);
const renameComposing = ref(false);
let renameBlurPending = false;
const fileWget = reactive({ path: '', isAppendOnly: false });
const fileMove = reactive({ oldPaths: [''], allNames: [''], type: '', path: '', name: '', count: 0, isDir: false });
const fileConvert = reactive<{
Expand Down Expand Up @@ -1728,21 +1738,47 @@ const getWgetProcess = async () => {
};

const openRename = (item: File.File, source: string) => {
fileRename.path = req.path;
fileRename.oldName = item.name;
if (renameSubmitting.value) return;
fileRename.path = item.path.substring(0, item.path.lastIndexOf('/')) || '/';
fileRename.oldPath = item.path;
fileRename.oldName = item.path.substring(item.path.lastIndexOf('/') + 1);
fileRename.newName = fileRename.oldName;
fileRename.tabId = editableTabsKey.value;
renameComposing.value = false;
renameBlurPending = false;
if (source === 'right') {
fileRename.newName = item.name;
isEdit.value = true;
nextTick(() => {
getCurrentRename().focus();
getCurrentRename()?.focus();
});
hideRightMenu();
} else {
isEdit.value = false;
renameRef.value.acceptParams(fileRename);
}
};

const onRenameBlur = (e: FocusEvent, row: File.File) => {
const isCurrentRename = (row: File.File) =>
isEdit.value && fileRename.oldPath === row.path && fileRename.tabId === editableTabsKey.value;

const onRenameEnter = (event: KeyboardEvent, row: File.File) => {
if (event.isComposing || event.keyCode === 229 || renameComposing.value || event.repeat) return;
event.preventDefault();
return handleRename(row);
};

const onRenameCompositionEnd = (event: CompositionEvent, row: File.File) => {
if (!isCurrentRename(row)) return;
fileRename.newName = (event.target as HTMLInputElement).value.trim();
renameComposing.value = false;
if (renameBlurPending) {
renameBlurPending = false;
return handleRename(row);
}
};

const onRenameBlur = async (e: FocusEvent, row: File.File) => {
if (!isCurrentRename(row) || renameSubmitting.value) return;
const related = e.relatedTarget as HTMLElement | null;
if (
related &&
Expand All @@ -1753,36 +1789,54 @@ const onRenameBlur = (e: FocusEvent, row: File.File) => {
}, 0);
return;
}
handleRename(row);
if (renameComposing.value) {
renameBlurPending = true;
return;
}
await nextTick();
return handleRename(row);
};

const handleRename = async (row: File.File): Promise<void> => {
if (fileRename.newName === fileRename.oldName) {
if (!isCurrentRename(row) || renameSubmitting.value || renameComposing.value) return;
const newName = fileRename.newName.trim();
if (!newName) {
MsgWarning(i18n.global.t('commons.rule.requiredInput'));
getCurrentRename()?.focus();
return;
}
if (newName === fileRename.oldName) {
isEdit.value = false;
fileRename.oldName = '';
return;
}
const addItem: File.FileRename = {
oldName: getPath(fileRename.path, fileRename.oldName),
newName: getPath(fileRename.path, fileRename.newName),
oldName: fileRename.oldPath,
newName: getPath(fileRename.path, newName),
};
const namePrefix = row.name.substring(0, row.name.lastIndexOf('/') + 1);
renameSubmitting.value = true;
loading.value = true;
try {
await renameRile(addItem);
MsgSuccess(i18n.global.t('commons.msg.updateSuccess'));
row.name = fileRename.newName;
row.path = getPath(req.path, fileRename.newName);
isEdit.value = false;
fileRename.oldName = '';
row.name = namePrefix + newName;
row.path = addItem.newName;
} catch (error) {
console.error(error);
nextTick(() => {
if (isCurrentRename(row)) getCurrentRename()?.focus();
});
} finally {
loading.value = false;
isEdit.value = false;
fileRename.oldName = '';
renameSubmitting.value = false;
}
};

const getPath = (path: string, name: string) => {
return path + '/' + name;
return path === '/' ? path + name : path + '/' + name;
};

const openMove = (type: string) => {
Expand Down
Loading