Skip to content

Commit 11a58fd

Browse files
authored
fix: 统一抽屉警告或提示信息样式 (#1453)
1 parent 3a8c3b5 commit 11a58fd

File tree

8 files changed

+43
-46
lines changed

8 files changed

+43
-46
lines changed

frontend/src/views/app-store/detail/install/index.vue

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@
1111
</template>
1212
<el-row v-loading="loading">
1313
<el-col :span="22" :offset="1">
14-
<el-alert type="error" :closable="false">
15-
<p>{{ $t('app.appInstallWarn') }}</p>
16-
</el-alert>
14+
<el-alert
15+
:title="$t('app.appInstallWarn')"
16+
style="margin-bottom: 20px"
17+
:closable="false"
18+
type="error"
19+
/>
1720
<el-form
1821
@submit.prevent
1922
ref="paramForm"

frontend/src/views/app-store/installed/detail/index.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@
2020
</el-row>
2121
<el-row v-else v-loading="loading">
2222
<el-col :span="22" :offset="1">
23-
<el-alert :title="$t('app.updateHelper')" type="warning" :closable="false" />
23+
<el-alert
24+
:title="$t('app.updateHelper')"
25+
type="warning"
26+
:closable="false"
27+
style="margin-bottom: 20px"
28+
/>
2429
<el-form @submit.prevent ref="paramForm" :model="paramModel" label-position="top" :rules="rules">
2530
<div v-for="(p, index) in params" :key="index">
2631
<el-form-item :prop="p.key" :label="getLabel(p)">

frontend/src/views/app-store/installed/index.vue

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,7 @@
6464
</span>
6565
</template>
6666
</el-alert>
67-
<el-alert type="info" :closable="false" v-if="mode === 'upgrade'">
68-
<template #default>
69-
<span>{{ $t('app.upgradeHelper') }}</span>
70-
</template>
71-
</el-alert>
67+
<el-alert type="info" :title="$t('app.upgradeHelper')" :closable="false" v-if="mode === 'upgrade'" />
7268
<div class="update-prompt" v-if="data == null">
7369
<span>{{ mode === 'upgrade' ? $t('app.updatePrompt') : $t('app.installPrompt') }}</span>
7470
<div>

frontend/src/views/container/container/upgrade/index.vue

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@
33
<template #header>
44
<DrawerHeader :header="$t('container.upgrade')" :resource="form.name" :back="handleClose" />
55
</template>
6-
<el-alert v-if="form.fromApp" style="margin-bottom: 20px" :closable="false" type="error">
7-
<template #default>
8-
<span>
9-
<span>{{ $t('container.appHelper') }}</span>
10-
</span>
11-
</template>
12-
</el-alert>
13-
<el-form @submit.prevent ref="formRef" v-loading="loading" :model="form" label-position="top">
14-
<el-row type="flex" justify="center">
15-
<el-col :span="22">
6+
7+
<el-row v-loading="loading">
8+
<el-col :span="22" :offset="1">
9+
<el-alert
10+
v-if="form.fromApp"
11+
:title="$t('container.appHelper')"
12+
style="margin-bottom: 20px"
13+
:closable="false"
14+
type="error"
15+
/>
16+
<el-form @submit.prevent ref="formRef" v-loading="loading" :model="form" label-position="top">
1617
<el-form-item :label="$t('container.oldImage')" prop="oldImage">
1718
<el-tag>{{ form.imageName }}:{{ form.oldTag }}</el-tag>
1819
</el-form-item>
@@ -22,9 +23,9 @@
2223
</el-input>
2324
<span class="input-help">{{ $t('container.upgradeHelper') }}</span>
2425
</el-form-item>
25-
</el-col>
26-
</el-row>
27-
</el-form>
26+
</el-form>
27+
</el-col>
28+
</el-row>
2829
<template #footer>
2930
<span class="dialog-footer">
3031
<el-button :disabled="loading" @click="drawerVisiable = false">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const acceptParams = (props: InstallRrops) => {
4545
};
4646
4747
const toApp = () => {
48-
router.push({ name: 'App' });
48+
router.push({ name: 'AppInstalled' });
4949
};
5050
5151
defineExpose({

frontend/src/views/host/file-management/chown/index.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
</template>
66
<el-row>
77
<el-col :span="22" :offset="1">
8+
<el-alert :title="$t('file.ownerHelper')" type="info" :closable="false" style="margin-bottom: 20px" />
89
<el-form
910
ref="fileForm"
1011
label-position="top"
@@ -22,9 +23,6 @@
2223
<el-form-item v-if="isDir">
2324
<el-checkbox v-model="addForm.sub">{{ $t('file.containSub') }}</el-checkbox>
2425
</el-form-item>
25-
<el-form-item>
26-
<el-alert :title="$t('file.ownerHelper')" type="info" :closable="false" />
27-
</el-form-item>
2826
</el-form>
2927
</el-col>
3028
</el-row>

frontend/src/views/host/ssh/log/log.vue

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
<div>
33
<LayoutContent v-loading="loading" :title="$t('ssh.loginLogs')">
44
<template #prompt>
5-
<el-alert type="info" :closable="false">
6-
<template #default>
7-
<span>
8-
{{ $t('ssh.sshAlert') }}
9-
</span>
10-
</template>
11-
</el-alert>
5+
<el-alert type="info" :title="$t('ssh.sshAlert')" :closable="false" />
126
</template>
137
<template #toolbar>
148
<el-row>

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
<template #header>
55
<DrawerHeader :header="$t('setting.timeZone')" :back="handleClose" />
66
</template>
7-
<el-alert v-if="canChangeZone()" style="margin-bottom: 20px" :closable="false" type="warning">
8-
<template #default>
9-
<span>
10-
<span>{{ $t('setting.timeZoneHelper') }}</span>
11-
</span>
12-
</template>
13-
</el-alert>
14-
<el-form ref="formRef" label-position="top" :model="form" @submit.prevent v-loading="loading">
15-
<el-row type="flex" justify="center">
16-
<el-col :span="22">
7+
<el-row type="flex" justify="center">
8+
<el-col :span="22">
9+
<el-alert
10+
v-if="canChangeZone()"
11+
:title="$t('setting.timeZoneHelper')"
12+
style="margin-bottom: 20px"
13+
:closable="false"
14+
type="warning"
15+
/>
16+
<el-form ref="formRef" label-position="top" :model="form" @submit.prevent v-loading="loading">
1717
<el-form-item :label="$t('setting.timeZone')" prop="timeZone" :rules="Rules.requiredInput">
1818
<el-select filterable :disabled="canChangeZone()" v-model="form.timeZone">
1919
<el-option v-for="item in zones" :key="item" :label="item" :value="item" />
@@ -46,9 +46,9 @@
4646
{{ $t('setting.timeZoneNY') }}
4747
</el-button>
4848
</el-form-item>
49-
</el-col>
50-
</el-row>
51-
</el-form>
49+
</el-form>
50+
</el-col>
51+
</el-row>
5252
<template #footer>
5353
<span class="dialog-footer">
5454
<el-button @click="drawerVisiable = false">{{ $t('commons.button.cancel') }}</el-button>

0 commit comments

Comments
 (0)