Commit Graph

2130 Commits

Author SHA1 Message Date
fit2cloud-chenyw
92f037658d fix: 前端超时时间非空判断 2022-06-21 11:18:35 +08:00
junjun
1d0e0e92ad feat: 视图支持计算字段 2022-06-20 18:35:00 +08:00
taojinlong
e5538941ce Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-20 17:40:49 +08:00
junjun
78022a8244 fix: 视图计算字段权限问题 2022-06-20 17:40:13 +08:00
taojinlong
7e5a78334b fix: 获取数据源类型 2022-06-20 17:39:44 +08:00
fit2cloud-chenyw
e39ee7844f fix: 插件上传错误提示 2022-06-20 17:18:07 +08:00
taojinlong
f29aa2ca95 fix: 解析 sql 空指针异常 2022-06-20 14:59:02 +08:00
taojinlong
05f510d3af fix: 回滚代码 2022-06-17 17:17:14 +08:00
Zhimin Ruan
4c3c925510 chore: pom.xml 格式化 2022-06-17 14:38:20 +08:00
taojinlong
2cfc3b457e fix: 依赖冲突 2022-06-17 13:26:40 +08:00
taojinlong
1e12eb5b64 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-17 11:36:55 +08:00
taojinlong
20bb6f4ea5 fix: 同步字段时,顺序错误 2022-06-17 11:36:45 +08:00
fit2cloud-chenyw
c65e461fa8
Merge pull request #2441 from dataease/pr@dev@perf_cas_reset
perf: 重置cas登录方式api增加管理员校验
2022-06-17 10:35:46 +08:00
fit2cloud-chenyw
3642805e67 perf: 重置cas登录方式api增加管理员校验 2022-06-17 10:34:41 +08:00
taojinlong
6c9191e9bd refactor: 解决冲突 2022-06-16 23:03:07 +08:00
taojinlong
3293f3a870 feat: 参数管理 2022-06-16 22:41:09 +08:00
fit2cloud-chenyw
a18964f0b7
Merge pull request #2439 from dataease/pr@dev@feat_fit_xpack_cas
feat: 适配xpack-cas单点登录
2022-06-16 18:42:06 +08:00
fit2cloud-chenyw
ccd4f7f1a3 fix: 删除不用的包引入 2022-06-16 18:38:20 +08:00
wangjiahao
3b64979625 refactor: 优化代码结构去掉无用的注释 2022-06-16 18:29:30 +08:00
fit2cloud-chenyw
7218b2105e fix: 删除注释 2022-06-16 18:29:08 +08:00
fit2cloud-chenyw
0baa789fa9 feat: 适配xpack-cas单点登录 2022-06-16 16:58:46 +08:00
wangjiahao
7673e58088 fix: 数据集预览和更新增加数据源权限校验,防止使用无权限数据源执行sql 2022-06-16 16:20:49 +08:00
wangjiahao
d61c5a5ae7 refactor: 更新flyway版本 2022-06-16 15:13:15 +08:00
wangjiahao
2ce2f94113 fix: 插件操作加入权限控制,解决普通用户或者API能越权上传卸载插件问题 2022-06-16 15:09:52 +08:00
taojinlong
4b5788b63c feat: 参数管理 2022-06-16 14:16:47 +08:00
taojinlong
2284cad01c fix: 校验驱动ID 2022-06-16 14:10:08 +08:00
wangjiahao
a6744f7b9f fix: 修复模板管理中导入模板未存储静态文件的问题 2022-06-16 11:41:02 +08:00
junjun
338cb44f5e feat: 视图支持计算字段 2022-06-13 14:30:43 +08:00
junjun
78caab8f61 fix: 修复文本转数值后做维度的排序问题 2022-06-10 13:27:22 +08:00
taojinlong
9637bef109 refactor: 升级版本号 2022-06-08 16:55:24 +08:00
fit2cloud-chenyw
28b53805c6
Merge pull request #2395 from dataease/pr@dev@fix_sql_inject_msg
fix: sql注入给出提示
2022-06-08 12:53:38 +08:00
fit2cloud-chenyw
59e7b9172b fix: sql注入给出提示 2022-06-08 12:52:41 +08:00
taojinlong
28d5912bc6 refactor: 升级版本号 2022-06-08 10:56:21 +08:00
taojinlong
10d7bfa0db feat: sql 数据集参数传递 2022-06-08 10:46:12 +08:00
fit2cloud-chenyw
bb1810b1bc fix: 过滤器枚举字段去除分组查询 2022-06-07 19:39:31 +08:00
taojinlong
9fa65bcc36 Merge branch 'main' into dev 2022-06-07 17:44:17 +08:00
taojinlong
ba5832b58f
Merge pull request #2345 from Antoniano1963/main
feat:提高请求超时时间的范围,创建关联数据集时保留原数据类型
2022-06-07 17:43:16 +08:00
fit2cloud-chenyw
e51b0d766b
Merge pull request #2385 from dataease/pr@dev@feat_filter_sort
feat: 过滤器枚举值排序
2022-06-07 15:05:26 +08:00
fit2cloud-chenyw
fbd0d39002 feat: 过滤器枚举值排序 2022-06-07 15:04:24 +08:00
junjun
936310b320 feat: 视图计算字段flyway 2022-06-06 15:10:25 +08:00
wangjiahao
54d8d59c0a fix: 修复不能创建关联数据集问题 2022-06-02 18:25:10 +08:00
fit2cloud-chenyw
2899983be0 fix: 升级版本号1.11.1 2022-06-02 13:30:30 +08:00
fit2cloud-chenyw
3c414d3da2
Merge pull request #2374 from dataease/pr@dev@fix_plugin_view_ds_scheme
fix: 插件视图使用带scheme的数据源没有设置scheme导致查询不到数据
2022-06-01 18:57:11 +08:00
fit2cloud-chenyw
ef86c2a885 fix: 插件视图使用带scheme的数据源没有设置scheme导致查询不到数据 2022-06-01 18:56:02 +08:00
wangjiahao
4258b29a09 Merge remote-tracking branch 'origin/dev' into dev 2022-06-01 16:40:55 +08:00
wangjiahao
85c6051712 fix: 过滤跳转设置中联动视图查询出现的无用数据 2022-06-01 16:39:46 +08:00
fit2cloud-chenyw
631acb29e7 fix: 符号地图明细数据错误 2022-06-01 16:34:44 +08:00
fit2cloud-chenyw
fb541e22ec
Merge pull request #2370 from dataease/pr@dev@fix_datasource_group_concat
fix: 数据源适配group_concat函数
2022-06-01 16:09:04 +08:00
fit2cloud-chenyw
47ac8ce776 fix: 数据源适配group_concat函数 2022-06-01 16:08:06 +08:00
taojinlong
d01a067c32 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-01 15:56:54 +08:00