Commit Graph

4011 Commits

Author SHA1 Message Date
fit2cloud-chenyw
d5164d59a0
Merge pull request #1612 from dataease/pr@dev@fix_print_panel_log
fix: 邮件预览日志
2022-01-10 16:26:32 +08:00
fit2cloud-chenyw
eaed04f441 fix: 邮件预览日志 2022-01-10 15:34:59 +08:00
fit2cloud-chenyw
9342486466
Merge pull request #1611 from dataease/pr@dev@fix_mult_filed_npe
fix: 多字段枚举NPE异常
2022-01-10 15:30:19 +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
fit2cloud-chenyw
2de66cf8d7
Merge pull request #1610 from dataease/pr@dev@fix_dynamic_filter_date
fix: 动态日期过滤组件月份逻辑
2022-01-10 12:07:52 +08:00
fit2cloud-chenyw
44ba1f8db6 fix: 动态日期过滤组件月份逻辑 2022-01-10 12:06:42 +08:00
junjie
1bf4cc1c74 fix(视图): 修复视图保存后未刷新详情的问题 2022-01-10 11:37:33 +08:00
Junjie
15bbafc2d5
Merge pull request #1609 from dataease/pr@dev@feat_calc_field
feat(数据集): 计算字段语法校验
2022-01-10 11:26:44 +08:00
junjie
dc1102d67f feat(数据集): 计算字段语法校验 2022-01-10 11:25:08 +08:00
fit2cloud-chenyw
3a4b0b3005
Merge pull request #1605 from dataease/pr@dev@fix_dynamic_time
fix: 动态时间组件
2022-01-07 14:15:33 +08:00
fit2cloud-chenyw
dc4c9ca3ac fix: 动态时间组件 2022-01-07 14:14:22 +08:00
wangjiahao
009cdaaab9 fix: 公共链接移动端跳转被拦截问题 2022-01-06 23:53:45 +08:00
taojinlong
7623a7dca5 Merge branch 'v1.6' into dev 2022-01-06 15:18:32 +08:00
taojinlong
7092dce543 Merge branch 'v1.6' of github.com:dataease/dataease into v1.6 2022-01-06 15:18:03 +08:00
taojinlong
4b33d79b47 fix: 处理原始表字段注释太长的问题 2022-01-06 15:17:28 +08:00
taojinlong
93ff28704d fix: 兼容以前的公共链接 2022-01-06 15:16:50 +08:00
Gin
32045f85bd
Merge pull request #1599 from dataease/pr@v1.6@fix_union_ds
fix: 直连SQL数据集不支持制作关联数据集
2022-01-06 12:55:56 +08:00
junjie
65dd6bc1e9 fix: 直连SQL数据集不支持制作关联数据集 2022-01-06 12:54:37 +08:00
Gin
bfe397f7f9
Merge pull request #1598 from dataease/pr@dev@fix_union_ds
fix: 直连SQL数据集不支持制作关联数据集
2022-01-06 12:53:11 +08:00
junjie
224f9ee60e fix: 直连SQL数据集不支持制作关联数据集 2022-01-06 12:52:10 +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
taojinlong
6ec1cb9d3b fix: sql 错误 2022-01-06 07:42:15 +08:00
wangjiahao
1b42ca168d refactor: 更新flyway 2022-01-06 00:47:33 +08:00
wangjiahao
f896e4efec refactor: 更新flyway 2022-01-06 00:00:19 +08:00
taojinlong
83ef01c805 fix: 处理数据源校验错误信息太长的问题 2022-01-05 21:31:49 +08:00
taojinlong
4de0465ee9 Merge branch 'v1.6' of github.com:dataease/dataease into v1.6 2022-01-05 21:30:24 +08:00
taojinlong
e8c6762c1f fix: 处理数据源校验错误信息太长的问题 2022-01-05 21:30:03 +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
Gin
8545bd830b
Merge pull request #1593 from dataease/pr@v1.6@fix_ds
fix: 数据集权限树
2022-01-04 17:45:44 +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
24a053e7ce Merge branch 'v1.6' of github.com:dataease/dataease into v1.6 2022-01-04 17:12:38 +08:00
taojinlong
ecad805dc4 fix: 查询数据时,先校验数据源有效性 2022-01-04 17:12:30 +08:00
fit2cloud-chenyw
c255113a19 fix: 移动端首页加载更多不自动消失 2022-01-04 17:04:02 +08:00
fit2cloud-chenyw
c959aa074f
Merge pull request #1591 from dataease/pr@dev@fix_mobile_dir
fix: 移动端首页加载更多不自动消失
2022-01-04 17:02:29 +08:00
fit2cloud-chenyw
e21319acd8 fix: 移动端首页加载更多不自动消失 2022-01-04 17:01:31 +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
e6e86bd74e refactor: 版本号 2022-01-04 16:22:50 +08:00
taojinlong
7ae8b80bf1 fix: 公共链接校验 token 2022-01-04 16:21:51 +08:00
王嘉豪
0cb8e67e12
Merge pull request #1590 from dataease/dev
Dev
2022-01-04 16:10:19 +08:00
wangjiahao
071d236d77 refactor: 增加移动端布局示例 2022-01-04 16:01:36 +08:00
fit2cloud-chenyw
b80174b762
Merge pull request #1588 from dataease/pr@v1.6@fix_version
fix: 移动端版本号
2022-01-04 15:29:18 +08:00