From e374f83007f42cca70c02ec5ad839545335e0b87 Mon Sep 17 00:00:00 2001 From: yaojn Date: Fri, 18 Jul 2025 16:24:51 +0800 Subject: [PATCH] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=85=8D=E7=BD=AE=E7=BB=84=E4=BB=B6=EF=BC=9A?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=85=8D=E7=BD=AE=E5=AF=B9=E6=AF=94=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1467978955063296?= =?UTF-8?q?]=E8=A1=A8=E5=8D=95=E5=8F=91=E5=B8=83=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=9A=E6=96=B0=E5=A2=9E=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E5=8A=9F=E8=83=BD=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/14?= =?UTF-8?q?67978955063296?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/resources/assets/css/theme.less | 65 +++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/package.json b/package.json index a30537fb..c9f0bfe8 100755 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "particles.vue": "^2.42.2", "qs": "^6.11.2", "save": "^2.4.0", + "v-code-diff": "^1.13.1", "vue": "^2.7.16", "vue-codemirror": "^4.0.6", "vue-cropper": "^0.5.6", diff --git a/src/resources/assets/css/theme.less b/src/resources/assets/css/theme.less index 5b3fc45e..a4f2decf 100644 --- a/src/resources/assets/css/theme.less +++ b/src/resources/assets/css/theme.less @@ -4119,6 +4119,71 @@ } } } + + // code-diff 对比样式 + .code-diff-view { + border: 1px solid var(--border-color, @border-color-base); + background-color: @op-color; + .file-header { + background-color: @background-color; + border-bottom: 1px solid var(--border-color, @border-color-base); + .file-info { + .info-left, + .info-right { + color: @text-color; + } + } + } + .file-diff-split { + .blob-code + .blob-num { + border-left: 1px solid var(--border-color, @border-color-base); + } + } + .diff-table { + .blob-num-deletion, + .blob-code-deletion { + background-color: #fdd; + } + .blob-code-deletion, + .blob-code-addition { + .hljs-regexp, + .hljs-attr, + .hljs-attribute, + .hljs-literal, + .hljs-meta, + .hljs-number, + .hljs-string, + .hljs-operator, + .hljs-variable, + .hljs-punctuation, + .hljs-selector-attr, + .hljs-selector-class, + .hljs-selector-id { + color: #212121 !important; // 新增删除高亮行保持黑色,确保字体可见 + } + } + .blob-code { + .blob-code-inner { + color: @text-color; + } + } + } + .hljs-regexp, + .hljs-attr, + .hljs-attribute, + .hljs-literal, + .hljs-meta, + .hljs-number, + .hljs-string, + .hljs-operator, + .hljs-variable, + .hljs-punctuation, + .hljs-selector-attr, + .hljs-selector-class, + .hljs-selector-id { + color: @text-color !important; + } + } } .theme-dark { -- Gitee