Commit Graph

81 Commits

Author SHA1 Message Date
wwt
4be1c7c9a4 处理冲突
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
2025-03-12 14:57:55 +08:00
wwt
c408b97b1e token 2025-03-12 14:47:14 +08:00
9b904b4fda Merge branch 'wyfMain-dev'
Some checks failed
Check / lint (push) Has been cancelled
Check / typecheck (push) Has been cancelled
Check / build (build, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:app, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:app, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Has been cancelled
2025-03-11 11:36:18 +08:00
8b61369006 调整打包配置 2025-03-11 11:35:42 +08:00
scout
93428be5df 添加命令
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
2025-03-10 19:07:30 +08:00
8c9b9d0f2c Merge branch 'zhangyuanshan-20250310' into wyfMain-dev 2025-03-10 15:31:23 +08:00
ada0bc0ee9 新增引入消息显示 2025-03-10 15:09:26 +08:00
张 元山
ff5a23b18e 构建 2025-03-10 14:28:52 +08:00
78756431b7 处理部分环境配置 2025-03-10 10:59:45 +08:00
226a24b06b 处理提测前的样式问题
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
2025-03-10 09:57:21 +08:00
c4b4ec323a 处理聊天数据请求特殊情况
Some checks failed
Check / lint (push) Has been cancelled
Check / typecheck (push) Has been cancelled
Check / build (build, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:app, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:app, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Has been cancelled
2025-03-07 16:14:25 +08:00
e782b72b74 Merge branch 'wyfMain-dev'
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
2025-03-07 15:06:49 +08:00
ba0a5384e0 解决聊天记录页面分页、数据加载、渲染等问题 2025-03-07 15:02:53 +08:00
ea73fa8b9b 处理聊天页面中出现的问题;优化页面中部门明细的样式问题 2025-03-06 18:50:11 +08:00
c9eb55ed5f 接入naive-ui组件 2025-03-06 09:04:59 +08:00
wwt
f1fa0208c1 更新搜索框背景色;通讯录导航栏背景图;聊天设置排版;聊天列表群名过长排版
Some checks failed
Check / lint (push) Has been cancelled
Check / typecheck (push) Has been cancelled
Check / build (build, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:app, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:app, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Has been cancelled
2025-03-05 13:14:54 +08:00
wwt
b151f90fa6 提交修改
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
2025-03-04 18:56:34 +08:00
wwt
37c5b604c9 更新z-paging组件为最新版本;修改首页的样式;添加下拉刷新;群聊设置的样式调整 2025-03-04 18:55:17 +08:00
11aacea856 自定义checkbox新增disabled状态;选择人员新增已在群内人员禁止选择
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
2025-03-04 16:38:44 +08:00
aa9adb6211 Merge branch 'main' into wyfMain-dev
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
2025-03-04 14:11:21 +08:00
69fd096c4d 完成部门选择和人员选择页面新规则 2025-03-04 14:10:25 +08:00
82ba6ddbd7 修改选择部门和人员的规则 2025-03-04 11:43:08 +08:00
wwt
ccc8c41b2d Merge branch 'wwt'
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
2025-03-04 11:41:54 +08:00
wwt
cef9d08356 token 2025-03-04 11:41:09 +08:00
wwt
69c5934ef4 首页样式改动:顶部;搜索框;滑块;消息间距 2025-03-04 11:40:37 +08:00
wwt
160788a107 修改搜索框默认提示的字体颜色 2025-03-04 09:14:53 +08:00
d7e8df5386 修改人员选择规则
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
2025-03-03 17:05:22 +08:00
b58f25945e 修改部门选择规则
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
2025-03-03 15:22:53 +08:00
bdfd84bd35 修改部分选择人员的规则与交互 2025-02-18 19:51:23 +08:00
a0578c57ad 解决群管理员列表【我】的判断规则不适配新版的问题;新增管理员选择页面搜索功能 2025-02-14 19:52:01 +08:00
e9bd2bf6cd 修改部门群管理员岗位新增修改规则,增加部门岗位对应关系 2025-02-13 08:49:20 +08:00
2c063f3d4f 重构部分聊天详情页面;重构部分管理员选择页面 2025-02-11 11:45:19 +08:00
5c55411aa3 重构部分聊天选择页面 2025-02-08 17:09:57 +08:00
df07c953bf 重构选择群类型页面部分样式;将选择部门和选择群成员合并到一起;去除选择管理员页面,复用设置管理员页面;调整按部门选择人员样式和逻辑;调整创建群聊部分规则 2025-02-07 17:00:57 +08:00
dafe65bb72 修改选择部门和新增群成员页面交互与样式;新增通讯录页面复用部分适配 2025-02-06 17:01:28 +08:00
78ca543946 新增通讯录页面;新增发起单聊功能;新增聊天会话左滑删除并同时删除localStorage中的记录 2025-02-05 16:22:32 +08:00
2e3b0b994b 新增自定义头像通用组件;进行发起群聊、选择部门页面部分重构 2025-01-24 17:01:50 +08:00
8704691821 更新zpaging组件版本至最新;新增自定义导航栏组件 2025-01-24 11:18:26 +08:00
4f57419c5d 实现普通群项目群的拉人、踢人功能;优化人员选择功能界面 2025-01-23 16:45:49 +08:00
489fb71be5 实现普通群创建和项目群创建;实现群头像修改功能;实现项目群和普通群的管理员设置、移除、查看 2025-01-22 16:37:28 +08:00
d516ce00ef 完成部门群岗位管理员权限的设置、移除、查看
Some checks failed
Check / lint (push) Has been cancelled
Check / typecheck (push) Has been cancelled
Check / build (build, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:app, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:app, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Has been cancelled
2025-01-21 18:43:14 +08:00
65eaefdbc3 OA体制内聊天项目完成修改群名称功能;完成群公告创建、修改、删除、查看;完成群内禁言添加人、解除禁言、全局禁言;全局维护群管理员部门与岗位对应关系 2025-01-20 19:03:57 +08:00
03c30c2945 群聊设置页面新增权限控制 2025-01-17 17:01:17 +08:00
5c6f254114 Merge branch 'wyfMain-dev'
Some checks failed
Check / lint (push) Has been cancelled
Check / typecheck (push) Has been cancelled
Check / build (build, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:app, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:app, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Has been cancelled
2025-01-17 14:00:18 +08:00
936f2eea86 组装部门和岗位对应树,并提供根据id查询 2025-01-17 13:56:06 +08:00
656fe2e4db OA体制内聊天新增用户详情页面,并接入真实用户数据,处理数据格式;新增聊天记录按图片与视频搜索,并处理图片排列格式 2025-01-16 18:25:21 +08:00
a3c1b56d27 新增按文件类型搜索聊天记录静态页面,并接入真实数据 2025-01-13 16:56:13 +08:00
0989ffb96e Merge branch 'main' of http://172.16.100.91:3000/scout666/chat-app
Some checks failed
Check / lint (push) Has been cancelled
Check / typecheck (push) Has been cancelled
Check / build (build, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:app, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:app, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Has been cancelled
2025-01-13 11:13:56 +08:00
b5a2504dbd fix 2025-01-13 11:13:51 +08:00
b93183eec3 Merge branch 'wyfMain-dev'
Some checks failed
Check / lint (push) Has been cancelled
Check / typecheck (push) Has been cancelled
Check / build (build, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:app, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:app, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Has been cancelled
2025-01-08 16:35:54 +08:00