From 2714d56ce15dc288df9e950227392db07dce3197 Mon Sep 17 00:00:00 2001 From: Joel Date: Thu, 6 Mar 2025 18:19:55 +0800 Subject: [PATCH 1/2] fix: success test --- .../metadata/hooks/use-batch-edit-document-metadata.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/app/components/datasets/metadata/hooks/use-batch-edit-document-metadata.ts b/web/app/components/datasets/metadata/hooks/use-batch-edit-document-metadata.ts index fa20ede0c0..02bafe7be0 100644 --- a/web/app/components/datasets/metadata/hooks/use-batch-edit-document-metadata.ts +++ b/web/app/components/datasets/metadata/hooks/use-batch-edit-document-metadata.ts @@ -5,6 +5,7 @@ import { useMemo } from 'react' import { isEqual } from 'lodash-es' import { useBatchUpdateDocMetadata } from '@/service/knowledge/use-metadata' import Toast from '@/app/components/base/toast' +import { t } from 'i18next' type Props = { datasetId: string @@ -132,7 +133,7 @@ const useBatchEditDocumentMetadata = ({ hideEditModal() Toast.notify({ type: 'success', - message: 'common.api.actionSuccess', + message: t('common.actionMsg.modifiedSuccessfully'), }) } From 8bc2e121e6b161700942e8412d641e60afded6c0 Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 7 Mar 2025 11:14:35 +0800 Subject: [PATCH 2/2] fix: multi doc save logic --- .../hooks/use-batch-edit-document-metadata.ts | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/web/app/components/datasets/metadata/hooks/use-batch-edit-document-metadata.ts b/web/app/components/datasets/metadata/hooks/use-batch-edit-document-metadata.ts index 02bafe7be0..9b9d64ed80 100644 --- a/web/app/components/datasets/metadata/hooks/use-batch-edit-document-metadata.ts +++ b/web/app/components/datasets/metadata/hooks/use-batch-edit-document-metadata.ts @@ -1,8 +1,7 @@ import { useBoolean } from 'ahooks' -import type { MetadataBatchEditToServer, MetadataItemInBatchEdit, MetadataItemWithValue } from '../types' +import { type MetadataBatchEditToServer, type MetadataItemInBatchEdit, type MetadataItemWithEdit, type MetadataItemWithValue, UpdateType } from '../types' import type { SimpleDocumentDetail } from '@/models/datasets' import { useMemo } from 'react' -import { isEqual } from 'lodash-es' import { useBatchUpdateDocMetadata } from '@/service/knowledge/use-metadata' import Toast from '@/app/components/base/toast' import { t } from 'i18next' @@ -69,14 +68,9 @@ const useBatchEditDocumentMetadata = ({ return res }, [metaDataList]) - const formateToBackendList = (editedList: MetadataItemInBatchEdit[], addedList: MetadataItemInBatchEdit[], isApplyToAllSelectDocument: boolean) => { + const formateToBackendList = (editedList: MetadataItemWithEdit[], addedList: MetadataItemInBatchEdit[], isApplyToAllSelectDocument: boolean) => { const updatedList = editedList.filter((editedItem) => { - const originalItem = originalList.find(i => i.id === editedItem.id) - if (!originalItem) // added item - return true - if (!isEqual(originalItem, editedItem)) // no change - return true - return false + return editedItem.updateType === UpdateType.changeValue }) const removedList = originalList.filter((originalItem) => { const editedItem = editedList.find(i => i.id === originalItem.id) @@ -101,7 +95,7 @@ const useBatchEditDocumentMetadata = ({ if (isApplyToAllSelectDocument) { // add missing metadata item updatedList.forEach((editedItem) => { - if (!newMetadataList.find(i => i.id === editedItem.id)) + if (!newMetadataList.find(i => i.id === editedItem.id) && !editedItem.isMultipleValue) newMetadataList.push(editedItem) }) }