diff --git a/controllers/message.go b/controllers/message.go index 225a3c0c..7adb7314 100644 --- a/controllers/message.go +++ b/controllers/message.go @@ -37,8 +37,17 @@ func (c *ApiController) GetMessages() { value := c.Input().Get("value") sortField := c.Input().Get("sortField") sortOrder := c.Input().Get("sortOrder") + chat := c.Input().Get("chat") + if limit == "" || page == "" { - c.Data["json"] = object.GetMaskedMessages(object.GetMessages(owner)) + var messages []*object.Message + if chat == "" { + messages = object.GetMessages(owner) + } else { + messages = object.GetChatMessages(chat) + } + + c.Data["json"] = object.GetMaskedMessages(messages) c.ServeJSON() } else { limit := util.ParseInt(limit) diff --git a/object/message.go b/object/message.go index 4aa9e1a0..9a0a5136 100644 --- a/object/message.go +++ b/object/message.go @@ -27,7 +27,7 @@ type Message struct { CreatedTime string `xorm:"varchar(100)" json:"createdTime"` Organization string `xorm:"varchar(100)" json:"organization"` - Chat string `xorm:"varchar(100)" json:"chat"` + Chat string `xorm:"varchar(100) index" json:"chat"` Author string `xorm:"varchar(100)" json:"author"` Text string `xorm:"mediumtext" json:"text"` } @@ -67,6 +67,16 @@ func GetMessages(owner string) []*Message { return messages } +func GetChatMessages(chat string) []*Message { + messages := []*Message{} + err := adapter.Engine.Desc("created_time").Find(&messages, &Message{Chat: chat}) + if err != nil { + panic(err) + } + + return messages +} + func GetPaginationMessages(owner string, offset, limit int, field, value, sortField, sortOrder string) []*Message { messages := []*Message{} session := GetSession(owner, offset, limit, field, value, sortField, sortOrder) diff --git a/web/src/ChatBox.js b/web/src/ChatBox.js new file mode 100644 index 00000000..97a190b4 --- /dev/null +++ b/web/src/ChatBox.js @@ -0,0 +1,44 @@ +// Copyright 2023 The Casdoor Authors. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import React from "react"; +import {Avatar, List} from "antd"; +import {CopyOutlined, DislikeOutlined, LikeOutlined} from "@ant-design/icons"; + +class ChatBox extends React.Component { + render() { + return ( + ( + + } + title={
{item.text}
} + /> +
+ + + +
+ + )} + /> + ); + } +} + +export default ChatBox; diff --git a/web/src/ChatMenu.js b/web/src/ChatMenu.js index 55bd067b..14be4e7a 100644 --- a/web/src/ChatMenu.js +++ b/web/src/ChatMenu.js @@ -14,13 +14,14 @@ import React from "react"; import {Menu} from "antd"; -import {MailOutlined} from "@ant-design/icons"; +import {LayoutOutlined} from "@ant-design/icons"; class ChatMenu extends React.Component { constructor(props) { super(props); this.state = { openKeys: ["0"], + selectedKeys: ["0-0"], }; } @@ -36,19 +37,37 @@ class ChatMenu extends React.Component { return Object.keys(categories).map((category, index) => { return { key: `${index}`, - icon: , + icon: , label: category, - children: categories[category].map((chat) => ({ - key: chat.id, - label: chat.displayName, - })), + children: categories[category].map((chat, chatIndex) => { + const globalChatIndex = chats.indexOf(chat); + return { + key: `${index}-${chatIndex}`, + dataIndex: globalChatIndex, + label: chat.displayName, + }; + }), }; }); } - // 处理菜单展开事件 + onSelect = (info) => { + const [categoryIndex, chatIndex] = info.selectedKeys[0].split("-").map(Number); + const selectedItem = this.chatsToItems(this.props.chats)[categoryIndex].children[chatIndex]; + this.setState({selectedKeys: [`${categoryIndex}-${chatIndex}`]}); + + if (this.props.onSelect) { + this.props.onSelect(selectedItem.dataIndex); + } + }; + + getRootSubmenuKeys(items) { + return items.map((item, index) => `${index}`); + } + onOpenChange = (keys) => { - const rootSubmenuKeys = this.props.chats.map((_, index) => `${index}`); + const items = this.chatsToItems(this.props.chats); + const rootSubmenuKeys = this.getRootSubmenuKeys(items); const latestOpenKey = keys.find((key) => this.state.openKeys.indexOf(key) === -1); if (rootSubmenuKeys.indexOf(latestOpenKey) === -1) { @@ -65,10 +84,9 @@ class ChatMenu extends React.Component { ); diff --git a/web/src/ChatPage.js b/web/src/ChatPage.js index 5fdbf093..a2ef6bb0 100644 --- a/web/src/ChatPage.js +++ b/web/src/ChatPage.js @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -import {Col, Row} from "antd"; -// import React from "react"; -import moment from "moment"; import React from "react"; +import moment from "moment"; import ChatMenu from "./ChatMenu"; +import ChatBox from "./ChatBox"; import * as Setting from "./Setting"; import * as ChatBackend from "./backend/ChatBackend"; +import * as MessageBackend from "./backend/MessageBackend"; import i18next from "i18next"; import BaseListPage from "./BaseListPage"; @@ -77,14 +77,17 @@ class ChatListPage extends BaseListPage { renderTable(chats) { return ( - - - - - - 222 - - +
+
+ { + const chat = chats[i]; + this.getMessages(chat.name); + }} /> +
+
+ +
+
); } @@ -122,6 +125,15 @@ class ChatListPage extends BaseListPage { } }); }; + + getMessages(chatName) { + MessageBackend.getChatMessages(chatName) + .then((messages) => { + this.setState({ + messages: messages, + }); + }); + } } export default ChatListPage; diff --git a/web/src/backend/MessageBackend.js b/web/src/backend/MessageBackend.js index af1e6a61..e46e5c75 100644 --- a/web/src/backend/MessageBackend.js +++ b/web/src/backend/MessageBackend.js @@ -24,6 +24,16 @@ export function getMessages(owner, page = "", pageSize = "", field = "", value = }).then(res => res.json()); } +export function getChatMessages(chat) { + return fetch(`${Setting.ServerUrl}/api/get-messages?chat=${chat}`, { + method: "GET", + credentials: "include", + headers: { + "Accept-Language": Setting.getAcceptLanguage(), + }, + }).then(res => res.json()); +} + export function getMessage(owner, name) { return fetch(`${Setting.ServerUrl}/api/get-message?id=${owner}/${encodeURIComponent(name)}`, { method: "GET",