diff --git a/frontend/src/views/container/compose/detail/index.vue b/frontend/src/views/container/compose/detail/index.vue
index 26ffa32c9..ea31a8f38 100644
--- a/frontend/src/views/container/compose/detail/index.vue
+++ b/frontend/src/views/container/compose/detail/index.vue
@@ -35,39 +35,45 @@
-
-
+
+
+
+
+ {{ $t('container.start') }}
+
+
+ {{ $t('container.stop') }}
+
+
+ {{ $t('container.restart') }}
+
+
+ {{ $t('container.kill') }}
+
+
+ {{ $t('container.pause') }}
+
+
+ {{ $t('container.unpause') }}
+
+
+ {{ $t('container.remove') }}
+
+
+
+
-
-
-
- {{ $t('container.start') }}
-
-
- {{ $t('container.stop') }}
-
-
- {{ $t('container.restart') }}
-
-
- {{ $t('container.kill') }}
-
-
- {{ $t('container.pause') }}
-
-
- {{ $t('container.unpause') }}
-
-
- {{ $t('container.remove') }}
-
-
-
-
-
+
+
diff --git a/frontend/src/views/database/mysql/index.vue b/frontend/src/views/database/mysql/index.vue
index ee8bbce98..56ac42cc4 100644
--- a/frontend/src/views/database/mysql/index.vue
+++ b/frontend/src/views/database/mysql/index.vue
@@ -11,19 +11,26 @@
-
- {{ $t('database.create') }}
-
-
- {{ $t('database.rootPassword') }}
-
-
- {{ $t('database.remoteAccess') }}
-
- phpMyAdmin
+
+
+ {{ $t('database.create') }}
+
+
+ {{ $t('database.rootPassword') }}
+
+
+ {{ $t('database.remoteAccess') }}
+
+ phpMyAdmin
+
-
+
@@ -375,7 +382,7 @@ const loadDashboardPort = async () => {
const checkExist = (data: App.CheckInstalled) => {
mysqlIsExist.value = data.isExist;
mysqlName.value = data.name;
- mysqlStatus.value = data.status;
+ mysqlStatus.value = 'Failed';
mysqlVersion.value = data.version;
mysqlContainer.value = data.containerName;
if (mysqlIsExist.value) {
diff --git a/frontend/src/views/database/redis/index.vue b/frontend/src/views/database/redis/index.vue
index 061e14860..c8ca6484d 100644
--- a/frontend/src/views/database/redis/index.vue
+++ b/frontend/src/views/database/redis/index.vue
@@ -1,25 +1,24 @@
-
-
-
-
- Redis-Commander
-
- {{ $t('database.changePassword') }}
-
+
+
+
-
+
+
+ Redis-Commander
+
+ {{ $t('database.changePassword') }}
+
+
+
+
@@ -57,7 +56,7 @@ import Setting from '@/views/database/redis/setting/index.vue';
import Password from '@/views/database/redis/password/index.vue';
import Terminal from '@/views/database/redis/terminal/index.vue';
import AppStatus from '@/components/app-status/index.vue';
-import { ref } from 'vue';
+import { nextTick, ref } from 'vue';
import { App } from '@/api/interface/app';
import { GetAppPort } from '@/api/modules/app';
import router from '@/routers';
@@ -113,7 +112,9 @@ const checkExist = (data: App.CheckInstalled) => {
loading.value = false;
if (redisStatus.value === 'Running') {
loadDashboardPort();
- terminalRef.value.acceptParams();
+ nextTick(() => {
+ terminalRef.value.acceptParams();
+ });
}
};
diff --git a/frontend/src/views/setting/panel/index.vue b/frontend/src/views/setting/panel/index.vue
index f14bc5a1f..9b4d281c2 100644
--- a/frontend/src/views/setting/panel/index.vue
+++ b/frontend/src/views/setting/panel/index.vue
@@ -48,19 +48,6 @@
-
-
-
-
- {{ $t('commons.button.save') }}
-
-
-
-
-
import { ref, reactive, onMounted, computed } from 'vue';
-import { ElMessage, ElForm, ElMessageBox } from 'element-plus';
+import { ElMessage, ElForm } from 'element-plus';
import LayoutContent from '@/layout/layout-content.vue';
-import { syncTime, getSettingInfo, updateSetting, updatePort } from '@/api/modules/setting';
+import { syncTime, getSettingInfo, updateSetting } from '@/api/modules/setting';
import { Rules } from '@/global/form-rules';
import { GlobalStore } from '@/store';
import { useI18n } from 'vue-i18n';
@@ -133,7 +120,6 @@ type FormInstance = InstanceType;
const form = reactive({
userName: '',
email: '',
- serverPort: 9999,
sessionTimeout: 0,
localTime: '',
panelName: '',
@@ -152,7 +138,6 @@ const search = async () => {
form.userName = res.data.userName;
form.sessionTimeout = Number(res.data.sessionTimeout);
form.localTime = res.data.localTime;
- form.serverPort = Number(res.data.serverPort);
form.panelName = res.data.panelName;
form.theme = res.data.theme;
form.language = res.data.language;
@@ -209,35 +194,6 @@ const onSave = async (formEl: FormInstance | undefined, key: string, val: any) =
});
};
-const onSavePort = async (formEl: FormInstance | undefined, key: string, val: any) => {
- if (!formEl) return;
- const result = await formEl.validateField(key.replace(key[0], key[0].toLowerCase()), callback);
- if (!result) {
- return;
- }
- ElMessageBox.confirm(i18n.t('setting.portChangeHelper'), i18n.t('setting.portChange'), {
- confirmButtonText: i18n.t('commons.button.confirm'),
- cancelButtonText: i18n.t('commons.button.cancel'),
- type: 'info',
- }).then(async () => {
- loading.value = true;
- let param = {
- serverPort: val,
- };
- await updatePort(param)
- .then(() => {
- loading.value = false;
- ElMessage.success(i18n.t('commons.msg.operationSuccess'));
- let href = window.location.href;
- let ip = href.split('//')[1].split(':')[0];
- window.open(`${href.split('//')[0]}//${ip}:${val}/1panel/login`, '_self');
- })
- .catch(() => {
- loading.value = false;
- });
- });
-};
-
function countdown() {
count.value = TIME_COUNT.value;
show.value = true;
diff --git a/frontend/src/views/setting/safe/index.vue b/frontend/src/views/setting/safe/index.vue
index 809f100e0..ae1be9f0c 100644
--- a/frontend/src/views/setting/safe/index.vue
+++ b/frontend/src/views/setting/safe/index.vue
@@ -15,6 +15,20 @@
+
+
+
+
+
+ {{ $t('commons.button.save') }}
+
+
+
+
+
import { ref, reactive, onMounted } from 'vue';
-import { ElMessage, ElForm } from 'element-plus';
+import { ElMessage, ElForm, ElMessageBox } from 'element-plus';
import { Setting } from '@/api/interface/setting';
import LayoutContent from '@/layout/layout-content.vue';
-import { updatePassword, updateSetting, getMFA, bindMFA, getSettingInfo } from '@/api/modules/setting';
+import { updatePassword, updateSetting, getMFA, bindMFA, getSettingInfo, updatePort } from '@/api/modules/setting';
import i18n from '@/lang';
import { Rules } from '@/global/form-rules';
import { dateFormatSimple } from '@/utils/util';
@@ -211,7 +225,7 @@ const passForm = reactive({
const form = reactive({
password: '',
- serverPort: '',
+ serverPort: 9999,
securityEntrance: '',
expirationDays: 0,
expirationTime: '',
@@ -229,6 +243,7 @@ const timeoutForm = reactive({
const search = async () => {
const res = await getSettingInfo();
form.password = '******';
+ form.serverPort = Number(res.data.serverPort);
form.securityEntrance = res.data.securityEntrance;
form.expirationDays = Number(res.data.expirationDays);
form.expirationTime = res.data.expirationTime;
@@ -284,6 +299,34 @@ function checkPassword(rule: any, value: any, callback: any) {
}
callback();
}
+const onSavePort = async (formEl: FormInstance | undefined, key: string, val: any) => {
+ if (!formEl) return;
+ const result = await formEl.validateField(key.replace(key[0], key[0].toLowerCase()), callback);
+ if (!result) {
+ return;
+ }
+ ElMessageBox.confirm(i18n.global.t('setting.portChangeHelper'), i18n.global.t('setting.portChange'), {
+ confirmButtonText: i18n.global.t('commons.button.confirm'),
+ cancelButtonText: i18n.global.t('commons.button.cancel'),
+ type: 'info',
+ }).then(async () => {
+ loading.value = true;
+ let param = {
+ serverPort: val,
+ };
+ await updatePort(param)
+ .then(() => {
+ loading.value = false;
+ ElMessage.success(i18n.global.t('commons.msg.operationSuccess'));
+ let href = window.location.href;
+ let ip = href.split('//')[1].split(':')[0];
+ window.open(`${href.split('//')[0]}//${ip}:${val}/1panel/login`, '_self');
+ })
+ .catch(() => {
+ loading.value = false;
+ });
+ });
+};
const onChangePassword = async () => {
passForm.oldPassword = '';