center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
6,674 Commits 1 Branch 86 Tags 417 MiB
e94cc53104
Commit Graph

2349 Commits

Author SHA1 Message Date
taojinlong
e64d401025 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-21 17:34:57 +08:00
taojinlong
43cb0b854e feat(数据源): API 数据源支持选择及组合多层级中的字段 2022-07-21 17:34:42 +08:00
fit2cloud-chenyw
01250ad621 perf(仪表板): 自定义地图文件与系统地图文件解耦 2022-07-21 17:22:30 +08:00
fit2cloud-chenyw
0d44ec8b74
Merge branch 'dev' into pr@dev@feat_global_map_setting 2022-07-21 13:43:01 +08:00
fit2cloud-chenyw
7f7cdeb0dd feat(仪表板): 增加世界地图及相关配置 2022-07-21 13:41:03 +08:00
wangjiahao
1112dcb763 refactor: 更新模板市场菜单 2022-07-21 11:33:41 +08:00
王嘉豪
daebb5c79f
Merge pull request #2650 from dataease/pr@dev@feat_panel-market 
feat: 模板市场增加预览功能并可以直接应用模板
 2022-07-21 11:17:25 +08:00
wangjiahao
07d3ca07af feat: 模板市场增加预览功能并可以直接应用模板 2022-07-21 11:16:34 +08:00
taojinlong
7426106c7c fix(数据源): API 数据源支持选择及组合多层级中的字段 2022-07-20 18:05:31 +08:00
taojinlong
fc9ca1e392 Merge branch 'dev' into pre@dev@api 2022-07-20 17:26:47 +08:00
taojinlong
fba93cfd16 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-20 17:25:47 +08:00
taojinlong
dafb95c887 feat(数据源): API 数据源支持选择及组合多层级中的字段 2022-07-20 17:25:33 +08:00
junjun
d7dc867310 feat(X-Pack): 行权限 2022-07-20 16:34:17 +08:00
junjun
dc0f3b0c3c feat(X-Pack): 行权限 2022-07-20 15:30:38 +08:00
junjun
bf8151201c feat(X-Pack): 行权限 2022-07-20 14:44:38 +08:00
junjun
c299ec76e5 feat(X-Pack): 行权限 2022-07-19 21:17:14 +08:00
junjun
382a01e73d feat(X-Pack): 行权限 2022-07-19 20:50:03 +08:00
junjun
61d22387f2 feat(X-Pack): 行权限 2022-07-19 20:49:32 +08:00
junjun
0fd5be758e feat(视图): 增加小数精度 2022-07-19 17:03:41 +08:00
wangjiahao
772af522a4 Merge remote-tracking branch 'origin/dev' into dev 2022-07-19 15:59:13 +08:00
wangjiahao
4f71820484 revert: 删除多余代码 2022-07-19 15:59:01 +08:00
junjun
eb085a489d feat(视图): 增加小数精度 2022-07-19 15:45:58 +08:00
wangjiahao
e925dc2364 feat(仪表板) :支持在DataEase中查看模板市场模板并且直接应用模板创建仪表板 2022-07-19 11:57:21 +08:00
fit2cloud-chenyw
67c55c23ef perf(系统管理): 组织角色管理api适配新版UI 2022-07-16 10:05:48 +08:00
fit2cloud-chenyw
adf6326732 perf(仪表板): 优化echarts地图 增加世界地图 2022-07-15 00:24:15 -04:00
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
429e27e12a Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-13 12:31:30 +08:00
taojinlong
37936e7b37 fix(数据源): 增加sql拼接前缀设置 2022-07-13 12:31:18 +08:00
fit2cloud-chenyw
00e6e18137
Merge pull request #2629 from dataease/pr@dev@perf_dept_manager 
perf(系统管理): 优化组织管理适配新版ui
 2022-07-13 11:13:14 +08:00
fit2cloud-chenyw
6b9ad96023 perf(系统管理): 优化组织管理适配新版ui 2022-07-13 11:11:48 +08:00
taojinlong
7759fd0383 feat(数据源): 基于mongo-bi-connector 新增对mongo数据源的支持 2022-07-12 17:25:20 +08:00
fit2cloud-chenyw
d95c89cfce perf(系统管理): 优化角色管理适配新版ui 2022-07-12 15:36:17 +08:00
fit2cloud-chenyw
b09eaa2ebd perf(系统管理): 优化用户管理增加手机号前缀字段 2022-07-12 12:17:13 +08:00
fit2cloud-chenyw
a6e9c558b8 fix(系统管理): 定时报告选择附件页面过滤掉非视图组件 2022-07-12 11:38:57 +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
junjun
d6ef0859b4 feat(X-Pack): 重构行权限 2022-07-09 13:50:39 +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
d4a35d7bd8 refactor: 升级版本号 2022-07-07 17:35:17 +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
975d9264ba
Merge pull request #2599 from dataease/pr@dev@fix_panel_share_cancel_error 
fix(仪表板): 删除分享仪表板报错
 2022-07-06 15:45:50 +08:00
fit2cloud-chenyw
f69332267f fix(仪表板): 删除分享仪表板报错 2022-07-06 03:42:10 -04:00
wangjiahao
c73e3e13a6 perf: 优化flyway，提升初次启动速度 2022-07-06 15:33:35 +08:00
fit2cloud-chenyw
aaa5141cd5 perf(系统): 升级kettle依赖版本号到8.3.0.18-1112(更好下载) 2022-07-05 23:02:33 -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
6599619aa2 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-04 15:30:41 +08:00
taojinlong
e74c3883f0 fix(数据源): 校验数据源配置的有效性 2022-07-04 15:29:40 +08:00
王嘉豪
663b323124
Merge pull request #2568 from dataease/pr@dev@fix_view-select-icon 
fix(仪表板): Tab组件选择视图时插件视图组件没有显示图标问题
 2022-07-04 15:02:35 +08:00
