diff --git a/core/core-frontend/src/views/login/index.vue b/core/core-frontend/src/views/login/index.vue
index bf1eace67c..03ac31f688 100644
--- a/core/core-frontend/src/views/login/index.vue
+++ b/core/core-frontend/src/views/login/index.vue
@@ -469,6 +469,7 @@ onMounted(async () => {
     font-style: normal;
     font-weight: 400;
     line-height: 20px;
+    word-wrap: break-word;
   }
 
   .demo-tips {
diff --git a/core/core-frontend/src/views/system/font/index.vue b/core/core-frontend/src/views/system/font/index.vue
index eb5ec28846..f522ebf2ed 100644
--- a/core/core-frontend/src/views/system/font/index.vue
+++ b/core/core-frontend/src/views/system/font/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, computed } from 'vue'
 import UploadDetail from './UploadDetail.vue'
 import { deleteById, edit, list, defaultFont } from '@/api/font'
 import { ElMessage, ElMessageBox } from 'element-plus-secondary'
@@ -24,6 +24,12 @@ const listFont = () => {
     })
 }
 
+const fontListComputed = computed(() => {
+  return fontList.value.filter(ele => {
+    return ele.name?.toLocaleLowerCase().includes(fontKeyword.value.trim().toLocaleLowerCase())
+  })
+})
+
 const deleteFont = item => {
   if (item.isDefault) {
     ElMessage.warning('请先将其他字体设置为默认字体，再进行删除。')
@@ -130,7 +136,7 @@ onMounted(() => {
     </div>
     <div class="font-content_overflow">
       <div class="font-content_list">
-        <div class="font-content_item" v-for="ele in fontList" :key="ele">
+        <div class="font-content_item" v-for="ele in fontListComputed" :key="ele">
           <span v-if="ele.isDefault" class="font-default">默认字体</span>
           <div class="font-name">
             {{ ele.name }} <span v-if="ele.isBuiltin" class="font-type"> 系统内置 </span>