From 18d7a6b3d30c70fef8e901d2f63622dc23cd1fcc Mon Sep 17 00:00:00 2001 From: wizardchen Date: Fri, 3 Jul 2026 18:37:16 +0800 Subject: [PATCH] Fix manual knowledge editor publish flow --- .../components/manual-knowledge-editor.vue | 225 ++++++++++++++---- .../src/components/settings/SettingDrawer.vue | 14 +- .../components/UploadConfirmDialog.vue | 2 +- 3 files changed, 183 insertions(+), 58 deletions(-) diff --git a/frontend/src/components/manual-knowledge-editor.vue b/frontend/src/components/manual-knowledge-editor.vue index 560951c9..bc52ead1 100644 --- a/frontend/src/components/manual-knowledge-editor.vue +++ b/frontend/src/components/manual-knowledge-editor.vue @@ -68,6 +68,7 @@ const visible = computed({ const mode = computed(() => uiStore.manualEditorMode) const knowledgeId = computed(() => uiStore.manualEditorKnowledgeId) +const currentKnowledgeId = ref(null) const form = reactive({ kbId: '' as string, @@ -382,7 +383,7 @@ const toolbarGroups = computed(() => [ ]) const isPreviewMode = computed(() => activeTab.value === 'preview') -const viewToggleIcon = computed(() => (isPreviewMode.value ? 'edit' : 'view-module')) +const viewToggleIcon = computed(() => (isPreviewMode.value ? 'edit-1' : 'browse')) const viewToggleLabel = computed(() => isPreviewMode.value ? t('manualEditor.view.editLabel') : t('manualEditor.view.previewLabel'), ) @@ -506,12 +507,12 @@ const parseManualMetadata = ( } const loadKnowledgeContent = async () => { - if (!knowledgeId.value) { + if (!currentKnowledgeId.value) { return } contentLoading.value = true try { - const res: any = await getKnowledgeDetails(knowledgeId.value) + const res: any = await getKnowledgeDetails(currentKnowledgeId.value) const data: KnowledgeDetailResponse | undefined = res?.data if (!data) { MessagePlugin.error(t('manualEditor.error.fetchDetailFailed')) @@ -546,6 +547,7 @@ const loadKnowledgeContent = async () => { } const resetForm = () => { + currentKnowledgeId.value = knowledgeId.value || null form.kbId = uiStore.manualEditorKBId || '' form.title = uiStore.manualEditorInitialTitle || '' form.content = uiStore.manualEditorInitialContent || '' @@ -646,7 +648,7 @@ const handleSave = async (targetStatus: ManualStatus) => { kbInfo, manual: { kbId: form.kbId, - knowledgeId: knowledgeId.value || undefined, + knowledgeId: currentKnowledgeId.value || undefined, title: payload.title, content: payload.content, tagIds: tagIdsToUpload, @@ -659,14 +661,16 @@ const handleSave = async (targetStatus: ManualStatus) => { } let response: any - let knowledgeID = knowledgeId.value + let knowledgeID = currentKnowledgeId.value let kbId = form.kbId - if (mode.value === 'edit' && knowledgeId.value) { - response = await updateManualKnowledge(knowledgeId.value, payload) + if (mode.value === 'edit' && currentKnowledgeId.value) { + response = await updateManualKnowledge(currentKnowledgeId.value, payload) } else { response = await createManualKnowledge(form.kbId, payload) knowledgeID = response?.data?.id || knowledgeID + currentKnowledgeId.value = knowledgeID || null + uiStore.manualEditorKnowledgeId = currentKnowledgeId.value kbId = form.kbId } @@ -740,30 +744,48 @@ onBeforeUnmount(() => { :max-width="1280" storage-key="setting-drawer:width:manual-markdown-editor" :hide-footer="!initialLoaded" - :confirm-loading="saving && savingAction === 'publish'" - :confirm-text="$t('manualEditor.actions.publish')" - :cancel-text="$t('manualEditor.actions.cancel')" @update:visible="(v: boolean) => { visible = v }" - @confirm="handleSave('publish')" > + +
@@ -815,27 +837,42 @@ onBeforeUnmount(() => {
- +
+ +
+
+ + + {{ viewToggleLabel }} + +
@@ -870,6 +907,38 @@ onBeforeUnmount(() => { flex-direction: column; } +.manual-editor-footer-meta { + min-width: 0; + display: flex; + align-items: center; + gap: 8px; + color: var(--td-text-color-placeholder); +} + +.manual-editor-footer-actions { + display: flex; + align-items: center; + justify-content: flex-end; + gap: 8px; + + :deep(.t-button) { + min-width: 88px; + } +} + +.manual-editor-cancel-btn { + border-color: transparent; + background: var(--td-bg-color-secondarycontainer); + color: var(--td-text-color-secondary); + transition: background 0.18s ease, border-color 0.18s ease, color 0.18s ease; + + &:hover { + border-color: var(--td-component-stroke); + background: var(--td-bg-color-container-hover); + color: var(--td-text-color-primary); + } +} + .form-item { display: flex; flex-direction: column; @@ -923,18 +992,72 @@ onBeforeUnmount(() => { display: flex; flex-wrap: nowrap; align-items: center; - gap: 6px; + justify-content: space-between; + gap: 12px; padding: 6px 8px; background: var(--td-bg-color-secondarycontainer); border-bottom: 1px solid var(--td-component-stroke); - overflow-x: auto; + overflow: hidden; flex-shrink: 0; +} + +.editor-toolbar__format { + min-width: 0; + display: flex; + flex: 1; + align-items: center; + gap: 6px; + overflow-x: auto; &::-webkit-scrollbar { height: 0; } } +.editor-toolbar__view { + flex-shrink: 0; + display: flex; + align-items: center; + padding-left: 8px; + border-left: 1px solid var(--td-component-stroke); +} + +.toggle-view-btn { + min-width: 92px; + height: 30px; + padding: 0 10px; + border: 1px solid var(--td-component-stroke); + border-radius: 7px; + background: var(--td-bg-color-container); + color: var(--td-text-color-secondary); + font-weight: 500; + box-shadow: 0 1px 2px rgba(15, 23, 42, 0.04); + transition: background 0.18s ease, border-color 0.18s ease, color 0.18s ease, box-shadow 0.18s ease; + + &:hover { + border-color: rgba(7, 192, 95, 0.45); + background: rgba(7, 192, 95, 0.06); + color: var(--td-brand-color); + box-shadow: 0 2px 6px rgba(7, 192, 95, 0.1); + } + + &.is-preview { + border-color: rgba(7, 192, 95, 0.5); + background: rgba(7, 192, 95, 0.1); + color: var(--td-brand-color); + } + + &:active { + transform: translateY(1px); + box-shadow: none; + } + + :deep(.t-button__icon) { + margin-right: 5px; + font-size: 15px; + } +} + .toolbar-group { display: flex; align-items: center; diff --git a/frontend/src/components/settings/SettingDrawer.vue b/frontend/src/components/settings/SettingDrawer.vue index c26adab1..d875e6ad 100644 --- a/frontend/src/components/settings/SettingDrawer.vue +++ b/frontend/src/components/settings/SettingDrawer.vue @@ -42,12 +42,14 @@
diff --git a/frontend/src/views/knowledge/components/UploadConfirmDialog.vue b/frontend/src/views/knowledge/components/UploadConfirmDialog.vue index 7964f6d2..b26a06b7 100644 --- a/frontend/src/views/knowledge/components/UploadConfirmDialog.vue +++ b/frontend/src/views/knowledge/components/UploadConfirmDialog.vue @@ -948,7 +948,7 @@ const handleConfirm = () => { .upload-confirm-overlay { position: fixed; inset: 0; - z-index: 1000; + z-index: 3000; display: flex; align-items: center; justify-content: center;