@@ -27,14 +27,14 @@
({{ $t('setting.hasNewVersion') }})
-
({{ $t('setting.upgradeCheck') }})
-
+
{{ $t('setting.upgrading') }}
diff --git a/frontend/src/styles/common.scss b/frontend/src/styles/common.scss
index fb019bda3..52bcfb2d3 100644
--- a/frontend/src/styles/common.scss
+++ b/frontend/src/styles/common.scss
@@ -464,3 +464,24 @@ html {
.monaco-editor-tree-dark .el-tree-node.is-current > .el-tree-node__content {
background-color: #111417;
}
+.check-label{
+ background: var(--panel-main-bg-color-10) !important;
+ .check-label-a {
+ color: var(--panel-color-primary);
+ }
+}
+.check-content {
+ background: var(--panel-main-bg-color-10);
+ pre {
+ margin: 0;
+ width: 350px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+}
+
+
+.el-descriptions {
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
\ No newline at end of file
diff --git a/frontend/src/styles/element-dark.scss b/frontend/src/styles/element-dark.scss
index 75ebd8b7b..cd6bd2065 100644
--- a/frontend/src/styles/element-dark.scss
+++ b/frontend/src/styles/element-dark.scss
@@ -22,19 +22,24 @@ html.dark {
--panel-main-bg-color-9: #2E313D;
--panel-main-bg-color-10: #242633;
--panel-main-bg-color-11: #60626F;
+ --panel-main-bg-color-12: #000000;
- --panel-alert-error-bg-color: #54293A;
- --panel-alert-error-text-color: #E2324F;
+ --panel-alert-error-bg-color: #fef0f0;
+ --panel-alert-error-text-color: #f56c6c;
--panel-alert-error-hover-bg-color: #E9657B;
- --panel-alert-success-bg-color: #1E5146;
- --panel-alert-success-text-color: #11B671;
+ --panel-alert-success-bg-color: #e1f3d8;
+ --panel-alert-success-text-color: #67c23a;
--panel-alert-success-hover-bg-color: #4DC894;
--panel-alert-warning-bg-color: #59472A;
--panel-alert-warning-text-color: #EDAC2C;
--panel-alert-warning-hover-bg-color: #F1C161;
+ --panel-alert-info-bg-color: var(--panel-main-bg-color-7);
+ --panel-alert-info-text-color: var(--panel-text-color-white);
+ --panel-alert-info-hover-bg-color: var(--panel-main-bg-color-4);
+
--el-color-success: #3fb950;
--el-color-success-light-5: #4DC894;
--el-color-success-light-8: #3fb950;
@@ -55,14 +60,11 @@ html.dark {
--el-color-error-light-8: #E2324F;
--el-color-error-light-9: #54293A;
- --el-color-info: var(--panel-text-color-white);
+ --el-color-info: var(--panel-main-bg-color-2);
--el-color-info-light-5: var(--panel-main-bg-color-3);
- --el-color-info-light-8: var(--panel-text-color-white);
+ --el-color-info-light-8: var(--panel-color-primary);
--el-color-info-light-9: var(--panel-main-bg-color-8);
- --panel-alert-info-bg-color: var(--panel-main-bg-color-8);
- --panel-alert-info-text-color: var(--panel-text-color-white);
- --panel-alert-info-hover-bg-color: var(--panel-main-bg-color-4);
--panel-pie-bg-color: #434552;
--panel-text-color-white: #ffffff;
@@ -78,7 +80,8 @@ html.dark {
--el-scrollbar-bg-color: var(--panel-main-bg-color-8);
--el-border-color-darker: var(--panel-main-bg-color-6);
- --panel-border: 2px solid var(--panel-main-bg-color-8);
+ --panel-border: 1px solid var(--panel-main-bg-color-8);
+ --panel-border-color: var(--panel-main-bg-color-8);
--panel-button-active: var(--panel-main-bg-color-10);
--panel-button-text-color: var(--panel-main-bg-color-10);
--panel-button-bg-color: var(--panel-color-primary);
@@ -113,6 +116,9 @@ html.dark {
--el-text-color-placeholder: var(--panel-main-bg-color-4);
+ .el-radio-button {
+ --el-radio-button-checked-text-color: var(--panel-main-bg-color-10);
+ }
.el-descriptions__content:not(.is-bordered-label) {
color: var(--panel-main-bg-color-3);
}
@@ -180,21 +186,52 @@ html.dark {
}
.el-button--primary {
+ --el-button-text-color: var(--panel-main-bg-color-10);
--el-button-hover-link-text-color: var(--panel-color-primary-light-1);
+ &.tag-button,
+ &.brief-button {
+ --el-button-text-color: var(--panel-main-bg-color-10);
+ --el-button-hover-text-color: var(--el-color-white);
+ --el-button-hover-border-color:var(--el-color-primary);
+ --el-button-hover-bg-color: var(--el-color-primary);
+ }
+
+ &.app-button {
+ --el-button-text-color: var(--el-color-primary);
+ }
+
+ &.h-app-button {
+ --el-button-text-color: var(--panel-main-bg-color-10);
+ --el-button-hover-text-color: var(--el-color-white);
+ --el-button-hover-border-color: var(--el-color-primary);
+ --el-button-hover-bg-color: var(--el-color-primary);
+ }
}
.el-button--primary.is-plain, .el-button--primary.is-text, .el-button--primary.is-link {
+ --el-button-text-color: var(--panel-main-bg-color-2);
--el-button-bg-color: var(--panel-main-bg-color-9);
--el-button-border-color: var(--panel-main-bg-color-8);
--el-button-hover-bg-color: var(--panel-main-bg-color-9);
--el-button-hover-border-color: var(--panel-main-bg-color-8);
}
+ .el-button--primary.is-text,.el-button--primary.is-link {
+ --el-button-text-color: var(--panel-color-primary);
+ }
+
.el-button--primary:hover {
- --el-button-hover-text-color: var(--panel-text-color-white);
- --el-button-border-color: var(--el-color-primary-light-3);
- --el-button-hover-bg-color: var(--el-color-primary-light-3);
- --el-button-hover-border-color: var(--el-color-primary-light-3);
+ --el-button-hover-text-color: var(--panel-main-bg-color-2);
+ --el-button-border-color: var(--el-color-primary);
+ --el-button-hover-bg-color: var(--panel-main-bg-color-9);
+ --el-button-hover-border-color: var(--panel-main-bg-color-8);
+ }
+
+ .el-button--primary.is-plain:hover {
+ --el-button-hover-text-color: var(--panel-main-bg-color-10);
+ --el-button-border-color: var(--el-color-primary);
+ --el-button-hover-bg-color: var(--el-color-primary);
+ --el-button-hover-border-color: var(--el-color-primary);
}
.el-button--primary:active {
@@ -231,7 +268,7 @@ html.dark {
}
.el-dialog {
- background-color: var(--panel-main-bg-color-8);
+ background-color: var(--panel-main-bg-color-9);
border: 1px solid var(--panel-border-color);
.el-dialog__header {
@@ -265,15 +302,24 @@ html.dark {
}
.md-editor-dark {
- --md-bk-color: var(--panel-main-bg-color-8);
+ --md-bk-color: var(--panel-main-bg-color-9);
}
+
.md-editor-dark .md-editor-preview {
--md-theme-color: var(--el-text-color-primary);
}
+
.md-editor-dark .default-theme a {
--md-theme-link-color: var(--el-color-primary);
}
+ .md-editor-dark .default-theme pre code {
+ background-color: var(--panel-main-bg-color-8);
+ }
+ .md-editor-dark .default-theme pre:before {
+ background-color: var(--panel-main-bg-color-10);
+ }
+
.el-descriptions__title {
color: var(--el-text-color-primary);
}
@@ -297,12 +343,20 @@ html.dark {
box-shadow: 0 0 4px rgba(0, 94, 235, 0.1);
border: 0.5px solid var(--panel-main-bg-color-7);
}
+ .el-drawer {
+ .cm-editor {
+ background-color: var(--panel-main-bg-color-10);
+ }
+ .cm-gutters {
+ background-color: var(--panel-main-bg-color-10);
+ }
+ }
.cm-editor {
background-color: var(--panel-main-bg-color-9);
}
.cm-gutters {
- background-color: var(--panel-main-bg-color-8);
+ background-color: var(--panel-main-bg-color-9);
}
// scroll-bar
@@ -312,6 +366,9 @@ html.dark {
::-webkit-scrollbar-thumb {
background-color: var(--el-border-color-darker);
}
+ ::-webkit-scrollbar-corner {
+ background-color: var(--el-scrollbar-bg-color);
+ }
.app-warn {
span {
@@ -325,4 +382,61 @@ html.dark {
}
}
+ .el-table {
+ --el-table-bg-color: var(--el-bg-color);
+ --el-table-tr-bg-color: var(--el-bg-color);
+ --el-table-header-bg-color: var(--el-bg-color);
+ --el-table-border: 1px solid var(--panel-main-bg-color-8);
+ --el-table-border-color: var(--panel-main-bg-color-8);
+ }
+
+ .el-message-box {
+ --el-messagebox-title-color: var(--el-menu-text-color);
+ border: 1px solid var(--panel-border-color);
+ }
+
+ .el-popover {
+ --el-popover-title-text-color: var(--panel-main-bg-color-2);
+ border: 1px solid var(--panel-border-color);
+ }
+
+ .app-wrapper {
+ .main-container {
+ background-color: var(--panel-main-bg-color-9) !important;
+ }
+ .app-footer {
+ background-color: var(--panel-main-bg-color-9) !important;
+ border-top: var(--panel-border);
+ }
+ .mobile-header {
+ background-color: var(--panel-main-bg-color-9) !important;
+ border-bottom: var(--panel-border);
+ color: #ffffff;
+ }
+ }
+
+ .router_card_button {
+ .el-radio-button__inner {
+ background: none !important;
+ }
+ .el-radio-button__original-radio:checked + .el-radio-button__inner {
+ color: var(--panel-main-bg-color-10);
+ background-color: var(--panel-color-primary) !important;
+ box-shadow: none !important;
+ border: none !important;
+ }
+ }
+
+ .el-date-table td.in-range .el-date-table-cell {
+ background-color: var(--panel-main-bg-color-8);
+ }
+
+ .el-collapse-item__header {
+ color: #ffffff;
+ background-color: var(--panel-main-bg-color-10) !important;
+ }
+
+ .el-loading-mask {
+ background-color: rgba(36, 38, 51, 0.8);
+ }
}
\ No newline at end of file
diff --git a/frontend/src/views/app-store/detail/index.vue b/frontend/src/views/app-store/detail/index.vue
index 71505691e..c3fb4cb97 100644
--- a/frontend/src/views/app-store/detail/index.vue
+++ b/frontend/src/views/app-store/detail/index.vue
@@ -162,7 +162,7 @@ defineExpose({
});
-
diff --git a/frontend/src/views/app-store/installed/check/index.vue b/frontend/src/views/app-store/installed/check/index.vue
index d678e05b5..49cefbc8f 100644
--- a/frontend/src/views/app-store/installed/check/index.vue
+++ b/frontend/src/views/app-store/installed/check/index.vue
@@ -1,5 +1,5 @@
-
+
-
-
-
+
+
- {{ $t('app.' + item[0]) }}
+
+ {{ $t('app.' + item[0]) }}
+
{{ map.get(item[0]).toString() }}
diff --git a/frontend/src/views/database/mysql/check/index.vue b/frontend/src/views/database/mysql/check/index.vue
index 9d31ec5fa..2c2172b56 100644
--- a/frontend/src/views/database/mysql/check/index.vue
+++ b/frontend/src/views/database/mysql/check/index.vue
@@ -15,10 +15,12 @@
show-icon
:closable="false"
/>
-
-
+
+
- {{ $t('app.app') }}
+
+ {{ $t('app.app') }}
+
{{ installData.join('\n') }}
@@ -40,7 +42,6 @@ let open = ref(false);
const acceptParams = (props: InstallProps) => {
installData.value = props.items;
- installData.value.push('sdsfhjdghjdgfhsdgfhjsgfkhjsdgfhjasgdfhjasgdfjhsagdfhjsagdfashdfgaskhjdfgaskjhdf');
open.value = true;
};
@@ -52,25 +53,3 @@ defineExpose({
acceptParams,
});
-
-
diff --git a/frontend/src/views/database/postgresql/check/index.vue b/frontend/src/views/database/postgresql/check/index.vue
index 96f1451a0..f11507f32 100644
--- a/frontend/src/views/database/postgresql/check/index.vue
+++ b/frontend/src/views/database/postgresql/check/index.vue
@@ -2,7 +2,7 @@
@@ -15,13 +15,14 @@
show-icon
:closable="false"
/>
-
-
+
- {{ $t('app.app') }}
+
+ {{ $t('app.app') }}
+
- {{ installData.join(',') }}
+ {{ installData.join('\n') }}
diff --git a/frontend/src/views/database/redis/check/index.vue b/frontend/src/views/database/redis/check/index.vue
index 96f1451a0..f11507f32 100644
--- a/frontend/src/views/database/redis/check/index.vue
+++ b/frontend/src/views/database/redis/check/index.vue
@@ -2,7 +2,7 @@
@@ -15,13 +15,14 @@
show-icon
:closable="false"
/>
-
-
+
- {{ $t('app.app') }}
+
+ {{ $t('app.app') }}
+
- {{ installData.join(',') }}
+ {{ installData.join('\n') }}
diff --git a/frontend/src/views/setting/snapshot/snap_status/index.vue b/frontend/src/views/setting/snapshot/snap_status/index.vue
index 9c8313be8..b49dc6d6c 100644
--- a/frontend/src/views/setting/snapshot/snap_status/index.vue
+++ b/frontend/src/views/setting/snapshot/snap_status/index.vue
@@ -14,69 +14,89 @@
- {{ $t('setting.panelInfo') }}
-
-
{{ status.panelInfo }}
+
+
+ {{ $t('setting.panelInfo') }}
+
+ {{ status.panelInfo }}
+
- {{ $t('setting.panelBin') }}
-
-
{{ status.panel }}
+
+
+ {{ $t('setting.panelBin') }}
+
+ {{ status.panel }}
+
- {{ $t('setting.daemonJson') }}
-
-
{{ status.daemonJson }}
+
+
+ {{ $t('setting.daemonJson') }}
+
+ {{ status.daemonJson }}
+
- {{ $t('setting.appData') }}
-
-
{{ status.appData }}
+
+
+ {{ $t('setting.appData') }}
+
+ {{ status.appData }}
+
- {{ $t('setting.backupData') }}
-
-
{{ status.backupData }}
+
+
+ {{ $t('setting.backupData') }}
+
+ {{ status.backupData }}
+
- {{ $t('setting.panelData') }}
-
-
{{ status.panelData }}
+
+
+ {{ $t('setting.panelData') }}
+
+ {{ status.panelData }}
+
-
- {{ $t('setting.compress') }} {{ status.size }}
-
-
-
{{ status.compress }}
+
+
+ {{ $t('setting.compress') }}
+
+ {{ status.compress }}
+
-
+
+
{{ $t('setting.upload') }}
-
-
-
{{ status.upload }}
+
+ {{ status.upload }}
+
@@ -98,6 +118,7 @@
import { Setting } from '@/api/interface/setting';
import { loadSnapStatus, snapshotCreate } from '@/api/modules/setting';
import { nextTick, onBeforeUnmount, reactive, ref } from 'vue';
+import { Loading, Check, Close } from '@element-plus/icons-vue';
const status = reactive
({
panel: '',
@@ -285,11 +306,11 @@ const loadIcon = (status: string) => {
case 'Running':
case 'Waiting':
case 'Uploading':
- return 'Loading';
+ return Loading;
case 'Done':
- return 'Check';
+ return Check;
default:
- return 'Close';
+ return Close;
}
};
diff --git a/frontend/src/views/setting/snapshot/status/index.vue b/frontend/src/views/setting/snapshot/status/index.vue
index 14c0b1605..2f76233a8 100644
--- a/frontend/src/views/setting/snapshot/status/index.vue
+++ b/frontend/src/views/setting/snapshot/status/index.vue
@@ -230,7 +230,7 @@ defineExpose({
border-top: 1px var(--el-border-color) var(--el-border-style);
}
.alert {
- background-color: rgba(0, 94, 235, 0.03);
+ background-color: var(--panel-main-bg-color-10);
}
.card-title {
diff --git a/frontend/src/views/website/runtime/php/check/index.vue b/frontend/src/views/website/runtime/php/check/index.vue
index 94060302c..e555d5a3e 100644
--- a/frontend/src/views/website/runtime/php/check/index.vue
+++ b/frontend/src/views/website/runtime/php/check/index.vue
@@ -1,5 +1,5 @@
-
+
-
-
+
- {{ $t('app.' + item[0]) }}
+
+ {{ $t('app.' + item[0]) }}
+
{{ map.get(item[0]).toString() }}