This commit is contained in:
zhangkai
2024-10-15 12:17:14 +08:00
parent 2408d980e5
commit e8279a2deb
7 changed files with 128 additions and 7 deletions

View File

@@ -0,0 +1,74 @@
import { useEffect, useRef } from "react";
import * as echarts from "echarts";
function Chart({ options }) {
const chartRef = useRef(null);
let chartInstance = null;
options = eval('('+options.substring(8)+')');
console.log(options)
const options1 = {
tooltip: {},
legend: {
data: [""],
},
xAxis: {
data: options.data.map(obj => {return obj.name}),
},
yAxis: {},
series: [
{
name: "",
type: options.chartType,
data: options.data.map(obj => {return obj.value}),
},
],
};
// 定义渲染函数
function renderChart() {
try {
// `echarts.getInstanceByDom` 可以从已经渲染成功的图表中获取实例,其目的就是在 options 发生改变的时候,不需要
// 重新创建图表,而是复用该图表实例,提升性能
const renderedInstance = echarts.getInstanceByDom(chartRef.current);
if (renderedInstance) {
chartInstance = renderedInstance;
} else {
chartInstance = echarts.init(chartRef.current);
}
chartInstance.setOption(options1);
} catch (error) {
console.error("error", error.message);
chartInstance && chartInstance.dispose();
}
}
// 定义窗口大小发生改变执行的回调函数
function resizeHandler() {
chartInstance.resize();
}
// 页面初始化时,开始渲染图表
useEffect(() => {
renderChart();
return () => {
// 销毁图表实例,释放内存
chartInstance && chartInstance.dispose();
};
}, []);
// 监听窗口大小改变
useEffect(() => {
window.addEventListener("resize", resizeHandler);
return () => window.removeEventListener("resize", resizeHandler);
}, []);
return (
<div>
<div style={{ width: "800px", height: "400px" }} ref={chartRef} />
</div>
);
}
export default Chart;

View File

@@ -22,7 +22,7 @@ import npcIcon from "../../../assets/npc/npcIcon.png";
import nengliIcon from "../../../assets/npc/nengliIcon.png";
import { TitleIconBg } from "../cardComponent";
import Thumbs from "@/pages/ChatAppPage/components/Thumbs";
import Chart from "@/components/Chart"
// 颜色列表
const colorList = [
"#111",
@@ -104,16 +104,26 @@ export default function MessageBs({ data, onUnlike = () => { }, flow_type, onSou
{/* 光标 */}
{/* {data.message.toString() && !data.end && <div className="animate-cursor absolute w-2 h-5 ml-1 bg-gray-600" style={{ left: cursor.x, top: cursor.y }}></div>} */}
{/* </div> */}
{/* <div className="App">
<Chart options={data.message} />
</div>
{data.message.toString() ?
<div className="chat-start-zk relative">
{mkdown}
{data.receiver && <p className="text-blue-500 text-sm">@ {data.receiver.user_name}</p>}
</div>
: <div><LoadIcon className="text-gray-400" /></div>
} */}
{data.message.toString() && data.message.toString().includes('```chart') && <Chart options={data.message} />}
{data.message.toString() && !data.message.toString().includes('```chart') && <div className="chat-start-zk relative">
{mkdown}
{/* @user */}
{data.receiver && <p className="text-blue-500 text-sm">@ {data.receiver.user_name}</p>}
{/* 光标 */}
{/* {data.message.toString() && !data.end && <div className="animate-cursor absolute w-2 h-5 ml-1 bg-gray-600" style={{ left: cursor.x, top: cursor.y }}></div>} */}
</div>
: <div><LoadIcon className="text-gray-400" /></div>
}
</div>}
{!data.message.toString() && <div><LoadIcon className="text-gray-400" /></div>}
{/* 赞 踩 */}
{!!data.id && data.end && <Thumbs

View File

@@ -75,7 +75,7 @@ export default function MessagePanne({ useName, guideWord, loadMore, flow_type }
} else if (msg.thought) {
type = 'system'
}
// console.log(type)
console.log(type)
switch (type) {
case 'user':
return <MessageUser key={msg.id} useName={useName} data={msg} />;

View File

@@ -13,6 +13,7 @@ import { ChatMessageType } from "../../../types/chat";
import { classNames } from "../../../utils";
import FileCard from "../fileComponent";
import { CodeBlock } from "./codeBlock";
import Chart from "@/components/Chart";
export default function ChatMessage({
chat,
lockChat,
@@ -26,6 +27,8 @@ export default function ChatMessage({
const [hidden, setHidden] = useState(true);
const template = chat.template;
const [promptOpen, setPromptOpen] = useState(false);
console.log(chat.message)
return (
<div
className={classNames("form-modal-chat-position", chat.isSend ? "human-word" : "robert-word")}
@@ -76,6 +79,9 @@ export default function ChatMessage({
<div className="w-full">
<div className="w-full dark:text-white">
<div className="w-full">
{chat.message.toString() && chat.message.toString().includes('```chart') && <Chart options={chat.message} />}
{useMemo(
() => (
<ReactMarkdown
@@ -125,7 +131,9 @@ export default function ChatMessage({
},
}}
>
{chat.message.toString()}
{chat.message.toString() && !chat.message.toString().includes('```chart') && chat.message.toString()}
{/* {chat.message.toString()} */}
</ReactMarkdown>
),
[chat.message, chat.message.toString()]