fix: go embed error

TheTNB · Oct 22, 2024 · 6e3db10 · 6e3db10
1 parent 8184347
commit 6e3db10
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 5 deletions.
diff --git a/internal/bootstrap/conf.go b/internal/bootstrap/conf.go
@@ -26,7 +26,7 @@ func initConf() {
 
 func initGlobal() {
 	app.Root = app.Conf.MustString("app.root")
-	app.Version = "2.3.11"
+	app.Version = "2.3.12"
 	app.Locale = app.Conf.MustString("app.locale")
 
 	// 初始化时区

diff --git a/internal/embed/embed.go b/internal/embed/embed.go
@@ -2,8 +2,8 @@ package embed
 
 import "embed"
 
-//go:embed frontend/*
+//go:embed all:frontend/*
 var PublicFS embed.FS
 
-//go:embed website/*
+//go:embed all:website/*
 var WebsiteFS embed.FS
diff --git a/web/package.json b/web/package.json
@@ -28,6 +28,7 @@
     "@xterm/addon-attach": "^0.11.0",
     "@xterm/addon-clipboard": "^0.1.0",
     "@xterm/addon-fit": "^0.10.0",
+    "@xterm/addon-unicode11": "^0.8.0",
     "@xterm/addon-web-links": "^0.11.0",
     "@xterm/addon-webgl": "^0.18.0",
     "@xterm/xterm": "^5.5.0",

diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
diff --git a/web/src/views/ssh/IndexView.vue b/web/src/views/ssh/IndexView.vue
@@ -13,11 +13,11 @@ import '@fontsource/jetbrains-mono/400.css'
 import { AttachAddon } from '@xterm/addon-attach'
 import { ClipboardAddon } from '@xterm/addon-clipboard'
 import { FitAddon } from '@xterm/addon-fit'
+import { Unicode11Addon } from '@xterm/addon-unicode11'
 import { WebLinksAddon } from '@xterm/addon-web-links'
 import { WebglAddon } from '@xterm/addon-webgl'
 import { Terminal } from '@xterm/xterm'
 import '@xterm/xterm/css/xterm.css'
-import type { MenuOption } from 'naive-ui'
 import { NButton, NFlex, NPopconfirm } from 'naive-ui'
 
 const terminal = ref<HTMLElement | null>(null)
@@ -32,7 +32,7 @@ const create = ref(false)
 const update = ref(false)
 const updateId = ref(0)
 
-const list = ref<MenuOption[]>([])
+const list = ref<any[]>([])
 
 const fetchData = async () => {
   list.value = []
@@ -129,6 +129,7 @@ const openSession = async (id: number) => {
   await ws.ssh(id).then((ws) => {
     sshWs = ws
     term.value = new Terminal({
+      allowProposedApi: true,
       lineHeight: 1.2,
       fontSize: 14,
       fontFamily: 'JetBrains Mono',
@@ -142,6 +143,8 @@ const openSession = async (id: number) => {
     term.value.loadAddon(fitAddon)
     term.value.loadAddon(new ClipboardAddon())
     term.value.loadAddon(new WebLinksAddon())
+    term.value.loadAddon(new Unicode11Addon())
+    term.value.unicode.activeVersion = '11'
     term.value.loadAddon(webglAddon)
     webglAddon.onContextLoss(() => {
       webglAddon.dispose()