Skip to content

fix: code editor tab persistence and close behavior #12270

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

Open
jakub961241 wants to merge 1 commit into
base: dev-v2
Choose a base branch
from
+15 −8
Open

fix: code editor tab persistence and close behavior #12270

Show file tree
Hide file tree
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
14 changes: 12 additions & 2 deletions frontend/src/views/host/file-management/code-editor/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,18 +568,25 @@ const removeTab = (targetPath: TabPaneName) => {
.then(() => {
updateTabs();
saveContent();
getContent(selectTab.value, '');
saveTabsToStorage();
if (fileTabs.value.length > 0) {
getContent(selectTab.value, '');
}
})
.catch(() => {
updateTabs();
isEdit.value = false;
saveTabsToStorage();
if (fileTabs.value.length > 0) {
getContent(selectTab.value, '');
}
});
} else {
updateTabs();
getContent(selectTab.value, '');
saveTabsToStorage();
if (fileTabs.value.length > 0) {
getContent(selectTab.value, '');
}
}
};

Expand Down Expand Up @@ -613,6 +620,7 @@ const removeAllTab = (targetPath: string, type: 'left' | 'right' | 'all') => {
const onConfirm = () => {
updateTabs();
saveContent();
saveTabsToStorage();
};

const onCancel = () => {
Expand All @@ -622,6 +630,7 @@ const removeAllTab = (targetPath: string, type: 'left' | 'right' | 'all') => {
isEdit.value = false;
isCreate.value = 'none';
updateTabs();
saveTabsToStorage();
};

if (isEdit.value) {
Expand All @@ -635,6 +644,7 @@ const removeAllTab = (targetPath: string, type: 'left' | 'right' | 'all') => {
.catch(onCancel);
} else {
updateTabs();
saveTabsToStorage();
if (type === 'all') editor.dispose();
else getContent(activeName, '');
}
Expand Down
9 changes: 3 additions & 6 deletions frontend/src/views/host/file-management/code-editor/tabs/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@
<el-tabs
v-model="currentTab"
type="card"
:closable="props.fileTabs.length > 1"
:closable="props.fileTabs.length >= 1"
class="monaco-editor monaco-editor-background"
@tab-remove="props.onRemoveTab"
@tab-change="props.onChangeTab"
>
<el-tab-pane v-for="item in props.fileTabs" :key="item.path" :name="item.path">
<template #label>
<el-tooltip v-if="props.fileTabs.length == 1" :content="item.path" placement="bottom-start">
<span>{{ item.name }}</span>
</el-tooltip>
<template v-if="props.fileTabs.length > 1">
<template v-if="props.fileTabs.length >= 1">
<el-dropdown
size="small"
:id="item.path"
Expand Down Expand Up @@ -58,7 +55,7 @@
</template>

<script setup lang="ts">
import { ref } from 'vue';
import { ref, watch } from 'vue';

interface FileTabs {
path: string;
Expand Down