diff --git a/web/src/layouts/index.tsx b/web/src/layouts/index.tsx
index 06eb101e8..ded00fa81 100644
--- a/web/src/layouts/index.tsx
+++ b/web/src/layouts/index.tsx
@@ -1,15 +1,14 @@
import { Divider, Layout, theme } from 'antd';
import React from 'react';
-import { useTranslation } from 'react-i18next';
import { Outlet } from 'umi';
import '../locales/config';
import Header from './components/header';
+
import styles from './index.less';
const { Content } = Layout;
const App: React.FC = () => {
- const { t } = useTranslation();
const {
token: { colorBgContainer, borderRadiusLG },
} = theme.useToken();
@@ -25,6 +24,7 @@ const App: React.FC = () => {
background: colorBgContainer,
borderRadius: borderRadiusLG,
overflow: 'auto',
+ display: 'flex',
}}
>
diff --git a/web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/preview.tsx b/web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/preview.tsx
index aafe2ecb9..e5c26c23f 100644
--- a/web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/preview.tsx
+++ b/web/src/pages/add-knowledge/components/knowledge-chunk/components/document-preview/preview.tsx
@@ -1,4 +1,4 @@
-import { Spin } from 'antd';
+import { Skeleton } from 'antd';
import { useEffect, useRef } from 'react';
import {
AreaHighlight,
@@ -43,7 +43,7 @@ const Preview = ({ selectedChunkId }: IProps) => {
return (
-
}>
+
}>
{(pdfDocument) => (
{
dataSource={data}
loading={loading}
pagination={pagination}
- scroll={{ scrollToFirstRowOnChange: true, x: true, y: 'fill' }}
+ scroll={{ scrollToFirstRowOnChange: true, x: 1300, y: 'fill' }}
/>
{
{
key: 'progress_msg',
label: 'Progress Msg',
- children: record.progress_msg,
+ children: reactStringReplace(
+ record.progress_msg.trim(),
+ /(\[ERROR\].+\s)/g,
+ (match, i) => {
+ return (
+
+ {match}
+
+ );
+ },
+ ),
},
];
return (
-
- {items.map((x) => {
+
+ {items.map((x, idx) => {
return (
-
+
{x.label}:
-
{x.children}
+
{x.children}
);
})}
diff --git a/web/src/pages/add-knowledge/index.less b/web/src/pages/add-knowledge/index.less
index 10a8f02da..122898c4c 100644
--- a/web/src/pages/add-knowledge/index.less
+++ b/web/src/pages/add-knowledge/index.less
@@ -1,6 +1,7 @@
.container {
display: flex;
height: 100%;
+ width: 100%;
.contentWrapper {
flex: 1;
overflow-x: auto;
diff --git a/web/src/pages/knowledge/index.less b/web/src/pages/knowledge/index.less
index 37174f960..ba92f652b 100644
--- a/web/src/pages/knowledge/index.less
+++ b/web/src/pages/knowledge/index.less
@@ -1,14 +1,14 @@
// @import '~@/less/variable.less';
.knowledge {
- padding: 48px 60px;
+ padding: 48px 0;
}
.topWrapper {
display: flex;
justify-content: space-between;
align-items: flex-start;
- padding-bottom: 72px;
+ padding: 0 60px 72px;
.title {
font-family: Inter;
@@ -41,3 +41,7 @@
.topButton();
}
}
+.knowledgeCardContainer {
+ padding: 0 60px;
+ overflow: auto;
+}
diff --git a/web/src/pages/knowledge/index.tsx b/web/src/pages/knowledge/index.tsx
index 02921b603..76ad3713e 100644
--- a/web/src/pages/knowledge/index.tsx
+++ b/web/src/pages/knowledge/index.tsx
@@ -1,21 +1,25 @@
import { ReactComponent as FilterIcon } from '@/assets/filter.svg';
import ModalManager from '@/components/modal-manager';
import { PlusOutlined } from '@ant-design/icons';
-import { Button, Flex, Space } from 'antd';
+import { Button, Empty, Flex, Space } from 'antd';
import KnowledgeCard from './knowledge-card';
import KnowledgeCreatingModal from './knowledge-creating-modal';
import { useFetchKnowledgeList } from '@/hooks/knowledgeHook';
+import { useSelectUserInfo } from '@/hooks/userSettingHook';
import styles from './index.less';
const Knowledge = () => {
- const data = useFetchKnowledgeList();
+ const list = useFetchKnowledgeList();
+ const userInfo = useSelectUserInfo();
return (
-
+
-
Welcome back, Zing
+
+ Welcome back, {userInfo.nickname}
+
Which database are we going to use today?
@@ -46,12 +50,22 @@ const Knowledge = () => {
-
- {data.map((item: any) => {
- return ;
- })}
+
+ {list.length > 0 ? (
+ list.map((item: any) => {
+ return ;
+ })
+ ) : (
+
+ )}
-
+
);
};