@veltra/desktop 1.2.17 → 1.2.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veltra/desktop",
-  "version": "1.2.17",
+  "version": "1.2.19",
   "files": [
     "dist",
     "src"
@@ -57,11 +57,11 @@
     "@cat-kit/core": ">=1.1.8",
     "@cat-kit/excel": ">=1.0.0",
     "@cat-kit/fe": "^1.1.8",
-    "@veltra/compositions": "1.2.17",
-    "@veltra/directives": "1.2.17",
-    "@veltra/icons": "1.2.17",
-    "@veltra/styles": "1.2.17",
-    "@veltra/utils": "1.2.17",
+    "@veltra/compositions": "1.2.19",
+    "@veltra/directives": "1.2.19",
+    "@veltra/icons": "1.2.19",
+    "@veltra/styles": "1.2.19",
+    "@veltra/utils": "1.2.19",
     "vue": ">=3.5.39"
   },
   "devDependencies": {

package/src/components/code-editor/code-editor.vue

@@ -20,9 +20,10 @@ import {
   type CSSProperties
 } from 'vue'
 
-import type { CodeEditorLang, CodeEditorProps } from '../../types'
+import type { CodeEditorProps } from '../../types'
 import { UScroll } from '../scroll'
 import { basicSetup } from './basic-setup'
+import { loadLanguage } from './lang-loaders'
 
 defineOptions({ name: 'UCodeEditor' })
 
@@ -58,13 +59,6 @@ const rootStyle = computed<CSSProperties>(() => ({
 const containerRef = useTemplateRef('container')
 const editor = shallowRef<EditorView | null>(null)
 
-const langLoaders: Record<CodeEditorLang, () => Promise<Extension>> = {
-  js: () => import('@codemirror/lang-javascript').then((m) => m.javascript({ typescript: true })),
-  sql: () => import('@codemirror/lang-sql').then((m) => m.sql()),
-  java: () => import('@codemirror/lang-java').then((m) => m.java()),
-  json: () => import('@codemirror/lang-json').then((m) => m.json())
-}
-
 const themeCompartment = new Compartment()
 const editableCompartment = new Compartment()
 const readOnlyCompartment = new Compartment()
@@ -161,7 +155,14 @@ async function applyLanguage() {
   if (!view) return
   const myToken = ++langToken
   const { language } = props
-  const ext = language ? await langLoaders[language]() : []
+
+  if (!language) {
+    if (myToken !== langToken || editor.value !== view) return
+    view.dispatch({ effects: langCompartment.reconfigure([]) })
+    return
+  }
+
+  const ext = await loadLanguage(language)
   if (myToken !== langToken || editor.value !== view) return
   view.dispatch({ effects: langCompartment.reconfigure(ext) })
 }

package/src/components/code-editor/lang-loaders.ts

@@ -0,0 +1,16 @@
+import type { Extension } from '@codemirror/state'
+
+import type { CodeEditorLang } from '../../types'
+
+/** 语言包动态加载器，新增语言只需在此注册一条 */
+const LANG_LOADERS: Record<CodeEditorLang, () => Promise<Extension>> = {
+  js: () => import('@codemirror/lang-javascript').then((m) => m.javascript({ typescript: true })),
+  sql: () => import('@codemirror/lang-sql').then((m) => m.sql()),
+  java: () => import('@codemirror/lang-java').then((m) => m.java()),
+  json: () => import('@codemirror/lang-json').then((m) => m.json())
+}
+
+/** 按需加载语言扩展；模块缓存由运行时保证，重复切换同一语言不会重复下载 */
+export function loadLanguage(lang: CodeEditorLang): Promise<Extension> {
+  return LANG_LOADERS[lang]()
+}