mirror of
https://github.com/infiniflow/ragflow.git
synced 2025-12-31 01:01:30 +08:00
Fix: Dataset parse error (#12310)
### What problem does this PR solve? Fix: Dataset parse error ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
@ -278,7 +278,7 @@ export const useRunDocument = () => {
|
||||
const ret = await kbService.document_run({
|
||||
doc_ids: documentIds,
|
||||
run,
|
||||
...option,
|
||||
...(option || {}),
|
||||
});
|
||||
const code = get(ret, 'data.code');
|
||||
if (code === 0) {
|
||||
|
||||
@ -129,6 +129,7 @@ export const util = {
|
||||
metaDataSettingJSONToMetaDataTableData(
|
||||
data: IMetaDataReturnJSONSettings,
|
||||
): IMetaDataTableData[] {
|
||||
if (!Array.isArray(data)) return [];
|
||||
return data.map((item) => {
|
||||
return {
|
||||
field: item.key,
|
||||
|
||||
@ -216,7 +216,7 @@ export default function Dataset() {
|
||||
{reparseDialogVisible && (
|
||||
<ReparseDialog
|
||||
// hidden={isZeroChunk || isRunning}
|
||||
hidden={false}
|
||||
hidden={true}
|
||||
handleOperationIconClick={handleOperationIconClick}
|
||||
chunk_num={0}
|
||||
visible={reparseDialogVisible}
|
||||
|
||||
@ -72,7 +72,7 @@ export function ParsingStatusCell({
|
||||
const isRunning = isParserRunning(run);
|
||||
const isZeroChunk = chunk_num === 0;
|
||||
|
||||
const handleOperationIconClick = (option: {
|
||||
const handleOperationIconClick = (option?: {
|
||||
delete: boolean;
|
||||
apply_kb: boolean;
|
||||
}) => {
|
||||
@ -183,8 +183,8 @@ export function ParsingStatusCell({
|
||||
)}
|
||||
{reparseDialogVisible && (
|
||||
<ReparseDialog
|
||||
// hidden={isZeroChunk || isRunning}
|
||||
hidden={false}
|
||||
hidden={isZeroChunk || isRunning}
|
||||
// hidden={false}
|
||||
handleOperationIconClick={handleOperationIconClick}
|
||||
chunk_num={chunk_num}
|
||||
visible={reparseDialogVisible}
|
||||
|
||||
@ -7,136 +7,134 @@ import {
|
||||
import { Checkbox } from '@/components/ui/checkbox';
|
||||
import { DialogProps } from '@radix-ui/react-dialog';
|
||||
import { t } from 'i18next';
|
||||
import { useCallback, useState } from 'react';
|
||||
import { memo, useCallback, useEffect, useRef } from 'react';
|
||||
|
||||
export const ReparseDialog = ({
|
||||
handleOperationIconClick,
|
||||
chunk_num,
|
||||
hidden = false,
|
||||
visible = true,
|
||||
hideModal,
|
||||
children,
|
||||
}: DialogProps & {
|
||||
chunk_num: number;
|
||||
handleOperationIconClick: (options: {
|
||||
delete: boolean;
|
||||
apply_kb: boolean;
|
||||
}) => void;
|
||||
visible: boolean;
|
||||
hideModal: () => void;
|
||||
hidden?: boolean;
|
||||
}) => {
|
||||
const [formInstance, setFormInstance] = useState<DynamicFormRef | null>(null);
|
||||
export const ReparseDialog = memo(
|
||||
({
|
||||
handleOperationIconClick,
|
||||
chunk_num,
|
||||
hidden = false,
|
||||
visible = true,
|
||||
hideModal,
|
||||
}: DialogProps & {
|
||||
chunk_num: number;
|
||||
handleOperationIconClick: (options?: {
|
||||
delete: boolean;
|
||||
apply_kb: boolean;
|
||||
}) => void;
|
||||
visible: boolean;
|
||||
hideModal: () => void;
|
||||
hidden?: boolean;
|
||||
}) => {
|
||||
// const [formInstance, setFormInstance] = useState<DynamicFormRef | null>(
|
||||
// null,
|
||||
// );
|
||||
|
||||
const formCallbackRef = useCallback((node: DynamicFormRef | null) => {
|
||||
if (node) {
|
||||
setFormInstance(node);
|
||||
console.log('Form instance assigned:', node);
|
||||
} else {
|
||||
console.log('Form instance removed');
|
||||
}
|
||||
}, []);
|
||||
// const formCallbackRef = useCallback((node: DynamicFormRef | null) => {
|
||||
// if (node) {
|
||||
// setFormInstance(node);
|
||||
// console.log('Form instance assigned:', node);
|
||||
// } else {
|
||||
// console.log('Form instance removed');
|
||||
// }
|
||||
// }, []);
|
||||
|
||||
const handleCancel = useCallback(() => {
|
||||
// handleOperationIconClick(false);
|
||||
hideModal?.();
|
||||
formInstance?.reset();
|
||||
}, [formInstance]);
|
||||
const formCallbackRef = useRef<DynamicFormRef>(null);
|
||||
|
||||
const handleSave = useCallback(async () => {
|
||||
const instance = formInstance;
|
||||
if (!instance) {
|
||||
console.error('Form instance is null');
|
||||
return;
|
||||
}
|
||||
const handleCancel = useCallback(() => {
|
||||
// handleOperationIconClick(false);
|
||||
hideModal?.();
|
||||
// formInstance?.reset();
|
||||
formCallbackRef?.current?.reset();
|
||||
}, [formCallbackRef, hideModal]);
|
||||
|
||||
const check = await instance.trigger();
|
||||
if (check) {
|
||||
instance.submit();
|
||||
const formValues = instance.getValues();
|
||||
console.log(formValues);
|
||||
handleOperationIconClick({
|
||||
delete: formValues.delete,
|
||||
apply_kb: formValues.apply_kb,
|
||||
});
|
||||
}
|
||||
}, [formInstance, handleOperationIconClick]);
|
||||
const handleSave = useCallback(async () => {
|
||||
// const instance = formInstance;
|
||||
const instance = formCallbackRef?.current;
|
||||
if (!instance) {
|
||||
console.error('Form instance is null');
|
||||
return;
|
||||
}
|
||||
|
||||
// useEffect(() => {
|
||||
// if (!hidden) {
|
||||
// const timer = setTimeout(() => {
|
||||
// if (!formInstance) {
|
||||
// console.warn(
|
||||
// 'Form ref is still null after component should be mounted',
|
||||
// );
|
||||
// } else {
|
||||
// console.log('Form ref is properly set');
|
||||
// }
|
||||
// }, 1000);
|
||||
const check = await instance.trigger();
|
||||
if (check) {
|
||||
instance.submit();
|
||||
const formValues = instance.getValues();
|
||||
console.log(formValues);
|
||||
handleOperationIconClick({
|
||||
delete: formValues.delete,
|
||||
apply_kb: formValues.apply_kb,
|
||||
});
|
||||
}
|
||||
}, [formCallbackRef, handleOperationIconClick]);
|
||||
|
||||
// return () => clearTimeout(timer);
|
||||
// }
|
||||
// }, [hidden, formInstance]);
|
||||
useEffect(() => {
|
||||
if (hidden) {
|
||||
handleOperationIconClick();
|
||||
}
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<ConfirmDeleteDialog
|
||||
title={t(`knowledgeDetails.parseFile`)}
|
||||
onOk={() => handleSave()}
|
||||
onCancel={() => handleCancel()}
|
||||
hidden={hidden}
|
||||
open={visible}
|
||||
okButtonText={t('common.confirm')}
|
||||
content={{
|
||||
title: t(`knowledgeDetails.parseFileTip`),
|
||||
node: (
|
||||
<div>
|
||||
<DynamicForm.Root
|
||||
onSubmit={(data) => {
|
||||
console.log('submit', data);
|
||||
}}
|
||||
ref={formCallbackRef}
|
||||
fields={[
|
||||
{
|
||||
name: 'delete',
|
||||
label: '',
|
||||
type: FormFieldType.Checkbox,
|
||||
render: (fieldProps) => (
|
||||
<div className="flex items-center text-text-secondary p-5 border border-border-button rounded-lg">
|
||||
<Checkbox
|
||||
{...fieldProps}
|
||||
onCheckedChange={(checked: boolean) => {
|
||||
fieldProps.onChange(checked);
|
||||
}}
|
||||
/>
|
||||
<span className="ml-2">
|
||||
{chunk_num > 0
|
||||
? t(`knowledgeDetails.redo`, { chunkNum: chunk_num })
|
||||
: t('knowledgeDetails.redoAll')}
|
||||
</span>
|
||||
</div>
|
||||
),
|
||||
},
|
||||
{
|
||||
name: 'apply_kb',
|
||||
label: '',
|
||||
type: FormFieldType.Checkbox,
|
||||
render: (fieldProps) => (
|
||||
<div className="flex items-center text-text-secondary p-5 border border-border-button rounded-lg">
|
||||
<Checkbox
|
||||
{...fieldProps}
|
||||
onCheckedChange={(checked: boolean) => {
|
||||
fieldProps.onChange(checked);
|
||||
}}
|
||||
/>
|
||||
<span className="ml-2">
|
||||
{t('knowledgeDetails.applyAutoMetadataSettings')}
|
||||
</span>
|
||||
</div>
|
||||
),
|
||||
},
|
||||
]}
|
||||
>
|
||||
{/* <DynamicForm.CancelButton
|
||||
return (
|
||||
<ConfirmDeleteDialog
|
||||
title={t(`knowledgeDetails.parseFile`)}
|
||||
onOk={() => handleSave()}
|
||||
onCancel={() => handleCancel()}
|
||||
hidden={hidden}
|
||||
open={visible}
|
||||
okButtonText={t('common.confirm')}
|
||||
content={{
|
||||
title: t(`knowledgeDetails.parseFileTip`),
|
||||
node: (
|
||||
<div>
|
||||
<DynamicForm.Root
|
||||
onSubmit={(data) => {
|
||||
console.log('submit', data);
|
||||
}}
|
||||
ref={formCallbackRef}
|
||||
fields={[
|
||||
{
|
||||
name: 'delete',
|
||||
label: '',
|
||||
type: FormFieldType.Checkbox,
|
||||
render: (fieldProps) => (
|
||||
<div className="flex items-center text-text-secondary p-5 border border-border-button rounded-lg">
|
||||
<Checkbox
|
||||
{...fieldProps}
|
||||
onCheckedChange={(checked: boolean) => {
|
||||
fieldProps.onChange(checked);
|
||||
}}
|
||||
/>
|
||||
<span className="ml-2">
|
||||
{chunk_num > 0
|
||||
? t(`knowledgeDetails.redo`, {
|
||||
chunkNum: chunk_num,
|
||||
})
|
||||
: t('knowledgeDetails.redoAll')}
|
||||
</span>
|
||||
</div>
|
||||
),
|
||||
},
|
||||
{
|
||||
name: 'apply_kb',
|
||||
label: '',
|
||||
type: FormFieldType.Checkbox,
|
||||
render: (fieldProps) => (
|
||||
<div className="flex items-center text-text-secondary p-5 border border-border-button rounded-lg">
|
||||
<Checkbox
|
||||
{...fieldProps}
|
||||
onCheckedChange={(checked: boolean) => {
|
||||
fieldProps.onChange(checked);
|
||||
}}
|
||||
/>
|
||||
<span className="ml-2">
|
||||
{t('knowledgeDetails.applyAutoMetadataSettings')}
|
||||
</span>
|
||||
</div>
|
||||
),
|
||||
},
|
||||
]}
|
||||
>
|
||||
{/* <DynamicForm.CancelButton
|
||||
handleCancel={() => handleOperationIconClick(false)}
|
||||
cancelText={t('common.cancel')}
|
||||
/>
|
||||
@ -144,12 +142,13 @@ export const ReparseDialog = ({
|
||||
buttonText={t('common.confirm')}
|
||||
submitFunc={handleSave}
|
||||
/> */}
|
||||
</DynamicForm.Root>
|
||||
</div>
|
||||
),
|
||||
}}
|
||||
>
|
||||
{/* {children} */}
|
||||
</ConfirmDeleteDialog>
|
||||
);
|
||||
};
|
||||
</DynamicForm.Root>
|
||||
</div>
|
||||
),
|
||||
}}
|
||||
>
|
||||
{/* {children} */}
|
||||
</ConfirmDeleteDialog>
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
@ -54,7 +54,7 @@ export function useBulkOperateDataset({
|
||||
);
|
||||
|
||||
const handleRunClick = useCallback(
|
||||
(option: { delete: boolean; apply_kb: boolean }) => {
|
||||
(option?: { delete: boolean; apply_kb: boolean }) => {
|
||||
runDocument(1, option);
|
||||
},
|
||||
[runDocument],
|
||||
|
||||
@ -10,7 +10,7 @@ export const useHandleRunDocumentByIds = (id: string) => {
|
||||
const handleRunDocumentByIds = async (
|
||||
documentId: string,
|
||||
isRunning: boolean,
|
||||
option: { delete: boolean; apply_kb: boolean },
|
||||
option?: { delete: boolean; apply_kb: boolean },
|
||||
) => {
|
||||
if (isLoading) {
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user