Commit Graph

1145 Commits

Author SHA1 Message Date
taojinlong
1c5ae1ca05 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-14 17:43:59 +08:00
taojinlong
7ae1ce6c02 fix(数据源): 同步 oracle 数据出错 2022-07-14 17:43:47 +08:00
junjun
6b10b217db feat(X-Pack): 行权限 2022-07-14 11:07:55 +08:00
junjun
fc0757613b feat(X-Pack): 行权限 2022-07-13 13:22:46 +08:00
taojinlong
37936e7b37 fix(数据源): 增加sql拼接前缀设置 2022-07-13 12:31:18 +08:00
junjun
b1df267c55 Merge remote-tracking branch 'origin/dev' into dev 2022-07-11 16:43:06 +08:00
junjun
00cf97e035 feat(X-Pack): 重构行权限 2022-07-11 16:42:43 +08:00
fit2cloud-chenyw
a7da54227b perf: 优化定时报告发送视图附件 2022-07-11 16:39:36 +08:00
fit2cloud-chenyw
a49b0ed107
Merge pull request #2609 from dataease/pr@dev@feat_email_task_view
feat(系统管理): 定时报告增加发送视图数据
2022-07-08 16:55:09 +08:00
fit2cloud-chenyw
01b3ad05d8 feat(系统管理): 定时报告增加发送视图数据 2022-07-08 04:52:26 -04:00
junjun
40357d5382 refactor(视图): 下钻后延续第一层排序规则(仅对升降序有效) 2022-07-08 15:59:28 +08:00
taojinlong
0b586c71cc Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-06 23:41:35 +08:00
taojinlong
50cd6367c3 fix(数据集): 处理 sql 参数错误 2022-07-06 23:41:15 +08:00
fit2cloud-chenyw
f69332267f fix(仪表板): 删除分享仪表板报错 2022-07-06 03:42:10 -04:00
fit2cloud-chenyw
bf33bdabfd fix(数据集): 带参数的数据集设置仪表板过滤器报错空指针 2022-07-05 22:22:54 +08:00
taojinlong
538ac13db6 fix(数据集): 过滤组件选择参数传递后,不再额外拼接过滤条件 2022-07-05 13:42:09 +08:00
王嘉豪
87907beff3
Merge pull request #2570 from dataease/pr@dev@fix_panel-mobile
fix: 修复导入有移动端布局的仪表板时,列表中没有及时显示移动端标识
2022-07-04 17:05:26 +08:00
wangjiahao
bf5084f236 fix: 修复导入有移动端布局的仪表板时,列表中没有及时显示移动端标识 2022-07-04 17:04:41 +08:00
taojinlong
e74c3883f0 fix(数据源): 校验数据源配置的有效性 2022-07-04 15:29:40 +08:00
taojinlong
ad233b2881 Merge branch 'v1.12' into dev 2022-07-04 00:46:11 +08:00
taojinlong
f5c8c5422e fix(数据集): 数据集参数传递支持 IN 2022-07-04 00:45:03 +08:00
taojinlong
4474970b2d fix(数据源): 超时时间无法修改 2022-07-03 22:02:01 +08:00
taojinlong
969b3d2fcf feat(数据集): 参数值只在编辑 sql 时生效 2022-07-01 18:11:06 +08:00
wangjiahao
59e771d605 refactor: 优化模板使用,上传模板时模板预览图片使用静态文件存储 2022-07-01 12:23:39 +08:00
wangjiahao
929e99ac01 refactor: 代码结构优化,去掉无用的引用 2022-06-30 17:38:25 +08:00
fit2cloud-chenyw
e3fcb702c9 feat: 优化修改初始密码提示 2022-06-30 04:06:16 -04:00
wangjiahao
013d5d5de9 refactor: 样式控制面板视图结果在编辑界面也可生效 2022-06-29 18:19:30 +08:00
taojinlong
3f88b27d50 fix: 枚举值过滤 2022-06-27 17:52:35 +08:00
junjun
cbf0391780 fix: 图表联动参数构建 2022-06-27 16:34:31 +08:00
taojinlong
0f5b69aebe fix: 显示并提示 sql 变量只能在where中使用 2022-06-27 12:42:08 +08:00
taojinlong
2421b5c80c fix: 抽取数据 2022-06-26 15:37:33 +08:00
taojinlong
96a7a62062 fix: 抽取数据 2022-06-26 00:04:21 +08:00
taojinlong
72cdab3c06 fix: 尝试修复支持数据库字符集 2022-06-25 23:35:07 +08:00
taojinlong
a5d31401e4 fix: 尝试修复支持数据库字符集 2022-06-25 23:31:20 +08:00
taojinlong
91491eb1ab fix: 尝试修复支持数据库字符集 2022-06-25 17:24:23 +08:00
fit2cloud-chenyw
9945b90fd5 fix: 过滤组件排序doris无效 2022-06-24 11:37:10 +08:00
fit2cloud-chenyw
4484cd3e6d fix: 过滤器排序功能代码冲突后被覆盖 2022-06-23 22:10:05 +08:00
junjun
2ffea5e26c feat: 视图支持计算字段 2022-06-22 20:34:49 +08:00
junjun
88f060d9ba feat: 视图支持计算字段 2022-06-22 20:18:31 +08:00
junjun
b5e4aea1dc feat: 视图支持计算字段 2022-06-22 19:59:38 +08:00
junjun
30435e00cf test: doris test 2022-06-22 18:19:03 +08:00
taojinlong
f612d21ee5 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-22 16:04:20 +08:00
taojinlong
1349431c63 feat: excel 替换数据显示'同步中' 2022-06-22 16:04:07 +08:00
fit2cloud-chenyw
948e7b61f3 fix: 符号地图选择数字提示后报错 2022-06-22 14:33:35 +08:00
fit2cloud-chenyw
67c4c8d55c fix: 日志导出文件使用excel无法打开 2022-06-22 12:16:30 +08:00
taojinlong
2efeec87b9 fix: 参数过滤空指针 2022-06-21 18:25:55 +08:00
fit2cloud-chenyw
a40fb8a8bf fix: 插件视图不能使用sql数据集 2022-06-21 15:37:54 +08:00
junjun
2620ddd16d feat: 视图支持计算字段 2022-06-21 11:31:44 +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
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
2cfc3b457e fix: 依赖冲突 2022-06-17 13:26:40 +08:00
taojinlong
20bb6f4ea5 fix: 同步字段时,顺序错误 2022-06-17 11:36:45 +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
0baa789fa9 feat: 适配xpack-cas单点登录 2022-06-16 16:58:46 +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
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
fbd0d39002 feat: 过滤器枚举值排序 2022-06-07 15:04:24 +08:00
wangjiahao
54d8d59c0a fix: 修复不能创建关联数据集问题 2022-06-02 18:25:10 +08:00
fit2cloud-chenyw
ef86c2a885 fix: 插件视图使用带scheme的数据源没有设置scheme导致查询不到数据 2022-06-01 18:56:02 +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
taojinlong
d176cfd597 fix: 获取枚举值空指针 2022-06-01 15:56:44 +08:00
fit2cloud-chenyw
87001c3268 fix: 符号地图导出excel缺少字段 2022-06-01 11:15:49 +08:00
taojinlong
2f8beea85b fix: 切换插件类型数据源不生效 2022-05-31 22:17:29 +08:00
taojinlong
8aa0bf2153 fix: 行权限枚举值 2022-05-31 19:03:27 +08:00
wangjiahao
1810e3481e revert: 代码回退 2022-05-31 15:31:47 +08:00
wangjiahao
edc9878368 refactor: 仪表板保存优化 2022-05-31 13:31:01 +08:00
王嘉豪
23acb3c9c0
Merge pull request #2360 from dataease/pr@dev@refactor_panel-save
refactor: 优化仪表板保存返回信息
2022-05-31 12:14:19 +08:00
wangjiahao
38ad5a1922 refactor: 优化仪表板保存返回信息 2022-05-31 12:13:35 +08:00
王嘉豪
feabca531c
Merge pull request #2359 from dataease/refactor_batch-opt-style
refactor: 缓存清理注解改为异步处理,加快接口处理时间
2022-05-31 12:05:22 +08:00
wangjiahao
31ba1baa31 refactor: 缓存清理注解改为异步处理,加快接口处理时间 2022-05-31 12:04:43 +08:00
taojinlong
d49f617c91 fix: 自定义驱动 2022-05-30 21:23:03 +08:00
fit2cloud-chenyw
d9e4cdd18f fix: 修改log文件名称 2022-05-30 10:22:23 +08:00
fit2cloud-chenyw
ce1f06705e
Merge pull request #2346 from dataease/pr@dev@fix_log_filter_error
fix: 操作日志列表查询条件包含多个操作类型结果集逻辑错误
2022-05-30 10:07:53 +08:00
fit2cloud-chenyw
966d7f90a7 fix: 操作日志列表查询条件包含多个操作类型结果集逻辑错误 2022-05-30 10:06:50 +08:00
taojinlong
a4a665203d fix: 替换excel时,提示影响计算字段 2022-05-30 01:11:53 +08:00
吕昊泽
1df069bc28 增加了注释 2022-05-29 22:54:05 +08:00
吕昊泽
00e7b5f349 修复[issue:2339](https://github.com/dataease/dataease/issues/2339)excel创建关联数据集保留原数据类型 2022-05-29 21:38:20 +08:00
fit2cloud-chenyw
792a86667f fix: 修改个人信息报错 2022-05-29 09:46:29 +08:00
taojinlong
2d1793f3f5 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-28 21:58:06 +08:00
taojinlong
0b468cc22b fix: API 数据集校验错误 2022-05-28 21:57:46 +08:00
fit2cloud-chenyw
215d262bbf fix: 暂时屏蔽视图操作日志 2022-05-28 21:42:53 +08:00
taojinlong
718585f3a0 fix: excel 替换、追加不生效 2022-05-28 10:51:11 +08:00
taojinlong
25e5fb40f1 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-27 22:02:48 +08:00
taojinlong
33f43369f2 fix: 驱动插件操作日志 2022-05-27 22:02:39 +08:00
wangjiahao
3c6d2fb98f refactor: 使用Gson 替换fastjson 2022-05-27 19:48:05 +08:00