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
2025-03-11 12:31:30 +08:00
parent f9dd170895
commit 4dbe41db0e
15 changed files with 181 additions and 121 deletions
--- a/projects/app/src/pageComponents/app/detail/SimpleApp/ChatTest.tsx
+++ b/projects/app/src/pageComponents/app/detail/SimpleApp/ChatTest.tsx
@@ -11,7 +11,6 @@ import { useI18n } from '@/web/context/I18n';
 import { useContextSelector } from 'use-context-selector';
 import { AppContext } from '../context';
 import { useChatTest } from '../useChatTest';
-import { useDatasetStore } from '@/web/core/dataset/store/dataset';
 import ChatItemContextProvider from '@/web/core/chat/context/chatItemContext';
 import ChatRecordContextProvider from '@/web/core/chat/context/chatRecordContext';
 import { useChatStore } from '@/web/core/chat/context/useChatStore';
@@ -23,8 +22,6 @@ const ChatTest = ({ appForm }: Props) => {
  const { appT } = useI18n();

  const { appDetail } = useContextSelector(AppContext, (v) => v);
-  // form2AppWorkflow dependent allDatasets
-  const { allDatasets } = useDatasetStore();

  const [workflowData, setWorkflowData] = useSafeState({
    nodes: appDetail.modules || [],
@@ -33,10 +30,8 @@ const ChatTest = ({ appForm }: Props) => {

  useEffect(() => {
    const { nodes, edges } = form2AppWorkflow(appForm, t);
-    // console.log(form2AppWorkflow(appForm, t));
    setWorkflowData({ nodes, edges });
-  }, [appForm, setWorkflowData, allDatasets, t]);
-
+  }, [appForm, setWorkflowData, t]);
  const { ChatContainer, restartChat, loading } = useChatTest({
    ...workflowData,
    chatConfig: appForm.chatConfig,
--- a/projects/app/src/pageComponents/app/detail/SimpleApp/EditForm.tsx
+++ b/projects/app/src/pageComponents/app/detail/SimpleApp/EditForm.tsx
@@ -10,9 +10,9 @@ import {
  HStack
 } from '@chakra-ui/react';
 import type { AppSimpleEditFormType } from '@fastgpt/global/core/app/type.d';
+import type { DatasetSimpleItemType } from '@fastgpt/global/core/dataset/type.d';
 import { useRouter } from 'next/router';
 import { useTranslation } from 'next-i18next';
-import { useDatasetStore } from '@/web/core/dataset/store/dataset';

 import dynamic from 'next/dynamic';
 import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
@@ -68,18 +68,9 @@ const EditForm = ({
  const { t } = useTranslation();

  const { appDetail } = useContextSelector(AppContext, (v) => v);
-
-  const { allDatasets } = useDatasetStore();
+  const selectDatasets = useMemo(() => appForm?.dataset?.datasets, [appForm]);
  const [, startTst] = useTransition();

-  const selectDatasets = useMemo(
-    () =>
-      allDatasets.filter((item) =>
-        appForm.dataset?.datasets.find((dataset) => dataset.datasetId === item._id)
-      ),
-    [allDatasets, appForm?.dataset?.datasets]
-  );
-
  const {
    isOpen: isOpenDatasetSelect,
    onOpen: onOpenKbSelect,
@@ -252,7 +243,7 @@ const EditForm = ({
          )}
          <Grid gridTemplateColumns={'repeat(2, minmax(0, 1fr))'} gridGap={[2, 4]}>
            {selectDatasets.map((item) => (
-              <MyTooltip key={item._id} label={t('common:core.dataset.Read Dataset')}>
+              <MyTooltip key={item.datasetId} label={t('common:core.dataset.Read Dataset')}>
                <Flex
                  overflow={'hidden'}
                  alignItems={'center'}
@@ -266,7 +257,7 @@ const EditForm = ({
                    router.push({
                      pathname: '/dataset/detail',
                      query: {
-                        datasetId: item._id
+                        datasetId: item.datasetId
                      }
                    })
                  }
@@ -413,8 +404,10 @@ const EditForm = ({
        <DatasetSelectModal
          isOpen={isOpenDatasetSelect}
          defaultSelectedDatasets={selectDatasets.map((item) => ({
-            datasetId: item._id,
-            vectorModel: item.vectorModel
+            datasetId: item.datasetId,
+            vectorModel: item.vectorModel,
+            name: item.name,
+            avatar: item.avatar
          }))}
          onClose={onCloseKbSelect}
          onChange={(e) => {
--- a/projects/app/src/pageComponents/app/detail/SimpleApp/Header.tsx
+++ b/projects/app/src/pageComponents/app/detail/SimpleApp/Header.tsx
@@ -17,7 +17,6 @@ import { publishStatusStyle } from '../constants';
 import { useSystem } from '@fastgpt/web/hooks/useSystem';
 import { formatTime2YMDHMS } from '@fastgpt/global/common/string/time';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
-import { useDatasetStore } from '@/web/core/dataset/store/dataset';
 import SaveButton from '../Workflow/components/SaveButton';
 import { useBoolean, useDebounceEffect, useLockFn } from 'ahooks';
 import { appWorkflow2Form } from '@fastgpt/global/core/app/utils';
@@ -61,7 +60,6 @@ const Header = ({
  const currentTab = useContextSelector(AppContext, (v) => v.currentTab);

  const { lastAppListRouteType } = useSystemStore();
-  const { allDatasets } = useDatasetStore();

  const { data: paths = [] } = useRequest2(() => getAppFolderPath(appId), {
    manual: false,
@@ -159,7 +157,7 @@ const Header = ({
      const val = compareSimpleAppSnapshot(savedSnapshot?.appForm, appForm);
      setIsSaved(val);
    },
-    [past, allDatasets],
+    [past],
    { wait: 500 }
  );

--- a/projects/app/src/pageComponents/app/detail/SimpleApp/index.tsx
+++ b/projects/app/src/pageComponents/app/detail/SimpleApp/index.tsx
@@ -10,7 +10,6 @@ import { Box, Flex } from '@chakra-ui/react';
 import { useTranslation } from 'next-i18next';
 import { SimpleAppSnapshotType, useSimpleAppSnapshots } from './useSnapshots';
 import { useDebounceEffect, useMount } from 'ahooks';
-import { useDatasetStore } from '@/web/core/dataset/store/dataset';
 import { v1Workflow2V2 } from '@/web/core/workflow/adapt';
 import { getAppConfigByDiff } from '@/web/core/app/diff';

@@ -19,7 +18,6 @@ const PublishChannel = dynamic(() => import('../Publish'));

 const SimpleEdit = () => {
  const { t } = useTranslation();
-  const { loadAllDatasets } = useDatasetStore();

  const { currentTab, appDetail } = useContextSelector(AppContext, (v) => v);
  const { forbiddenSaveSnapshot, past, setPast, saveSnapshot } = useSimpleAppSnapshots(
@@ -31,7 +29,6 @@ const SimpleEdit = () => {
  // Init app form
  useMount(() => {
    // show selected dataset
-    loadAllDatasets();

    if (appDetail.version !== 'v2') {
      return setAppForm(
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectDataset.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderInput/templates/SelectDataset.tsx
@@ -1,13 +1,10 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import type { RenderInputProps } from '../type';
 import { Box, Button, Flex, Grid, Switch, useDisclosure, useTheme } from '@chakra-ui/react';
-import { useDatasetStore } from '@/web/core/dataset/store/dataset';
 import { SelectedDatasetType } from '@fastgpt/global/core/workflow/api';
 import Avatar from '@fastgpt/web/components/common/Avatar';
-import { useQuery } from '@tanstack/react-query';
 import { useTranslation } from 'next-i18next';
 import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constants';
-
 import dynamic from 'next/dynamic';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { useContextSelector } from 'use-context-selector';
@@ -32,26 +29,17 @@ export const SelectDatasetRender = React.memo(function SelectDatasetRender({
    usingReRank: false
  });

-  const { allDatasets, loadAllDatasets } = useDatasetStore();
  const {
    isOpen: isOpenDatasetSelect,
    onOpen: onOpenDatasetSelect,
    onClose: onCloseDatasetSelect
  } = useDisclosure();

-  const selectedDatasetsValue = useMemo(() => {
+  const selectedDatasets = useMemo(() => {
    if (Array.isArray(item.value)) return item.value as SelectedDatasetType;
    return [] as SelectedDatasetType;
  }, [item.value]);

-  const selectedDatasets = useMemo(() => {
-    return allDatasets.filter((dataset) =>
-      selectedDatasetsValue?.find((item) => item.datasetId === dataset._id)
-    );
-  }, [allDatasets, selectedDatasetsValue]);
-
-  useQuery(['loadAllDatasets'], loadAllDatasets);
-
  useEffect(() => {
    inputs.forEach((input) => {
      // @ts-ignore
@@ -82,7 +70,7 @@ export const SelectDatasetRender = React.memo(function SelectDatasetRender({
          </Button>
          {selectedDatasets.map((item) => (
            <Flex
-              key={item._id}
+              key={item.datasetId}
              alignItems={'center'}
              h={10}
              boxShadow={'sm'}
@@ -108,7 +96,12 @@ export const SelectDatasetRender = React.memo(function SelectDatasetRender({
        {isOpenDatasetSelect && (
          <DatasetSelectModal
            isOpen={isOpenDatasetSelect}
-            defaultSelectedDatasets={selectedDatasetsValue}
+            defaultSelectedDatasets={selectedDatasets.map((item) => ({
+              datasetId: item.datasetId,
+              vectorModel: item.vectorModel,
+              name: item.name,
+              avatar: item.avatar
+            }))}
            onChange={(e) => {
              onChangeNode({
                nodeId,
@@ -133,7 +126,6 @@ export const SelectDatasetRender = React.memo(function SelectDatasetRender({
    onCloseDatasetSelect,
    onOpenDatasetSelect,
    selectedDatasets,
-    selectedDatasetsValue,
    t
  ]);