mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2025-12-10 04:16:29 +08:00
style: Optimize the closing method of the right drawer (#9108)
This commit is contained in:
parent
89526d9075
commit
d9358b87c4
7 changed files with 17 additions and 3 deletions
|
|
@ -4,7 +4,8 @@
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:destroy-on-close="true"
|
:destroy-on-close="true"
|
||||||
:size="size"
|
:size="size"
|
||||||
:close-on-press-escape="true"
|
:close-on-press-escape="autoClose"
|
||||||
|
:close-on-click-modal="autoClose"
|
||||||
>
|
>
|
||||||
<template #header>
|
<template #header>
|
||||||
<el-page-header @back="handleBack">
|
<el-page-header @back="handleBack">
|
||||||
|
|
@ -73,6 +74,10 @@ const props = defineProps({
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
|
autoClose: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const slots = useSlots();
|
const slots = useSlots();
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:resource="title"
|
:resource="title"
|
||||||
:size="globalStore.isFullScreen ? 'full' : 'large'"
|
:size="globalStore.isFullScreen ? 'full' : 'large'"
|
||||||
|
:autoClose="false"
|
||||||
>
|
>
|
||||||
<Terminal class="mt-2" style="height: calc(100vh - 175px)" ref="terminalRef"></Terminal>
|
<Terminal class="mt-2" style="height: calc(100vh - 175px)" ref="terminalRef"></Terminal>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
:header="$t('menu.terminal')"
|
:header="$t('menu.terminal')"
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:resource="title"
|
:resource="title"
|
||||||
|
:autoClose="!terminalOpen"
|
||||||
size="large"
|
size="large"
|
||||||
>
|
>
|
||||||
<template #content>
|
<template #content>
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,12 @@
|
||||||
<span v-else>{{ row.retainCopies }}</span>
|
<span v-else>{{ row.retainCopies }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column :label="$t('cronjob.lastRecordTime')" :min-width="120" prop="lastRecordTime">
|
<el-table-column
|
||||||
|
:label="$t('cronjob.lastRecordTime')"
|
||||||
|
:min-width="120"
|
||||||
|
show-overflow-tooltip
|
||||||
|
prop="lastRecordTime"
|
||||||
|
>
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<el-button v-if="row.lastRecordStatus === 'Success'" icon="Select" link type="success" />
|
<el-button v-if="row.lastRecordStatus === 'Success'" icon="Select" link type="success" />
|
||||||
<el-button v-if="row.lastRecordStatus === 'Failed'" icon="CloseBold" link type="danger" />
|
<el-button v-if="row.lastRecordStatus === 'Failed'" icon="CloseBold" link type="danger" />
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:resource="scriptName"
|
:resource="scriptName"
|
||||||
size="large"
|
size="large"
|
||||||
|
:autoClose="false"
|
||||||
>
|
>
|
||||||
<template #content>
|
<template #content>
|
||||||
<Terminal style="height: calc(100vh - 175px); margin-top: 18px" ref="terminalRef"></Terminal>
|
<Terminal style="height: calc(100vh - 175px); margin-top: 18px" ref="terminalRef"></Terminal>
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
:header="$t('menu.terminal')"
|
:header="$t('menu.terminal')"
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
size="large"
|
size="large"
|
||||||
:close-on-click-modal="false"
|
:autoClose="false"
|
||||||
>
|
>
|
||||||
<template #content>
|
<template #content>
|
||||||
<Terminal style="height: calc(100vh - 100px)" ref="terminalRef"></Terminal>
|
<Terminal style="height: calc(100vh - 100px)" ref="terminalRef"></Terminal>
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
||||||
:resource="title"
|
:resource="title"
|
||||||
fullScreen
|
fullScreen
|
||||||
:size="globalStore.isFullScreen ? 'full' : 'large'"
|
:size="globalStore.isFullScreen ? 'full' : 'large'"
|
||||||
|
:autoClose="false"
|
||||||
>
|
>
|
||||||
<template #content>
|
<template #content>
|
||||||
<Terminal style="height: calc(100vh - 180px)" ref="terminalRef" v-if="terminalOpen"></Terminal>
|
<Terminal style="height: calc(100vh - 180px)" ref="terminalRef" v-if="terminalOpen"></Terminal>
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue