!750 修复头部主题深色模式下,顶部工具栏的搜索、消息没有传主题色

Merge pull request !750 from 熊猫大侠/master
pull/813/head
芋道源码 2025-08-16 12:34:02 +00:00 committed by Gitee
commit 2fcd5b081a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 11 additions and 4 deletions

View File

@ -18,7 +18,7 @@
</el-select> </el-select>
</ElDialog> </ElDialog>
<div v-else class="custom-hover" @click.stop="showTopSearch = !showTopSearch"> <div v-else class="custom-hover" @click.stop="showTopSearch = !showTopSearch">
<Icon icon="ep:search" /> <Icon icon="ep:search" :color="color"/>
<el-select <el-select
@click.stop @click.stop
filterable filterable
@ -41,11 +41,13 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { propTypes } from '@/utils/propTypes'
defineProps({ defineProps({
isModal: { isModal: {
type: Boolean, type: Boolean,
default: true default: true
} },
color: propTypes.string.def('')
}) })
const router = useRouter() // const router = useRouter() //

View File

@ -2,9 +2,14 @@
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import * as NotifyMessageApi from '@/api/system/notify/message' import * as NotifyMessageApi from '@/api/system/notify/message'
import { useUserStoreWithOut } from '@/store/modules/user' import { useUserStoreWithOut } from '@/store/modules/user'
import { propTypes } from '@/utils/propTypes'
defineOptions({ name: 'Message' }) defineOptions({ name: 'Message' })
defineProps({
color: propTypes.string.def('')
})
const { push } = useRouter() const { push } = useRouter()
const userStore = useUserStoreWithOut() const userStore = useUserStoreWithOut()
const activeName = ref('notice') const activeName = ref('notice')
@ -54,7 +59,7 @@ onMounted(() => {
<ElPopover :width="400" placement="bottom" trigger="click"> <ElPopover :width="400" placement="bottom" trigger="click">
<template #reference> <template #reference>
<ElBadge :is-dot="unreadCount > 0" class="item"> <ElBadge :is-dot="unreadCount > 0" class="item">
<Icon :size="18" class="cursor-pointer" icon="ep:bell" @click="getList" /> <Icon :size="18" class="cursor-pointer" icon="ep:bell" :color="color" @click="getList" />
</ElBadge> </ElBadge>
</template> </template>
<ElTabs v-model="activeName"> <ElTabs v-model="activeName">

View File

@ -73,7 +73,7 @@ export default defineComponent({
{screenfull.value ? ( {screenfull.value ? (
<Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull> <Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull>
) : undefined} ) : undefined}
{search.value ? <RouterSearch isModal={false} /> : undefined} {search.value ? <RouterSearch isModal={false} color="var(--top-header-text-color)"/> : undefined}
{size.value ? ( {size.value ? (
<SizeDropdown class="custom-hover" color="var(--top-header-text-color)"></SizeDropdown> <SizeDropdown class="custom-hover" color="var(--top-header-text-color)"></SizeDropdown>
) : undefined} ) : undefined}