From 935b456c3c75429ad0804ad06bb9d97ce0341245 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Mon, 14 Sep 2026 18:13:33 +0800 Subject: [PATCH] fix(skills): isolate skill drops from global file uploads --- frontend/src/views/platform/fileDrop.test.mjs | 140 ++++++++++++++++++ frontend/src/views/platform/index.vue | 30 +++- 2 files changed, 162 insertions(+), 8 deletions(-) create mode 100644 frontend/src/views/platform/fileDrop.test.mjs diff --git a/frontend/src/views/platform/fileDrop.test.mjs b/frontend/src/views/platform/fileDrop.test.mjs new file mode 100644 index 00000000..39401deb --- /dev/null +++ b/frontend/src/views/platform/fileDrop.test.mjs @@ -0,0 +1,140 @@ +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import { runInNewContext } from 'node:vm' +import test from 'node:test' +import ts from 'typescript' +import { ref } from 'vue' + +const source = readFileSync(new URL('./index.vue', import.meta.url), 'utf8') +const handlers = ts.transpile(source.slice( + source.indexOf('let dragCounter = 0'), + source.indexOf('// 组件挂载时添加全局事件监听器'), +)) + +function fixture(name, { kbId, settingsOpen = false } = {}) { + const route = { name, params: { kbId } } + const uiStore = { showSettingsModal: settingsOpen } + const ismask = ref(false) + const messages = [] + const requests = [] + const dispatched = [] + let collected = 0 + const api = runInNewContext(`${handlers}; ({ + handleGlobalDragEnter, handleGlobalDragOver, handleGlobalDragLeave, handleGlobalDrop, + })`, { + route, uiStore, ismask, + t: key => key, + MessagePlugin: { + error: message => messages.push(message), + warning: message => messages.push(message), + }, + collectDroppedFiles: async event => { collected++; return event.dataTransfer.files }, + getKnowledgeBaseById: async id => { + requests.push(id) + return { data: { summary_model_id: 'chat-model', embedding_model_id: 'embedding-model' } } + }, + CustomEvent: class { + constructor(type, options) { this.type = type; this.detail = options.detail } + }, + window: { dispatchEvent: event => dispatched.push(event) }, + }) + return { ...api, route, uiStore, ismask, messages, requests, dispatched, collected: () => collected } +} + +function fileDrag(types = ['Files']) { + return { + dataTransfer: { types, files: [{ name: 'skill.zip' }] }, + defaultPrevented: false, + propagationStopped: false, + preventDefault() { this.defaultPrevented = true }, + stopPropagation() { this.propagationStopped = true }, + } +} + +test('skill ZIP drops on settings never enter knowledge upload or consume the local drop', async () => { + const f = fixture('settings') + for (let attempt = 0; attempt < 3; attempt++) { + const event = fileDrag() + f.handleGlobalDragEnter(event) + f.handleGlobalDragOver(event) + await f.handleGlobalDrop(event) + assert.equal(f.ismask.value, false) + assert.equal(event.propagationStopped, false) + assert.deepEqual(f.messages, []) + assert.deepEqual(f.requests, []) + assert.deepEqual(f.dispatched, []) + assert.equal(f.collected(), 0) + } +}) + +test('settings opened over a knowledge base or chat own their file drops', async () => { + for (const name of ['knowledgeBaseDetail', 'chat', 'globalCreatChat', 'kbCreatChat']) { + const f = fixture(name, { kbId: 'kb-1', settingsOpen: true }) + const event = fileDrag() + f.handleGlobalDragEnter(event) + await f.handleGlobalDrop(event) + assert.equal(f.ismask.value, false) + assert.equal(event.propagationStopped, false) + assert.deepEqual(f.messages, []) + assert.deepEqual(f.requests, []) + assert.deepEqual(f.dispatched, []) + assert.equal(f.collected(), 0) + } +}) + +test('unrelated pages and a knowledge route without an ID ignore global upload', async () => { + for (const name of ['knowledgeBaseList', 'agentList', 'organizationList', 'knowledgeBaseDetail']) { + const f = fixture(name) + f.handleGlobalDragEnter(fileDrag()) + await f.handleGlobalDrop(fileDrag()) + assert.equal(f.ismask.value, false) + assert.deepEqual(f.messages, []) + assert.equal(f.collected(), 0) + } +}) + +test('knowledge file drops still validate initialization and reach the knowledge page', async () => { + const f = fixture('knowledgeBaseDetail', { kbId: 'kb-1' }) + const event = fileDrag() + f.handleGlobalDragEnter(event) + assert.equal(f.ismask.value, true) + await f.handleGlobalDrop(event) + assert.equal(f.ismask.value, false) + assert.deepEqual(f.requests, ['kb-1']) + assert.equal(f.dispatched[0].type, 'weknora:knowledge-file-drop') + assert.equal(f.dispatched[0].detail.kbId, 'kb-1') + assert.equal(f.dispatched[0].detail.files, event.dataTransfer.files) +}) + +test('chat file drops still dispatch attachments without knowledge initialization', async () => { + for (const name of ['chat', 'globalCreatChat', 'kbCreatChat']) { + const f = fixture(name, { kbId: 'kb-1' }) + const event = fileDrag() + await f.handleGlobalDrop(event) + assert.deepEqual(f.requests, []) + assert.deepEqual(f.messages, []) + assert.equal(f.dispatched[0].type, 'weknora:chat-file-drop') + assert.equal(f.dispatched[0].detail.files, event.dataTransfer.files) + } +}) + +test('in-app text drags do not activate upload', async () => { + const f = fixture('knowledgeBaseDetail', { kbId: 'kb-1' }) + const event = fileDrag(['text/plain']) + f.handleGlobalDragEnter(event) + await f.handleGlobalDrop(event) + assert.equal(event.defaultPrevented, false) + assert.equal(f.ismask.value, false) + assert.equal(f.collected(), 0) +}) + +test('opening settings during a drag clears the global upload mask', async () => { + const f = fixture('chat') + f.handleGlobalDragEnter(fileDrag()) + assert.equal(f.ismask.value, true) + f.uiStore.showSettingsModal = true + f.handleGlobalDragOver(fileDrag()) + assert.equal(f.ismask.value, false) + await f.handleGlobalDrop(fileDrag()) + assert.deepEqual(f.dispatched, []) +}) diff --git a/frontend/src/views/platform/index.vue b/frontend/src/views/platform/index.vue index 4a7cfe74..cb7ec523 100644 --- a/frontend/src/views/platform/index.vue +++ b/frontend/src/views/platform/index.vue @@ -29,6 +29,7 @@ import GlobalInvitationBell from '@/components/GlobalInvitationBell.vue' import NewUserGuide from '@/components/NewUserGuide.vue' import { useCommandPaletteStore } from '@/stores/commandPalette' import { useChatResourcesStore } from '@/stores/chatResources' +import { useUIStore } from '@/stores/ui' import { getKnowledgeBaseById } from '@/api/knowledge-base/index' import { MessagePlugin } from 'tdesign-vue-next' import { useI18n } from 'vue-i18n' @@ -37,6 +38,7 @@ import { collectDroppedFiles } from './collectDroppedFiles' const route = useRoute(); const router = useRouter(); const commandPaletteStore = useCommandPaletteStore(); +const uiStore = useUIStore(); let ismask = ref(false) const { t } = useI18n(); @@ -119,10 +121,25 @@ const isFileDrag = (event: DragEvent): boolean => { return Array.from(types).includes('Files') } +const shouldHandleGlobalFileDrag = (event: DragEvent): boolean => { + if (!isFileDrag(event)) return false; + // Keep the browser from opening dropped files, even outside upload pages. + event.preventDefault(); + // Settings and its teleported skill drawers own their uploads. This runs + // in document capture, before a local drop handler can stop propagation. + const enabled = !uiStore.showSettingsModal && ( + isChatDropRoute() || (route.name === 'knowledgeBaseDetail' && !!getCurrentKbId()) + ); + if (!enabled) { + dragCounter = 0; + ismask.value = false; + } + return enabled; +} + // 全局拖拽事件处理 const handleGlobalDragEnter = (event: DragEvent) => { - if (!isFileDrag(event)) return; - event.preventDefault(); + if (!shouldHandleGlobalFileDrag(event)) return; dragCounter++; if (event.dataTransfer) { event.dataTransfer.effectAllowed = 'all'; @@ -131,16 +148,14 @@ const handleGlobalDragEnter = (event: DragEvent) => { } const handleGlobalDragOver = (event: DragEvent) => { - if (!isFileDrag(event)) return; - event.preventDefault(); + if (!shouldHandleGlobalFileDrag(event)) return; if (event.dataTransfer) { event.dataTransfer.dropEffect = 'copy'; } } const handleGlobalDragLeave = (event: DragEvent) => { - if (!isFileDrag(event)) return; - event.preventDefault(); + if (!shouldHandleGlobalFileDrag(event)) return; dragCounter--; if (dragCounter === 0) { ismask.value = false; @@ -148,8 +163,7 @@ const handleGlobalDragLeave = (event: DragEvent) => { } const handleGlobalDrop = async (event: DragEvent) => { - if (!isFileDrag(event)) return; - event.preventDefault(); + if (!shouldHandleGlobalFileDrag(event)) return; dragCounter = 0; ismask.value = false;