Skip to content

Commit 869d0c7

Browse files
authored
fix: 服务器代理修改默认值 (#5242)
1 parent 9af00cc commit 869d0c7

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

frontend/src/views/database/mysql/index.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,9 @@
215215
v-if="mysqlStatus != 'Running' && currentDB && !loading && maskShow && currentDB?.from === 'local'"
216216
class="mask-prompt"
217217
>
218-
<span>{{ $t('commons.service.serviceNotStarted', ['MySQL']) }}</span>
218+
<span>
219+
{{ $t('commons.service.serviceNotStarted', [currentDB.type === 'mysql' ? 'MySQL' : 'Mariadb']) }}
220+
</span>
219221
</el-card>
220222

221223
<div v-if="dbOptionsLocal.length === 0 && dbOptionsRemote.length === 0">

frontend/src/views/database/redis/index.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,8 @@ const loadQuickCmd = async () => {
363363
364364
const quickInput = (val: any) => {
365365
if (val) {
366-
terminalRef.value?.sendMsg(val + '\n');
366+
terminalRef.value?.sendMsg(val);
367+
quickCmd.value = '';
367368
}
368369
};
369370

frontend/src/views/database/redis/setting/index.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div v-show="settingShow" v-loading="loading">
3-
<LayoutContent :title="'Redis ' + $t('commons.button.set')" :reload="true">
3+
<LayoutContent :title="database + ' ' + $t('commons.button.set')" :reload="true">
44
<template #buttons>
55
<el-button type="primary" :plain="activeName !== 'conf'" @click="changeTab('conf')">
66
{{ $t('database.confChange') }}
@@ -201,7 +201,7 @@ const changeTab = (val: string) => {
201201
break;
202202
case 'tuning':
203203
case 'port':
204-
loadform();
204+
loadForm();
205205
break;
206206
case 'status':
207207
statusRef.value!.acceptParams({ status: redisStatus.value, database: database.value });
@@ -288,7 +288,7 @@ const submitForm = async () => {
288288
loading.value = true;
289289
await updateRedisConf(param)
290290
.then(() => {
291-
loadform();
291+
loadForm();
292292
loading.value = false;
293293
MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
294294
})
@@ -336,7 +336,7 @@ const submitFile = async () => {
336336
});
337337
};
338338
339-
const loadform = async () => {
339+
const loadForm = async () => {
340340
const res = await loadRedisConf(database.value);
341341
form.name = res.data?.name;
342342
form.timeout = Number(res.data?.timeout);

frontend/src/views/setting/panel/proxy/index.vue

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
</el-alert>
2626
<el-form-item :label="$t('setting.proxyType')" prop="proxyType">
2727
<el-select v-model="form.proxyType" clearable>
28+
<el-option value="" :label="$t('commons.button.close')" />
2829
<el-option value="socks5" label="SOCKS5" />
2930
<el-option value="http" label="HTTP" />
3031
<el-option value="https" label="HTTPS" />
@@ -105,8 +106,8 @@ interface DialogProps {
105106
passwdKeep: string;
106107
}
107108
const acceptParams = (params: DialogProps): void => {
108-
form.proxyUrl = params.url || '127.0.0.1';
109-
form.proxyType = params.type || 'socks5';
109+
form.proxyUrl = params.url;
110+
form.proxyType = params.type;
110111
form.proxyPortItem = params.port ? Number(params.port) : 7890;
111112
form.proxyUser = params.user;
112113
form.proxyPasswd = params.passwd;

0 commit comments

Comments
 (0)