+
{data.sender &&
{data.sender}
}
{/* {(data.flow_id == "06b1d374-ba97-46e6-8782-c56dec8dcc17" || data.flow_id == "ed8e21f6-9757-43d0-b076-8c6e81bb0580") && 
}
{data.flow_id == "ca214b41-2b73-4585-b172-bf1e546cf6ec" && 
}
{(data.flow_id != "06b1d374-ba97-46e6-8782-c56dec8dcc17" && data.flow_id != "ed8e21f6-9757-43d0-b076-8c6e81bb0580" && data.flow_id != "ca214b41-2b73-4585-b172-bf1e546cf6ec") && 
} */}
- {data.flow_id && 
((set, get) => ({
console.log('change updateCurrentMessage');
const messages = get().messages
const isRunLog = runLogsTypes.includes(wsdata.category);
- console.log(wsdata,isRunLog,messages)
// run log类型存在嵌套情况，使用 extra 匹配 currentMessage; 否则取最近
const currentMessageIndex = isRunLog ?
messages.findLastIndex((msg) => msg.extra === wsdata.extra)
@@ -173,13 +172,12 @@ export const useMessageStore = create((set, get) => ({
}
messages[currentMessageIndex] = newCurrentMessage
- console.log(newCurrentMessage)
+ console.log(messages,currentMessageIndex,newCurrentMessage)
// 会话特殊处理，兼容后端的缺陷
if (!isRunLog) {
// start - end 之间没有内容删除load
if (newCurrentMessage.end && !(newCurrentMessage.files.length || newCurrentMessage.thought || newCurrentMessage.message)) {
- // messages.pop()
- console.log("删了")
+ messages.pop()
}
// 无 messageid 删除
// if (newCurrentMessage.end && !newCurrentMessage.id) {
diff --git a/src/components/bs-comp/sheets/SkillSheet.tsx b/src/components/bs-comp/sheets/SkillSheet.tsx
index 9c853e6..077081e 100644
--- a/src/components/bs-comp/sheets/SkillSheet.tsx
+++ b/src/components/bs-comp/sheets/SkillSheet.tsx
@@ -10,7 +10,7 @@ import {
SheetTitle,
SheetTrigger,
} from "../../bs-ui/sheet";
-import CardComponent from "../cardComponent";
+import CardComponent, { TitleIconBg } from "../cardComponent";
import { useTranslation } from "react-i18next";
import { SpotlightCard } from "@lobehub/ui";
import { Flexbox } from 'react-layout-kit';
@@ -20,6 +20,8 @@ import robot3 from "../../../assets/robot3.png";
import zidingyi1 from "../../../assets/npc/zidingyi1.png";
import zidingyi2 from "../../../assets/npc/zidingyi2.png";
import borderR from "../../../assets/npc/border-r.png";
+import npcIcon from "../../../assets/npc/npcIcon.png";
+import nengliIcon from "../../../assets/npc/nengliIcon.png";
export default function SkillSheet({ select, children, onSelect }) {
const [keyword, setKeyword] = useState("");
@@ -65,19 +67,13 @@ export default function SkillSheet({ select, children, onSelect }) {
-
diff --git a/src/components/bs-comp/chatComponent/messageStore.ts b/src/components/bs-comp/chatComponent/messageStore.ts
index 6432696..551157c 100644
--- a/src/components/bs-comp/chatComponent/messageStore.ts
+++ b/src/components/bs-comp/chatComponent/messageStore.ts
@@ -154,7 +154,6 @@ export const useMessageStore = create
- {data.message.toString() ? mkdown : }
+
+ {/*
*/}
+ {data.message.toString() ?
+
+ {data.message.toString() ? mkdown : } */}
{/* @user */}
- {data.receiver &&
+ {/* @ {data.receiver.user_name}
} + {/* {data.receiver &&@ {data.receiver.user_name}
} */} {/* 光标 */} {/* {data.message.toString() && !data.end && } */} -
+ {mkdown}
+ {/* @user */}
+ {data.receiver &&
+ : @ {data.receiver.user_name}
} + {/* 光标 */} + {/* {data.message.toString() && !data.end && } */} +
- {/* */}
- {(item.id == "06b1d374-ba97-46e6-8782-c56dec8dcc17" || item.id == "ed8e21f6-9757-43d0-b076-8c6e81bb0580") && }
- {item.id == "ca214b41-2b73-4585-b172-bf1e546cf6ec" && }
- {(item.id != "06b1d374-ba97-46e6-8782-c56dec8dcc17" && item.id != "ed8e21f6-9757-43d0-b076-8c6e81bb0580" && item.id != "ca214b41-2b73-4585-b172-bf1e546cf6ec") && }
+ 
- {(item.id == "06b1d374-ba97-46e6-8782-c56dec8dcc17" || item.id == "ed8e21f6-9757-43d0-b076-8c6e81bb0580") && }
- {item.id == "ca214b41-2b73-4585-b172-bf1e546cf6ec" && }
- {(item.id != "06b1d374-ba97-46e6-8782-c56dec8dcc17" && item.id != "ed8e21f6-9757-43d0-b076-8c6e81bb0580" && item.id != "ca214b41-2b73-4585-b172-bf1e546cf6ec") && }
- {/* */}
+
{item.name}
diff --git a/src/components/inputFileComponent/index.tsx b/src/components/inputFileComponent/index.tsx
index 4370685..716084f 100644
--- a/src/components/inputFileComponent/index.tsx
+++ b/src/components/inputFileComponent/index.tsx
@@ -107,10 +107,10 @@ export default function InputFileComponent({
onClick={handleButtonClick}
className={
editNode
- ? "input-edit-node input-dialog text-muted-foreground"
+ ? "input-edit-node input-dialog text-[#999]"
: disabled
? "input-disable input-dialog input-primary"
- : "input-dialog input-primary text-muted-foreground"
+ : "input-dialog input-primary text-[#999]"
}
>
{myValue !== "" ? myValue : placeholder}
diff --git a/src/controllers/API/user.ts b/src/controllers/API/user.ts
index 2d4073a..1a57bf1 100644
--- a/src/controllers/API/user.ts
+++ b/src/controllers/API/user.ts
@@ -56,6 +56,12 @@ export async function setSysConfigApi(data) {
export async function getRoleSkillsApi(params): Promise<{ data: any[], total: number }> {
return await axios.get(`/api/v1/role_access/flow`, { params });
}
+/**
+ * 根据角色获取技能列表
+ */
+export async function getRoleAssistApi(params): Promise<{ data: any[], total: number }> {
+ return await axios.get(`/api/v1/role_access/list_type`, { params });
+}
/**
* 根据角色获取知识库列表
*/
diff --git a/src/modals/formModal/chatMessage/codeBlock/index.tsx b/src/modals/formModal/chatMessage/codeBlock/index.tsx
index 66a7ef8..6fef86a 100644
--- a/src/modals/formModal/chatMessage/codeBlock/index.tsx
+++ b/src/modals/formModal/chatMessage/codeBlock/index.tsx
@@ -3,6 +3,8 @@ import { useState } from "react";
import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
import { oneDark } from "react-syntax-highlighter/dist/cjs/styles/prism";
import { copyText, programmingLanguages } from "../../../../utils";
+import copy from "../../../../assets/chat/copy.png"
+import xiazai from "../../../../assets/chat/xiazai.png"
interface Props {
language: string;
@@ -42,17 +44,19 @@ export function CodeBlock({ language, value }) {
URL.revokeObjectURL(url);
};
return (
-
+
- {language}
+ {language}
diff --git a/src/pages/ChatAppPage/components/ChatPanne.tsx b/src/pages/ChatAppPage/components/ChatPanne.tsx
index 4d9c598..7bbd7dd 100644
--- a/src/pages/ChatAppPage/components/ChatPanne.tsx
+++ b/src/pages/ChatAppPage/components/ChatPanne.tsx
@@ -387,7 +387,7 @@ export default function ChatPanne({ customWsHost = '', data }) {
wsUrl={wsUrl}
onBeforSend={getWsParamData}
loadMore={() => loadMoreHistoryMsg(flow.id,"flow")}
- type={type}
+ type={{"avatar_img":flow.avatar_img,"avatar_color":flow.avatar_color,"type":type}}
inputForm={flowSate.isForm ?
-
@@ -426,7 +426,7 @@ export default function ChatPanne({ customWsHost = '', data }) {
wsUrl={wsUrl}
onBeforSend={getWsParamData}
loadMore={() => loadMoreHistoryMsg(assistant.id,"assistant")}
- type={type}
+ type={{"avatar_img":assistant.avatar_img,"avatar_color":assistant.avatar_color,"type":type}}
inputForm={null}
/>
diff --git a/src/pages/ChatAppPage/index.tsx b/src/pages/ChatAppPage/index.tsx
index ab1acda..8830844 100755
--- a/src/pages/ChatAppPage/index.tsx
+++ b/src/pages/ChatAppPage/index.tsx
@@ -60,7 +60,9 @@ export default function SkillChatPage() {
"chat_id": _chatId,
"create_time": "-",
"update_time": "-",
- "flow_type": card.flow_type
+ "flow_type": card.flow_type,
+ "avatar_img": card.avatar_img,
+ "avatar_color": card.avatar_color,
})
setSelelctChat({ id: card.id, chatId: _chatId, type: card.flow_type })
@@ -92,7 +94,7 @@ export default function SkillChatPage() {
return
-
+
{/*
diff --git a/src/pages/FileLibPage/files.tsx b/src/pages/FileLibPage/files.tsx
index 254f475..c4d55c3 100755
--- a/src/pages/FileLibPage/files.tsx
+++ b/src/pages/FileLibPage/files.tsx
@@ -46,7 +46,7 @@ export default function FilesPage() {
})
)
// loadData();
- // setTimeout(() => reload(), 5000);
+ setTimeout(() => reload(), 5000);
const [hasPermission, setHasPermission] = useState(true)
const { appConfig } = useContext(locationContext)
diff --git a/src/pages/FlowPage/components/extraSidebarComponent/PersonalComponents.tsx b/src/pages/FlowPage/components/extraSidebarComponent/PersonalComponents.tsx
index 17cf882..c2dc95e 100644
--- a/src/pages/FlowPage/components/extraSidebarComponent/PersonalComponents.tsx
+++ b/src/pages/FlowPage/components/extraSidebarComponent/PersonalComponents.tsx
@@ -10,11 +10,14 @@ import { classNames, nodeColors, nodeIconsLucide, getNodeNames, nodeIMgsLucide,
import gengduo from "../../../../assets/npc/gengduo.png";
import gang from "../../../../assets/npc/gang.png";
import wenhao from "../../../../assets/npc/wenhao.png";
+import del from "../../../../assets/npc/del.png";
import { JSX } from "react/jsx-runtime";
import DescriptionModel from "../../../../modals/descriptionModel";
+import { typesContext } from "@/contexts/typesContext";
export default function PersonalComponents({ onDragStart, launch }) {
const { addSavedComponent, checkComponentsName, delComponent, savedComponents } = useContext(userContext)
+ const { types } = useContext(typesContext);
const addComponent = (data) => {
if (checkComponentsName(data.node.display_name)) {
@@ -126,29 +129,28 @@ export default function PersonalComponents({ onDragStart, launch }) {
handleDel(e, comp)} />
*/}
- }
{(item.id != "06b1d374-ba97-46e6-8782-c56dec8dcc17" && item.id != "ed8e21f6-9757-43d0-b076-8c6e81bb0580" && item.id != "ca214b41-2b73-4585-b172-bf1e546cf6ec") && } */}
{/* */}
-
+ }
{item.id == "ca214b41-2b73-4585-b172-bf1e546cf6ec" && }
{(item.id != "06b1d374-ba97-46e6-8782-c56dec8dcc17" && item.id != "ed8e21f6-9757-43d0-b076-8c6e81bb0580" && item.id != "ca214b41-2b73-4585-b172-bf1e546cf6ec") && } */}
-
@@ -64,7 +64,7 @@ export default function SkillTemps({ flows, isTemp = false,
{item.id == "ca214b41-2b73-4585-b172-bf1e546cf6ec" &&
-
diff --git a/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
index 381c7b3..6e62112 100644
--- a/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
+++ b/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
@@ -52,7 +52,7 @@ const NodeToolbarComponent = ({ data, deleteNode, openPopUp, position }) => {
// 部分组件开放“历史/history”入口：agent、chains、retrievers 、vector store 4类组件。
return ["chains", "agents", "vectorstores", "retrievers"].includes(types[data.type])
}, [data, types])
-
+
const navigate = useNavigate()
const { id: flowId } = useParams()
const { addSavedComponent, checkComponentsName } = useContext(userContext)
diff --git a/src/pages/SkillPage/components/SkillTemps.tsx b/src/pages/SkillPage/components/SkillTemps.tsx
index 7688572..f351a8f 100644
--- a/src/pages/SkillPage/components/SkillTemps.tsx
+++ b/src/pages/SkillPage/components/SkillTemps.tsx
@@ -54,7 +54,7 @@ export default function SkillTemps({ flows, isTemp = false,
{/* {(item.id == "06b1d374-ba97-46e6-8782-c56dec8dcc17" || item.id == "ed8e21f6-9757-43d0-b076-8c6e81bb0580") &&
+
-
+
- ![]({nodeIMgsLucide1["Save"]})
+ 
*/}
{comp.description_url && {
- console.log(111)
openPopUp(
- {comp.name ?? ""}
{/*
- {/* 
*/}
+
- handleDel(e, comp)}>
+ 
{comp.description}
+{comp.data.node.description}
{item.name}
diff --git a/src/pages/SkillPage/components/editAssistant/Header.tsx b/src/pages/SkillPage/components/editAssistant/Header.tsx
index 59566bf..b974698 100644
--- a/src/pages/SkillPage/components/editAssistant/Header.tsx
+++ b/src/pages/SkillPage/components/editAssistant/Header.tsx
@@ -5,7 +5,7 @@ import { Dialog, DialogTrigger } from "@/components/bs-ui/dialog";
import { useAssistantStore } from "@/store/assistantStore";
import { ChevronLeftIcon, Pencil2Icon } from "@radix-ui/react-icons";
import { useEffect, useRef, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
import EditAssistantDialog from "./EditAssistantDialog";
import { useTranslation } from "react-i18next";
import npcIcon from "../../../../assets/npc/npcIcon.png";
@@ -20,6 +20,7 @@ export default function Header({ onSave, onLine }) {
const [editShow, setEditShow] = useState(false);
const needSaveRef = useRef(false)
+ const {state} = useLocation();
useEffect(() => {
if (needSaveRef.current) {
needSaveRef.current = false
@@ -33,7 +34,7 @@ export default function Header({ onSave, onLine }) {
}
return
-
diff --git a/src/pages/SkillPage/tabAssistant.tsx b/src/pages/SkillPage/tabAssistant.tsx
index 73e5561..54b072b 100644
--- a/src/pages/SkillPage/tabAssistant.tsx
+++ b/src/pages/SkillPage/tabAssistant.tsx
@@ -7,7 +7,7 @@ import { AssistantItemDB, changeAssistantStatusApi, deleteAssistantApi, getAssis
import { FlowType } from "../../types/flow";
import { useTable } from "../../util/hook";
import CreateAssistant from "./components/CreateAssistant";
-import { useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
import { captureAndAlertRequestErrorHoc } from "@/controllers/request";
import { useToast } from "@/components/bs-ui/toast/use-toast";
import { bsConfirm } from "@/components/bs-ui/alertDialog/useConfirm";
@@ -23,7 +23,7 @@ import sousuo from "../../assets/npc/sousuo.png";
import del from "../../assets/npc/del.png";
import zidingyi1 from "../../assets/npc/zidingyi1.png";
import zidingyijia from "../../assets/npc/zidingyijia.png";
-import { useContext, useRef, useState } from "react";
+import { useContext, useEffect, useRef, useState } from "react";
import { SpotlightCard } from "@lobehub/ui";
import { Flexbox } from 'react-layout-kit';
import { updataOnlineState } from "@/controllers/API/flow";
@@ -44,13 +44,24 @@ export default function Assistants() {
const { page, pageSize, data: dataSource, total, loading, setPage, search, reload, refreshData } = useTable({ pageSize: 15 }, (param) =>
getAssistantsApi(param.page, param.pageSize, param.keyword)
)
-
- if(dataSource[0] && dataSource[0].type != 0){
+
+ if(dataSource == "" || dataSource[0].type != 0){
dataSource.unshift({"type":0})
}
const inputRef = useRef(null);
-
+ const {state} = useLocation();
+ useEffect(() => {
+ if(state){
+ if(state.page){
+ setPage(state.page)
+ }
+ if(state.value){
+ inputRef.current.value = state.value
+ search(state.value)
+ }
+ }
+ }, [])
const handleDelete = () => {
// bsConfirm({
// desc: t('确认删除该NPC？'),
@@ -147,16 +158,17 @@ export default function Assistants() {
}
@@ -169,8 +181,8 @@ export default function Assistants() {
{/* list */}
diff --git a/src/pages/SkillPage/tabSkills.tsx b/src/pages/SkillPage/tabSkills.tsx
index 89a527a..d06c765 100644
--- a/src/pages/SkillPage/tabSkills.tsx
+++ b/src/pages/SkillPage/tabSkills.tsx
@@ -3,7 +3,7 @@ import { bsConfirm } from "@/components/bs-ui/alertDialog/useConfirm";
import { useToast } from "@/components/bs-ui/toast/use-toast";
import { useContext, useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
import CardComponent, { TitleIconBg } from "../../components/bs-comp/cardComponent";
import { MoveOneIcon } from "../../components/bs-icons/moveOne";
import { Button } from "../../components/bs-ui/button";
@@ -48,7 +48,7 @@ export default function Skills() {
readFlowsFromDatabase(param.page, param.pageSize, param.keyword)
)
- if(dataSource[0] && dataSource[0].type != 0){
+ if(dataSource == "" || dataSource[0].type != 0){
dataSource.unshift({"type":0})
}
@@ -60,7 +60,18 @@ export default function Skills() {
const { open: tempOpen, flowRef, toggleTempModal } = useCreateTemp()
const [isShareLink, setIsShareLink] = useState(false)
const [isShareLinkData, setIsShareLinkData] = useState("Any");
-
+ const {state} = useLocation();
+ useEffect(() => {
+ if(state){
+ if(state.page){
+ setPage(state.page)
+ }
+ if(state.value){
+ search(state.value)
+ inputRef.current.value = state.value
+ }
+ }
+ }, [])
// 上下线
const handleCheckedChange = (checked, data) => {
// data.versionId todo
@@ -90,11 +101,12 @@ export default function Skills() {
const handleSetting = (data) => {
// console.log('data :>> ', data);
const vid = data.version_list.find(item => item.is_current === 1)?.id
- navigate(`/build/skill/${data.id}/${vid}`)
+ navigate(`/build/skill/${data.id}/${vid}`,{state: { value:inputRef.current.value, page:page}})
}
// 选模板(创建技能)
const handldSelectTemp = async (tempId) => {
+ console.log(tempId)
const [flow] = await readTempsDatabase(tempId.id)
flow.name = `${flow.name}-${generateUUID(5)}`
@@ -102,13 +114,14 @@ export default function Skills() {
res.user_name = user.user_name
res.write = true
setOpen(false)
- navigate(`/build/skill/${res.id}/${res.version_id}`)
+ navigate(`/build/skill/${res.id}/${res.version_id}`,{state: { avatar_color:tempId.avatar_color ? tempId.avatar_color : tempId.id, avatar_img:tempId.avatar_img}})
}))
}
const nvaigate = useNavigate()
const handleEdit = (id,pageNo) => {
// onBeforeEdit?.()
+ console.log()
window.SearchSkillsPage = { no: pageNo, key: inputRef.current.value };
nvaigate("/skill/" + id)
}
@@ -161,7 +174,7 @@ export default function Skills() {
!item.write && item.status !== 2 && message({ title: t('prompt'), description: "请联系管理员上线能力", variant: 'warning' })} onCheckedChange={item.write && handleChange} />
+
{/* list */}
diff --git a/src/pages/SkillPage/temps.tsx b/src/pages/SkillPage/temps.tsx
index 18d4dd9..c64f02a 100644
--- a/src/pages/SkillPage/temps.tsx
+++ b/src/pages/SkillPage/temps.tsx
@@ -17,10 +17,13 @@ import { SpotlightCard } from "@lobehub/ui";
import { Flexbox } from 'react-layout-kit';
import robot from "../../assets/robot.png";
import del from "../../assets/npc/del.png";
-import { useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
+import nengliIcon from "../../assets/npc/nengliIcon.png";
+import { TitleIconBg } from "@/components/bs-comp/cardComponent";
export default function Templates() {
const navigate = useNavigate()
+ const {state} = useLocation();
const onChange = () => { }
const { t } = useTranslation()
@@ -89,13 +92,15 @@ export default function Templates() {
-
+
{/* 
};
diff --git a/src/pages/SkillPage/editAssistant.tsx b/src/pages/SkillPage/editAssistant.tsx
index 908b75a..1f1d4ab 100644
--- a/src/pages/SkillPage/editAssistant.tsx
+++ b/src/pages/SkillPage/editAssistant.tsx
@@ -5,7 +5,7 @@ import { captureAndAlertRequestErrorHoc } from "@/controllers/request";
import { useAssistantStore } from "@/store/assistantStore";
import { useEffect, useState } from "react";
import { useParams } from "react-router";
-import { useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
import Header from "./components/editAssistant/Header";
import Prompt from "./components/editAssistant/Prompt";
import Setting from "./components/editAssistant/Setting";
@@ -58,6 +58,7 @@ export default function editAssistant() {
})
})
}
+ const {state} = useLocation();
// 上线助手
const handleOnline = async () => {
@@ -72,7 +73,8 @@ export default function editAssistant() {
})
})
setTimeout(() => {
- navigate('/build')
+ // navigate('/build')
+ navigate('/build/assist',{state:state})
}, 1200);
}
diff --git a/src/pages/SkillPage/l2Edit.tsx b/src/pages/SkillPage/l2Edit.tsx
index 5d44627..731902f 100644
--- a/src/pages/SkillPage/l2Edit.tsx
+++ b/src/pages/SkillPage/l2Edit.tsx
@@ -1,7 +1,7 @@
import { ArrowLeft, ChevronUp } from "lucide-react";
import { useContext, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
-import { useNavigate, useParams } from "react-router-dom";
+import { useLocation, useNavigate, useParams } from "react-router-dom";
import L2ParameterComponent from "../../CustomNodes/GenericNode/components/parameterComponent/l2Index";
import ShadTooltip from "../../components/ShadTooltipComponent";
import { Button } from "../../components/ui/button";
@@ -41,8 +41,9 @@ export default function l2Edit() {
const [avatar_img, setAvatar_img] = useState("")
const [avatar_color, setAvatar_color] = useState("")
const randomNum = Math.floor(Math.random()*(4-0+1)+0).toString();
-
+ const {state} = useLocation();
useEffect(() => {
+ console.log(id)
if(!id){
setAvatar_color(randomNum);
}
@@ -51,11 +52,18 @@ export default function l2Edit() {
// 已有flow 数据时，不再请求
if (flow?.id === id) {
setIsL2(true)
+ console.log(1)
nameRef.current.value = flow.name
descRef.current.value = flow.description
guideRef.current.value = flow.guide_word
- setAvatar_img(flow.avatar_img);
- if(flow.avatar_color){
+ if(state && state.avatar_img){
+ setAvatar_img(state.avatar_img);
+ }else{
+ setAvatar_img(flow.avatar_img);
+ }
+ if(state && state.avatar_color){
+ setAvatar_color(state.avatar_color);
+ }else if(flow.avatar_color){
setAvatar_color(flow.avatar_color);
}else{
setAvatar_color(id);
@@ -70,8 +78,14 @@ export default function l2Edit() {
nameRef.current.value = _flow.name
descRef.current.value = _flow.description
guideRef.current.value = _flow.guide_word
- setAvatar_img(_flow.avatar_img);
- if(_flow.avatar_color){
+ if(state && state.avatar_img){
+ setAvatar_img(state.avatar_img);
+ }else{
+ setAvatar_img(_flow.avatar_img);
+ }
+ if(state && state.avatar_color){
+ setAvatar_color(state.avatar_color);
+ }else if(_flow.avatar_color){
setAvatar_color(_flow.avatar_color);
}else{
setAvatar_color(id);
@@ -152,7 +166,8 @@ export default function l2Edit() {
await saveFlow({...flow, name, description, guide_word: guideWords, avatar_img, avatar_color})
setLoading(false)
setSuccessData({ title: t('success') });
- setTimeout(() => /^\/skill\/[\w\d-]+/.test(location.pathname) && navigate(-1), 2000);
+ setTimeout(() => navigate('/build/skills',{state:state}), 2000);
+ // setTimeout(() => /^\/skill\/[\w\d-]+/.test(location.pathname) && navigate(-1), 2000);
}
// 表单收缩
@@ -234,7 +249,7 @@ export default function l2Edit() {
{item.desc}
- {!openSwitch && !item.write && item.status !== 1 && message({ title: t('prompt'), description: t('skills.contactAdmin'), variant: 'warning' })} onCheckedChange={item.write && handleChange} />
item.status !== 1 && navigate('/assistant/' + item.id)}>
+ {!openSwitch &&
- item.status !== 1 && navigate('/assistant/' + item.id,{state: { value:inputRef.current.value, page:page}})}>
编辑
}
- delConfirm(item)}>
+ {item.write &&
}
delConfirm(item)}>
-
+
- 
- search(e.target.value)} />
+
+ search(e.target.value)} />
{item.description}
- {!openSwitch &&
- handleEdit(item.id,page.pageNo)}>
+ {!openSwitch && 
}
- handleSetting(item)}>
编辑
}
@@ -174,11 +187,13 @@ export default function Skills() {
delConfirm(item)}>
+ {item.write &&
}
delConfirm(item)}>
-
+ navigate('/build/temps')}>
模版管理
}
+ {user.role === 'admin' && navigate('/build/temps',{state: { value:inputRef.current.value, page:page}})}>模版管理
}
{/* {user.role === 'admin' && setIsTempPage(true)}>模版管理
} */}
-
+ {/* */}
+
-
+ {/* */}
+
{item.name}
@@ -111,7 +116,7 @@ export default function Templates() {
);
return
-
navigate('/build/skills')}>
+ (id, 'skill')
+ const { data: libData, change: handleLibChange } = usePageData(id, 'lib')
+
+ const handleSave = async () => {
+ if (!form.name.length || form.name.length > 50) {
+ return setErrorData({
+ title: t('prompt'),
+ list: [t('system.roleNameRequired'), t('system.roleNamePrompt')],
+ });
+ }
+ if (onBeforeChange(form.name)) {
+ return setErrorData({
+ title: t('prompt'),
+ list: [t('system.roleNameExists')]
+ })
+ }
+ // 新增先创建角色
+ let roleId = id
+ if (id === -1) {
+ const res = await captureAndAlertRequestErrorHoc(createRole(form.name))
+ roleId = res.id
+ } else {
+ // 更新基本信息
+ captureAndAlertRequestErrorHoc(updateRoleNameApi(roleId, form.name))
+ }
+ // 更新角色权限
+ const res = await Promise.all([
+ updateRolePermissionsApi({ role_id: roleId, access_id: form.useSkills, type: 2 }),
+ updateRolePermissionsApi({ role_id: roleId, access_id: form.useLibs, type: 1 }),
+ updateRolePermissionsApi({ role_id: roleId, access_id: form.manageLibs, type: 3 })
+ ])
+
+ console.log('form :>> ', form, res);
+ setSuccessData({ title: t('success') })
+ onChange(true)
+ }
+
+ return (id: number, key: 'skill' | 'lib') => {
+ const [data, setData] = useState<{ data: T[], total: number }>({ data: [], total: 0 })
+
+ useEffect(() => {
+ loadData()
+ }, [])
+
+ const loadData = async (page = 1, keyword = '') => {
+ const param = {
+ name: keyword,
+ role_id: id === -1 ? 0 : id,
+ page_num: page,
+ page_size: pageSize
+ }
+ const data = key === 'skill' ? await getRoleSkillsApi(param) : await getRoleLibsApi(param)
+ setData(data)
+ }
+
+ return {
+ data,
+ change: loadData
+ }
+}
\ No newline at end of file
diff --git a/src/pages/SystemPage/components/EditRole.tsx b/src/pages/SystemPage/components/EditRole.tsx
index f9ef7b7..eb527e2 100644
--- a/src/pages/SystemPage/components/EditRole.tsx
+++ b/src/pages/SystemPage/components/EditRole.tsx
@@ -1,8 +1,8 @@
-import { Search } from "lucide-react";
-import { useContext, useEffect, useRef, useState } from "react";
+import { useContext, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
-import { Button } from "../../../components/ui/button";
-import { Input } from "../../../components/ui/input";
+import { Button } from "../../../components/bs-ui/button";
+import { Input, SearchInput } from "../../../components/bs-ui/input";
+import AutoPagination from "../../../components/bs-ui/pagination/autoPagination";
import { Switch } from "../../../components/ui/switch";
import {
Table,
@@ -11,45 +11,40 @@ import {
TableHead,
TableHeader,
TableRow
-} from "../../../components/ui/table";
+} from "../../../components/bs-ui/table";
import { alertContext } from "../../../contexts/alertContext";
-import { createRole, getRoleLibsApi, getRolePermissionsApi, getRoleSkillsApi, updateRoleNameApi, updateRolePermissionsApi } from "../../../controllers/API/user";
-import { useDebounce } from "../../../util/hook";
+import { createRole, getRoleAssistApi, getRoleLibsApi, getRolePermissionsApi, getRoleSkillsApi, updateRoleNameApi, updateRolePermissionsApi } from "../../../controllers/API/user";
import { captureAndAlertRequestErrorHoc } from "../../../controllers/request";
+import { useTable } from "../../../util/hook";
-const pageSize = 10
-const SearchPanne = ({ title, total, onChange, children }) => {
- const [page, setPage] = useState(1)
- const pageCount = Math.ceil(total / pageSize)
- const searchKeyRef = useRef('')
- const { t } = useTranslation()
-
- const handleSearch = useDebounce((e) => {
- searchKeyRef.current = e.target.value
- setPage(1)
- onChange(1, searchKeyRef.current)
- }, 500, false)
-
- const loadPage = (page) => {
- setPage(page)
- onChange(page, searchKeyRef.current)
- }
+const SearchPanne = ({ role_id, title, type, children }) => {
+ const { page, pageSize, data, total, loading, setPage, search } = useTable({ pageSize: 10 }, (params) => {
+ const { page, pageSize, keyword } = params
+ const param = {
+ name: keyword,
+ role_id,
+ page_num: page,
+ page_size: pageSize
+ }
+ return type === 'skill' ? getRoleSkillsApi(param)
+ : (type === 'assistant' ? getRoleAssistApi({ ...param, type: 'assistant' })
+ : getRoleLibsApi(param))
+ })
return <>
(id, 'skill')
- const { data: libData, change: handleLibChange } = usePageData(id, 'lib')
-
+ /**
+ * 保存权限信息
+ * 1.验证重名
+ * 2.新增时先保存基本信息 创建 ID
+ * 3.修改时先更新基本信息
+ * 4.批量 保存各个种类权限信息（助手、技能、知识库等）
+ * @returns
+ */
const handleSave = async () => {
if (!form.name.length || form.name.length > 50) {
return setErrorData({
@@ -115,7 +116,7 @@ export default function EditRole({ id, name, onChange, onBeforeChange }) {
list: [t('system.roleNameExists')]
})
}
- // 新增先创建角色
+ // 没有id时需要走创建流程，否则修改
let roleId = id
if (id === -1) {
const res = await captureAndAlertRequestErrorHoc(createRole(form.name))
@@ -128,7 +129,8 @@ export default function EditRole({ id, name, onChange, onBeforeChange }) {
const res = await Promise.all([
updateRolePermissionsApi({ role_id: roleId, access_id: form.useSkills, type: 2 }),
updateRolePermissionsApi({ role_id: roleId, access_id: form.useLibs, type: 1 }),
- updateRolePermissionsApi({ role_id: roleId, access_id: form.manageLibs, type: 3 })
+ updateRolePermissionsApi({ role_id: roleId, access_id: form.manageLibs, type: 3 }),
+ updateRolePermissionsApi({ role_id: roleId, access_id: form.useAssistant, type: 5 })
])
console.log('form :>> ', form, res);
@@ -136,90 +138,101 @@ export default function EditRole({ id, name, onChange, onBeforeChange }) {
onChange(true)
}
- return
navigate('/build/skills',{state:state})}>
返 回
{/* {t('skills.skillTemplateManagement')}
*/} diff --git a/src/pages/SystemPage/components/EditRole copy.tsx b/src/pages/SystemPage/components/EditRole copy.tsx new file mode 100644 index 0000000..43bae3d --- /dev/null +++ b/src/pages/SystemPage/components/EditRole copy.tsx @@ -0,0 +1,225 @@ +import { Search } from "lucide-react"; +import { useContext, useEffect, useRef, useState } from "react"; +import { useTranslation } from "react-i18next"; +import { Button } from "../../../components/ui/button"; +import { Input } from "../../../components/ui/input"; +import { Switch } from "../../../components/ui/switch"; +import { + Table, + TableBody, + TableCell, + TableHead, + TableHeader, + TableRow +} from "../../../components/ui/table"; +import { alertContext } from "../../../contexts/alertContext"; +import { createRole, getRoleAssistApi, getRoleLibsApi, getRolePermissionsApi, getRoleSkillsApi, updateRoleNameApi, updateRolePermissionsApi } from "../../../controllers/API/user"; +import { useDebounce } from "../../../util/hook"; +import { captureAndAlertRequestErrorHoc } from "../../../controllers/request"; + +const pageSize = 10 +const SearchPanne = ({ title, total, onChange, children }) => { + const [page, setPage] = useState(1) + const pageCount = Math.ceil(total / pageSize) + const searchKeyRef = useRef('') + const { t } = useTranslation() + + const handleSearch = useDebounce((e) => { + searchKeyRef.current = e.target.value + setPage(1) + onChange(1, searchKeyRef.current) + }, 500, false) + + const loadPage = (page) => { + setPage(page) + onChange(page, searchKeyRef.current) + } + + return <> +
+
+ {title}
+ +
+ {children}
+
+
+
+
+
+
+
+}
+
+
+// -1 id表示新增
+export default function EditRole({ id, name, onChange, onBeforeChange }) {
+ const { setErrorData, setSuccessData } = useContext(alertContext);
+ const { t } = useTranslation()
+
+ const [form, setForm] = useState({
+ name,
+ useSkills: [],
+ useLibs: [],
+ manageLibs: []
+ })
+ useEffect(() => {
+ if (id !== -1) {
+ // 获取详情
+ getRolePermissionsApi(id).then(res => {
+ const useSkills = [], useLibs = [], manageLibs = []
+ res.data.forEach(item => {
+ switch (item.type) {
+ case 1: useLibs.push(Number(item.third_id)); break;
+ case 2: useSkills.push(item.third_id); break;
+ case 3: manageLibs.push(Number(item.third_id)); break;
+ }
+ })
+ setForm({ name, useSkills, useLibs, manageLibs })
+ })
+ }
+ }, [id])
+
+ const switchDataChange = (id, key, checked) => {
+ const index = form[key].findIndex(el => el === id)
+ checked && index === -1 && form[key].push(id)
+ !checked && index !== -1 && form[key].splice(index, 1)
+ setForm({ ...form, [key]: form[key] })
+ }
+
+ // 知识库管理权限switch
+ const switchLibManage = (id, checked) => {
+ switchDataChange(id, 'manageLibs', checked)
+ if (checked) switchDataChange(id, 'useLibs', checked)
+ }
+ // 知识库使用权限switch
+ const switchUseLib = (id, checked) => {
+ if (!checked && form.manageLibs.includes(id)) return
+ switchDataChange(id, 'useLibs', checked)
+ }
+
+ const { data: skillData, change: handleSkillChange } = usePageData
+
+}
+
+const usePageData =
+
+ {t('system.roleName')}
+ setForm({ ...form, name: e.target.value })} maxLength={60}> +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- search(e.target.value)}>
{title}
- -{title}
+
- {children}
-
-
-
-
+ {loading ?
+
+
+
+
+ : children(data)}
+ const roleId = id === -1 ? 0 : id
+
+ return
+ {/* 助手 */}
-}
-
-const usePageData = (id: number, key: 'skill' | 'lib') => {
- const [data, setData] = useState<{ data: T[], total: number }>({ data: [], total: 0 })
-
- useEffect(() => {
- loadData()
- }, [])
-
- const loadData = async (page = 1, keyword = '') => {
- const param = {
- name: keyword,
- role_id: id === -1 ? 0 : id,
- page_num: page,
- page_size: pageSize
- }
- const data = key === 'skill' ? await getRoleSkillsApi(param) : await getRoleLibsApi(param)
- setData(data)
- }
-
- return {
- data,
- change: loadData
- }
}
\ No newline at end of file
diff --git a/src/pages/SystemPage/components/Roles.tsx b/src/pages/SystemPage/components/Roles.tsx
index 7a2567a..42db983 100644
--- a/src/pages/SystemPage/components/Roles.tsx
+++ b/src/pages/SystemPage/components/Roles.tsx
@@ -90,7 +90,7 @@ export default function Roles() {
{el.role_name}
{el.create_time.replace('T', ' ')}
-
+
diff --git a/src/style/applies.css b/src/style/applies.css
index 15adee9..0f08565 100644
--- a/src/style/applies.css
+++ b/src/style/applies.css
@@ -207,7 +207,7 @@
@apply focus:placeholder-transparent focus:ring-ring focus:border-ring
}
.input-primary {
- @apply bg-background block border-border form-input px-3 placeholder:text-muted-foreground rounded-md shadow-sm sm:text-sm truncate w-full;
+ @apply bg-background block border-border form-input px-3 placeholder:text-[#999] rounded-md shadow-sm sm:text-sm truncate w-full;
}
.input-edit-node{
diff --git a/src/style/zk.scss b/src/style/zk.scss
index 0d98392..2ba65db 100644
--- a/src/style/zk.scss
+++ b/src/style/zk.scss
@@ -204,6 +204,9 @@
width: 100%!important;
height: 100%;
}
+ .chata{
+ height: 96vh!important;
+ }
}
.chatShareM{
.duihua-chat{
@@ -3180,7 +3183,7 @@
justify-content: center;
background: #0D0D0D!important;
cursor: pointer;
- z-index: 1;
+ z-index: 10;
>span{
font-family: PingFang SC;
font-weight: 400;
@@ -3216,12 +3219,16 @@
background: #1A1A1A;
border-radius: 7px;
margin: 7px;
+ position: relative;
cursor: pointer;
.npcInfoItemBg{
- position: relative;
+ position: absolute;
overflow: hidden;
+ width: 100%;
height: 64px;
- margin-bottom: -56px;
+ top: 0;
+ left: 0;
+ // margin-bottom: -56px;
background: rgba(0, 0, 0, 0.06);
-webkit-mask-image: linear-gradient(to bottom, #fff, transparent);
mask-image: linear-gradient(to bottom, #fff, transparent);
@@ -3240,6 +3247,7 @@
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
+ z-index: -1;
>span{
width: 180px;
height: 180px;
@@ -3312,6 +3320,7 @@
}
>div:nth-of-type(2){
margin-right: 14px;
+ z-index: 1000;
}
}
>p{
@@ -4176,4 +4185,33 @@
}
.input-dialog{
color: #999999;
+ }
+ .daimaStyle{
+ background: rgba(255, 255, 255, 0.05);
+ border-radius: 14px!important;
+ border: none;
+ overflow: hidden;
+ margin: 6px 0;
+ &:focus{
+ // border: 1px solid #997e1f!important;
+ border: none!important;
+ outline: none!important;
+ }
+ .code-block-modal{
+ background: rgba(255, 213, 76, 0.04);
+ }
+ .overflow-auto{
+ background: rgba(255, 255, 255, 0.05)!important;
+ background-color: rgba(255, 255, 255, 0.05)!important;
+
+ .language-sql{
+ background-color: rgba(255, 255, 255, 0.00)!important;
+ // background: rgba(255, 255, 255, 0.05)!important;
+ // background: none;
+ span{
+ background: none;
+ // background: rgba(255, 255, 255, 0.05)!important;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/src/util/hook.ts b/src/util/hook.ts
index f431cd1..d7ca84c 100644
--- a/src/util/hook.ts
+++ b/src/util/hook.ts
@@ -71,7 +71,7 @@ export function useTable(param, apiFun) {
const requestIdRef = useRef(0); // 控制请求响应顺序
const loadData = () => {
- setLoading(true);
+ // setLoading(true);
const requestId = ++requestIdRef.current
apiFun({ ...page, ...paramRef.current }).then(res => {
if (requestId !== requestIdRef.current) return
@@ -79,9 +79,9 @@ export function useTable(param, apiFun) {
// res.data.unshift({type:0})
setData(res.data);
setTotal(res.total);
- setLoading(false);
+ // setLoading(false);
}).catch(() => {
- setLoading(false);
+ // setLoading(false);
})
}
const debounceLoad = useDebounce(loadData, 600, false)
{t('system.roleName')}
- setForm({ ...form, name: e.target.value })} maxLength={60}> + setForm({ ...form, name: e.target.value })} maxLength={60}>
-
-
-
+ )}
+ {/* 技能 */}
-
-
-
+ )}
+
+
+ {/* 知识库 */}
+
+
+ {(data) => (
+
+
+ )}
-
+