kuaifan
|
7a267cc07b
|
整理代码
|
2022-02-19 11:44:03 +08:00 |
|
kuaifan
|
f4f351cf9d
|
Merge branch 'develop' of ssh://git.gezi.vip:6006/gx/dootask
# Conflicts:
# public/css/app.css
# public/js/app.js
# public/js/build/208.js
# public/js/build/389.js
# public/js/build/406.js
# public/js/build/406.js.LICENSE.txt
# public/js/build/423.js
# public/js/build/459.js
# public/js/build/459.js.LICENSE.txt
# public/js/build/688.js
# public/js/build/688.js.LICENSE.txt
# public/js/build/726.js
# public/js/build/755.js
# public/js/build/93.js
# public/js/build/954.js
|
2022-02-19 09:30:13 +08:00 |
|
韦荣超
|
35ddc4a472
|
Merge remote-tracking branch 'origin/chao-flow' into develop
|
2022-02-18 11:52:22 +08:00 |
|
韦荣超
|
3400d1e803
|
fix: 为引入组件报错
|
2022-02-18 11:51:11 +08:00 |
|
韦荣超
|
4171d993d0
|
Merge remote-tracking branch 'origin/chao-flow' into develop
# Conflicts:
# public/js/app.js
|
2022-02-18 11:25:49 +08:00 |
|
韦荣超
|
1521d1e883
|
fix: 【文件】流程图只读接入新组件及删除旧组件引入代码
|
2022-02-18 11:21:56 +08:00 |
|
kuaifan
|
403545cd9b
|
perf: 没有时间还显示时间倒计时的问题
|
2022-02-17 19:11:52 +08:00 |
|
kuaifan
|
54e4ed27ae
|
perf: 优化修改任务时间记录
|
2022-02-17 19:11:23 +08:00 |
|
kuaifan
|
5ed0ae2fa9
|
perf: 主任务归档时同步子任务归档
|
2022-02-17 17:27:11 +08:00 |
|
kuaifan
|
90b8e785a4
|
fix: 已完成子任务还出现时间跳动的情况
|
2022-02-15 10:39:19 +08:00 |
|
韦荣超
|
54dd90fc4a
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# public/js/app.js
# public/js/build/423.js
# public/js/build/726.js
# public/js/build/93.js
|
2022-02-15 09:05:20 +08:00 |
|
韦荣超
|
5115a048a3
|
Merge remote-tracking branch 'origin/chao-flow' into develop
# Conflicts:
# public/css/app.css
# public/js/app.js
# public/js/build/423.js
# public/js/build/93.js
|
2022-02-14 18:17:09 +08:00 |
|
kuaifan
|
972b8f83bc
|
添加任务详细描述取消文件上传
|
2022-02-14 17:37:11 +08:00 |
|
kuaifan
|
ce70c1ca3a
|
perf: 单条消息最长2000个字符，超过自动分割发送，总最长20000
|
2022-02-12 17:01:12 +08:00 |
|
韦荣超
|
56b91a59a2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-02-12 16:02:04 +08:00 |
|
kuaifan
|
0ef6476e58
|
perf: 任务详细描述取消文件上传
|
2022-02-12 14:15:23 +08:00 |
|
kuaifan
|
f9d28e1b6b
|
perf: 优化任务详情拖动发送文件
|
2022-02-12 13:49:30 +08:00 |
|
韦荣超
|
63534d3eb5
|
feat: 更新流程图组件
|
2022-02-12 11:54:56 +08:00 |
|
韦荣超
|
230d1a1f86
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# app/Http/Controllers/Api/FileController.php
# public/js/build/208.js
# public/js/build/252.js
# public/js/build/400.js
# public/js/build/76.js
|
2022-02-11 11:01:05 +08:00 |
|
kuaifan
|
feed984ba8
|
perf: 兼容iPad端
|
2022-02-10 21:03:36 +08:00 |
|
kuaifan
|
ae80939d2e
|
perf: 任务详情
|
2022-02-10 20:33:35 +08:00 |
|
kuaifan
|
c117e4b087
|
fix: 修复文件上传一直出现loading的情况
|
2022-02-10 20:33:14 +08:00 |
|
kuaifan
|
96580e2284
|
perf: 该文件版本已经改变了。该页面将被重新加载
|
2022-02-10 20:12:17 +08:00 |
|
kuaifan
|
d49790ba78
|
perf: 团队管理新增身份筛选项
|
2022-02-09 17:09:40 +08:00 |
|
kuaifan
|
598f01de95
|
no message
|
2022-02-09 16:59:48 +08:00 |
|
kuaifan
|
992e137339
|
perf: 任务文件支持更多格式上传
|
2022-02-09 16:59:42 +08:00 |
|
韦荣超
|
3d6df3cc09
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# app/Http/Controllers/Api/DialogController.php
# app/Http/Controllers/Api/ProjectController.php
# app/Models/Project.php
# electron/package.json
# package.json
# public/css/app.css
# public/js/app.js
# public/js/build/146.js
# public/js/build/188.js
# public/js/build/188.js.LICENSE.txt
# public/js/build/244.js
# public/js/build/244.js.LICENSE.txt
# public/js/build/278.js
# public/js/build/278.js.LICENSE.txt
# public/js/build/30.js
# public/js/build/423.js
# public/js/build/43.js
# public/js/build/525.js
# public/js/build/644.js.LICENSE.txt
# public/js/build/660.js
# public/js/build/766.js
# public/js/build/831.js
# public/js/build/893.js
# public/js/build/919.js
# public/js/build/919.js.LICENSE.txt
# public/js/build/934.js
# public/js/build/934.js.LICENSE.txt
# resources/assets/js/pages/manage/components/DialogList.vue
# resources/assets/js/pages/manage/components/DialogWrapper.vue
# resources/assets/js/pages/manage/components/TaskAdd.vue
# resources/assets/sass/components/report.scss
|
2022-02-07 10:50:38 +08:00 |
|
kuaifan
|
95033cd5b7
|
perf: 优化项目筛选工作流
|
2022-01-29 16:02:49 +08:00 |
|
kuaifan
|
9999548bc2
|
perf: 优化撤回消息
|
2022-01-29 13:39:16 +08:00 |
|
kuaifan
|
21e618cca2
|
优化了一些代码
|
2022-01-28 18:27:47 +08:00 |
|
kuaifan
|
35bd038802
|
Merge branch 'master' of github.com:kuaifan/dootask into develop
# Conflicts:
# app/Http/Controllers/Api/DialogController.php
# app/Http/Controllers/Api/ProjectController.php
# electron/package.json
# package.json
# public/css/app.css
# public/docs/assets/main.bundle.js
# public/js/app.js
# public/js/build/146.js.LICENSE.txt
# public/js/build/161.js
# public/js/build/199.js
# public/js/build/199.js.LICENSE.txt
# public/js/build/218.js
# public/js/build/218.js.LICENSE.txt
# public/js/build/244.js
# public/js/build/244.js.LICENSE.txt
# public/js/build/309.js
# public/js/build/423.js
# public/js/build/43.js
# public/js/build/693.js
# public/js/build/717.js
# public/js/build/717.js.LICENSE.txt
# public/js/build/79.js.LICENSE.txt
# resources/assets/js/pages/manage/components/TaskAdd.vue
|
2022-01-28 14:39:43 +08:00 |
|
kuaifan
|
1ff59aee56
|
perf: 优化修改工作流未保存关闭提示
|
2022-01-28 13:25:51 +08:00 |
|
kuaifan
|
ae169810d0
|
perf: 优化UserInput组件
|
2022-01-28 13:04:54 +08:00 |
|
kuaifan
|
a881bfd63b
|
fix: 客户端编辑文件不显示协助成员
|
2022-01-28 01:12:22 +08:00 |
|
kuaifan
|
09d3131d46
|
fix: 添加任务时选择任务组无效
|
2022-01-28 00:12:51 +08:00 |
|
kuaifan
|
53550b8975
|
fix: 工作报告弹窗被遮挡的问题
|
2022-01-27 23:55:13 +08:00 |
|
kuaifan
|
9e560c79ae
|
优化聊天消息附件支持预览
|
2022-01-27 12:17:30 +08:00 |
|
kuaifan
|
705d7f3da0
|
perf: 聊天消息附件支持预览
|
2022-01-27 00:44:49 +08:00 |
|
kuaifan
|
08372facd7
|
fix: 移动端无法上传任务文件的问题
|
2022-01-26 19:11:16 +08:00 |
|
kuaifan
|
8ff94bc138
|
fix: 任务中没有聊天记录时，发送图片无法成功
|
2022-01-26 18:05:53 +08:00 |
|
Mr.Huan
|
d22266a947
|
perf: 聊天页面图片尺寸缩小至180px
|
2022-01-26 17:26:29 +08:00 |
|
Mr.Huan
|
e34fb25759
|
fix: 修复消息撤回文字提示在第一条时会被顶部遮住的问题
|
2022-01-26 17:23:20 +08:00 |
|
Mr.Huan
|
72e5f9a83e
|
fix: 修复消息撤回文字提示在第一条时会被顶部遮住的问题
|
2022-01-26 15:02:56 +08:00 |
|
kuaifan
|
f596749645
|
Merge branch 'master' of github.com:kuaifan/dootask into develop
# Conflicts:
# electron/package.json
# package.json
# public/css/app.css
# public/js/app.js
# public/js/build/120.js
# public/js/build/120.js.LICENSE.txt
# public/js/build/146.js.LICENSE.txt
# public/js/build/161.js
# public/js/build/284.js
# public/js/build/309.js
# public/js/build/400.js
# public/js/build/644.js
# public/js/build/644.js.LICENSE.txt
# public/js/build/79.js.LICENSE.txt
# resources/assets/js/pages/manage/components/TaskAdd.vue
|
2022-01-26 09:35:16 +08:00 |
|
kuaifan
|
60e47e85a3
|
perf: 添加任务时如果自己不是任务负责人可选择加入协助人员列表
|
2022-01-26 01:12:00 +08:00 |
|
kuaifan
|
4a42ce87a2
|
feat: 工作流程负责人新增剔除模式（改变任务负责人并保留操作状态的人员）
|
2022-01-25 23:46:47 +08:00 |
|
kuaifan
|
8f0b5dc049
|
Merge branch 'master' of github.com:kuaifan/dootask into develop
# Conflicts:
# app/Http/Controllers/Api/DialogController.php
# electron/package.json
# package.json
# public/css/app.css
# public/js/app.js
# public/js/build/146.js
# public/js/build/146.js.LICENSE.txt
# public/js/build/178.js
# public/js/build/178.js.LICENSE.txt
# public/js/build/199.js
# public/js/build/199.js.LICENSE.txt
# public/js/build/309.js
# public/js/build/328.js.LICENSE.txt
# public/js/build/388.js
# public/js/build/43.js
# public/js/build/46.js.LICENSE.txt
# public/js/build/857.js
# public/js/build/857.js.LICENSE.txt
# public/js/build/893.js
|
2022-01-25 16:12:53 +08:00 |
|
kuaifan
|
7f14a82053
|
perf: 任务群聊中拖拽文件或者照片时并未有确认窗口
|
2022-01-25 16:06:26 +08:00 |
|
kuaifan
|
f12c79d292
|
pref: 待处理时进入动态中点击重置，重置提示中的参数为空，点击确定后，提示流程不存在或者删除
|
2022-01-25 15:04:03 +08:00 |
|
kuaifan
|
6e76514a24
|
pref: 添加子任务时输入框为空，回车时提示的图标错误
|
2022-01-25 15:03:43 +08:00 |
|