mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2024-11-24 02:59:16 +08:00
fix:mysql升级到8.4后查询会出错,容器的command回显使用 text area (#6147)
* style:容器的command参数回显应该使用 text area而不是text input,且不应该过滤'\n' * chore:prettier格式化 * fix:mysql升级到8.4后,数据库管理 - 当前状态 查询会出错 * chore:修改逻辑判断
This commit is contained in:
parent
7da5f7a884
commit
779addfcb4
@ -533,7 +533,10 @@ func (u *MysqlService) LoadStatus(req dto.OperationWithNameAndType) (*dto.MysqlS
|
||||
info.Position = "OFF"
|
||||
rows, err := executeSqlForRows(app.ContainerName, app.Key, app.Password, "show master status;")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
rows, err = executeSqlForRows(app.ContainerName, app.Key, app.Password, "SHOW BINARY LOG STATUS;")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
if len(rows) > 2 {
|
||||
itemValue := strings.Split(rows[1], "\t")
|
||||
|
@ -201,7 +201,11 @@
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item label="Command" prop="cmdStr">
|
||||
<el-input v-model="dialogData.rowData!.cmdStr" :placeholder="$t('container.cmdHelper')" />
|
||||
<el-input
|
||||
type="textarea"
|
||||
v-model="dialogData.rowData!.cmdStr"
|
||||
:placeholder="$t('container.cmdHelper')"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="Entrypoint" prop="entrypointStr">
|
||||
<el-input
|
||||
|
Loading…
Reference in New Issue
Block a user