GithubBackup/MyGoNavi
1
0
Fork 0
mirror of https://github.com/Syngnat/GoNavi.git synced 2026-08-12 01:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 fix(query-editor): 修复快捷执行与 Windows 输入丢字

Browse Source 
- 快捷执行仅由 Monaco 编辑器处理，保留 Shift+Home 反向选区和光标位置
- 缓冲并恢复 Windows 下丢失的可打印输入和延迟 IME 提交
- 降低 AI 行内补全预检与元数据刷新造成的编辑器输入抖动
- 补充快捷键、输入回退和 AI 补全回归测试
This commit is contained in:
Syngnat
2026-07-10 18:09:56 +08:00
parent 18f40753dd
commit be09808d1f
8 changed files with 812 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
frontend/src/components/QueryEditor.tsx
View File

@@ -159,6 +159,7 @@ import {
splitCompletionSchemaAndTable,
splitQueryIdentifierPathSegments,
stripCompletionIdentifierQuotes,
shouldHandleQueryEditorRunShortcutFallback,
} from './queryEditor/QueryEditorHelpers';
import {
buildQueryEditorAiInlineSuggestOptions,
@@ -168,6 +169,8 @@ import {
resolveInlineSqlGhostPreviewText,
resolveQueryEditorInlineMemoryInsertText,
resolveQueryEditorInlineCompletionIntentDetails,
resolveQueryEditorInlineLocalCompletion,
resolveQueryEditorInlineRuntimeReadiness,
shouldTriggerQueryEditorInlineObjectSuggestFallback,
shouldRequestQueryEditorInlineCompletion,
type QueryEditorAiApplyMode,
@@ -189,8 +192,9 @@ const QUERY_EDITOR_MONACO_FIND_OPTIONS = {
const QUERY_EDITOR_NATIVE_SELECT_CURRENT_LINE_EVENT = 'gonavi:native-select-current-line';
const QUERY_EDITOR_MAC_FIND_WITH_SELECTION_COMBO = 'Meta+E';
const QUERY_EDITOR_MAC_FIND_WITH_SELECTION_GUARD_ACTION_ID = 'gonavi.suppressMacFindWithSelection';
const QUERY_EDITOR_AI_INLINE_DEBOUNCE_MS = 90;
const QUERY_EDITOR_AI_INLINE_DEBOUNCE_MS = 220;
const QUERY_EDITOR_AI_INLINE_CONTEXT_KEY = 'gonaviAiInlineSuggestionVisible';
const QUERY_EDITOR_IME_FALLBACK_DELAY_MS = 80;
const normalizeQueryEditorInlineMemorySqlKey = (sql: string): string => (
String(sql || '')
@@ -3775,9 +3779,36 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
return;
}
try {
const aiContext = buildQueryEditorAiContext();
const localCompletion = resolveQueryEditorInlineLocalCompletion({
aiContext,
editorSnapshot,
deferEmptySchemaCompletion: true,
});
if (localCompletion.handled) {
if (localCompletion.insertText.trim()) {
renderAiInlineGhost(model, position, localCompletion.insertText, editorSnapshot);
}
return;
}
const aiService = getQueryEditorAiService();
const readiness = await resolveQueryEditorInlineRuntimeReadiness(aiService);
if (
!readiness.ready
|| requestId !== aiInlineGhostRequestSeqRef.current
|| editorRef.current !== editor
) {
return;
}
await ensureQueryEditorAiContextMetadata(editorSnapshot);
if (
requestId !== aiInlineGhostRequestSeqRef.current
|| editorRef.current !== editor
) {
return;
}
const insertText = await requestQueryEditorInlineCompletion({
service: getQueryEditorAiService(),
service: aiService,
aiContext: buildQueryEditorAiContext(),
editorSnapshot,
});
@@ -4061,7 +4092,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
if (nextPosition) {
editor.setPosition?.(nextPosition);
}
}, 0);
}, QUERY_EDITOR_IME_FALLBACK_DELAY_MS);
};
const handleEditorDragOver = (rawEvent: Event) => {
const event = rawEvent as DragEvent;
@@ -4223,6 +4254,10 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
if (recoverTriggerSqlAiCompletionFallback(event)) {
return;
}
if (imeCompositionFallbackTimerRef.current !== null) {
clearImeCompositionFallbackTimer();
syncQueryDraft(getEditorText());
}
const hasSlashCommandMarker = Array.isArray(event?.changes)
&& event.changes.some((change: any) => /__AI_\w+__/.test(String(change?.text || '')));
if (hasSlashCommandMarker) {
@@ -4458,6 +4493,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
id: 'gonavi.runQuery',
label: buildQueryEditorMonacoActionLabel('app.shortcuts.action.runQuery.label'),
keybindings: [keyBinding.keyMod | keyBinding.keyCode],
keybindingContext: 'editorTextFocus',
run: () => {
window.dispatchEvent(new CustomEvent('gonavi:run-active-query', {
detail: { requireSelection: true },
@@ -6730,11 +6766,17 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
return;
}
const editorHasFocus = !!editorRef.current?.hasTextFocus?.();
if (!editorHasFocus && !isEditableElement(event.target)) {
const targetNode = resolveEventTargetNode(event.target);
if (!shouldHandleQueryEditorRunShortcutFallback({
editorHasFocus,
targetNode,
editorPane: editorPaneRef.current,
})) {
return;
}
event.preventDefault();
event.stopPropagation();
event.stopImmediatePropagation?.();
void handleRunSelectedShortcut();
};
@@ -6851,6 +6893,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
id: 'gonavi.runQuery',
label: buildQueryEditorMonacoActionLabel('app.shortcuts.action.runQuery.label'),
keybindings: [keyBinding.keyMod | keyBinding.keyCode],
keybindingContext: 'editorTextFocus',
run: () => {
window.dispatchEvent(new CustomEvent('gonavi:run-active-query', {
detail: { requireSelection: true },