diff --git a/web/.umirc.ts b/web/.umirc.ts
index 46f100657d3ef504677b60d4d9eb277747177532..2d66b3c9f602686331f8f2ecd4ff89add7490029 100644
--- a/web/.umirc.ts
+++ b/web/.umirc.ts
@@ -16,6 +16,11 @@ export default defineConfig({
},
plugins: ['@react-dev-inspector/umi4-plugin', '@umijs/plugins/dist/dva'],
dva: {},
+ lessLoader: {
+ modifyVars: {
+ hack: `true; @import "~@/less/variable.less";`,
+ },
+ },
// proxy: {
// '/v1': {
// 'target': 'http://54.80.112.79:9380/',
diff --git a/web/src/assets/filter.svg b/web/src/assets/filter.svg
new file mode 100644
index 0000000000000000000000000000000000000000..b2aa28abc8991665a83fae425189caacb8d89a4f
--- /dev/null
+++ b/web/src/assets/filter.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 10H15M2.5 5H17.5M7.5 15H12.5" stroke="#344054" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/web/src/assets/svg/chat-star.svg b/web/src/assets/svg/chat-star.svg
new file mode 100644
index 0000000000000000000000000000000000000000..eb34c34b3da0d0d9dc24fe423d30bcec551c3292
--- /dev/null
+++ b/web/src/assets/svg/chat-star.svg
@@ -0,0 +1,12 @@
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <g clip-path="url(#clip0_1164_5493)">
+ <path
+ d="M3.08282 12.894V10.0795M3.08282 4.45031V1.63574M1.67554 3.04303H4.49011M1.67554 11.4867H4.49011M7.86759 2.19866L6.8914 4.73676C6.73265 5.1495 6.65328 5.35588 6.52984 5.52947C6.42045 5.68332 6.28603 5.81774 6.13218 5.92713C5.95858 6.05057 5.75221 6.12994 5.33947 6.28869L2.80137 7.26488L5.33947 8.24107C5.75221 8.39982 5.95859 8.4792 6.13218 8.60263C6.28603 8.71203 6.42045 8.84645 6.52984 9.0003C6.65328 9.17389 6.73265 9.38026 6.8914 9.79301L7.86759 12.3311L8.84378 9.79301C9.00253 9.38026 9.08191 9.17389 9.20534 9.0003C9.31474 8.84645 9.44916 8.71203 9.60301 8.60263C9.7766 8.4792 9.98297 8.39982 10.3957 8.24107L12.9338 7.26488L10.3957 6.28869C9.98297 6.12994 9.7766 6.05057 9.60301 5.92713C9.44916 5.81774 9.31474 5.68332 9.20534 5.52947C9.08191 5.35588 9.00253 5.1495 8.84378 4.73676L7.86759 2.19866Z"
+ stroke="black" stroke-width="1.68874" stroke-linecap="round" stroke-linejoin="round" />
+ </g>
+ <defs>
+ <clipPath id="clip0_1164_5493">
+ <rect width="13.5099" height="13.5099" fill="white" transform="translate(0.549805 0.509888)" />
+ </clipPath>
+ </defs>
+</svg>
\ No newline at end of file
diff --git a/web/src/assets/svg/logo.svg b/web/src/assets/svg/logo.svg
new file mode 100644
index 0000000000000000000000000000000000000000..8e7968d21538eb956ae343b5344b6dedc49d604f
--- /dev/null
+++ b/web/src/assets/svg/logo.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <path
+ d="M18.1777 8C23.2737 8 23.2737 16 18.1777 16C13.0827 16 11.0447 8 5.43875 8C0.85375 8 0.85375 16 5.43875 16C11.0447 16 13.0828 8 18.1788 8H18.1777Z"
+ stroke="#7F56D9" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+</svg>
\ No newline at end of file
diff --git a/web/src/assets/svg/more.svg b/web/src/assets/svg/more.svg
new file mode 100644
index 0000000000000000000000000000000000000000..58ae40b2b552352d5b041cb5d89ccfb45b416b94
--- /dev/null
+++ b/web/src/assets/svg/more.svg
@@ -0,0 +1,11 @@
+<svg width="24" height="6" viewBox="0 0 24 6" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <path
+ d="M12 4.25C12.6904 4.25 13.25 3.69036 13.25 3C13.25 2.30964 12.6904 1.75 12 1.75C11.3096 1.75 10.75 2.30964 10.75 3C10.75 3.69036 11.3096 4.25 12 4.25Z"
+ stroke="#98A2B3" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" />
+ <path
+ d="M20.75 4.25C21.4404 4.25 22 3.69036 22 3C22 2.30964 21.4404 1.75 20.75 1.75C20.0596 1.75 19.5 2.30964 19.5 3C19.5 3.69036 20.0596 4.25 20.75 4.25Z"
+ stroke="#98A2B3" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" />
+ <path
+ d="M3.25 4.25C3.94036 4.25 4.5 3.69036 4.5 3C4.5 2.30964 3.94036 1.75 3.25 1.75C2.55964 1.75 2 2.30964 2 3C2 3.69036 2.55964 4.25 3.25 4.25Z"
+ stroke="#98A2B3" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" />
+</svg>
\ No newline at end of file
diff --git a/web/src/layouts/components/header/index.less b/web/src/layouts/components/header/index.less
new file mode 100644
index 0000000000000000000000000000000000000000..b396f073982ebf46bf4e3c1cf1259c3f3182e0e7
--- /dev/null
+++ b/web/src/layouts/components/header/index.less
@@ -0,0 +1,46 @@
+.tag {
+ height: 40px;
+ padding: 0 30px;
+ margin: 0 5px;
+ border: 1px solid #000;
+ border-radius: 10px;
+ cursor: pointer;
+}
+
+.checked {
+ color: #1677ff;
+ border-color: #1677ff;
+}
+
+.appIcon {
+ vertical-align: middle;
+}
+
+.appName {
+ vertical-align: middle;
+ font-family: Inter;
+ font-size: 14px;
+ font-style: normal;
+ font-weight: 400;
+ line-height: 20px;
+}
+
+.radioGroup {
+ background: rgba(249, 249, 249, 1) !important;
+ & > label {
+ border: 0 !important;
+ &::before {
+ display: none !important;
+ }
+ }
+ :global(.ant-radio-button-wrapper-checked) {
+ border-radius: 6px !important;
+ }
+}
+
+.ant-radio-button-wrapper-checked {
+ border-radius: 6px !important;
+}
+.radioButtonIcon {
+ vertical-align: middle;
+}
diff --git a/web/src/layouts/components/header/index.tsx b/web/src/layouts/components/header/index.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..fab3ee41682bdf602d2851be46cf964c68bfb504
--- /dev/null
+++ b/web/src/layouts/components/header/index.tsx
@@ -0,0 +1,74 @@
+import { ReactComponent as StarIon } from '@/assets/svg/chat-star.svg';
+import { ReactComponent as Logo } from '@/assets/svg/logo.svg';
+import { Layout, Radio, Space, theme } from 'antd';
+
+import styles from './index.less';
+
+import { useMemo } from 'react';
+import { useLocation, useNavigate } from 'umi';
+import User from '../user';
+
+const { Header } = Layout;
+
+const RagHeader = () => {
+ const {
+ token: { colorBgContainer },
+ } = theme.useToken();
+ const navigate = useNavigate();
+ const { pathname } = useLocation();
+
+ const tagsData = [
+ { path: '/knowledge', name: 'knowledge' },
+ { path: '/chat', name: 'chat' },
+ { path: '/file', name: 'file' },
+ ];
+
+ const currentPath = useMemo(() => {
+ return tagsData.find((x) => x.path === pathname)?.name || 'knowledge';
+ }, [pathname]);
+
+ const handleChange = (path: string) => {
+ navigate(path);
+ };
+
+ return (
+ <Header
+ style={{
+ padding: '0 16px',
+ background: colorBgContainer,
+ display: 'flex',
+ justifyContent: 'space-between',
+ alignItems: 'center',
+ height: '72px',
+ }}
+ >
+ <Space size={12}>
+ <Logo className={styles.appIcon}></Logo>
+ <label className={styles.appName}>Infinity flow</label>
+ </Space>
+ <Space size={[0, 8]} wrap>
+ <Radio.Group
+ defaultValue="a"
+ buttonStyle="solid"
+ className={styles.radioGroup}
+ value={currentPath}
+ >
+ {tagsData.map((item) => (
+ <Radio.Button
+ value={item.name}
+ onClick={() => handleChange(item.path)}
+ >
+ <Space>
+ <StarIon className={styles.radioButtonIcon}></StarIon>
+ {item.name}
+ </Space>
+ </Radio.Button>
+ ))}
+ </Radio.Group>
+ </Space>
+ <User></User>
+ </Header>
+ );
+};
+
+export default RagHeader;
diff --git a/web/src/layouts/index.less b/web/src/layouts/index.less
index fc201abe128ec730799966c24eadab8e9455fbcd..d52ab516a86bb31593b7be10270a51c9cb08f583 100644
--- a/web/src/layouts/index.less
+++ b/web/src/layouts/index.less
@@ -18,16 +18,6 @@ body {
margin: 0;
}
-.tag {
- height: 40px;
- padding: 0 30px;
- margin: 0 5px;
- border: 1px solid #000;
- border-radius: 10px;
- cursor: pointer;
+.divider {
+ margin: 0;
}
-
-.checked {
- color: #1677ff;
- border-color: #1677ff;
-}
\ No newline at end of file
diff --git a/web/src/layouts/index.tsx b/web/src/layouts/index.tsx
index 3c809f14b6b960038c61ca516c2799c5605fa670..06eb101e8fcdaf4b0dfe5a89dabc99cc2916147d 100644
--- a/web/src/layouts/index.tsx
+++ b/web/src/layouts/index.tsx
@@ -1,74 +1,26 @@
-import logo from '@/assets/logo.png';
-import { Layout, Space, theme } from 'antd';
-import classnames from 'classnames';
-import React, { useEffect, useState } from 'react';
+import { Divider, Layout, theme } from 'antd';
+import React from 'react';
import { useTranslation } from 'react-i18next';
-import { Outlet, useLocation, useNavigate } from 'umi';
+import { Outlet } from 'umi';
import '../locales/config';
-import User from './components/user';
+import Header from './components/header';
import styles from './index.less';
-const { Header, Content } = Layout;
+const { Content } = Layout;
-const App: React.FC = (props) => {
+const App: React.FC = () => {
const { t } = useTranslation();
- const navigate = useNavigate();
const {
token: { colorBgContainer, borderRadiusLG },
} = theme.useToken();
- const [current, setCurrent] = useState('knowledge');
-
- const location = useLocation();
- useEffect(() => {
- if (location.pathname !== '/') {
- const path = location.pathname.split('/');
- // setCurrent(path[1]);
- }
- console.log(location.pathname.split('/'));
- }, [location.pathname]);
-
- const handleChange = (path: string) => {
- // setCurrent(path)
- navigate(path);
- };
- const tagsData = [
- { path: '/knowledge', name: 'knowledge' },
- { path: '/chat', name: 'chat' },
- { path: '/file', name: 'file' },
- ];
return (
<Layout className={styles.layout}>
<Layout>
- <Header
- style={{
- padding: '0 8px',
- background: colorBgContainer,
- display: 'flex',
- justifyContent: 'space-between',
- alignItems: 'center',
- }}
- >
- <img src={logo} alt="" style={{ height: 30, width: 30 }} />
- <Space size={[0, 8]} wrap>
- {tagsData.map((item) => (
- <span
- key={item.name}
- className={classnames(styles['tag'], {
- [styles['checked']]: current === item.name,
- })}
- onClick={() => handleChange(item.path)}
- >
- {item.name}
- </span>
- ))}
- </Space>
- <User></User>
- </Header>
+ <Header></Header>
+ <Divider orientationMargin={0} className={styles.divider} />
<Content
style={{
- margin: '24px 16px',
-
minHeight: 280,
background: colorBgContainer,
borderRadius: borderRadiusLG,
diff --git a/web/src/less/variable.less b/web/src/less/variable.less
new file mode 100644
index 0000000000000000000000000000000000000000..37fe53bc76abb77c46033eb43e24cfaea311031d
--- /dev/null
+++ b/web/src/less/variable.less
@@ -0,0 +1 @@
+@fontWeight600: 600;
diff --git a/web/src/pages/404.jsx b/web/src/pages/404.jsx
index e05f99d98e6cdfaec626fe30895eb0a48572a3d3..6a40f34d5be2c6b41527ca0d488b26f358cec137 100644
--- a/web/src/pages/404.jsx
+++ b/web/src/pages/404.jsx
@@ -1,5 +1,4 @@
import { Button, Result } from 'antd';
-import React from 'react';
import { history } from 'umi';
const NoFoundPage = () => {
diff --git a/web/src/pages/add-knowledge/model.ts b/web/src/pages/add-knowledge/model.ts
index 32a75ef4da0741e20937dd3da1edb974cba0bc20..0820749256f4331fae12a39617fdd5214db01cba 100644
--- a/web/src/pages/add-knowledge/model.ts
+++ b/web/src/pages/add-knowledge/model.ts
@@ -2,7 +2,6 @@ import { DvaModel } from 'umi';
export interface kAModelState {
isShowPSwModal: boolean;
isShowTntModal: boolean;
- loading: boolean;
tenantIfo: any;
activeKey: string;
id: string;
@@ -14,7 +13,6 @@ const model: DvaModel<kAModelState> = {
state: {
isShowPSwModal: false,
isShowTntModal: false,
- loading: false,
tenantIfo: {},
activeKey: 'setting',
id: '',
diff --git a/web/src/pages/knowledge/index.less b/web/src/pages/knowledge/index.less
index e9d499b9f3f89ead05718e60a1b19ebfa7957f34..37174f960d4709d75977eecf7a07a220c4294999 100644
--- a/web/src/pages/knowledge/index.less
+++ b/web/src/pages/knowledge/index.less
@@ -1,40 +1,43 @@
+// @import '~@/less/variable.less';
+
.knowledge {
- padding: 24px;
+ padding: 48px 60px;
}
-.container {
- height: 100px;
+.topWrapper {
display: flex;
- flex-direction: column;
justify-content: space-between;
-
- .content {
- display: flex;
- justify-content: space-between;
-
- .context {
- flex: 1;
- }
+ align-items: flex-start;
+ padding-bottom: 72px;
+
+ .title {
+ font-family: Inter;
+ font-size: 30px;
+ font-style: normal;
+ font-weight: @fontWeight600;
+ line-height: 38px;
+ color: rgba(16, 24, 40, 1);
}
-
- .footer {
- height: 20px;
-
- .text {
- margin-left: 10px;
- }
+ .description {
+ font-family: Inter;
+ font-size: 16px;
+ font-style: normal;
+ font-weight: 400;
+ line-height: 24px;
+ color: rgba(71, 84, 103, 1);
}
-}
-
-.card {
- :global {
- .ant-card-body {
- padding: 10px;
- margin: 0;
- }
- margin-bottom: 10px;
+ .topButton {
+ font-family: Inter;
+ font-size: 14px;
+ font-style: normal;
+ font-weight: @fontWeight600;
+ line-height: 20px;
}
- cursor: pointer;
+ .filterButton {
+ display: flex;
+ align-items: center;
+ .topButton();
+ }
}
diff --git a/web/src/pages/knowledge/index.tsx b/web/src/pages/knowledge/index.tsx
index 8af444f9c086ae1a1976e2e5277faea20fd4a63e..44734dace44335ff329f4296a1d9d263e95edca4 100644
--- a/web/src/pages/knowledge/index.tsx
+++ b/web/src/pages/knowledge/index.tsx
@@ -1,13 +1,10 @@
-import { formatDate } from '@/utils/date';
-import {
- DeleteOutlined,
- MinusSquareOutlined,
- PlusOutlined,
-} from '@ant-design/icons';
-import { Card, Col, FloatButton, Popconfirm, Row } from 'antd';
+import { ReactComponent as FilterIcon } from '@/assets/filter.svg';
+import { PlusOutlined } from '@ant-design/icons';
+import { Button, Col, Row, Space } from 'antd';
import { useCallback, useEffect } from 'react';
import { useDispatch, useNavigate, useSelector } from 'umi';
import styles from './index.less';
+import KnowledgeCard from './knowledge-card';
const Knowledge = () => {
const dispatch = useDispatch();
@@ -22,98 +19,54 @@ const Knowledge = () => {
});
}, []);
- const confirm = (id: string) => {
- dispatch({
- type: 'knowledgeModel/rmKb',
- payload: {
- kb_id: id,
- },
- });
- };
const handleAddKnowledge = () => {
navigate(`add/setting?activeKey=setting`);
};
- const handleEditKnowledge = (id: string) => {
- navigate(`add/setting?activeKey=file&id=${id}`);
- };
+
useEffect(() => {
fetchList();
}, [fetchList]);
+
return (
- <>
- <div className={styles.knowledge}>
- <FloatButton
- onClick={handleAddKnowledge}
- icon={<PlusOutlined />}
- type="primary"
- style={{ right: 24, top: 100 }}
- />
- <Row gutter={{ xs: 8, sm: 16, md: 24, lg: 32 }}>
- {data.map((item: any) => {
- return (
- <Col
- className="gutter-row"
- key={item.name}
- xs={24}
- sm={12}
- md={8}
- lg={6}
- >
- <Card
- className={styles.card}
- onClick={() => {
- handleEditKnowledge(item.id);
- }}
- >
- <div className={styles.container}>
- <div className={styles.content}>
- <span className={styles.context}>{item.name}</span>
- <span className={styles.delete}>
- <Popconfirm
- title="Delete the task"
- description="Are you sure to delete this task?"
- onConfirm={(e: any) => {
- e.stopPropagation();
- e.nativeEvent.stopImmediatePropagation();
- confirm(item.id);
- }}
- okText="Yes"
- cancelText="No"
- >
- <DeleteOutlined
- onClick={(e) => {
- e.stopPropagation();
- e.nativeEvent.stopImmediatePropagation();
- }}
- />
- </Popconfirm>
- </span>
- </div>
- <div className={styles.footer}>
- <span className={styles.text}>
- <MinusSquareOutlined />
- {item.doc_num}文档
- </span>
- <span className={styles.text}>
- <MinusSquareOutlined />
- {item.chunk_num}个
- </span>
- <span className={styles.text}>
- <MinusSquareOutlined />
- {item.token_num}ĺŤĺ—符
- </span>
- <span style={{ float: 'right' }}>
- {formatDate(item.update_date)}
- </span>
- </div>
- </div>
- </Card>
- </Col>
- );
- })}
- </Row>
+ <div className={styles.knowledge}>
+ <div className={styles.topWrapper}>
+ <div>
+ <span className={styles.title}>Welcome back, Zing</span>
+ <p className={styles.description}>
+ Which database are we going to use today?
+ </p>
+ </div>
+ <Space size={'large'}>
+ <Button icon={<FilterIcon />} className={styles.filterButton}>
+ Filters
+ </Button>
+ <Button
+ type="primary"
+ icon={<PlusOutlined />}
+ onClick={handleAddKnowledge}
+ className={styles.topButton}
+ >
+ Create knowledge base
+ </Button>
+ </Space>
</div>
- </>
+ <Row gutter={{ xs: 8, sm: 16, md: 24, lg: 32 }}>
+ {data.map((item: any) => {
+ return (
+ <Col
+ className="gutter-row"
+ key={item.name}
+ xs={24}
+ sm={12}
+ md={8}
+ lg={6}
+ >
+ <KnowledgeCard item={item}></KnowledgeCard>
+ </Col>
+ );
+ })}
+ </Row>
+ </div>
);
};
diff --git a/web/src/pages/knowledge/knowledge-card/index.less b/web/src/pages/knowledge/knowledge-card/index.less
new file mode 100644
index 0000000000000000000000000000000000000000..17b6bb6420f311562e1119b60ecc19cb4fb5ccdf
--- /dev/null
+++ b/web/src/pages/knowledge/knowledge-card/index.less
@@ -0,0 +1,73 @@
+.container {
+ height: 251px;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+
+ .content {
+ display: flex;
+ justify-content: space-between;
+
+ .context {
+ flex: 1;
+ }
+ }
+
+ .footer {
+ // text-align: left;
+ }
+ .footerTop {
+ padding-bottom: 2px;
+ }
+}
+
+.card {
+ border-radius: 12px;
+ border: 1px solid rgba(234, 236, 240, 1);
+ box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
+ padding: 24px;
+ min-width: 300px;
+ cursor: pointer;
+
+ .titleWrapper {
+ // flex: 1;
+ .title {
+ font-size: 24px;
+ line-height: 32px;
+ font-weight: 600;
+ color: rgba(0, 0, 0, 0.88);
+ }
+ .description {
+ font-size: 12px;
+ font-weight: 600;
+ line-height: 20px;
+ color: rgba(0, 0, 0, 0.45);
+ }
+ }
+
+ :global {
+ .ant-card-body {
+ padding: 0;
+ margin: 0;
+ }
+ }
+ .bottom {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
+ .bottomLeft {
+ vertical-align: middle;
+ }
+ .leftIcon {
+ margin-right: 10px;
+ font-size: 18px;
+ vertical-align: middle;
+ }
+ .rightText {
+ font-size: 12px;
+ font-weight: 600;
+ color: rgba(0, 0, 0, 0.65);
+ vertical-align: middle;
+ }
+}
diff --git a/web/src/pages/knowledge/knowledge-card/index.tsx b/web/src/pages/knowledge/knowledge-card/index.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..2536641c07cc541ed22e7d5e5534a0570ef05ded
--- /dev/null
+++ b/web/src/pages/knowledge/knowledge-card/index.tsx
@@ -0,0 +1,123 @@
+import { ReactComponent as MoreIcon } from '@/assets/svg/more.svg';
+import { formatDate } from '@/utils/date';
+import {
+ AntDesignOutlined,
+ CalendarOutlined,
+ DeleteOutlined,
+ FileTextOutlined,
+ UserOutlined,
+} from '@ant-design/icons';
+import { Avatar, Card, Dropdown, MenuProps, Space, Tooltip } from 'antd';
+import { MouseEvent } from 'react';
+import { useDispatch, useNavigate } from 'umi';
+
+import styles from './index.less';
+
+interface IProps {
+ item: any;
+}
+
+const KnowledgeCard = ({ item }: IProps) => {
+ const navigate = useNavigate();
+ const dispatch = useDispatch();
+
+ const handleDelete = (e: MouseEvent<HTMLButtonElement>) => {
+ e.stopPropagation();
+ };
+
+ const items: MenuProps['items'] = [
+ {
+ key: '1',
+ label: (
+ <Space>
+ ĺ 除
+ <DeleteOutlined onClick={handleDelete} />
+ </Space>
+ ),
+ },
+ ];
+
+ const confirm = (id: string) => {
+ dispatch({
+ type: 'knowledgeModel/rmKb',
+ payload: {
+ kb_id: id,
+ },
+ });
+ };
+
+ const handleCardClick = () => {
+ navigate(`add/setting?activeKey=file&id=${item.id}`);
+ };
+
+ const onConfirmDelete = (e?: MouseEvent<HTMLElement>) => {
+ e?.stopPropagation();
+ e?.nativeEvent.stopImmediatePropagation();
+ confirm(item.id);
+ };
+
+ return (
+ <Card className={styles.card} onClick={handleCardClick}>
+ <div className={styles.container}>
+ <div className={styles.content}>
+ <Avatar size={34} icon={<UserOutlined />} />
+
+ <span className={styles.delete}>
+ {/* <Popconfirm
+ title="Delete the task"
+ description="Are you sure to delete this task?"
+ onConfirm={onConfirmDelete}
+ okText="Yes"
+ cancelText="No"
+ >
+ <DeleteOutlined onClick={handleDelete} />
+ </Popconfirm> */}
+ <Dropdown menu={{ items }}>
+ <MoreIcon />
+ </Dropdown>
+ </span>
+ </div>
+ <div className={styles.titleWrapper}>
+ <span className={styles.title}>{item.name}</span>
+ <p>A comprehensive knowledge base for crafting effective resumes.</p>
+ </div>
+ <div className={styles.footer}>
+ <div className={styles.footerTop}>
+ <div className={styles.bottomLeft}>
+ <FileTextOutlined className={styles.leftIcon} />
+ <span className={styles.rightText}>
+ <Space>{item.doc_num}文档</Space>
+ </span>
+ </div>
+ </div>
+ <div className={styles.bottom}>
+ <div className={styles.bottomLeft}>
+ <CalendarOutlined className={styles.leftIcon} />
+ <span className={styles.rightText}>
+ {formatDate(item.update_date)}
+ </span>
+ </div>
+ <Avatar.Group size={25}>
+ <Avatar src="https://api.dicebear.com/7.x/miniavs/svg?seed=1" />
+ <a href="https://ant.design">
+ <Avatar style={{ backgroundColor: '#f56a00' }}>K</Avatar>
+ </a>
+ <Tooltip title="Ant User" placement="top">
+ <Avatar
+ style={{ backgroundColor: '#87d068' }}
+ icon={<UserOutlined />}
+ />
+ </Tooltip>
+ <Avatar
+ style={{ backgroundColor: '#1677ff' }}
+ icon={<AntDesignOutlined />}
+ />
+ </Avatar.Group>
+ </div>
+ </div>
+ </div>
+ </Card>
+ );
+};
+
+export default KnowledgeCard;
diff --git a/web/src/pages/knowledge/model.ts b/web/src/pages/knowledge/model.ts
index 0621f763a38804df30158b558fb45cdb06b66bed..51ab284bc93828f2da625bd781a3ad13690df9db 100644
--- a/web/src/pages/knowledge/model.ts
+++ b/web/src/pages/knowledge/model.ts
@@ -19,7 +19,7 @@ const model: DvaModel<KnowledgeModelState> = {
},
},
effects: {
- *rmKb({ payload = {}, callback }, { call, put }) {
+ *rmKb({ payload = {} }, { call, put }) {
const { data } = yield call(kbService.rmKb, payload);
const { retcode } = data;
if (retcode === 0) {
diff --git a/web/src/pages/login/index.tsx b/web/src/pages/login/index.tsx
index a0696b361b38cd893873ee801a409ad327121283..3493673b2f33f81bf73ed49045331e8269d88b22 100644
--- a/web/src/pages/login/index.tsx
+++ b/web/src/pages/login/index.tsx
@@ -12,6 +12,8 @@ const Login = () => {
(state) => state.loading.effects,
);
+ // TODO: When the server address request is not accessible, the value of dva-loading always remains true.
+
const signLoading =
effectsLoading['loginModel/login'] || effectsLoading['loginModel/register'];
diff --git a/web/src/pages/login/model.ts b/web/src/pages/login/model.ts
index 257879f6dea386b7ecc921bc9bb62e2c8845b5d5..0c2dd4abd1e7cd4ae6a2431f3123279fecfdf74d 100644
--- a/web/src/pages/login/model.ts
+++ b/web/src/pages/login/model.ts
@@ -32,10 +32,8 @@ const model: DvaModel<LoginModelState> = {
},
effects: {
*login({ payload = {} }, { call, put }) {
- console.log(111, payload);
const { data, response } = yield call(userService.login, payload);
- const { retcode, data: res, retmsg } = data;
- console.log();
+ const { retcode, data: res } = data;
const authorization = response.headers.get(Authorization);
if (retcode === 0) {
message.success('登录ć功ďĽ');
diff --git a/web/src/pages/setting/CPwModal.tsx b/web/src/pages/setting/CPwModal.tsx
index 031d611c75dff14c87ae812ab77ca23979512fe6..c9713709d0f93e5f881630fbe3ba8428cc2d6294 100644
--- a/web/src/pages/setting/CPwModal.tsx
+++ b/web/src/pages/setting/CPwModal.tsx
@@ -1,92 +1,78 @@
-import { connect, Dispatch } from 'umi';
-import i18n from 'i18next';
-import { useTranslation, Trans } from 'react-i18next'
-import { Input, Modal, Form } from 'antd'
-import { rsaPsw } from '@/utils'
-import styles from './index.less';
-import { FC } from 'react';
+import { rsaPsw } from '@/utils';
+import { Form, Input, Modal } from 'antd';
+import { useTranslation } from 'react-i18next';
+import { useDispatch, useSelector } from 'umi';
type FieldType = {
- newPassword?: string;
- password?: string;
+ newPassword?: string;
+ password?: string;
};
-interface CPwModalProps {
- dispatch: Dispatch;
- settingModel: any
-}
-const Index: FC<CPwModalProps> = ({ settingModel, dispatch }) => {
- const { isShowPSwModal } = settingModel
- const { t } = useTranslation()
- const handleCancel = () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowPSwModal: false
- }
- });
- };
- const [form] = Form.useForm()
- const handleOk = async () => {
- try {
- const values = await form.validateFields();
- var password = rsaPsw(values.password)
- var new_password = rsaPsw(values.newPassword)
- dispatch({
- type: 'settingModel/setting',
- payload: {
- password,
- new_password
- },
- callback: () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowPSwModal: false
- }
- });
- dispatch({
- type: 'settingModel/getUserInfo',
- payload: {
+const CpwModal = () => {
+ const dispatch = useDispatch();
+ const settingModel = useSelector((state: any) => state.settingModel);
+ const { isShowPSwModal } = settingModel;
+ const { t } = useTranslation();
+ const [form] = Form.useForm();
- }
- });
- }
- });
+ const handleCancel = () => {
+ dispatch({
+ type: 'settingModel/updateState',
+ payload: {
+ isShowPSwModal: false,
+ },
+ });
+ };
+ const handleOk = async () => {
+ try {
+ const values = await form.validateFields();
+ var password = rsaPsw(values.password);
+ var new_password = rsaPsw(values.newPassword);
- } catch (errorInfo) {
- console.log('Failed:', errorInfo);
- }
- };
+ dispatch({
+ type: 'settingModel/setting',
+ payload: {
+ password,
+ new_password,
+ },
+ });
+ } catch (errorInfo) {
+ console.log('Failed:', errorInfo);
+ }
+ };
- return (
- <Modal title="Basic Modal" open={isShowPSwModal} onOk={handleOk} onCancel={handleCancel}>
- <Form
- form={form}
- labelCol={{ span: 8 }}
- wrapperCol={{ span: 16 }}
- style={{ maxWidth: 600 }}
- autoComplete="off"
- >
- <Form.Item<FieldType>
- label="旧密ç "
- name="password"
- rules={[{ required: true, message: 'Please input value' }]}
- >
- <Input.Password />
- </Form.Item>
- <Form.Item<FieldType>
- label="新密ç "
- name="newPassword"
- rules={[{ required: true, message: 'Please input your newPassword!' }]}
- >
- <Input.Password />
- </Form.Item>
-
- </Form>
- </Modal >
-
-
- );
-}
-export default connect(({ settingModel, loading }) => ({ settingModel, loading }))(Index);
+ return (
+ <Modal
+ title="Basic Modal"
+ open={isShowPSwModal}
+ onOk={handleOk}
+ onCancel={handleCancel}
+ >
+ <Form
+ form={form}
+ labelCol={{ span: 8 }}
+ wrapperCol={{ span: 16 }}
+ style={{ maxWidth: 600 }}
+ autoComplete="off"
+ >
+ <Form.Item<FieldType>
+ label="旧密ç "
+ name="password"
+ rules={[{ required: true, message: 'Please input value' }]}
+ >
+ <Input.Password />
+ </Form.Item>
+ <Form.Item<FieldType>
+ label="新密ç "
+ name="newPassword"
+ rules={[
+ { required: true, message: 'Please input your newPassword!' },
+ ]}
+ >
+ <Input.Password />
+ </Form.Item>
+ </Form>
+ </Modal>
+ );
+};
+export default CpwModal;
diff --git a/web/src/pages/setting/List.tsx b/web/src/pages/setting/List.tsx
index 86e0a3bf66605199a0fc01a8af0c49a98bf26439..35c8191db0a67cd50136df45fee706a6fd49045b 100644
--- a/web/src/pages/setting/List.tsx
+++ b/web/src/pages/setting/List.tsx
@@ -1,196 +1,146 @@
-import { connect, Dispatch } from 'umi';
-import i18n from 'i18next';
-import { useTranslation, Trans } from 'react-i18next'
+import { useTranslation } from 'react-i18next';
+import { useEffect, useState } from 'react';
import styles from './index.less';
-import type { ColumnsType } from 'antd/es/table';
-import { useEffect, useState, FC } from 'react';
import { RadarChartOutlined } from '@ant-design/icons';
import { ProCard } from '@ant-design/pro-components';
-import { Button, Tag, Row, Col, Card } from 'antd';
-
+import { Button, Card, Col, Row, Tag } from 'antd';
+import { useDispatch, useSelector } from 'umi';
interface DataType {
- key: React.Key;
- name: string;
- age: number;
- address: string;
- description: string;
-}
-interface ListProps {
- dispatch: Dispatch;
- settingModel: any
+ key: React.Key;
+ name: string;
+ age: number;
+ address: string;
+ description: string;
}
-const Index: FC<ListProps> = ({ settingModel, dispatch }) => {
- const { llmInfo = {}, factoriesList, myLlm = [] } = settingModel
- const { OpenAI = [], tongyi = [] } = llmInfo
- console.log(OpenAI)
- const [collapsed, setCollapsed] = useState(true);
- const { t } = useTranslation()
- const columns: ColumnsType<DataType> = [
- { title: 'Name', dataIndex: 'name', key: 'name' },
- { title: 'Age', dataIndex: 'age', key: 'age' },
- {
- title: 'Action',
- dataIndex: '',
- key: 'x',
- render: () => <a>Delete</a>,
- },
- ];
- useEffect(() => {
- dispatch({
- type: 'settingModel/factories_list',
- payload: {
- },
- });
- dispatch({
- type: 'settingModel/llm_list',
- payload: {
- },
- });
- dispatch({
- type: 'settingModel/my_llm',
- payload: {
- },
- });
- }, [])
- const data: DataType[] = [
- {
- key: 1,
- name: 'John Brown',
- age: 32,
- address: 'New York No. 1 Lake Park',
- description: 'My name is John Brown, I am 32 years old, living in New York No. 1 Lake Park.',
- },
- {
- key: 2,
- name: 'Jim Green',
- age: 42,
- address: 'London No. 1 Lake Park',
- description: 'My name is Jim Green, I am 42 years old, living in London No. 1 Lake Park.',
- },
- {
- key: 3,
- name: 'Not Expandable',
- age: 29,
- address: 'Jiangsu No. 1 Lake Park',
- description: 'This not expandable',
- },
- {
- key: 4,
- name: 'Joe Black',
- age: 32,
- address: 'Sydney No. 1 Lake Park',
- description: 'My name is Joe Black, I am 32 years old, living in Sydney No. 1 Lake Park.',
- },
- ];
+const SettingList = () => {
+ const dispatch = useDispatch();
+ const settingModel = useSelector((state: any) => state.settingModel);
+ const { llmInfo = {}, factoriesList, myLlm = [] } = settingModel;
+ const { OpenAI = [], tongyi = [] } = llmInfo;
+ const [collapsed, setCollapsed] = useState(true);
+ const { t } = useTranslation();
- return (
- <div
- className={styles.list}
- style={{
- display: 'flex',
- flexDirection: 'column',
- padding: 24,
- gap: 12,
+ useEffect(() => {
+ dispatch({
+ type: 'settingModel/factories_list',
+ payload: {},
+ });
+ dispatch({
+ type: 'settingModel/llm_list',
+ payload: {},
+ });
+ dispatch({
+ type: 'settingModel/my_llm',
+ payload: {},
+ });
+ }, []);
+
+ return (
+ <div
+ className={styles.list}
+ style={{
+ display: 'flex',
+ flexDirection: 'column',
+ padding: 24,
+ gap: 12,
+ }}
+ >
+ {myLlm.map((item: any) => {
+ return (
+ <ProCard
+ key={item.llm_factory}
+ // title={<div>可ćŠĺŹ -ĺ›ľć ‡č‡Şĺ®šäą‰</div>}
+ collapsibleIconRender={({
+ collapsed: buildInCollapsed,
+ }: {
+ collapsed: boolean;
+ }) => {
+ return (
+ <div>
+ <h3>
+ <RadarChartOutlined />
+ {item.llm_factory}
+ </h3>
+ <div>
+ {item.tags.split(',').map((d: string) => {
+ return <Tag key={d}>{d}</Tag>;
+ })}
+ </div>
+ {buildInCollapsed ? (
+ <span>ćľç¤ş{OpenAI.length}个模型</span>
+ ) : (
+ <span>收起{OpenAI.length}个模型 </span>
+ )}
+ </div>
+ );
}}
- >
- {
- myLlm.map((item: any) => {
- return (<ProCard
- key={item.llm_factory}
- // title={<div>可ćŠĺŹ -ĺ›ľć ‡č‡Şĺ®šäą‰</div>}
- collapsibleIconRender={({
- collapsed: buildInCollapsed,
- }: {
- collapsed: boolean;
- }) => {
- return (<div>
- <h3><RadarChartOutlined />{item.llm_factory}</h3>
- <div>{item.tags.split(',').map((d: string) => {
- return <Tag key={d}>{d}</Tag>
- })}</div>
- {
- buildInCollapsed ? <span>ćľç¤ş{OpenAI.length}个模型</span> : <span>收起{OpenAI.length}个模型 </span>
- }
- </div>)
- }}
- extra={
- <Button
- size="small"
- type='link'
- onClick={(e) => {
- e.stopPropagation();
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- llm_factory: item.llm_factory,
- isShowSAKModal: true
- }
- });
- }}
- >
- 设置
- </Button>
- }
- style={{ marginBlockStart: 16 }}
- headerBordered
- collapsible
- defaultCollapsed
- >
- {/* <ul>
- {OpenAI.map(item => {
- return <li key={item.llm_name}>
- <span>{item.llm_name}</span>
- <span className={styles[item.available ? 'statusAvailable' : 'statusDisaabled']}>
- </span>
- </li>
- })}
- </ul> */}
- </ProCard>)
- })
+ extra={
+ <Button
+ size="small"
+ type="link"
+ onClick={(e) => {
+ e.stopPropagation();
+ dispatch({
+ type: 'settingModel/updateState',
+ payload: {
+ llm_factory: item.llm_factory,
+ isShowSAKModal: true,
+ },
+ });
+ }}
+ >
+ 设置
+ </Button>
}
+ style={{ marginBlockStart: 16 }}
+ headerBordered
+ collapsible
+ defaultCollapsed
+ ></ProCard>
+ );
+ })}
-
-
- <Row gutter={{ xs: 8, sm: 16, md: 24, lg: 32 }}>
- {
- factoriesList.map((item: any) => {
- return (<Col key={item.name} xs={24} sm={12} md={8} lg={6}>
- <Card title={item.name} bordered={false} extra={
- <Button
- size="small"
- type='link'
- onClick={(e) => {
- e.stopPropagation();
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- llm_factory: item.name,
- isShowSAKModal: true
- }
- });
- }}
- >
- 设置
- </Button>
- }>
-
- <div>
- {
- item.tags.split(',').map((d: string) => {
- return <Tag key={d}>{d}</Tag>
- })
- }
- </div>
- </Card>
- </Col>)
- })
+ <Row gutter={{ xs: 8, sm: 16, md: 24, lg: 32 }}>
+ {factoriesList.map((item: any) => {
+ return (
+ <Col key={item.name} xs={24} sm={12} md={8} lg={6}>
+ <Card
+ title={item.name}
+ bordered={false}
+ extra={
+ <Button
+ size="small"
+ type="link"
+ onClick={(e) => {
+ e.stopPropagation();
+ dispatch({
+ type: 'settingModel/updateState',
+ payload: {
+ llm_factory: item.name,
+ isShowSAKModal: true,
+ },
+ });
+ }}
+ >
+ 设置
+ </Button>
}
- </Row>
- </div>
- );
-}
-export default connect(({ settingModel, loading }) => ({ settingModel, loading }))(Index);
+ >
+ <div>
+ {item.tags.split(',').map((d: string) => {
+ return <Tag key={d}>{d}</Tag>;
+ })}
+ </div>
+ </Card>
+ </Col>
+ );
+ })}
+ </Row>
+ </div>
+ );
+};
+export default SettingList;
diff --git a/web/src/pages/setting/SAKModal.tsx b/web/src/pages/setting/SAKModal.tsx
index 94da17bb457cd72c8ff79c4930a3910efe623d19..43744cb124c9e51ff71d2e309a2c75831e382fe9 100644
--- a/web/src/pages/setting/SAKModal.tsx
+++ b/web/src/pages/setting/SAKModal.tsx
@@ -1,83 +1,66 @@
-import { connect, Dispatch } from 'umi';
-import i18n from 'i18next';
-import { FC } from 'react'
-import { useTranslation, Trans } from 'react-i18next'
-import { Input, Modal, Form } from 'antd'
-import styles from './index.less';
+import { Form, Input, Modal } from 'antd';
+import { useTranslation } from 'react-i18next';
+import { useDispatch, useSelector } from 'umi';
type FieldType = {
- api_key?: string;
+ api_key?: string;
};
-interface SAKModalProps {
- dispatch: Dispatch;
- settingModel: any
-}
-const Index: FC<SAKModalProps> = ({ settingModel, dispatch }) => {
- const { isShowSAKModal, llm_factory } = settingModel
- console.log(llm_factory)
- const { t } = useTranslation()
- const handleCancel = () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowSAKModal: false
- }
- });
- };
- const [form] = Form.useForm()
- const handleOk = async () => {
- try {
- const values = await form.validateFields();
- dispatch({
- type: 'settingModel/set_api_key',
- payload: {
- api_key: values.api_key,
- llm_factory: llm_factory
- },
- callback: () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowSAKModal: false
- }
- });
- // dispatch({
- // type: 'settingModel/getUserInfo',
- // payload: {
+const SakModal = () => {
+ const dispatch = useDispatch();
+ const settingModel = useSelector((state: any) => state.settingModel);
+ const { isShowSAKModal, llm_factory } = settingModel;
+ const { t } = useTranslation();
+ const [form] = Form.useForm();
- // }
- // });
- }
- });
+ const handleCancel = () => {
+ dispatch({
+ type: 'settingModel/updateState',
+ payload: {
+ isShowSAKModal: false,
+ },
+ });
+ };
+ const handleOk = async () => {
+ try {
+ const values = await form.validateFields();
- } catch (errorInfo) {
- console.log('Failed:', errorInfo);
- }
- };
+ dispatch({
+ type: 'settingModel/set_api_key',
+ payload: {
+ api_key: values.api_key,
+ llm_factory: llm_factory,
+ },
+ });
+ } catch (errorInfo) {
+ console.log('Failed:', errorInfo);
+ }
+ };
- return (
- <Modal title="Basic Modal" open={isShowSAKModal} onOk={handleOk} onCancel={handleCancel}>
- <Form
- form={form}
- name="validateOnly"
- labelCol={{ span: 8 }}
- wrapperCol={{ span: 16 }}
- style={{ maxWidth: 600 }}
- autoComplete="off"
- >
- <Form.Item<FieldType>
- label="API Key"
- name="api_key"
- rules={[{ required: true, message: 'Please input ' }]}
- >
- <Input />
- </Form.Item>
-
- </Form>
- </Modal >
-
-
- );
-}
-export default connect(({ settingModel, loading }) => ({ settingModel, loading }))(Index);
+ return (
+ <Modal
+ title="Basic Modal"
+ open={isShowSAKModal}
+ onOk={handleOk}
+ onCancel={handleCancel}
+ >
+ <Form
+ form={form}
+ name="validateOnly"
+ labelCol={{ span: 8 }}
+ wrapperCol={{ span: 16 }}
+ style={{ maxWidth: 600 }}
+ autoComplete="off"
+ >
+ <Form.Item<FieldType>
+ label="API Key"
+ name="api_key"
+ rules={[{ required: true, message: 'Please input ' }]}
+ >
+ <Input />
+ </Form.Item>
+ </Form>
+ </Modal>
+ );
+};
+export default SakModal;
diff --git a/web/src/pages/setting/SSModal.tsx b/web/src/pages/setting/SSModal.tsx
index 097933745674d4192990152d5d51407a363c4f07..6e89669b44d85b1e2ecaadad6ae510c8b9f969cd 100644
--- a/web/src/pages/setting/SSModal.tsx
+++ b/web/src/pages/setting/SSModal.tsx
@@ -1,152 +1,144 @@
-import { connect, Dispatch } from 'umi';
-import { FC } from 'react'
-import i18n from 'i18next';
-import { useTranslation, Trans } from 'react-i18next'
-import { Input, Modal, Form, Select } from 'antd'
-import styles from './index.less';
+import { Form, Modal, Select } from 'antd';
+import { useTranslation } from 'react-i18next';
+import { useDispatch, useSelector } from 'umi';
type FieldType = {
- embd_id?: string;
- img2txt_id?: string;
- llm_id?: string;
- asr_id?: string
+ embd_id?: string;
+ img2txt_id?: string;
+ llm_id?: string;
+ asr_id?: string;
};
-interface SSModalProps {
- dispatch: Dispatch;
- settingModel: any
-}
-const Index: FC<SSModalProps> = ({ settingModel, dispatch }) => {
- const { isShowSSModal, llmInfo = {}, tenantIfo } = settingModel
- const { t } = useTranslation()
- const handleCancel = () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowSSModal: false
- }
- });
- };
- const [form] = Form.useForm()
- const handleOk = async () => {
- try {
- const values = await form.validateFields();
- console.log(values)
- dispatch({
- type: 'settingModel/set_tenant_info',
- payload: {
- ...values,
- tenant_id: tenantIfo.tenant_id,
- },
- callback: () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowSSModal: false
- }
- });
- // dispatch({
- // type: 'settingModel/getUserInfo',
- // payload: {
+const SsModal = () => {
+ const dispatch = useDispatch();
+ const settingModel = useSelector((state: any) => state.settingModel);
+ const { isShowSSModal, llmInfo = {}, tenantIfo } = settingModel;
+ const [form] = Form.useForm();
+ const { t } = useTranslation();
- // }
- // });
- }
- });
-
- } catch (errorInfo) {
- console.log('Failed:', errorInfo);
- }
- };
- const handleChange = () => {
+ const handleCancel = () => {
+ dispatch({
+ type: 'settingModel/updateState',
+ payload: {
+ isShowSSModal: false,
+ },
+ });
+ };
+ const handleOk = async () => {
+ try {
+ const values = await form.validateFields();
+ const retcode = await dispatch<any>({
+ type: 'settingModel/set_tenant_info',
+ payload: {
+ ...values,
+ tenant_id: tenantIfo.tenant_id,
+ },
+ });
+ retcode === 0 &&
+ dispatch({
+ type: 'settingModel/updateState',
+ payload: {
+ isShowSSModal: false,
+ },
+ });
+ } catch (errorInfo) {
+ console.log('Failed:', errorInfo);
}
+ };
- return (
- <Modal title="Basic Modal" open={isShowSSModal} onOk={handleOk} onCancel={handleCancel}>
- <Form
- form={form}
- name="validateOnly"
- // labelCol={{ span: 8 }}
- // wrapperCol={{ span: 16 }}
- style={{ maxWidth: 600 }}
- autoComplete="off"
- layout="vertical"
- >
- <Form.Item<FieldType>
- label="embedding 模型"
- name="embd_id"
- rules={[{ required: true, message: 'Please input value' }]}
- initialValue={tenantIfo.embd_id}
-
- >
- <Select
- // style={{ width: 200 }}
- onChange={handleChange}
- // fieldNames={label:}
- options={Object.keys(llmInfo).map(t => {
- const options = llmInfo[t].filter((d: any) => d.model_type === 'embedding').map((d: any) => ({ label: d.llm_name, value: d.llm_name, }))
- return { label: t, options }
- })}
- />
- </Form.Item>
- <Form.Item<FieldType>
- label="chat 模型"
- name="llm_id"
- rules={[{ required: true, message: 'Please input value' }]}
- initialValue={tenantIfo.llm_id}
-
- >
- <Select
- // style={{ width: 200 }}
- onChange={handleChange}
- // fieldNames={label:}
- options={Object.keys(llmInfo).map(t => {
- const options = llmInfo[t].filter((d: any) => d.model_type === 'chat').map((d: any) => ({ label: d.llm_name, value: d.llm_name, }))
- return { label: t, options }
- })}
- />
- </Form.Item>
- <Form.Item<FieldType>
- label="image2text 模型"
- name="img2txt_id"
- rules={[{ required: true, message: 'Please input value' }]}
- initialValue={tenantIfo.img2txt_id}
+ const handleChange = () => {};
- >
- <Select
- // style={{ width: 200 }}
- onChange={handleChange}
- // fieldNames={label:}
- options={Object.keys(llmInfo).map(t => {
- const options = llmInfo[t].filter((d: any) => d.model_type === 'image2text').map((d: any) => ({ label: d.llm_name, value: d.llm_name, }))
- return { label: t, options }
- })}
- />
- </Form.Item>
- <Form.Item<FieldType>
- label="speech2text 模型"
- name="asr_id"
- rules={[{ required: true, message: 'Please input value' }]}
- initialValue={tenantIfo.asr_id}
-
- >
- <Select
- // style={{ width: 200 }}
- onChange={handleChange}
- // fieldNames={label:}
- options={Object.keys(llmInfo).map(t => {
- const options = llmInfo[t].filter((d: any) => d.model_type === 'speech2text').map((d: any) => ({ label: d.llm_name, value: d.llm_name, }))
- return { label: t, options }
- })}
- />
- </Form.Item>
-
-
- </Form>
- </Modal >
-
-
- );
-}
-export default connect(({ settingModel, loading }) => ({ settingModel, loading }))(Index);
+ return (
+ <Modal
+ title="Basic Modal"
+ open={isShowSSModal}
+ onOk={handleOk}
+ onCancel={handleCancel}
+ >
+ <Form
+ form={form}
+ name="validateOnly"
+ // labelCol={{ span: 8 }}
+ // wrapperCol={{ span: 16 }}
+ style={{ maxWidth: 600 }}
+ autoComplete="off"
+ layout="vertical"
+ >
+ <Form.Item<FieldType>
+ label="embedding 模型"
+ name="embd_id"
+ rules={[{ required: true, message: 'Please input value' }]}
+ initialValue={tenantIfo.embd_id}
+ >
+ <Select
+ // style={{ width: 200 }}
+ onChange={handleChange}
+ // fieldNames={label:}
+ options={Object.keys(llmInfo).map((t) => {
+ const options = llmInfo[t]
+ .filter((d: any) => d.model_type === 'embedding')
+ .map((d: any) => ({ label: d.llm_name, value: d.llm_name }));
+ return { label: t, options };
+ })}
+ />
+ </Form.Item>
+ <Form.Item<FieldType>
+ label="chat 模型"
+ name="llm_id"
+ rules={[{ required: true, message: 'Please input value' }]}
+ initialValue={tenantIfo.llm_id}
+ >
+ <Select
+ // style={{ width: 200 }}
+ onChange={handleChange}
+ // fieldNames={label:}
+ options={Object.keys(llmInfo).map((t) => {
+ const options = llmInfo[t]
+ .filter((d: any) => d.model_type === 'chat')
+ .map((d: any) => ({ label: d.llm_name, value: d.llm_name }));
+ return { label: t, options };
+ })}
+ />
+ </Form.Item>
+ <Form.Item<FieldType>
+ label="image2text 模型"
+ name="img2txt_id"
+ rules={[{ required: true, message: 'Please input value' }]}
+ initialValue={tenantIfo.img2txt_id}
+ >
+ <Select
+ // style={{ width: 200 }}
+ onChange={handleChange}
+ // fieldNames={label:}
+ options={Object.keys(llmInfo).map((t) => {
+ const options = llmInfo[t]
+ .filter((d: any) => d.model_type === 'image2text')
+ .map((d: any) => ({ label: d.llm_name, value: d.llm_name }));
+ return { label: t, options };
+ })}
+ />
+ </Form.Item>
+ <Form.Item<FieldType>
+ label="speech2text 模型"
+ name="asr_id"
+ rules={[{ required: true, message: 'Please input value' }]}
+ initialValue={tenantIfo.asr_id}
+ >
+ <Select
+ // style={{ width: 200 }}
+ onChange={handleChange}
+ // fieldNames={label:}
+ options={Object.keys(llmInfo).map((t) => {
+ const options = llmInfo[t]
+ .filter((d: any) => d.model_type === 'speech2text')
+ .map((d: any) => ({ label: d.llm_name, value: d.llm_name }));
+ return { label: t, options };
+ })}
+ />
+ </Form.Item>
+ </Form>
+ </Modal>
+ );
+};
+export default SsModal;
diff --git a/web/src/pages/setting/TntModal.tsx b/web/src/pages/setting/TntModal.tsx
index 21c99b0a7f0e90c174cbfaef1c0c88ccc308d0d9..72a5ef8099306618315e8c9231cd0924e208e84b 100644
--- a/web/src/pages/setting/TntModal.tsx
+++ b/web/src/pages/setting/TntModal.tsx
@@ -1,58 +1,65 @@
-import { connect, Dispatch } from 'umi';
-import { FC } from 'react'
-import i18n from 'i18next';
-import { useTranslation, Trans } from 'react-i18next'
-import { Modal, Table } from 'antd'
+import { useOneNamespaceEffectsLoading } from '@/hooks/storeHooks';
+import { Modal, Table } from 'antd';
+import { ColumnsType } from 'antd/es/table';
+import { useTranslation } from 'react-i18next';
+import { useDispatch, useSelector } from 'umi';
import styles from './index.less';
-import type { ColumnsType } from 'antd/es/table';
-
interface DataType {
- key: React.Key;
- name: string;
- role: string;
- time: string;
+ key: React.Key;
+ name: string;
+ role: string;
+ time: string;
}
-interface TntodalProps {
- dispatch: Dispatch;
- settingModel: any
-}
+const TntModal = () => {
+ const dispatch = useDispatch();
+ const settingModel = useSelector((state: any) => state.settingModel);
+ const { isShowTntModal, tenantIfo, factoriesList } = settingModel;
+ const { t } = useTranslation();
+ const loading = useOneNamespaceEffectsLoading('settingModel', [
+ 'getTenantInfo',
+ ]);
-const Index: FC<TntodalProps> = ({ settingModel, dispatch }) => {
- const { isShowTntModal, tenantIfo, loading, factoriesList } = settingModel
- const { t } = useTranslation()
- const handleCancel = () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowTntModal: false
- }
- });
- };
- console.log(tenantIfo)
- const handleOk = async () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowTntModal: false
- }
- });
- };
- const columns: ColumnsType<DataType> = [
- { title: '姓ĺŤ', dataIndex: 'name', key: 'name' },
- { title: '活动时间', dataIndex: 'update_date', key: 'update_date' },
- { title: '角色', dataIndex: 'role', key: 'age' },
+ const columns: ColumnsType<DataType> = [
+ { title: '姓ĺŤ', dataIndex: 'name', key: 'name' },
+ { title: '活动时间', dataIndex: 'update_date', key: 'update_date' },
+ { title: '角色', dataIndex: 'role', key: 'age' },
+ ];
- ];
+ const handleCancel = () => {
+ dispatch({
+ type: 'settingModel/updateState',
+ payload: {
+ isShowTntModal: false,
+ },
+ });
+ };
- return (
- <Modal title="用ć·" open={isShowTntModal} onOk={handleOk} onCancel={handleCancel}>
- <div className={styles.tenantIfo}>
- {tenantIfo.name}
- </div>
- <Table rowKey='name' loading={loading} columns={columns} dataSource={factoriesList} />
- </Modal >
- );
-}
-export default connect(({ settingModel, loading }) => ({ settingModel, loading }))(Index);
+ const handleOk = async () => {
+ dispatch({
+ type: 'settingModel/updateState',
+ payload: {
+ isShowTntModal: false,
+ },
+ });
+ };
+
+ return (
+ <Modal
+ title="用ć·"
+ open={isShowTntModal}
+ onOk={handleOk}
+ onCancel={handleCancel}
+ >
+ <div className={styles.tenantIfo}>{tenantIfo.name}</div>
+ <Table
+ rowKey="name"
+ loading={loading}
+ columns={columns}
+ dataSource={factoriesList}
+ />
+ </Modal>
+ );
+};
+export default TntModal;
diff --git a/web/src/pages/setting/index.tsx b/web/src/pages/setting/index.tsx
index 98855294565f027eafa8736b02a65a7f8935b3dc..dbb6bccc1ad6718c62804ba132a16f2129d74756 100644
--- a/web/src/pages/setting/index.tsx
+++ b/web/src/pages/setting/index.tsx
@@ -1,34 +1,35 @@
import { Button, FloatButton } from 'antd';
import i18n from 'i18next';
import { useTranslation } from 'react-i18next';
-import { Dispatch, connect } from 'umi';
import authorizationUtil from '@/utils/authorizationUtil';
-import { FC, useEffect } from 'react';
+import { useEffect } from 'react';
+import { useDispatch, useSelector } from 'umi';
import CPwModal from './CPwModal';
import List from './List';
import SAKModal from './SAKModal';
import SSModal from './SSModal';
import TntModal from './TntModal';
import styles from './index.less';
-interface CPwModalProps {
- dispatch: Dispatch;
- settingModel: any;
-}
-const Index: FC<CPwModalProps> = ({ settingModel, dispatch }) => {
- // const [llm_factory, set_llm_factory] = useState('')
+
+const Setting = () => {
+ const dispatch = useDispatch();
+ const settingModel = useSelector((state: any) => state.settingModel);
const { t } = useTranslation();
const userInfo = authorizationUtil.getUserInfoObject();
+
const changeLang = (val: string) => {
// 改ĺŹçŠ¶ć€é‡Śçš„ čŻč¨€ 进行ĺ‡ćŤ˘
i18n.changeLanguage(val);
};
+
useEffect(() => {
dispatch({
type: 'settingModel/getTenantInfo',
payload: {},
});
}, []);
+
const showCPwModal = () => {
dispatch({
type: 'settingModel/updateState',
@@ -52,11 +53,6 @@ const Index: FC<CPwModalProps> = ({ settingModel, dispatch }) => {
isShowSSModal: true,
},
});
- // dispatch({
- // type: 'settingModel/getTenantInfo',
- // payload: {
- // }
- // });
};
return (
<div className={styles.settingPage}>
@@ -99,7 +95,4 @@ const Index: FC<CPwModalProps> = ({ settingModel, dispatch }) => {
</div>
);
};
-export default connect(({ settingModel, loading }) => ({
- settingModel,
- loading,
-}))(Index);
+export default Setting;
diff --git a/web/src/pages/setting/model.ts b/web/src/pages/setting/model.ts
index 604b87fdacb7b25fc8483cf3b508915228ef525a..bc3a5f1d9731c93130a970f9a318e0c6158ad8a9 100644
--- a/web/src/pages/setting/model.ts
+++ b/web/src/pages/setting/model.ts
@@ -9,7 +9,6 @@ export interface SettingModelState {
isShowSAKModal: boolean;
isShowSSModal: boolean;
llm_factory: string;
- loading: boolean;
tenantIfo: any;
llmInfo: any;
myLlm: any[];
@@ -24,7 +23,6 @@ const model: DvaModel<SettingModelState> = {
isShowSAKModal: false,
isShowSSModal: false,
llm_factory: '',
- loading: false,
tenantIfo: {},
llmInfo: {},
myLlm: [],
@@ -44,12 +42,21 @@ const model: DvaModel<SettingModelState> = {
},
},
effects: {
- *setting({ payload = {}, callback }, { call, put }) {
- const { data, response } = yield call(userService.setting, payload);
- const { retcode, data: res, retmsg } = data;
+ *setting({ payload = {} }, { call, put }) {
+ const { data } = yield call(userService.setting, payload);
+ const { retcode } = data;
if (retcode === 0) {
message.success('密ç 修改ć功ďĽ');
- callback && callback();
+ yield put({
+ type: 'updateState',
+ payload: {
+ isShowPSwModal: false,
+ },
+ });
+ yield put({
+ type: 'getUserInfo',
+ payload: {},
+ });
}
},
*getUserInfo({ payload = {} }, { call, put }) {
@@ -72,11 +79,8 @@ const model: DvaModel<SettingModelState> = {
loading: true,
},
});
- const { data, response } = yield call(
- userService.get_tenant_info,
- payload,
- );
- const { retcode, data: res, retmsg } = data;
+ const { data } = yield call(userService.get_tenant_info, payload);
+ const { retcode, data: res } = data;
// llm_id 对应chat_id
// asr_id 对应speech2txt
@@ -98,11 +102,8 @@ const model: DvaModel<SettingModelState> = {
}
},
*set_tenant_info({ payload = {} }, { call, put }) {
- const { data, response } = yield call(
- userService.set_tenant_info,
- payload,
- );
- const { retcode, data: res, retmsg } = data;
+ const { data } = yield call(userService.set_tenant_info, payload);
+ const { retcode } = data;
// llm_id 对应chat_id
// asr_id 对应speech2txt
if (retcode === 0) {
@@ -116,6 +117,7 @@ const model: DvaModel<SettingModelState> = {
type: 'getTenantInfo',
});
}
+ return retcode;
},
*factories_list({ payload = {} }, { call, put }) {
@@ -157,12 +159,17 @@ const model: DvaModel<SettingModelState> = {
});
}
},
- *set_api_key({ payload = {}, callback }, { call, put }) {
- const { data, response } = yield call(userService.set_api_key, payload);
- const { retcode, data: res, retmsg } = data;
+ *set_api_key({ payload = {} }, { call, put }) {
+ const { data } = yield call(userService.set_api_key, payload);
+ const { retcode } = data;
if (retcode === 0) {
message.success('设置API KEYć功ďĽ');
- callback && callback();
+ yield put({
+ type: 'updateState',
+ payload: {
+ isShowSAKModal: false,
+ },
+ });
}
},
},
diff --git a/web/src/utils/api.ts b/web/src/utils/api.ts
index 6e297676862e42c82370f4db7bceb0da4985553f..70b4f066fd3ecd3f0619d58dd70f4dbe3e36e8e6 100644
--- a/web/src/utils/api.ts
+++ b/web/src/utils/api.ts
@@ -1,14 +1,8 @@
-
-
-
-let api_host = `http://54.80.112.79:9380/v1`;
-
+let api_host = `http://223.111.148.200:9380/v1`;
export { api_host };
export default {
-
-
// 用ć·
login: `${api_host}/user/login`,
register: `${api_host}/user/register`,
@@ -23,8 +17,6 @@ export default {
my_llm: `${api_host}/llm/my_llms`,
set_api_key: `${api_host}/llm/set_api_key`,
-
-
//知识库管ç†
kb_list: `${api_host}/kb/list`,
create_kb: `${api_host}/kb/create`,
@@ -41,9 +33,6 @@ export default {
rm_chunk: `${api_host}/chunk/rm`,
retrieval_test: `${api_host}/chunk/retrieval_test`,
-
-
-
// 上äĽ
upload: `${api_host}/document/upload`,
get_document_list: `${api_host}/document/list`,
@@ -51,5 +40,4 @@ export default {
document_rm: `${api_host}/document/rm`,
document_create: `${api_host}/document/create`,
document_change_parser: `${api_host}/document/change_parser`,
-
};
diff --git a/web/src/utils/date.ts b/web/src/utils/date.ts
index 9f806e9dcb9a20a9ff4c742d2060ac49929fd72a..dc9272d3017bd20d15da1e55fd6f2ca6414d8b2d 100644
--- a/web/src/utils/date.ts
+++ b/web/src/utils/date.ts
@@ -12,9 +12,9 @@ export function lastWeek() {
return formatDate(moment().subtract(1, 'weeks'));
}
-export function formatDate(date) {
+export function formatDate(date: any) {
if (!date) {
return '';
}
- return moment(date).format('YYYY-MM-DD');
+ return moment(date).format('DD/MM/YYYY');
}
diff --git a/web/src/utils/request.ts b/web/src/utils/request.ts
index 536c6746ea1c7dacb5f35cc1f671d79f827864d2..2005a821858566bba8af575815c4052072449624 100644
--- a/web/src/utils/request.ts
+++ b/web/src/utils/request.ts
@@ -83,7 +83,7 @@ const errorHandler = (error: {
*/
const request: RequestMethod = extend({
errorHandler, // é»č®¤é”™čŻŻĺ¤„ç†
- timeout: 3000000,
+ timeout: 300000,
getResponse: true,
});