From c9229319d6839e1052ac0fa89928f5c02f21fdaa Mon Sep 17 00:00:00 2001 From: qianmoQ Date: Fri, 29 Aug 2025 23:26:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20(core):=20=E4=BF=AE=E5=A4=8D=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E5=B8=AE=E5=8A=A9=E6=8F=90=E7=A4=BA=E6=A1=86=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E7=99=BD=E8=89=B2=E8=83=8C=E6=99=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ README.md | 2 +- src-tauri/src/plugins/shell.rs | 2 +- src/composables/useCodeMirrorFunctionHelp.ts | 23 +++++++++++++------- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 1c1c5de..df87552 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ pnpm-lock.yaml *.json !config*.json go.mod +.RData +.Rhistory diff --git a/README.md b/README.md index 22b51d9..c7a6368 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ CodeForge 是一款轻量级、高性能的桌面代码执行器，专为开发 Java JavaScript (Browser) JavaScript (jQuery) - JavaScript (Node.js) + JavaScript (Node.js) Kotlin Node.js PHP diff --git a/src-tauri/src/plugins/shell.rs b/src-tauri/src/plugins/shell.rs index 9f62d81..00587e6 100644 --- a/src-tauri/src/plugins/shell.rs +++ b/src-tauri/src/plugins/shell.rs @@ -9,7 +9,7 @@ impl LanguagePlugin for ShellPlugin { } fn get_language_name(&self) -> &'static str { - "Shell" + "ShellScript" } fn get_language_key(&self) -> &'static str { diff --git a/src/composables/useCodeMirrorFunctionHelp.ts b/src/composables/useCodeMirrorFunctionHelp.ts index a4dc2d5..a81153e 100644 --- a/src/composables/useCodeMirrorFunctionHelp.ts +++ b/src/composables/useCodeMirrorFunctionHelp.ts @@ -1,5 +1,7 @@ -import { EditorView, hoverTooltip } from '@codemirror/view' +import {EditorView, hoverTooltip} from '@codemirror/view' + 1 + export function useCodeMirrorFunctionHelp() { // 提示框 @@ -10,7 +12,7 @@ export function useCodeMirrorFunctionHelp() dom.innerHTML = `
- ${ text } + ${text}
@@ -19,12 +21,12 @@ export function useCodeMirrorFunctionHelp()
` - return { dom } + return {dom} } // 显示函数提示扩展 const showFunctionHelpHover = hoverTooltip((view, pos, side) => { - let { from, to, text } = view.state.doc.lineAt(pos) + let {from, to, text} = view.state.doc.lineAt(pos) let start = pos, end = pos while (start > from && /\w/.test(text[start - from - 1])) { start-- @@ -44,7 +46,7 @@ export function useCodeMirrorFunctionHelp() return createHelpTooltip(text.slice(start - from, end - from)) } } - }, { hoverTime: 300 }) + }, {hoverTime: 300}) // 提示框样式主题 const functionHelpTheme = EditorView.theme({ @@ -53,11 +55,16 @@ export function useCodeMirrorFunctionHelp() animation: 'fadeIn 0.2s ease-out' }, '.cm-tooltip': { - border: 'none !important' + border: 'none !important', + backgroundColor: 'transparent !important', + boxShadow: 'none !important' + }, + '.cm-tooltip-arrow': { + display: 'none !important' }, '@keyframes fadeIn': { - 'from': { opacity: '0', transform: 'translateY(-2px)' }, - 'to': { opacity: '1', transform: 'translateY(0)' } + 'from': {opacity: '0', transform: 'translateY(-2px)'}, + 'to': {opacity: '1', transform: 'translateY(0)'} } }) From a78acf49cea6c2907c5f47eb3632f68826575ace Mon Sep 17 00:00:00 2001 From: qianmoQ Date: Fri, 29 Aug 2025 23:37:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20(core):=20=E4=BF=AE=E5=A4=8D=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=8F=90=E7=A4=BA=E5=8D=95=E8=AF=8D=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=B7=B7=E4=B9=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/composables/useCodeMirrorFunctionHelp.ts | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/composables/useCodeMirrorFunctionHelp.ts b/src/composables/useCodeMirrorFunctionHelp.ts index a81153e..aa367ef 100644 --- a/src/composables/useCodeMirrorFunctionHelp.ts +++ b/src/composables/useCodeMirrorFunctionHelp.ts @@ -1,20 +1,17 @@ import {EditorView, hoverTooltip} from '@codemirror/view' -1 - export function useCodeMirrorFunctionHelp() { // 提示框 const createHelpTooltip = (text: string) => { const dom = document.createElement('div') - dom.className = 'cm-function-help-tooltip' + dom.className = 'cm-custom-function-tooltip' dom.innerHTML = `
${text}
-
@@ -50,18 +47,15 @@ export function useCodeMirrorFunctionHelp() // 提示框样式主题 const functionHelpTheme = EditorView.theme({ - '.cm-function-help-tooltip': { + '.cm-custom-function-tooltip': { zIndex: '100', animation: 'fadeIn 0.2s ease-out' }, - '.cm-tooltip': { - border: 'none !important', + '.cm-tooltip.cm-tooltip-hover': { backgroundColor: 'transparent !important', + border: 'none !important', boxShadow: 'none !important' }, - '.cm-tooltip-arrow': { - display: 'none !important' - }, '@keyframes fadeIn': { 'from': {opacity: '0', transform: 'translateY(-2px)'}, 'to': {opacity: '1', transform: 'translateY(0)'}