fix :Get application bound knowledge base information logical rewrite (#4057)

* fix :Get application bound knowledge base information logical rewrite

* fix :Get application bound knowledge base information logical rewrite

* fix :Get application bound knowledge base information logical rewrite

* fix :Get application bound knowledge base information logical rewrite
This commit is contained in:
gggaaallleee
2025-03-11 12:31:30 +08:00
committed by archer
parent 39a2a4a592
commit bf72defbff
15 changed files with 181 additions and 121 deletions

View File

@@ -17,7 +17,6 @@ import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
import { useTranslation } from 'next-i18next';
import { useDatasetStore } from '@/web/core/dataset/store/dataset';
import DatasetSelectContainer, { useDatasetSelect } from '@/components/core/dataset/SelectModal';
import { useLoading } from '@fastgpt/web/hooks/useLoading';
import EmptyTip from '@fastgpt/web/components/common/EmptyTip';
@@ -35,29 +34,24 @@ export const DatasetSelectModal = ({
}) => {
const { t } = useTranslation();
const theme = useTheme();
const { allDatasets } = useDatasetStore();
const [selectedDatasets, setSelectedDatasets] = useState<SelectedDatasetType>(
defaultSelectedDatasets.filter((dataset) => {
return allDatasets.find((item) => item._id === dataset.datasetId);
})
);
const [selectedDatasets, setSelectedDatasets] =
useState<SelectedDatasetType>(defaultSelectedDatasets);
const { toast } = useToast();
const { paths, setParentId, datasets, isFetching } = useDatasetSelect();
const { Loading } = useLoading();
const filterDatasets = useMemo(() => {
return {
selected: allDatasets.filter((item) =>
const filtered = {
selected: datasets.filter((item) =>
selectedDatasets.find((dataset) => dataset.datasetId === item._id)
),
unSelected: datasets.filter(
(item) => !selectedDatasets.find((dataset) => dataset.datasetId === item._id)
)
};
}, [datasets, allDatasets, selectedDatasets]);
const activeVectorModel = allDatasets.find(
(dataset) => dataset._id === selectedDatasets[0]?.datasetId
)?.vectorModel?.model;
return filtered;
}, [datasets, selectedDatasets]);
const activeVectorModel = defaultSelectedDatasets[0]?.vectorModel?.model;
return (
<DatasetSelectContainer
@@ -150,7 +144,15 @@ export const DatasetSelectModal = ({
title: t('common:dataset.Select Dataset Tips')
});
}
setSelectedDatasets((state) => [...state, { datasetId: item._id }]);
setSelectedDatasets((state) => [
...state,
{
datasetId: item._id,
avatar: item.avatar,
name: item.name,
vectorModel: item.vectorModel
}
]);
}
}}
>
@@ -200,7 +202,7 @@ export const DatasetSelectModal = ({
onClick={() => {
// filter out the dataset that is not in the kList
const filterDatasets = selectedDatasets.filter((dataset) => {
return allDatasets.find((item) => item._id === dataset.datasetId);
return datasets.find((item) => item._id === dataset.datasetId);
});
onClose();