diff --git a/projects/app/src/components/support/permission/DefaultPerList/index.tsx b/projects/app/src/components/support/permission/DefaultPerList/index.tsx index 60feeb466..2a282543f 100644 --- a/projects/app/src/components/support/permission/DefaultPerList/index.tsx +++ b/projects/app/src/components/support/permission/DefaultPerList/index.tsx @@ -32,7 +32,6 @@ const DefaultPermissionList = ({ onChange, isInheritPermission = false, hasParent, - isDisabled = false, ...styles }: Props) => { const { ConfirmModal, openConfirm } = useConfirm({}); @@ -65,7 +64,6 @@ const DefaultPermissionList = ({ return onRequestChange(per); } }} - isDisabled={isDisabled} fontSize={styles?.fontSize} /> diff --git a/projects/app/src/pages/dataset/detail/components/Import/index.tsx b/projects/app/src/pages/dataset/detail/components/Import/index.tsx index 6e2c44a3e..85c03f96f 100644 --- a/projects/app/src/pages/dataset/detail/components/Import/index.tsx +++ b/projects/app/src/pages/dataset/detail/components/Import/index.tsx @@ -31,7 +31,14 @@ const ImportDataset = () => { const Render = () => { return ( - + diff --git a/projects/app/src/pages/dataset/detail/components/Info.tsx b/projects/app/src/pages/dataset/detail/components/Info.tsx index 2cfd3b2df..42d4df4f1 100644 --- a/projects/app/src/pages/dataset/detail/components/Info.tsx +++ b/projects/app/src/pages/dataset/detail/components/Info.tsx @@ -12,7 +12,7 @@ import Avatar from '@fastgpt/web/components/common/Avatar'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; import { useTranslation } from 'next-i18next'; import { useSystemStore } from '@/web/common/system/useSystemStore'; -import { useRequest } from '@fastgpt/web/hooks/useRequest'; +import { useRequest, useRequest2 } from '@fastgpt/web/hooks/useRequest'; import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants'; import AIModelSelector from '@/components/Select/AIModelSelector'; import { postRebuildEmbedding } from '@/web/core/dataset/api'; @@ -77,18 +77,6 @@ const Info = ({ datasetId }: { datasetId: string }) => { multiple: false }); - /* 点击删除 */ - const { mutate: onclickDelete, isLoading: isDeleting } = useRequest({ - mutationFn: () => { - return delDatasetById(datasetId); - }, - onSuccess() { - router.replace(`/dataset/list`); - }, - successToast: t('common:common.Delete Success'), - errorToast: t('common:common.Delete Failed') - }); - const { mutate: onSave, isLoading: isSaving } = useRequest({ mutationFn: (data: DatasetItemType) => { return updateDataset({ @@ -136,7 +124,13 @@ const Info = ({ datasetId }: { datasetId: string }) => { errorToast: t('common:common.Update Failed') }); - const totalLoading = isSelecting || isDeleting || isSaving || isRebuilding; + const { runAsync: onEditBaseInfo } = useRequest2((data) => updateDataset(data), { + manual: true, + successToast: t('common:common.Update Success'), + errorToast: t('common:common.Update Failed') + }); + + const totalLoading = isSelecting || isSaving || isRebuilding; return ( @@ -185,7 +179,7 @@ const Info = ({ datasetId }: { datasetId: string }) => { - + {t('common:common.base_config')} { _hover={{ color: 'primary.500', cursor: 'pointer' }} color={'myGray.500'} name={openBaseConfig ? 'core/chat/chevronUp' : 'core/chat/chevronDown'} - onClick={() => setOpenBaseConfig(!openBaseConfig)} + onClick={(e) => { + e.preventDefault(); + setOpenBaseConfig(!openBaseConfig); + }} /> - - {t('common:core.dataset.Dataset ID')} + + + {t('common:core.dataset.Dataset ID')} + {datasetDetail._id} - {t('common:core.ai.model.Vector Model')} + + {t('common:core.ai.model.Vector Model')} + { onchange={(e) => { const vectorModel = vectorModelList.find((item) => item.model === e); if (!vectorModel) return; - onOpenConfirmRebuild(() => { + return onOpenConfirmRebuild(() => { setValue('vectorModel', vectorModel); onRebuilding(vectorModel); })(); @@ -232,7 +233,7 @@ const Info = ({ datasetId }: { datasetId: string }) => { - + {t('common:core.Max Token')} @@ -241,7 +242,9 @@ const Info = ({ datasetId }: { datasetId: string }) => { - {t('common:core.ai.model.Dataset Agent Model')} + + {t('common:core.ai.model.Dataset Agent Model')} + { const agentModel = datasetModelList.find((item) => item.model === e); if (!agentModel) return; setValue('agentModel', agentModel); - handleSubmit((data) => onSave({ ...data, agentModel: agentModel }))(); + return handleSubmit((data) => onSave({ ...data, agentModel: agentModel }))(); }} isDisabled={totalLoading} /> @@ -267,7 +270,7 @@ const Info = ({ datasetId }: { datasetId: string }) => { {datasetDetail.type === DatasetTypeEnum.externalFile && ( <> - + {t('dataset:external_read_url')} @@ -288,7 +291,7 @@ const Info = ({ datasetId }: { datasetId: string }) => { - + {t('common:permission.Permission config')} { - + {t('common:permission.Default permission')} { isDisabled={totalLoading} onChange={(v) => { setValue('defaultPermission', v); - handleSubmit((data) => onSave({ ...data, defaultPermission: v }))(); + return handleSubmit((data) => onSave({ ...data, defaultPermission: v }))(); }} /> - + { setEditedDataset(undefined); }} onEdit={async (data) => { - await updateDataset({ + await onEditBaseInfo({ id: editedDataset.id, name: data.name, intro: data.intro, diff --git a/projects/app/src/pages/dataset/detail/components/MetaDataCard.tsx b/projects/app/src/pages/dataset/detail/components/MetaDataCard.tsx index 83176636d..44b8a3a37 100644 --- a/projects/app/src/pages/dataset/detail/components/MetaDataCard.tsx +++ b/projects/app/src/pages/dataset/detail/components/MetaDataCard.tsx @@ -105,7 +105,7 @@ const MetaDataCard = ({ datasetId }: { datasetId: string }) => { {metadataList.map((item, i) => ( - + {item.label} {item.value} diff --git a/projects/app/src/pages/dataset/detail/components/NavBar.tsx b/projects/app/src/pages/dataset/detail/components/NavBar.tsx index 99f9aa754..fb4c328e3 100644 --- a/projects/app/src/pages/dataset/detail/components/NavBar.tsx +++ b/projects/app/src/pages/dataset/detail/components/NavBar.tsx @@ -123,8 +123,7 @@ const NavBar = ({ currentTab }: { currentTab: TabEnum }) => { fontWeight: 500, border: 'none', _hover: { - bg: 'myGray.05', - color: 'blue.700' + bg: 'myGray.05' }, borderRadius: '6px' }} @@ -148,7 +147,7 @@ const NavBar = ({ currentTab }: { currentTab: TabEnum }) => { }} > - + {t('common:core.dataset.training.tag')}