Commit Graph

302 Commits

Author SHA1 Message Date
xingyy
5753dacfb5 Merge branch 'xingyy' into dev 2025-09-05 13:24:02 +08:00
xingyy
6cdf5cfbd0 refactor(ContactModal): 将forwardMode属性定义改为完整props对象
使用defineProps的完整对象语法定义forwardMode属性,增加类型检查和默认值
2025-09-05 13:23:51 +08:00
xingyy
1eb110d3a8 Merge branch 'xingyy' into dev 2025-09-05 13:13:57 +08:00
xingyy
c49a77d42a fix(消息面板): 在多选模式下仅滚动到底部而不触发加载
避免多选模式下触发加载导致选中状态丢失
2025-09-05 13:13:41 +08:00
xingyy
775fed6ca5 Merge branch 'xingyy' into dev 2025-09-05 13:02:51 +08:00
xingyy
c4bed90c52 fix(聊天): 添加对话创建节流防止重复创建
在 talk.js 中添加节流机制,相同会话5秒内只创建一次
移除 ContactModal.vue 中冗余的选择逻辑
更新测试用的默认 token
2025-09-05 13:02:32 +08:00
xingyy
c45091e9aa Merge branch 'xingyy' into dev 2025-09-02 09:19:57 +08:00
xingyy
9853c435d1 12 2025-09-02 09:19:24 +08:00
xingyy
44e0edc278 fix(talk): 修复自己发送的消息被标记为未读的问题 2025-08-28 16:18:55 +08:00
xingyy
f730571232 feat(ContactModal): 添加群聊选择功能并优化联系人选择逻辑
- 新增群聊选择表格列和状态管理
- 优化联系人选择逻辑,支持单选和多选模式
- 调整弹窗高度和按钮样式
- 分离员工通讯录和群聊列表的提交处理
2025-08-28 11:03:59 +08:00
xingyy
6fc34c13b8 fix(ContactModal): 完善通讯录提交逻辑并添加错误处理
添加对空选择的验证,实现异步获取用户信息并过滤无效数据
处理提交过程中的错误情况,提供用户友好的错误提示
2025-08-27 16:02:51 +08:00
xingyy
1946ef8e9c feat(ContactModal): 新增通讯录功能并重构转发联系人界面
- 添加@vicons/tabler图标库依赖
- 启用vueDevTools插件
- 重构ContactModal组件,增加通讯录功能
- 实现部门树形结构展示和员工搜索
- 添加群聊列表展示功能
- 优化界面样式和交互体验
2025-08-27 15:48:23 +08:00
82c1fa1fa6 Merge branch 'wyfMain-dev' into dev 2025-08-08 16:42:42 +08:00
b484bc0823 1、将聊天助手消息判断规则改正确;2、处理新消息socket热更新时聊天助手消息为不创建;3、处理通讯录搜索页面结果为空时列表显示情况 2025-08-08 16:40:45 +08:00
e3b6d5bdf1 Merge branch 'wyfMain-dev' into dev 2025-08-08 16:03:54 +08:00
e7f7d266da 新增会话列表聊天助手会话过滤,不处理新增消息类型 2025-08-08 16:02:17 +08:00
4cbad14c98 Merge pull request 'fix: 增加文件大小限制' (#24) from yink into main
Reviewed-on: https://gitea-inner.fontree.cn/scout666/chat-pc/pulls/24
2025-07-11 07:39:54 +00:00
39bdccf811 Merge pull request 'fix: 增加文件大小限制' (#23) from yink into dev
Reviewed-on: https://gitea-inner.fontree.cn/scout666/chat-pc/pulls/23
2025-07-11 07:39:41 +00:00
e0924b14ef fix: 增加文件大小限制 2025-07-11 15:39:02 +08:00
6c6bcb7dce 更换体制外文档查看器的地址路径;解决单聊搜索定位聊天记录,无法定位到对方的聊天记录的问题 2025-07-11 15:02:45 +08:00
7d3d47a63c 分离体制内外正式环境配置 2025-07-11 13:37:28 +08:00
c00d5da7d7 修改正式环境配置 2025-07-11 13:26:17 +08:00
32aa5f7d81 Merge branch 'wyfMain-dev' 2025-07-11 09:28:42 +08:00
78009bc5e7 Merge pull request 'yink' (#22) from yink into main
Reviewed-on: https://gitea-inner.fontree.cn/scout666/chat-pc/pulls/22
2025-07-11 01:24:03 +00:00
e8a4d7e525 Merge pull request 'fix: 增加上传文件接口的超时时间' (#21) from yink into dev
Reviewed-on: https://gitea-inner.fontree.cn/scout666/chat-pc/pulls/21
2025-07-10 07:33:43 +00:00
21f413d6e3 fix: 增加上传文件接口的超时时间 2025-07-10 15:32:56 +08:00
e806848228 Merge pull request 'fix: bug 修复' (#20) from yink into dev
Reviewed-on: https://gitea-inner.fontree.cn/scout666/chat-pc/pulls/20
2025-07-10 02:49:10 +00:00
6e0322e2c7 fix: bug 修复 2025-07-10 10:48:45 +08:00
d20d1f3bed Merge pull request 'fix: bug修复' (#19) from yink into dev
Reviewed-on: https://gitea-inner.fontree.cn/scout666/chat-pc/pulls/19
2025-07-09 03:50:23 +00:00
2d7f2492af fix: bug修复 2025-07-09 11:49:55 +08:00
e39e78eda3 Merge pull request 'fix: bug修复' (#18) from yink into dev
Reviewed-on: https://gitea-inner.fontree.cn/scout666/chat-pc/pulls/18
2025-07-08 03:08:12 +00:00
6543ac0607 fix: bug修复 2025-07-08 11:07:37 +08:00
94aff02175 Merge pull request 'yink' (#17) from yink into dev
Reviewed-on: https://gitea-inner.fontree.cn/scout666/chat-pc/pulls/17
2025-07-07 07:15:25 +00:00
6c63946d37 Merge pull request 'yink' (#16) from yink into main
Reviewed-on: https://gitea-inner.fontree.cn/scout666/chat-pc/pulls/16
2025-07-07 07:11:01 +00:00
13830d748b fix: bug修复 2025-07-07 15:05:26 +08:00
7999499702 Merge branch 'main' of https://gitea-inner.fontree.cn/scout666/chat-pc into yink 2025-07-07 14:29:43 +08:00
d0a79e1a7d Merge pull request 'fix: bug修复' (#14) from yink into dev
Reviewed-on: https://gitea-inner.fontree.cn/scout666/chat-pc/pulls/14
2025-07-07 06:28:36 +00:00
429c30808b fix: bug修复 2025-07-07 14:27:08 +08:00
Phoenix
111f303b2a Merge branch 'xingyy' 2025-07-07 13:42:27 +08:00
Phoenix
d0c4ee8782 Merge branch 'dev' of http://172.16.100.91:3000/scout666/chat-pc into dev 2025-07-07 13:42:15 +08:00
Phoenix
0ebd368d85 Merge branch 'xingyy' into dev 2025-07-07 13:41:47 +08:00
Phoenix
a438174af4 fix(editor): 修复建议组件空项处理和粘贴功能优化
修复建议组件在空项时的处理逻辑,避免潜在错误。优化编辑器粘贴功能:
1. 处理空剪贴板数据时更安全
2. 添加纯文本粘贴支持
3. 简化图片节点更新逻辑
2025-07-07 13:41:26 +08:00
e2e540bc35 Merge branch 'wyfMain-dev' into dev 2025-07-07 13:19:17 +08:00
451974a84f 解决转发功能弹窗没有在切换会话时关闭的问题;解决自己转发消息给其他人,自己也会显示未读消息数量的问题 2025-07-07 13:18:09 +08:00
Phoenix
7a68232244 refactor(editor): 移除注释并保持原有功能 2025-07-07 10:45:07 +08:00
Phoenix
959978a2c7 Merge branch 'main' of http://172.16.100.91:3000/scout666/chat-pc 2025-07-07 10:44:15 +08:00
Phoenix
4863bc2220 fix(editor): 修复Tiptap编辑器mention和emoji的文本转换问题
修改tiptapToString函数以正确处理mention节点和emoji节点的文本转换
添加mention配置参数char、allowSpaces和allowedPrefixes
2025-07-07 10:42:06 +08:00
Phoenix
516680d0cb feat(编辑器): 增强tiptap编辑器的mention和文本转换功能
修改mention插件的触发字符配置,并优化tiptapToString方法以正确处理mention、表情和换行符。现在能够保留表情的alt文本并正确格式化mention输出。
2025-07-07 10:41:12 +08:00
Phoenix
e5a5b36dcc Merge branch 'dev' of http://172.16.100.91:3000/scout666/chat-pc into dev 2025-07-07 10:26:52 +08:00
Phoenix
b18a1b2604 refactor(TiptapEditor): 清理代码注释和格式化代码 2025-07-07 10:26:09 +08:00