소스 검색

!750 修复头部主题深色模式下,顶部工具栏的搜索、消息没有传主题色
Merge pull request !750 from 熊猫大侠/master

芋道源码 5 달 전
부모
커밋
2fcd5b081a
3개의 변경된 파일11개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 2
      src/components/RouterSearch/index.vue
  2. 6 1
      src/layout/components/Message/src/Message.vue
  3. 1 1
      src/layout/components/ToolHeader.vue

+ 4 - 2
src/components/RouterSearch/index.vue

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

+ 6 - 1
src/layout/components/Message/src/Message.vue

@@ -2,9 +2,14 @@
 import { formatDate } from '@/utils/formatTime'
 import * as NotifyMessageApi from '@/api/system/notify/message'
 import { useUserStoreWithOut } from '@/store/modules/user'
+import { propTypes } from '@/utils/propTypes'
 
 defineOptions({ name: 'Message' })
 
+defineProps({
+  color: propTypes.string.def('')
+})
+
 const { push } = useRouter()
 const userStore = useUserStoreWithOut()
 const activeName = ref('notice')
@@ -54,7 +59,7 @@ onMounted(() => {
     <ElPopover :width="400" placement="bottom" trigger="click">
       <template #reference>
         <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>
       </template>
       <ElTabs v-model="activeName">

+ 1 - 1
src/layout/components/ToolHeader.vue

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