diff --git a/src/App.vue b/src/App.vue index bcef1abea093760849c6f521ca9c55ce5942d008..e5b55fd6b62f6342dacdc4c20dfe450c2bdc0e60 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,7 +1,7 @@ @@ -46,12 +46,26 @@ const handleMessage = (e: MessageEvent) => { ElMessage({ message: '未获取到token数据!', type: 'warning', + customClass: 'o-message--warning', }) } + }else if(e.data?.type === 'changeTheme') { + const theme = e.data.theme; + if(theme) { + document.body.setAttribute('theme', theme); + localStorage.setItem('theme-witchiand', theme); + } else { + ElMessage({ + message: '未获取到主题数据!', + type: 'warning', + customClass: 'o-message--warning', + }); + } } }; onMounted(() => { + document.body.setAttribute('theme', localStorage.getItem('theme') || 'light'); // 监听手动导航 router.beforeEach((to, from, next) => { if (from.name === undefined && to.name) { @@ -83,6 +97,14 @@ onMounted(() => { window.addEventListener('message', handleMessage); }); onUnmounted(() => window.removeEventListener('message', handleMessage)); + +// 页面加载时应用存储的主题 +document.addEventListener('DOMContentLoaded', () => { + const savedTheme = localStorage.getItem('theme-witchiand') || 'light'; + if (savedTheme) { + document.body.setAttribute('theme', savedTheme); + } +}); \ No newline at end of file diff --git a/src/assets/images/empty_pending.svg b/src/assets/images/empty_pending.svg index 32b734e14ef3adde93f4388128617c7bb6990444..7e8824e46a784c02628fc2243f1b0be031c665ca 100644 --- a/src/assets/images/empty_pending.svg +++ b/src/assets/images/empty_pending.svg @@ -38,8 +38,8 @@ - - + + diff --git a/src/assets/images/empty_running.svg b/src/assets/images/empty_running.svg index a7ca9663306915093aa4517a92dcf01ca1d0694f..02d0c7e754e07eabdd22c4e22861aa1f840ddf30 100644 --- a/src/assets/images/empty_running.svg +++ b/src/assets/images/empty_running.svg @@ -25,7 +25,7 @@ - + diff --git a/src/assets/svg/more.svg b/src/assets/svg/more.svg new file mode 100644 index 0000000000000000000000000000000000000000..69e80d3ccf78421b48d0a44d9317a1af8c67788d --- /dev/null +++ b/src/assets/svg/more.svg @@ -0,0 +1,13 @@ + + + Created with Pixso. + + + + + + + + + + diff --git a/src/assets/svg/more_hover.svg b/src/assets/svg/more_hover.svg new file mode 100644 index 0000000000000000000000000000000000000000..46cc8e87d64f938caaf0bd77212e6e6d75c2b9e0 --- /dev/null +++ b/src/assets/svg/more_hover.svg @@ -0,0 +1,13 @@ + + + Created with Pixso. + + + + + + + + + + diff --git a/src/components/CustomLoading/index.vue b/src/components/CustomLoading/index.vue index 61cad56667b40ae26e3673d830135dd0348046b3..f5067e504f652ffa761637d1172d7974f753e2f5 100644 --- a/src/components/CustomLoading/index.vue +++ b/src/components/CustomLoading/index.vue @@ -4,7 +4,7 @@ v-loading="loading" :class="loading ? 'customLoading' : 'loadingNone'" :element-loading-text="loadingText || `${$t('pageTipText.Loading')}...`" - :element-loading-background="dark?'rgba(122, 122, 122, 0.5)':'rgba(255, 255, 255, 0.7)'"> + :element-loading-background="backgroundColor"> diff --git a/src/components/EmptyStatus/index.vue b/src/components/EmptyStatus/index.vue index 790841207801d2a138c9f32538a0184b7dd6802a..e3f186413c9eaaed7d7e996bf4876df5af2c9e96 100644 --- a/src/components/EmptyStatus/index.vue +++ b/src/components/EmptyStatus/index.vue @@ -1,5 +1,5 @@ - +
diff --git a/src/views/dataSet/index.vue b/src/views/dataSet/index.vue index 40420809389f618577d2451794cbbab119ce5b21..2ea5d2dff0f783d8b09a3b7c5bab62f01c8a6890 100644 --- a/src/views/dataSet/index.vue +++ b/src/views/dataSet/index.vue @@ -1,5 +1,5 @@