Commit Graph

4065 Commits

Author SHA1 Message Date
fit2cloud-chenyw
c8805bceb2 fix: dockerfile路径错误 2021-12-30 17:34:09 +08:00
fit2cloud-chenyw
b9be10aae8
Merge pull request #1572 from dataease/pr@dev@fix_dockerfile
fix: dockerfile报错
2021-12-30 17:26:10 +08:00
fit2cloud-chenyw
54434b991a fix: dockerfile报错 2021-12-30 17:24:53 +08:00
王嘉豪
f582cb3d83
Merge pull request #1570 from dataease/pr@dev@feat-mobile-reset
refactor: 过滤组件初始化优化,适配历史过滤组件
2021-12-30 17:17:48 +08:00
fit2cloud-chenyw
826122ff83
Merge pull request #1571 from dataease/pr@dev@fix_chrome_lose_driver
fix: 定时任务截图报错
2021-12-30 17:15:30 +08:00
fit2cloud-chenyw
a047346c66 fix: 定时任务截图报错 2021-12-30 17:14:27 +08:00
wangjiahao
5f31ed7ed9 refactor: 过滤组件初始化优化,视频历史过滤组件 2021-12-30 17:14:17 +08:00
taojinlong
31f7cc0c85 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-30 16:26:52 +08:00
taojinlong
d4e7c888aa fix: 编辑行权限,字段名可以重复 2021-12-30 16:26:41 +08:00
fit2cloud-chenyw
fb7ccd3427
Merge pull request #1568 from dataease/pr@dev@fix_print_log
fix: 优化打印日志
2021-12-30 15:59:34 +08:00
王嘉豪
79f82c274d
Merge pull request #1569 from dataease/pr@dev@feat-mobile-reset
refactor: 国际化
2021-12-30 15:59:27 +08:00
wangjiahao
4d8bb2d7d5 refactor: 国际化 2021-12-30 15:58:37 +08:00
fit2cloud-chenyw
983b166dea fix: 优化打印日志 2021-12-30 15:57:45 +08:00
taojinlong
0aa40304fc fix: 获取用户角色 ID 2021-12-30 15:48:01 +08:00
taojinlong
7ffe5514a9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-30 14:50:48 +08:00
taojinlong
47f9ca83bc fix: 枚举值接口支持行权限 2021-12-30 14:50:26 +08:00
Gin
57d7a2b980
Merge pull request #1567 from dataease/pr@dev@fix_time
fix: 数据集文本转日期
2021-12-30 14:45:57 +08:00
junjie
f39f56e0fe fix: 数据集文本转日期 2021-12-30 14:44:36 +08:00
fit2cloudrd
2dfe2e3cc0
style: 样式修改 (#1563)
* style: 样式修改

* style: 样式修改

Co-authored-by: wangjiahao <1522128093@qq.com>
2021-12-30 14:30:37 +08:00
wangjiahao
f20b58df80 style: 样式修改 2021-12-30 14:29:51 +08:00
fit2cloud-chenyw
3948184720
Merge pull request #1566 from dataease/pr@dev@fix_打印邮堆栈异常
fix: 打印邮件堆栈异常
2021-12-30 13:49:27 +08:00
fit2cloud-chenyw
d451100a57 fix: 打印邮件堆栈异常 2021-12-30 13:48:28 +08:00
Gin
c421fa426a
Merge pull request #1565 from dataease/pr@dev@fix_form
fix: 弹框回车事件
2021-12-30 13:30:09 +08:00
junjie
613731700e fix: 弹框回车事件 2021-12-30 13:29:16 +08:00
fit2cloud-chenyw
8fb3d3490f
Merge pull request #1564 from dataease/pr@dev@fix_邮件截图报错
fix: 邮件截图报错
2021-12-30 12:39:06 +08:00
fit2cloud-chenyw
b8cc97fad8 fix: 邮件截图报错 2021-12-30 12:38:00 +08:00
wangjiahao
b011aaab98 style: 样式修改 2021-12-30 12:32:23 +08:00
王嘉豪
6a56fe9b84
Merge pull request #1562 from dataease/pr@dev@feat-mobile-reset
refactor: 仪表板间隙设置优化
2021-12-30 11:48:57 +08:00
wangjiahao
f29b660819 refactor: 仪表板间隙设置优化 2021-12-30 11:47:26 +08:00
wangjiahao
e9634abaa1 Merge remote-tracking branch 'origin/dev' into feat-mobile-reset 2021-12-30 11:46:41 +08:00
fit2cloud-chenyw
ae56b13b2c
Merge pull request #1560 from dataease/pr@dev@fix_public_link_time
fix: 公共链接有效期
2021-12-30 10:52:34 +08:00
fit2cloud-chenyw
1b174f589a fix: 公共链接有效期 2021-12-30 10:39:53 +08:00
Gin
2a4f3a760c
Merge pull request #1559 from dataease/pr@dev@fix_group
fix: 删除分组后,右侧界面关闭
2021-12-30 10:19:50 +08:00
junjie
9fa458a704 fix: 删除分组后,右侧界面关闭 2021-12-30 10:18:54 +08:00
fit2cloudrd
a386b6f2c7
style: 样式修改
style: 样式修改
2021-12-29 18:52:48 +08:00
wangjiahao
ba3c3fd1c2 style: 样式修改 2021-12-29 18:51:07 +08:00
fit2cloud-chenyw
20941ce2bd
Merge pull request #1558 from dataease/pr@dev@fix_muilt_fields
fix: 多字段枚举接口免登录
2021-12-29 18:47:54 +08:00
fit2cloud-chenyw
b2e4307ba5 fix: 多字段枚举接口免登录 2021-12-29 18:47:01 +08:00
wangjiahao
b522aab62f style: 移动端布局样式优化 2021-12-29 18:35:57 +08:00
taojinlong
72164d375f Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-29 18:34:38 +08:00
taojinlong
eb69f3c68e fix: db2 分页问题 2021-12-29 18:34:27 +08:00
taojinlong
55a08f61d2 fix: db2 分页问题 2021-12-29 18:32:23 +08:00
王嘉豪
d2e3f90a78
Merge pull request #1556 from dataease/pr@dev@feat-mobile-reset
style: 移动端布局样式优化
2021-12-29 18:06:10 +08:00
wangjiahao
97d78aca86 style: 移动端布局样式优化 2021-12-29 18:05:36 +08:00
taojinlong
d5a0f9a9c6 fix: sql 数据集不允许有重复字段 2021-12-29 17:52:54 +08:00
王嘉豪
daa03411b2
Merge pull request #1555 from dataease/feat-mobile-reset
refactor: 移动端禁用跳转
2021-12-29 16:43:47 +08:00
wangjiahao
be94b177a0 refactor: 移动端禁用跳转 2021-12-29 16:41:01 +08:00
junjie
37e98ea808 fix: 下钻字段容错 2021-12-29 16:13:28 +08:00
junjie
da1d0b8282 fix: 下钻字段容错 2021-12-29 16:11:55 +08:00
taojinlong
fac31a30b5 fix: Db2 增量更新 2021-12-29 15:16:47 +08:00