File tree 4 files changed +12
-8
lines changed
4 files changed +12
-8
lines changed Original file line number Diff line number Diff line change 215
215
v-if =" mysqlStatus != 'Running' && currentDB && !loading && maskShow && currentDB?.from === 'local'"
216
216
class =" mask-prompt"
217
217
>
218
- <span >{{ $t('commons.service.serviceNotStarted', ['MySQL']) }}</span >
218
+ <span >
219
+ {{ $t('commons.service.serviceNotStarted', [currentDB.type === 'mysql' ? 'MySQL' : 'Mariadb']) }}
220
+ </span >
219
221
</el-card >
220
222
221
223
<div v-if =" dbOptionsLocal.length === 0 && dbOptionsRemote.length === 0" >
Original file line number Diff line number Diff line change @@ -363,7 +363,8 @@ const loadQuickCmd = async () => {
363
363
364
364
const quickInput = (val : any ) => {
365
365
if (val ) {
366
- terminalRef .value ?.sendMsg (val + ' \n ' );
366
+ terminalRef .value ?.sendMsg (val );
367
+ quickCmd .value = ' ' ;
367
368
}
368
369
};
369
370
Original file line number Diff line number Diff line change 1
1
<template >
2
2
<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" >
4
4
<template #buttons >
5
5
<el-button type =" primary" :plain =" activeName !== 'conf'" @click =" changeTab('conf')" >
6
6
{{ $t('database.confChange') }}
@@ -201,7 +201,7 @@ const changeTab = (val: string) => {
201
201
break ;
202
202
case ' tuning' :
203
203
case ' port' :
204
- loadform ();
204
+ loadForm ();
205
205
break ;
206
206
case ' status' :
207
207
statusRef .value ! .acceptParams ({ status: redisStatus .value , database: database .value });
@@ -288,7 +288,7 @@ const submitForm = async () => {
288
288
loading .value = true ;
289
289
await updateRedisConf (param )
290
290
.then (() => {
291
- loadform ();
291
+ loadForm ();
292
292
loading .value = false ;
293
293
MsgSuccess (i18n .global .t (' commons.msg.operationSuccess' ));
294
294
})
@@ -336,7 +336,7 @@ const submitFile = async () => {
336
336
});
337
337
};
338
338
339
- const loadform = async () => {
339
+ const loadForm = async () => {
340
340
const res = await loadRedisConf (database .value );
341
341
form .name = res .data ?.name ;
342
342
form .timeout = Number (res .data ?.timeout );
Original file line number Diff line number Diff line change 25
25
</el-alert >
26
26
<el-form-item :label =" $t('setting.proxyType')" prop =" proxyType" >
27
27
<el-select v-model =" form.proxyType" clearable >
28
+ <el-option value =" " :label =" $t('commons.button.close')" />
28
29
<el-option value =" socks5" label =" SOCKS5" />
29
30
<el-option value =" http" label =" HTTP" />
30
31
<el-option value =" https" label =" HTTPS" />
@@ -105,8 +106,8 @@ interface DialogProps {
105
106
passwdKeep: string ;
106
107
}
107
108
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 ;
110
111
form .proxyPortItem = params .port ? Number (params .port ) : 7890 ;
111
112
form .proxyUser = params .user ;
112
113
form .proxyPasswd = params .passwd ;
You can’t perform that action at this time.
0 commit comments