wangjiahao
d72f5432f2 fix(仪表板): Tab组件选择视图时插件视图组件没有显示图标问题 2022-07-04 15:01:53 +08:00
junjun
3bcdc56e50 fix(视图): SQLServer明细表类型转换错误 2022-07-04 12:50:48 +08:00
fit2cloud-chenyw
b73a8d477f fix(系统管理): 授权插件菜单的操作在记录日志时无法获取到菜单名称 2022-07-03 23:07:48 -04: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
taojinlong
8d13c10d97 fix(API): 去掉默认 http client 请求头 2022-07-01 17:43:29 +08:00
taojinlong
94871bdbc3 fix(抽取数据): 调整 doris 建表语句 2022-07-01 17:34:11 +08:00
taojinlong
3a8fb1de26 fix(抽取数据): 调整 doris 建表语句 2022-07-01 17:09:16 +08:00
王嘉豪
da03efd1ec
Merge pull request #2545 from dataease/pr@dev@refactor_template-static 
refactor: 优化模板使用，上传模板时模板预览图片使用静态文件存储
 2022-07-01 12:24:37 +08:00
wangjiahao
59e771d605 refactor: 优化模板使用，上传模板时模板预览图片使用静态文件存储 2022-07-01 12:23:39 +08:00
王嘉豪
459b0d49c2
Merge pull request #2541 from dataease/pr@dev@refactor_slow-sql 
refactor: 优惠插件菜单同步慢sql
 2022-07-01 10:38:39 +08:00
wangjiahao
d1d116e86d refactor: 优惠插件菜单同步慢sql 2022-07-01 10:34:27 +08:00
taojinlong
75a51d9eaa Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-30 22:17:41 +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
1e7bc31c52 fix: db2 V10版本sql 拼接 2022-06-29 11:28:58 +08:00
taojinlong
6fc563024a fix: 排除 Spring Security 2022-06-28 18:10:21 +08:00
taojinlong
00aeffc8dc fix: db2 时间格式化 2022-06-28 17:42:05 +08:00
taojinlong
dfbca77cee fix: mysql json 字段长度 2022-06-28 12:45:19 +08:00
taojinlong
c89dc628fd fix: MySql数据库表名称含有小数点 2022-06-27 18:23:52 +08:00
taojinlong
3f88b27d50 fix: 枚举值过滤 2022-06-27 17:52:35 +08:00
taojinlong
313942b26e Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-27 17:16:53 +08:00
taojinlong
5366fd1a3b feat: 支持查询超时 2022-06-27 17:16:43 +08:00
junjun
cbf0391780 fix: 图表联动参数构建 2022-06-27 16:34:31 +08:00
taojinlong
fb5f713d62 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-27 12:42:30 +08:00
taojinlong
0f5b69aebe fix: 显示并提示 sql 变量只能在where中使用 2022-06-27 12:42:08 +08:00
wangjiahao
a9228bc420 refactor:更新官方示例，新安装系统屏蔽自定义数据集 2022-06-27 12:09:17 +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
taojinlong
be11424539 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-25 15:33:56 +08:00
taojinlong
dc7b06bca5 fix: 参数默认值的時間格式化 2022-06-25 15:33:39 +08:00
wangjiahao
1bc5afa52b refactor: 更新flyway 重置默认主题 2022-06-24 18:05:29 +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
wangjiahao
f823b35171 refactor: 权限管理授权用户同时显示id和名称 2022-06-23 18:54:23 +08:00
fit2cloud-chenyw
3c0c39ff46 perf: 格式化代码 2022-06-23 10:55: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
559bcb1ebb
Merge pull request #2469 from dataease/pr@dev@fix_log_export 
fix: 日志导出文件使用excel无法打开
 2022-06-22 12:17:54 +08:00
fit2cloud-chenyw
67c4c8d55c fix: 日志导出文件使用excel无法打开 2022-06-22 12:16:30 +08:00
taojinlong
de35ff89ca feat: 增加达梦插件 2022-06-22 11:35:00 +08:00
fit2cloud-chenyw
5c73127124
Merge pull request #2467 from dataease/pr@dev@fix_logout_error 
fix: 退出登录错误
 2022-06-22 10:48:31 +08:00
fit2cloud-chenyw
1de0d83284 fix: 退出登录错误 2022-06-22 10:46:01 +08:00
taojinlong
2efeec87b9 fix: 参数过滤空指针 2022-06-21 18:25:55 +08:00
taojinlong
152b4fdeee Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-21 18:14:51 +08:00
taojinlong
e83cc02448 refactor: 移动代码到sdk 2022-06-21 18:14:44 +08:00
fit2cloud-chenyw
a40fb8a8bf fix: 插件视图不能使用sql数据集 2022-06-21 15:37:54 +08:00
fit2cloud-chenyw
3d2e4f5edd
Merge pull request #2461 from dataease/pr@dev@fix_api_auth_error_i18n 
fix: api权限错误提示国际化
 2022-06-21 14:40:45 +08:00
fit2cloud-chenyw
32e76cdf82 fix: api权限错误提示国际化 2022-06-21 14:39:40 +08:00
junjun
2620ddd16d feat: 视图支持计算字段 2022-06-21 11:31:44 +08:00
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