mirror/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-11-23 18:49:21 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 日志查看统一改成网页全屏以及样式调整 (#6682)

Browse Source 
Refs #5873
This commit is contained in:
John Bro 2024-10-10 18:55:02 +08:00 committed by GitHub
parent 50dbe7cfc0
commit 1a44f48fad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/components/compose-log/index.vue
View File

@ -95,15 +95,14 @@ const logSearch = reactive({
const handleClose = () => {
terminalSocket.value?.send('close conn');
open.value = false;
globalStore.isFullScreen = false;
};
function toggleFullscreen() {
if (screenfull.isEnabled) {
screenfull.toggle();
}
globalStore.isFullScreen = !globalStore.isFullScreen;
}
const loadTooltip = () => {
return i18n.global.t('commons.button.' + (screenfull.isFullscreen ? 'quitFullscreen' : 'fullscreen'));
return i18n.global.t('commons.button.' + (globalStore.isFullScreen ? 'quitFullscreen' : 'fullscreen'));
};
watch(logVisible, (val) => {
@ -214,6 +213,9 @@ defineExpose({
</script>
<style scoped lang="scss">
.fullScreen {
border: none;
}
.selectWidth {
width: 200px;
}

4
frontend/src/lang/modules/en.ts
View File

@ -56,8 +56,8 @@ const message = {
copy: 'Copy',
random: 'Random',
uninstall: 'Uninstall',
fullscreen: 'Fullscreen',
quitFullscreen: 'Quit Fullscreen',
fullscreen: 'WebsiteFullscreen',
quitFullscreen: 'Quit WebsiteFullscreen',
update: 'Edit',
showAll: 'Show All',
hideSome: 'Hide Some',

4
frontend/src/lang/modules/tw.ts
View File

@ -55,8 +55,8 @@ const message = {
copy: '復製',
random: '隨機密碼',
uninstall: '卸載',
fullscreen: '全屏',
quitFullscreen: '退出全屏',
fullscreen: '網頁全屏',
quitFullscreen: '退出網頁全屏',
update: '編輯',
showAll: '顯示所有',
hideSome: '隱藏部分',

4
frontend/src/lang/modules/zh.ts
View File

@ -55,8 +55,8 @@ const message = {
copy: '复制',
random: '随机密码',
uninstall: '卸载',
fullscreen: '全屏',
quitFullscreen: '退出全屏',
fullscreen: '网页全屏',
quitFullscreen: '退出网页全屏',
update: '编辑',
showAll: '显示所有',
hideSome: '隐藏部分',

7
frontend/src/views/container/container/log/index.vue
View File

@ -122,17 +122,16 @@ const timeOptions = ref([
]);
function toggleFullscreen() {
if (screenfull.isEnabled) {
screenfull.toggle();
}
globalStore.isFullScreen = !globalStore.isFullScreen;
}
const loadTooltip = () => {
return i18n.global.t('commons.button.' + (screenfull.isFullscreen ? 'quitFullscreen' : 'fullscreen'));
return i18n.global.t('commons.button.' + (globalStore.isFullScreen ? 'quitFullscreen' : 'fullscreen'));
};
const handleClose = async () => {
terminalSocket.value?.send('close conn');
logVisible.value = false;
globalStore.isFullScreen = false;
};
watch(logVisible, (val) => {
if (screenfull.isEnabled && !val && !mobile.value) screenfull.exit();

1
frontend/src/views/host/file-management/code-editor/index.vue
View File

@ -19,6 +19,7 @@
v-if="!mobile"
class="!border-none !bg-transparent !text-base !font-semibold !py-2 !px-1"
icon="FullScreen"
style="margin-right: 10px"
></el-button>
</el-tooltip>
<el-button

7
frontend/src/views/toolbox/supervisor/file/index.vue
View File

@ -97,12 +97,10 @@ const mobile = computed(() => {
});
function toggleFullscreen() {
if (screenfull.isEnabled) {
screenfull.toggle();
}
globalStore.isFullScreen = !globalStore.isFullScreen;
}
const loadTooltip = () => {
return i18n.global.t('commons.button.' + (screenfull.isFullscreen ? 'quitFullscreen' : 'fullscreen'));
return i18n.global.t('commons.button.' + (globalStore.isFullScreen ? 'quitFullscreen' : 'fullscreen'));
};
const getContent = () => {
@ -134,6 +132,7 @@ const changeTail = () => {
const handleClose = () => {
content.value = '';
open.value = false;
globalStore.isFullScreen = false;
};
const submit = () => {