gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-31 22:18:07 +08:00
Code

fix: 优化英文状态下，备份恢复按钮换行的问题 (#1860)

Browse Source
This commit is contained in:
ssongliu 2023-08-07 11:52:11 +08:00 committed by GitHub
parent c9ea6f6c8d
commit c326606401
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/utils/mysql/client/local.go
View File

@ -179,6 +179,7 @@ func (r *Local) ChangeAccess(info AccessChangeInfo) error {
if info.Username == "root" { if info.Username == "root" {
info.OldPermission = "%" info.OldPermission = "%"
info.Name = "*" info.Name = "*"
info.Password = r.Password
} }
if info.Permission != info.OldPermission { if info.Permission != info.OldPermission {
if err := r.Delete(DeleteInfo{ if err := r.Delete(DeleteInfo{

1
backend/utils/mysql/client/remote.go
View File

@ -180,6 +180,7 @@ func (r *Remote) ChangeAccess(info AccessChangeInfo) error {
if info.Username == "root" { if info.Username == "root" {
info.OldPermission = "%" info.OldPermission = "%"
info.Name = "*" info.Name = "*"
info.Password = r.Password
} }
if info.Permission != info.OldPermission { if info.Permission != info.OldPermission {
if err := r.Delete(DeleteInfo{ if err := r.Delete(DeleteInfo{

16
frontend/src/components/app-status/index.vue
View File

@ -106,11 +106,17 @@ const goRouter = async (key: string) => {
}; };
const onCheck = async () => { const onCheck = async () => {
const res = await CheckAppInstalled(key.value); await CheckAppInstalled(key.value)
data.value = res.data; .then((res) => {
em('isExist', res.data); data.value = res.data;
operateReq.installId = res.data.appInstallId; em('isExist', res.data);
refresh.value++; operateReq.installId = res.data.appInstallId;
refresh.value++;
})
.catch(() => {
em('isExist', false);
refresh.value++;
});
}; };
const onOperate = async (operation: string) => { const onOperate = async (operation: string) => {

2
frontend/src/components/backup/index.vue
View File

@ -41,7 +41,7 @@
show-overflow-tooltip show-overflow-tooltip
/> />
<fu-table-operations :buttons="buttons" :label="$t('commons.table.operate')" fix /> <fu-table-operations width="230px" :buttons="buttons" :label="$t('commons.table.operate')" fix />
</ComplexTable> </ComplexTable>
</el-drawer> </el-drawer>
</div> </div>

4
frontend/src/components/upload/index.vue
View File

@ -60,13 +60,13 @@
{{ computeSize(row.size) }} {{ computeSize(row.size) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.table.createdAt')" min-width="80" fix> <el-table-column show-overflow-tooltip :label="$t('commons.table.createdAt')" min-width="90" fix>
<template #default="{ row }"> <template #default="{ row }">
{{ row.createdAt }} {{ row.createdAt }}
</template> </template>
</el-table-column> </el-table-column>
<fu-table-operations <fu-table-operations
width="300px" width="150px"
:buttons="buttons" :buttons="buttons"
:ellipsis="10" :ellipsis="10"
:label="$t('commons.table.operate')" :label="$t('commons.table.operate')"

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

@ -38,7 +38,7 @@
> >
{{ $t('database.create') }} {{ $t('database.create') }}
</el-button> </el-button>
<el-button :disabled="!mysqlIsExist && isLocal()" @click="onChangeConn" type="primary" plain> <el-button v-if="mysqlIsExist || !isLocal()" @click="onChangeConn" type="primary" plain>
{{ $t('database.databaseConnInfo') }} {{ $t('database.databaseConnInfo') }}
</el-button> </el-button>
<el-button <el-button