gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-19 08:19:15 +08:00
Code

fix: 解决慢日志开启后未刷新导致无法关闭的问题

Browse Source
This commit is contained in:
ssongliu 2023-03-17 22:48:22 +08:00 committed by f2c-ci-robot[bot]
parent 89cb9e6693
commit fb286d2def
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/views/database/mysql/password/index.vue
View File

@ -2,7 +2,7 @@
<div>
<el-drawer v-model="changeVisiable" :destroy-on-close="true" :close-on-click-modal="false" width="30%">
<template #header>
<DrawerHeader :header="$t('database.changePassword')" :back="handleClose" />
<DrawerHeader :header="title" :back="handleClose" />
</template>
<el-form>
<el-form v-loading="loading" ref="changeFormRef" :model="changeForm" label-position="top">
@ -78,6 +78,7 @@ const loading = ref();
const changeVisiable = ref(false);
type FormInstance = InstanceType<typeof ElForm>;
const changeFormRef = ref<FormInstance>();
const title = ref();
const changeForm = reactive({
id: 0,
mysqlName: '',
@ -101,6 +102,10 @@ interface DialogProps {
value: string;
}
const acceptParams = (params: DialogProps): void => {
title.value =
params.operation === 'password'
? i18n.global.t('database.changePassword')
: i18n.global.t('database.permission');
changeForm.id = params.id;
changeForm.mysqlName = params.mysqlName;
changeForm.userName = params.username;

16
frontend/src/views/database/mysql/setting/slow-log/index.vue
View File

@ -17,9 +17,11 @@
{{ $t('commons.button.save') }}
</el-button>
<div style="float: left; margin-left: 20px">
<el-checkbox border v-model="isWatch">{{ $t('commons.button.watch') }}</el-checkbox>
<el-checkbox style="margin-top: 2px" :disabled="!currentStatus" border v-model="isWatch">
{{ $t('commons.button.watch') }}
</el-checkbox>
</div>
<el-button style="margin-left: 20px" @click="onDownload" icon="Download">
<el-button :disabled="!currentStatus" style="margin-left: 20px" @click="onDownload" icon="Download">
{{ $t('file.download') }}
</el-button>
</el-form-item>
@ -29,7 +31,7 @@
:placeholder="$t('database.noData')"
:indent-with-tab="true"
:tabSize="4"
style="height: calc(100vh - 427px); width: 100%"
style="height: calc(100vh - 428px); width: 100%"
:lineWrapping="true"
:matchBrackets="true"
theme="cobalt"
@ -77,7 +79,6 @@ const variables = reactive({
slow_query_log: 'OFF',
long_query_time: 10,
});
const oldVariables = ref();
interface DialogProps {
mysqlName: string;
@ -100,7 +101,6 @@ const acceptParams = async (params: DialogProps): Promise<void> => {
}
}, 1000 * 5);
}
oldVariables.value = { ...variables };
};
const emit = defineEmits(['loading']);
@ -132,13 +132,12 @@ const changeSlowLogs = () => {
const onCancle = async () => {
variables.slow_query_log = currentStatus.value ? 'ON' : 'OFF';
detailShow.value = currentStatus.value;
};
const onSave = async () => {
let param = [] as Array<Database.VariablesUpdate>;
if (variables.slow_query_log !== oldVariables.value.slow_query_log) {
param.push({ param: 'slow_query_log', value: variables.slow_query_log });
}
param.push({ param: 'slow_query_log', value: variables.slow_query_log });
if (variables.slow_query_log === 'ON') {
param.push({ param: 'long_query_time', value: variables.long_query_time + '' });
param.push({ param: 'slow_query_log_file', value: '/var/lib/mysql/1Panel-slow.log' });
@ -149,7 +148,6 @@ const onSave = async () => {
emit('loading', false);
currentStatus.value = variables.slow_query_log === 'ON';
detailShow.value = variables.slow_query_log === 'ON';
oldVariables.value.slow_query_log = variables.slow_query_log;
MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
})
.catch(() => {

2
frontend/src/views/database/mysql/setting/variables/index.vue
View File

@ -152,7 +152,7 @@ let mysqlVariables = reactive({
});
const variablesRules = reactive({
key_buffer_size: [Rules.number, checkNumberRange(1, 102400)],
query_cache_size: [Rules.number, checkNumberRange(1, 102400)],
query_cache_size: [Rules.number, checkNumberRange(0, 102400)],
tmp_table_size: [Rules.number, checkNumberRange(1, 102400)],
innodb_buffer_pool_size: [Rules.number, checkNumberRange(1, 102400)],
innodb_log_buffer_size: [Rules.number, checkNumberRange(1, 102400)],