diff --git a/package.json b/package.json index a30537fbd758f9127eee8235cc13b8c862b46bf9..c9f0bfe8e68b2dcff256bd463afce282c1d0580f 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 5b3fc45e98b037b0d949679020539dba0ddd20f9..a4f2decf7c690170454bd6e6574470347130e612 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 {