Skip to content

Commit

Permalink
feat: dir jump by ctrl+click
Browse files Browse the repository at this point in the history
  • Loading branch information
@zyyzyykk
zyyzyykk committed Dec 24, 2024
1 parent fb0ff50 commit 7392181
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 10 deletions.
52 changes: 46 additions & 6 deletions front/terminal/src/components/FileBlock.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,20 @@
>
<div style="margin-top: -27px;"></div>
<div>
<div class="title" style="display: flex; align-items: center;" >
<div class="title kk-flex" >
<div class="ellipsis" style="flex: 1;">
<div v-if="isShowDirInput == true" >
<el-input id="aimDirInput" v-model="dir" :placeholder="$t('输入目录路径')" size="small" @keydown.enter="isShowDirInput = false;" @blur="isShowDirInput = false;" @mousedown.stop @dblclick.stop @change="dirInputCallback" />
</div>
<div class="no-select ellipsis" v-else @dblclick="doShowDirInput" >{{ dir }}</div>
<div class="kk-flex no-select ellipsis" v-else @dblclick="doShowDirInput" >
<div v-for="(item, index) in dirLevels" :key="index" class="kk-flex" >
<div>/</div>
<div class="dir-level" @click="changeDirByLevel($event,index)" >{{ item }}</div>
</div>
<div>/</div>
</div>
</div>
<div style="display: flex; align-items: center;">
<div class="kk-flex" >
<div class="hover-class" @click="doRefresh" style="margin-left: 10px; font-size: 18px; cursor: pointer;"><el-icon><Refresh /></el-icon></div>
<div v-if="dir && dir != '/'" class="hover-class" @click="doReturn" style="margin-left: 10px; font-size: 18px; cursor: pointer;"><el-icon><Fold /></el-icon></div>
<div v-else class="disabled-function" style="margin-left: 10px; font-size: 18px; cursor: pointer;"><el-icon><Fold /></el-icon></div>
Expand All @@ -31,19 +37,19 @@
<template #dropdown>
<el-dropdown-menu v-show="DialogVisilble" class="no-select" style="text-align: center;">
<el-dropdown-item @click="fileUploadTypeChoose(0)" >
<div style="display: flex; align-items: center;" >
<div class="kk-flex" >
<div><el-icon><DocumentAdd /></el-icon></div>
<div>{{ $t('文件') }}</div>
</div>
</el-dropdown-item>
<el-dropdown-item @click="fileUploadTypeChoose(1)" >
<div style="display: flex; align-items: center;" >
<div class="kk-flex" >
<div><el-icon><FolderAdd /></el-icon></div>
<div>{{ $t('文件夹') }}</div>
</div>
</el-dropdown-item>
<el-dropdown-item @click="fileUploadTypeChoose(2)" >
<div style="display: flex; align-items: center;" >
<div class="kk-flex" >
<div><el-icon><Link /></el-icon></div>
<div>URL</div>
</div>
Expand Down Expand Up @@ -265,11 +271,29 @@ export default {
};
const dir = ref('');
const dirLevels = ref([]);
// 保证路径正确
const confirmDirCorrect = () => {
if(dir.value == '' || dir.value[0] != '/') dir.value = '/' + dir.value;
if(dir.value[dir.value.length - 1] != '/') dir.value = dir.value + '/';
dir.value = dir.value.replace(/\/{2,}/g, '/');
// 更新路径显示
calcDirLevel(dir.value);
};
const calcDirLevel = (fullPath) => {
if(fullPath == '/') dirLevels.value = [];
else dirLevels.value = fullPath.substring(1,fullPath.length - 1).split('/');
};
const changeDirByLevel = (event,index) => {
// ctrl
if(!((props.os == "Windows" && event.ctrlKey) || ((props.os == "Mac" || props.os == "iOS") && event.metaKey))) return;
event.preventDefault();
let aimDir = '/';
for(let i=0;i<=index;i++) {
aimDir += dirLevels.value[i];
aimDir += '/';
}
changeDir(aimDir);
};
// 获取初始家目录
Expand Down Expand Up @@ -408,6 +432,7 @@ export default {
const changeDir = (new_dir) => {
if(isShowDirInput.value == true) return;
dir.value = new_dir;
confirmDirCorrect();
selectedFiles.value = [];
getDirList();
};
Expand All @@ -432,6 +457,7 @@ export default {
if(dir.value[dir.value.length - 1] == '/') dir.value = dir.value.substring(0,dir.value.length - 1);
let index = dir.value.lastIndexOf('/');
if(index != -1) dir.value = dir.value.substring(0,index + 1);
confirmDirCorrect();
selectedFiles.value = [];
doRefresh();
};
Expand Down Expand Up @@ -1160,6 +1186,7 @@ export default {
loading.value = true;
files.value = [];
dir.value = '';
dirLevels.value = [];
isShowDirInput.value = false;
noDataMsg.value = i18n.global.t('暂无文件');
dirStatus.value = 0;
Expand Down Expand Up @@ -1285,6 +1312,8 @@ export default {
isZipFile,
untar,
editPermissions,
dirLevels,
changeDirByLevel,
}
}
}
Expand All @@ -1301,6 +1330,11 @@ export default {
margin-bottom: 15px;
}
.kk-flex {
display: flex;
align-items: center;
}
.list-class {
height: 248px;
overflow-y: scroll;
Expand Down Expand Up @@ -1386,4 +1420,10 @@ export default {
user-select: none;
}
.dir-level:hover {
text-decoration: none;
color: var(--link);
cursor: pointer;
}
</style>
8 changes: 4 additions & 4 deletions front/terminal/src/utils/BaseUrl.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// export const http_base_url = http_protocol + '//' + window.location.host + '/api';

// 本地开发环境
export const ws_base_url = 'ws://localhost:3000/socket/ssh/';
export const http_base_url = 'http://localhost:3000/api';
// export const ws_base_url = 'ws://localhost:3000/socket/ssh/';
// export const http_base_url = 'http://localhost:3000/api';

// 在线环境
// export const ws_base_url = 'wss://ssh.kkbpro.com/socket/ssh/';
// export const http_base_url = 'https://ssh.kkbpro.com/api';
export const ws_base_url = 'ws://ssh.kkbpro.com/socket/ssh/';
export const http_base_url = 'http://ssh.kkbpro.com/api';

0 comments on commit 7392181

Please sign in to comment.