From ecad1c3e78f967db7c45a49b2bdee2a586f1c66c Mon Sep 17 00:00:00 2001 From: AN <1983933789@qq.com> Date: Fri, 5 Sep 2025 14:31:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?optimize(components):=20=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/modules/global-header/components/message-button.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/modules/global-header/components/message-button.vue b/src/layouts/modules/global-header/components/message-button.vue index d751d34d..c235481c 100644 --- a/src/layouts/modules/global-header/components/message-button.vue +++ b/src/layouts/modules/global-header/components/message-button.vue @@ -33,7 +33,7 @@ const toGitee = () => { - 消息 + {{ $t('page.home.message') }} Date: Fri, 5 Sep 2025 17:20:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?style(styles):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E6=A0=B7=E5=BC=8F=E5=AF=BC=E8=87=B4=E4=B8=8B?= =?UTF-8?q?=E5=88=92=E7=BA=BF=E4=B8=8D=E5=8F=AF=E8=A7=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/css/global.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/css/global.css b/src/styles/css/global.css index 51cf0ef6..384f823a 100644 --- a/src/styles/css/global.css +++ b/src/styles/css/global.css @@ -6,6 +6,7 @@ html, body, #app { height: 100%; + font-family: inherit; } html { From 378aa869bf933d72fa8be1112163483a1982d5c5 Mon Sep 17 00:00:00 2001 From: AN <1983933789@qq.com> Date: Mon, 8 Sep 2025 13:51:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?style(components):=20=E4=BF=AE=E6=94=B9json?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/custom/json-preview.vue | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/components/custom/json-preview.vue b/src/components/custom/json-preview.vue index 8b28a58b..e8158065 100644 --- a/src/components/custom/json-preview.vue +++ b/src/components/custom/json-preview.vue @@ -2,6 +2,7 @@ import { computed } from 'vue'; import hljs from 'highlight.js/lib/core'; import json from 'highlight.js/lib/languages/json'; +import { twMerge } from 'tailwind-merge'; hljs.registerLanguage('json', json); @@ -10,15 +11,19 @@ defineOptions({ }); interface Props { + class?: string; code?: string; showLineNumbers?: boolean; } const props = withDefaults(defineProps(), { + class: '', code: '', showLineNumbers: false }); +const DEFAULT_CLASS = 'max-h-500px'; + /** 格式化JSON数据 */ const jsonData = computed(() => { if (!props.code) return ''; @@ -33,9 +38,9 @@ const jsonData = computed(() => {