diff --git a/web/src/pages/add-knowledge/components/knowledge-file/index.tsx b/web/src/pages/add-knowledge/components/knowledge-file/index.tsx index 713196d3dac1ce94097e431c563e3339c4415ce4..fe71ee3638092a3b837713fe6fb2aa97a07344a2 100644 --- a/web/src/pages/add-knowledge/components/knowledge-file/index.tsx +++ b/web/src/pages/add-knowledge/components/knowledge-file/index.tsx @@ -227,14 +227,6 @@ const KnowledgeFile = () => { return parserList.find((x) => x.value === text)?.label; }, }, - { - title: 'Parsing Status', - dataIndex: 'run', - key: 'run', - render: (text, record) => { - return <ParsingStatusCell record={record}></ParsingStatusCell>; - }, - }, { title: 'Enabled', key: 'status', @@ -250,6 +242,14 @@ const KnowledgeFile = () => { </> ), }, + { + title: 'Parsing Status', + dataIndex: 'run', + key: 'run', + render: (text, record) => { + return <ParsingStatusCell record={record}></ParsingStatusCell>; + }, + }, { title: 'Action', key: 'action', @@ -301,7 +301,7 @@ const KnowledgeFile = () => { rowKey="id" columns={finalColumns} dataSource={data} - loading={loading} + // loading={loading} pagination={pagination} scroll={{ scrollToFirstRowOnChange: true, x: 1300, y: 'fill' }} /> diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/configuration.tsx b/web/src/pages/add-knowledge/components/knowledge-setting/configuration.tsx index e57e7eac21977f13cd1be27be776d370b67f161b..f0e7e7030b5d2a2950b2ce9ae1fcd312978085d0 100644 --- a/web/src/pages/add-knowledge/components/knowledge-setting/configuration.tsx +++ b/web/src/pages/add-knowledge/components/knowledge-setting/configuration.tsx @@ -55,7 +55,7 @@ const Configuration = () => { const embeddingModelOptions = useSelectLlmOptions(); const onFinish = async (values: any) => { - const avatar = getBase64FromUploadFileList(values.avatar); + const avatar = await getBase64FromUploadFileList(values.avatar); dispatch({ type: 'kSModel/updateKb', payload: { @@ -123,6 +123,7 @@ const Configuration = () => { <Upload listType="picture-card" maxCount={1} + beforeUpload={() => false} showUploadList={{ showPreviewIcon: false, showRemoveIcon: false }} > <button style={{ border: 0, background: 'none' }} type="button"> @@ -184,7 +185,7 @@ const Configuration = () => { {({ getFieldValue }) => { const parserId = getFieldValue('parser_id'); - if (parserId === 'general') { + if (parserId === 'naive') { return ( <Form.Item label="Chunk token number" tooltip="xxx"> <Flex gap={20} align="center"> diff --git a/web/src/pages/chat/chat-configuration-modal/model-setting.tsx b/web/src/pages/chat/chat-configuration-modal/model-setting.tsx index 2f4c6668d20d3f1b415c682326f9aef721a951f9..1324441c900920aef13c0e4d39082d5d43cd37fe 100644 --- a/web/src/pages/chat/chat-configuration-modal/model-setting.tsx +++ b/web/src/pages/chat/chat-configuration-modal/model-setting.tsx @@ -18,18 +18,12 @@ const ModelSetting = ({ show, form }: ISegmentedContentProps) => { value: x, })); - const parameters: ModelVariableType = Form.useWatch('parameters', form); - const modelOptions = useSelectLlmOptions(); const handleParametersChange = (value: ModelVariableType) => { - console.info(value); - }; - - useEffect(() => { - const variable = settledModelVariableMap[parameters]; + const variable = settledModelVariableMap[value]; form.setFieldsValue({ llm_setting: variable }); - }, [parameters, form]); + }; useEffect(() => { const values = Object.keys(variableEnabledFieldMap).reduce< diff --git a/web/src/pages/chat/chat-container/index.less b/web/src/pages/chat/chat-container/index.less index ada0de0e53147f3033a4e0ca94dd9928ef95a1b3..14556a142d7798b1401b3e90483c972f6ebde00a 100644 --- a/web/src/pages/chat/chat-container/index.less +++ b/web/src/pages/chat/chat-container/index.less @@ -27,6 +27,7 @@ .messageText { padding: 0 14px; background-color: rgba(249, 250, 251, 1); + word-break: break-all; } .messageEmpty { width: 300px; diff --git a/web/src/pages/user-setting/setting-profile/index.tsx b/web/src/pages/user-setting/setting-profile/index.tsx index 29f4be20a6162fe0e91cc42f3044737b476ad413..daf92124d8b2b4484c9ff0a3a88995252b283e93 100644 --- a/web/src/pages/user-setting/setting-profile/index.tsx +++ b/web/src/pages/user-setting/setting-profile/index.tsx @@ -45,8 +45,8 @@ const UserSettingProfile = () => { const loading = useGetUserInfoLoading(); const { form, submittable } = useValidateSubmittable(); - const onFinish = (values: any) => { - const avatar = getBase64FromUploadFileList(values.avatar); + const onFinish = async (values: any) => { + const avatar = await getBase64FromUploadFileList(values.avatar); saveSetting({ ...values, avatar }); }; @@ -112,6 +112,10 @@ const UserSettingProfile = () => { <Upload listType="picture-card" maxCount={1} + accept="image/*" + beforeUpload={() => { + return false; + }} showUploadList={{ showPreviewIcon: false, showRemoveIcon: false }} > <button style={{ border: 0, background: 'none' }} type="button"> diff --git a/web/src/utils/fileUtil.ts b/web/src/utils/fileUtil.ts index 537abb4774a1119f2ff74eda4d25969e44421391..44e43c6dfe9dc3abcff32a70bff53d1f4e9eaa6f 100644 --- a/web/src/utils/fileUtil.ts +++ b/web/src/utils/fileUtil.ts @@ -46,9 +46,11 @@ export const getUploadFileListFromBase64 = (avatar: string) => { return fileList; }; -export const getBase64FromUploadFileList = (fileList?: UploadFile[]) => { +export const getBase64FromUploadFileList = async (fileList?: UploadFile[]) => { if (Array.isArray(fileList) && fileList.length > 0) { - return fileList[0].thumbUrl; + const base64 = await transformFile2Base64(fileList[0].originFileObj); + return base64; + // return fileList[0].thumbUrl; TODO: Even JPG files will be converted to base64 parameters in png format } return '';