From ce282d36d67e6b0fee00f925b043fc7c841e68b3 Mon Sep 17 00:00:00 2001 From: purocean Date: Tue, 13 Jul 2021 22:51:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E7=BB=88=E7=AB=AF?= =?UTF-8?q?=E4=B8=BB=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- src/renderer/components/Xterm.vue | 7 +++---- src/renderer/shims-vue.d.ts | 1 + yarn.lock | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 64bdf022..f8da6d2e 100644 --- a/package.json +++ b/package.json @@ -101,6 +101,7 @@ "vue-tsc": "^0.0.24", "vuex": "^4.0.0-0", "xterm": "^4.13.0", - "xterm-addon-fit": "^0.5.0" + "xterm-addon-fit": "^0.5.0", + "xterm-theme": "^1.1.0" } } diff --git a/src/renderer/components/Xterm.vue b/src/renderer/components/Xterm.vue index 74fbb292..fb1e51f0 100644 --- a/src/renderer/components/Xterm.vue +++ b/src/renderer/components/Xterm.vue @@ -15,8 +15,9 @@ import { $args, FLAG_DEMO, FLAG_DISABLE_XTERM } from '@fe/support/global-args' import { toggleXterm } from '@fe/context/layout' import { registerAction, removeAction } from '@fe/context/action' import { getLogger } from '@fe/utils' -import 'xterm/css/xterm.css' import { getColorScheme } from '@fe/context/theme' +import { OneHalfLight, OneHalfDark } from 'xterm-theme' +import 'xterm/css/xterm.css' const logger = getLogger('component-x-term') @@ -42,9 +43,7 @@ export default defineComponent({ function changeTheme () { const dark = getColorScheme() === 'dark' - const background = dark ? '#2c2e2f' : '#fbfbfb' - const foreground = dark ? '#fbfbfb' : '#2c2e2f' - xterm!.setOption('theme', { background, foreground }) + xterm!.setOption('theme', dark ? OneHalfDark : OneHalfLight) } function input (data: string) { diff --git a/src/renderer/shims-vue.d.ts b/src/renderer/shims-vue.d.ts index bd8d970a..1cd8bcb0 100644 --- a/src/renderer/shims-vue.d.ts +++ b/src/renderer/shims-vue.d.ts @@ -21,3 +21,4 @@ declare module 'mermaid/dist/mermaid.js' declare module 'katex' declare module 'path-browserify' declare module 'luckyexcel' +declare module 'xterm-theme' diff --git a/yarn.lock b/yarn.lock index 6ab83a41..8b7f4f16 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6252,6 +6252,11 @@ xterm-addon-fit@^0.5.0: resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596" integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ== +xterm-theme@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/xterm-theme/-/xterm-theme-1.1.0.tgz#2e499c4dd6d2cf592c90389022095e1ce509bbbe" + integrity sha512-n2GocBEbqcz4vEl4OYkU93hEVia8GWdnqchiz/0nQ/olRUyhulGf4wfha23x/D2m0imWaIavRZtt8c6kWZXdsA== + xterm@^4.13.0: version "4.13.0" resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.13.0.tgz#7998de1e2ad92c4796fe45807be4f31061f3d9d1"