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

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

View File

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

View File

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

View File

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

View File

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

View File

@ -122,17 +122,16 @@ const timeOptions = ref([
]); ]);
function toggleFullscreen() { function toggleFullscreen() {
if (screenfull.isEnabled) { globalStore.isFullScreen = !globalStore.isFullScreen;
screenfull.toggle();
}
} }
const loadTooltip = () => { 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 () => { const handleClose = async () => {
terminalSocket.value?.send('close conn'); terminalSocket.value?.send('close conn');
logVisible.value = false; logVisible.value = false;
globalStore.isFullScreen = false;
}; };
watch(logVisible, (val) => { watch(logVisible, (val) => {
if (screenfull.isEnabled && !val && !mobile.value) screenfull.exit(); if (screenfull.isEnabled && !val && !mobile.value) screenfull.exit();

View File

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

View File

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