diff --git a/src/frontend/src/App.css b/src/frontend/src/App.css
index 3e7b125dd..6bf4ee4f6 100644
--- a/src/frontend/src/App.css
+++ b/src/frontend/src/App.css
@@ -121,8 +121,13 @@
}
@font-face {
- font-family: text-security-disc;
- src: url("assets/text-security-disc.woff") format("woff");
+ font-family: AlibabaPuHuiTi-3-55-Regular;
+ /* src: url("assets/text-security-disc.woff") format("woff"); */
+ src: url("assets/AlibabaPuHuiTi-3-55-Regular.otf") format("opentype");
+}
+
+:root {
+ --font-sans: 'AlibabaPuHuiTi-3-55-Regular'
}
/* pdf-text */
diff --git a/src/frontend/src/assets/AlibabaPuHuiTi-3-55-Regular.otf b/src/frontend/src/assets/AlibabaPuHuiTi-3-55-Regular.otf
new file mode 100644
index 000000000..541e3c108
Binary files /dev/null and b/src/frontend/src/assets/AlibabaPuHuiTi-3-55-Regular.otf differ
diff --git a/src/frontend/src/components/bs-comp/sheets/TaggingSheet.tsx b/src/frontend/src/components/bs-comp/sheets/TaggingSheet.tsx
index f28c22192..c338e5172 100644
--- a/src/frontend/src/components/bs-comp/sheets/TaggingSheet.tsx
+++ b/src/frontend/src/components/bs-comp/sheets/TaggingSheet.tsx
@@ -41,7 +41,7 @@ export default function TaggingSheet({children}) {
{(provided) => (
- {b.name}
+ {index + 1} + {b.name}
)}
diff --git a/src/frontend/src/controllers/API/log.ts b/src/frontend/src/controllers/API/log.ts
index 33cd1a7ef..8faf0a1fc 100644
--- a/src/frontend/src/controllers/API/log.ts
+++ b/src/frontend/src/controllers/API/log.ts
@@ -37,7 +37,7 @@ const actions = [
{name:'删除应用',value:'delete_build'},{name:'新建知识库',value:'create_knowledge'},{name:'删除知识库',value:'delete_knowledge'},{name:'知识库上传文件',value:'upload_file'},
{name:'知识库删除文件',value:'delete_file'},{name:'用户编辑',value:'update_user'},{name:'停用用户',value:'forbid_user'},{name:'启用用户',value:'recover_user'},
{name:'新建用户组',value:'create_user_group'},{name:'删除用户组',value:'delete_user_group'},{name:'编辑用户组',value:'update_user_group'},{name:'新建角色',value:'create_role'},
- {name:'删除角色',value:'delete_role'},{name:'编辑角色',value:'update_role'}
+ {name:'删除角色',value:'delete_role'},{name:'编辑角色',value:'update_role'},{name:'用户登录',value:'user_login'}
]
// 全部操作行为
diff --git a/src/frontend/src/layout/MainLayout.tsx b/src/frontend/src/layout/MainLayout.tsx
index ab388898a..941e1d9c8 100755
--- a/src/frontend/src/layout/MainLayout.tsx
+++ b/src/frontend/src/layout/MainLayout.tsx
@@ -29,6 +29,7 @@ import { userContext } from "../contexts/userContext";
import { logoutApi } from "../controllers/API/user";
import { captureAndAlertRequestErrorHoc } from "../controllers/request";
import { User } from "../types/api/user";
+import { bsConfirm } from "@/components/bs-ui/alertDialog/useConfirm";
export default function MainLayout() {
const { dark, setDark } = useContext(darkContext);
@@ -38,9 +39,17 @@ export default function MainLayout() {
const { language, options, changLanguage, t } = useLanguage(user)
const handleLogout = () => {
- captureAndAlertRequestErrorHoc(logoutApi()).then(_ => {
- setUser(null)
- localStorage.removeItem('isLogin')
+ bsConfirm({
+ title: `${t('prompt')}!`,
+ desc: `${t('menu.logoutDescription')}?`,
+ okTxt: t('system.confirm'),
+ onOk(next) {
+ captureAndAlertRequestErrorHoc(logoutApi()).then(_ => {
+ setUser(null)
+ localStorage.removeItem('isLogin')
+ })
+ next()
+ }
})
}
diff --git a/src/frontend/src/pages/LogPage/utils/index.ts b/src/frontend/src/pages/LogPage/utils/index.ts
index dbfdc06ae..32c511d9e 100644
--- a/src/frontend/src/pages/LogPage/utils/index.ts
+++ b/src/frontend/src/pages/LogPage/utils/index.ts
@@ -28,12 +28,14 @@ export function transformEvent(event: string): string {
case 'create_role': return '新建角色';
case 'delete_role': return '删除角色';
case 'update_role': return '编辑角色';
+ case 'user_login': return '用户登录';
default: return '转换失败'
}
}
export function transformObjectType(object: string): string {
switch(object) {
+ case 'none': return '无'
case 'flow': return '技能'
case 'assistant': return '助手'
case 'knowledge': return '知识库'
diff --git a/src/frontend/src/style/applies.css b/src/frontend/src/style/applies.css
index da9ba81c6..053cc2d82 100644
--- a/src/frontend/src/style/applies.css
+++ b/src/frontend/src/style/applies.css
@@ -7,6 +7,10 @@
@apply border-border;
}
+ #root {
+ @apply font-sans;
+ }
+
body {
@apply bg-background text-foreground;
font-feature-settings: "rlig" 1, "calt" 1;
diff --git a/src/frontend/vite.config.ts b/src/frontend/vite.config.ts
index 3292e76a2..e4961c47a 100644
--- a/src/frontend/vite.config.ts
+++ b/src/frontend/vite.config.ts
@@ -6,7 +6,7 @@ import { viteStaticCopy } from 'vite-plugin-static-copy';
import svgr from "vite-plugin-svgr";
// Use environment variable to determine the target.
-const target = process.env.VITE_PROXY_TARGET || "http://192.168.106.120:3003";
+const target = process.env.VITE_PROXY_TARGET || "http://192.168.106.120:3002";
const apiRoutes = ["^/api/", "/health"];
const proxyTargets = apiRoutes.reduce((proxyObj, route) => {