From ae90546262a84dcfd90b5da370b56bd0774cc8f2 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Thu, 8 Oct 2026 14:51:56 +0800 Subject: [PATCH] fix(frontend): avoid false unsaved changes warnings --- .../src/composables/useModalShell.test.ts | 202 ++++++++++++++++++ frontend/src/composables/useModalShell.ts | 4 +- frontend/src/views/agent/AgentEditorModal.vue | 14 +- .../knowledge/settings/KBParserSettings.vue | 12 +- 4 files changed, 218 insertions(+), 14 deletions(-) create mode 100644 frontend/src/composables/useModalShell.test.ts diff --git a/frontend/src/composables/useModalShell.test.ts b/frontend/src/composables/useModalShell.test.ts new file mode 100644 index 00000000..17d7ebb6 --- /dev/null +++ b/frontend/src/composables/useModalShell.test.ts @@ -0,0 +1,202 @@ +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import { createRequire } from 'node:module' +import { runInNewContext } from 'node:vm' +import test from 'node:test' +import { compileScript, parse } from '@vue/compiler-sfc' +import ts from 'typescript' +import * as vue from 'vue' + +const require = createRequire(import.meta.url) +const renderer = vue.createRenderer({ + createElement: () => ({}), createText: () => ({}), createComment: () => ({}), + insert() {}, remove() {}, setElementText() {}, setText() {}, patchProp() {}, + parentNode: () => null, nextSibling: () => null, +}) + +function fixture() { + const dialogs: any[] = [] + const errors: unknown[][] = [] + const ui = vue.reactive({ showSettingsModal: false }) + const resources = { + agentTypePresets: [], promptTemplates: null, storageStatus: [], skillCatalog: [], + parserEngines: [ + { Name: 'builtin', Available: true, FileTypes: ['pdf', 'xlsx'] }, + { Name: 'anydoc', Available: true, FileTypes: ['pdf', 'xlsx'] }, + ], + async prefetchAgentEditorDeps() {}, async ensureSkills() {}, async ensureSkillCatalog() {}, + async ensureParserEngines(_force = false) {}, + } + const chat = { + allModels: [{ id: 'model', type: 'KnowledgeQA', is_default: true, capabilities: { thinking_levels: ['auto', 'high'] } }], + rawKnowledgeBases: [], webSearchProviders: [], sandboxConfigs: [], + async ensureModels() {}, async ensureKnowledgeBases() {}, + async ensureWebSearchProviders() {}, async ensureSandboxConfigs() {}, + } + const modules: Record = { + vue, + 'vue-i18n': { useI18n: () => ({ t: (key: string) => key, locale: vue.ref('en') }) }, + 'vue-router': { useRouter: () => ({}) }, + pinia: { storeToRefs: vue.toRefs }, + 'tdesign-vue-next': { + DialogPlugin: { confirm: (options: any) => { dialogs.push(options); return { destroy() {} } } }, + MessagePlugin: { success() {}, error() {}, warning() {} }, + }, + '@/stores/ui': { useUIStore: () => ui }, + '@/stores/auth': { useAuthStore: () => ({ hasRole: () => true }) }, + '@/stores/organization': { useOrganizationStore: () => ({ sharedKnowledgeBases: [] }) }, + '@/stores/chatResources': { useChatResourcesStore: () => chat }, + '@/stores/editorResources': { useEditorResourcesStore: () => resources }, + '@/stores/deploymentCapabilities': { + useDeploymentCapabilitiesStore: () => ({ isSupported: () => true, async ensureLoaded() {} }), + }, + '@/api/agent': { listIMChannels: async () => ({ data: [] }) }, + '@/api/embed': { listEmbedChannels: async () => ({ data: [] }) }, + '@/api/skill': {}, + '@/api/system': { isNamedSandboxBackend: () => true }, + '@/utils/clipboard': { copyWithToast() {} }, + } + function evaluate(code: string) { + const exports: any = {} + const compiled = ts.transpileModule(code, { + compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2022 }, + }).outputText + runInNewContext(compiled, { + exports, setTimeout, clearTimeout, + console: { ...console, error: (...args: unknown[]) => errors.push(args) }, + window: { addEventListener() {}, removeEventListener() {}, setInterval, clearInterval }, + require(name: string) { + if (modules[name]) return modules[name] + if (name.endsWith('.vue')) return { default: {} } + if (name.startsWith('@/')) return require('../' + name.slice(2)) + return require(name) + }, + }) + return exports + } + modules['@/composables/useModalShell'] = evaluate(readFileSync(new URL('./useModalShell.ts', import.meta.url), 'utf8')) + function mount(path: string, props: Record) { + const { descriptor } = parse(readFileSync(new URL(path, import.meta.url), 'utf8')) + const script = compileScript(descriptor, { id: 'dirty-test' }).content + .replace('__expose();', '') + .replace('return __returned__', '__expose(__returned__); return __returned__') + const component = evaluate(script).default + component.render = () => null + const instance = vue.ref() + const app = renderer.createApp({ render: () => vue.h(component, { ...props, ref: instance }) }) + app.mount({}) + return { vm: instance.value, unmount: () => { app.unmount(); assert.deepEqual(errors, []) } } + } + return { mount, dialogs, resources, ui } +} + +async function settle() { + // Drain asynchronous resource loading plus the Vue watchers it triggers. + await new Promise(resolve => setImmediate(resolve)) + await vue.nextTick() +} + +for (const mode of ['edit', 'create'] as const) { + test(`${mode}: initialization stays clean, while real edits require confirmation`, async () => { + const f = fixture() + const props = vue.reactive({ + visible: false, mode, + agent: { id: 'agent', name: 'Original', config: { model_id: 'model', thinking: false } }, + 'onUpdate:visible': (value: boolean) => { props.visible = value }, + }) + const { vm, unmount } = f.mount('../views/agent/AgentEditorModal.vue', props) + try { + props.visible = true + await settle() + assert.equal(vm.editorInitializing, false) + assert.equal(vm.formData.config.reasoning_effort, 'auto', 'always-on model normalizes the initial off value') + assert.equal(vm.modalShell.isDirty(), false) + vm.modalShell.requestClose() + assert.equal(props.visible, false) + assert.equal(f.dialogs.length, 0) + await settle() + props.visible = true + await settle() + const name = vm.formData.name + vm.formData.name = 'Changed' + await vue.nextTick() + vm.modalShell.requestClose() + assert.equal(f.dialogs.length, 1) + assert.equal(props.visible, true) + f.dialogs[0].onClose() + vm.formData.name = name + await vue.nextTick() + assert.equal(vm.modalShell.isDirty(), false, 'reverting an edit restores the clean state') + vm.formData.config.temperature += 0.1 + vm.modalShell.requestClose() + assert.equal(f.dialogs.length, 2) + f.dialogs[1].onConfirm() + assert.equal(props.visible, false) + } finally { unmount() } + }) +} + +test('closing during initialization does not warn or let a stale load replace the next baseline', async () => { + const f = fixture() + let release!: () => void + const pending = new Promise(resolve => { release = resolve }) + f.resources.ensureSkills = () => pending + const props = vue.reactive({ + visible: false, mode: 'edit', agent: { id: 'agent', name: 'Original', config: { model_id: 'model' } }, + 'onUpdate:visible': (value: boolean) => { props.visible = value }, + }) + const { vm, unmount } = f.mount('../views/agent/AgentEditorModal.vue', props) + try { + props.visible = true + await settle() + assert.equal(vm.editorInitializing, true) + vm.modalShell.requestClose() + assert.equal(props.visible, false) + assert.equal(f.dialogs.length, 0) + await settle() + f.resources.ensureSkills = async () => {} + props.visible = true + await settle() + vm.formData.name = 'Keep this edit' + release() + await settle() + assert.equal(vm.modalShell.isDirty(), true) + } finally { release(); unmount() } +}) + +for (const savedRules of [[], [{ file_types: ['xlsx'], engine: 'builtin', xlsx_first_row_as_header: true }]]) { + test(`parser loading and refresh preserve ${savedRules.length ? 'partial' : 'empty'} saved rules`, async () => { + const f = fixture() + let release!: () => void + f.resources.ensureParserEngines = () => new Promise(resolve => { release = resolve }) + const updates: any[] = [] + const props = vue.reactive({ + parserEngineRules: savedRules, + 'onUpdate:parserEngineRules': (rules: any[]) => { updates.push(rules); props.parserEngineRules = rules }, + }) + const { vm, unmount } = f.mount('../views/knowledge/settings/KBParserSettings.vue', props) + try { + release() + await settle() + assert.equal(vm.getEngineForGroup(['pdf']), 'anydoc', 'defaults are still displayed') + assert.equal(updates.length, 0, 'loading must not mutate the parent form') + f.ui.showSettingsModal = true + await vue.nextTick() + f.ui.showSettingsModal = false + await vue.nextTick() + release() + await settle() + assert.equal(updates.length, 0, 'refreshing available engines is not a user edit') + vm.handleEngineChange(['pdf'], 'builtin') + await vue.nextTick() + assert.equal(updates.length, 1) + assert.equal(updates[0].find((r: any) => r.file_types.includes('pdf')).engine, 'builtin') + if (savedRules.length) { + assert.equal(updates[0].find((r: any) => r.file_types.includes('xlsx')).xlsx_first_row_as_header, true) + } + vm.handleXLSXFirstRowAsHeaderChange(['xlsx'], false) + assert.equal(updates.length, 2) + assert.equal(updates[1].find((r: any) => r.file_types.includes('xlsx')).xlsx_first_row_as_header, false) + } finally { unmount() } + }) +} diff --git a/frontend/src/composables/useModalShell.ts b/frontend/src/composables/useModalShell.ts index 5cb86970..39936518 100644 --- a/frontend/src/composables/useModalShell.ts +++ b/frontend/src/composables/useModalShell.ts @@ -23,6 +23,8 @@ export interface ModalShellOptions { close: () => void /** 参与 dirty 比较的数据;不传则不做未保存提示 */ snapshot?: () => unknown + /** 加载期间表单不可编辑,初始化赋值不算未保存修改 */ + loading?: () => boolean /** 返回 true 时跳过 Esc(例如组件内部自绘的弹层正打开) */ ignoreEscape?: () => boolean } @@ -58,7 +60,7 @@ export function useModalShell(options: ModalShellOptions) { } const isDirty = () => { - if (!options.snapshot) return false + if (!options.snapshot || options.loading?.()) return false return serialize(options.snapshot()) !== cleanSnapshot } diff --git a/frontend/src/views/agent/AgentEditorModal.vue b/frontend/src/views/agent/AgentEditorModal.vue index 3d4b96ea..26a4a702 100644 --- a/frontend/src/views/agent/AgentEditorModal.vue +++ b/frontend/src/views/agent/AgentEditorModal.vue @@ -3456,7 +3456,7 @@ const reasoningEffortLevel = computed({ // 只在模型真正解析出来之后才夹:模型列表异步加载期间 capabilities 还是 undefined, // 此时的通用梯度会把已保存的 max/xhigh 误降级成 auto。 const clampReasoningEffortToModel = () => { - if (editorInitializing.value || !selectedChatModel.value) return; + if (!selectedChatModel.value) return; const clamped = clampLevel(reasoningEffortLevel.value, reasoningEffortOptions.value); if (clamped !== reasoningEffortLevel.value) reasoningEffortLevel.value = clamped; }; @@ -3466,7 +3466,9 @@ watch( formData.value.config.model_id, reasoningEffortOptions.value.join(','), ].join('|'), - () => clampReasoningEffortToModel(), + () => { + if (!editorInitializing.value) clampReasoningEffortToModel(); + }, { immediate: true }, ); @@ -3670,8 +3672,13 @@ watch(() => props.visible, async (val) => { console.error('Failed to initialize agent editor', error); } finally { if (generation === editorInitializationGeneration && props.visible) { - editorInitializing.value = false; + // Model normalization and queued form watchers belong to initialization, + // so capture the baseline only after they have settled. + clampReasoningEffortToModel(); + await nextTick(); + if (generation !== editorInitializationGeneration || !props.visible) return; modalShell.markClean(); + editorInitializing.value = false; } } } else { @@ -4062,6 +4069,7 @@ const handleClose = () => { const modalShell = useModalShell({ visible: () => props.visible, + loading: () => editorInitializing.value, close: handleClose, snapshot: () => formData.value, ignoreEscape: () => diff --git a/frontend/src/views/knowledge/settings/KBParserSettings.vue b/frontend/src/views/knowledge/settings/KBParserSettings.vue index 107eb2db..860299ff 100644 --- a/frontend/src/views/knowledge/settings/KBParserSettings.vue +++ b/frontend/src/views/knowledge/settings/KBParserSettings.vue @@ -310,19 +310,11 @@ async function loadEngines(force = false) { parserEngines.value = [] } finally { loading.value = false - ensureCompleteRules() - } -} - -function ensureCompleteRules() { - if (!parserEngines.value.length) return - const complete = buildCompleteRules() - if (complete.length && complete.length > localEngineRules.value.length) { - localEngineRules.value = complete - emit('update:parserEngineRules', complete) } } +// Missing rules display getDefaultEngine() without turning a read-only visit +// into a form edit. Only explicit user changes emit the completed rules. onMounted(loadEngines) const { showSettingsModal } = storeToRefs(uiStore)