Commit Graph

1485 Commits

Author SHA1 Message Date
taojinlong
d64f0050a3
Merge pull request #1615 from rc452860/dev
feat: 添加数据库数据集时显示表注释
2022-01-17 18:16:45 +08:00
taojinlong
be5b1b07c2 refactor: 修复冲突 2022-01-17 18:05:26 +08:00
taojinlong
7d90a503c9 feat: 数据集列权限 2022-01-17 18:00:53 +08:00
fit2cloud-chenyw
563d7bee95 fix: token超时时间计算错误 2022-01-14 15:19:31 +08:00
fit2cloud-chenyw
624bffd8c0
Merge pull request #1638 from dataease/pr@dev@feat_priority_task_pool
feat: 定时报告使用优先级线程池
2022-01-13 17:29:32 +08:00
fit2cloud-chenyw
9cd891556f feat: 定时报告使用优先级线程池 2022-01-13 17:28:25 +08:00
wangjiahao
18b5815fd7 feat: 系统样式设置中增加首页是否显示按钮 2022-01-13 15:10:46 +08:00
fit2cloud-chenyw
a23e2601d7
Merge pull request #1634 from dataease/pr@dev@feat_default_pwd
feat: 默认密码
2022-01-12 17:47:26 +08:00
fit2cloud-chenyw
1714b7b017 feat: 默认密码 2022-01-12 17:46:14 +08:00
wangjiahao
c8491b069e refactor: 首页导航样式适配 2022-01-12 16:56:17 +08:00
wangjiahao
95186bd330 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/lang/en.js
#	frontend/src/lang/tw.js
#	frontend/src/lang/zh.js
2022-01-12 11:17:01 +08:00
wangjiahao
9c1a055b3f feat: 新增首页导航 2022-01-12 11:14:51 +08:00
fit2cloud-chenyw
0a3580ddae refactor: 优化主题切换 2022-01-12 11:07:03 +08:00
rc452860
00650ce9f2 feat: 添加数据库数据集时显示表注释 2022-01-11 11:11:54 +08:00
fit2cloud-chenyw
eaed04f441 fix: 邮件预览日志 2022-01-10 15:34:59 +08:00
fit2cloud-chenyw
d424e15400 fix: 多字段枚举NPE异常 2022-01-10 15:28:33 +08:00
taojinlong
0f678140cf
Merge pull request #1596 from rc452860/dev
fix: 数据源类型为oracle时候不同步字段注释问题
2022-01-10 14:23:00 +08:00
junjie
dc1102d67f feat(数据集): 计算字段语法校验 2022-01-10 11:25:08 +08:00
taojinlong
4b33d79b47 fix: 处理原始表字段注释太长的问题 2022-01-06 15:17:28 +08:00
wangjiahao
4f5cf69378 Merge remote-tracking branch 'origin/v1.6' into v1.6 2022-01-06 11:37:14 +08:00
wangjiahao
65d37de5b0 refactor: 更新flyway 2022-01-06 11:36:37 +08:00
taojinlong
9562f5e207 fix: sql 错误 2022-01-06 07:43:02 +08:00
wangjiahao
f896e4efec refactor: 更新flyway 2022-01-06 00:00:19 +08:00
turc
3be575c98e fix: 数据源类型为oracle时候不同步字段注释问题 2022-01-05 13:36:15 +08:00
fit2cloud-chenyw
ad936cd963 fix: 周表达式无效 2022-01-04 17:53:02 +08:00
fit2cloud-chenyw
2747de3aa8
Merge pull request #1594 from dataease/pr@dev@fix_cron
fix: 周表达式无效
2022-01-04 17:52:10 +08:00
fit2cloud-chenyw
314b9fae66 fix: 周表达式无效 2022-01-04 17:50:33 +08:00
junjie
5acf996055 fix: 数据集权限树 2022-01-04 17:44:11 +08:00
junjie
a0d4fd1812 fix: 数据集权限树 2022-01-04 17:32:25 +08:00
taojinlong
aba661e1b5 fix: 查询数据时,先校验数据源有效性 2022-01-04 17:13:15 +08:00
taojinlong
ecad805dc4 fix: 查询数据时,先校验数据源有效性 2022-01-04 17:12:30 +08:00
taojinlong
71a78c0595 Merge branch 'v1.6' of github.com:dataease/dataease into v1.6 2022-01-04 16:23:11 +08:00
taojinlong
617da997a8 fix: 公共链接校验 token 2022-01-04 16:22:53 +08:00
taojinlong
7ae8b80bf1 fix: 公共链接校验 token 2022-01-04 16:21:51 +08:00
wangjiahao
071d236d77 refactor: 增加移动端布局示例 2022-01-04 16:01:36 +08:00
taojinlong
8f50764fa2 Merge branch 'v1.6' of github.com:dataease/dataease into v1.6 2022-01-04 12:08:37 +08:00
taojinlong
d35c03d828 fix: 查询数据时,先校验数据源有效性 2022-01-04 12:06:21 +08:00
taojinlong
9f98c73e08 fix: 查询数据时,先校验数据源有效性 2022-01-04 12:04:43 +08:00
fit2cloud-chenyw
9b15f26ccb refactor: 移动端代码合并 2022-01-04 11:53:10 +08:00
fit2cloud-chenyw
a50c94fbd5 fix: 移动端分页api 2022-01-04 11:52:46 +08:00
taojinlong
832c244736 fix: 定时任务过滤数据集 2022-01-04 11:15:51 +08:00
taojinlong
a5216ba596 build: v1.6 2022-01-04 11:15:49 +08:00
taojinlong
6ce8e851d6 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-01-04 11:15:09 +08:00
taojinlong
8ca71983e1 fix: 定时任务过滤数据集 2022-01-04 11:14:19 +08:00
fit2cloud-chenyw
2ba5690ba9 refactor: 移动端代码合并 2022-01-03 21:13:45 +08:00
fit2cloud-chenyw
b246111524 fix: 移动端分页api 2022-01-03 20:34:56 +08:00
taojinlong
f0cad41560 build: v1.6 2021-12-31 17:46:06 +08:00
taojinlong
64e5c34f05 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-31 17:42:29 +08:00
taojinlong
927bdbdebf fix: mongo sql 拼接问题 2021-12-31 16:34:21 +08:00
fit2cloud-chenyw
765ab7587f fix: 公共链接跳转白名单 2021-12-31 11:46:03 +08:00