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

922 Commits

Author SHA1 Message Date
taojinlong
dfe654c547 feat: sqlserver 2021-08-04 21:27:37 +08:00
fit2cloud-chenyw
c64343a289 fix: 增加sql注入白名单；sql注入拦截器只验证排序字段 2021-08-04 18:11:37 +08:00
wangjiahao
6bfb5a74c1 Merge branch 'pr@dev@feat_panel-linkage' of github.com:dataease/dataease into feat_panel-linkage 2021-08-04 17:00:29 +08:00
wangjiahao
b09a935a06 refactor:增加视图联动相关表结构等 2021-08-04 16:57:16 +08:00
王嘉豪
c856d1c91d
Merge branch 'dev' into pr@dev@feat_panel-linkage 2021-08-04 16:54:22 +08:00
wangjiahao
1c91e0e831 feat:仪表板联动增加源联动视图虚化样式，过滤非视图组件等 2021-08-04 16:52:49 +08:00
XiaJunjie2020
958cbabb6f
Merge pull request #521 from dataease/pr@dev@feat_视图钻取 
feat: 视图钻取
 2021-08-04 16:50:55 +08:00
junjie
05e9f8274e fix: sql注入排除减号 2021-08-04 16:47:11 +08:00
junjie
68a80e2cc8 feat: 视图钻取 2021-08-04 16:40:53 +08:00
fit2cloud-chenyw
2f06f3720e fix: sql注入和xss攻击 2021-08-04 15:18:12 +08:00
taojinlong
85059c5cfa Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-04 10:35:18 +08:00
taojinlong
e438d4e1f0 fix: 原始表添加列时，同步失败 2021-08-04 10:34:50 +08:00
taojinlong
b4a057d46b fix: 更新任务状态-> 执行结束 2021-08-04 10:34:46 +08:00
taojinlong
e4b16b33c3 fix: 没有经过全量更新不能进行增量更新，并记录日志 2021-08-04 10:34:43 +08:00
taojinlong
a3defb1a88 feat: 优化任务状态的切换 2021-08-04 10:34:37 +08:00
taojinlong
d86531967f feat: sqlserver 2021-08-03 17:29:38 +08:00
junjie
5a0fcc52c9 refactor: 堆叠图优化 2021-08-03 16:12:15 +08:00
fit2cloud-chenyw
546152fe27
Merge pull request #501 from dataease/pr@dev@perf_优化地图文件请求速度 
perf: rest请求优化为json文件请求
 2021-08-03 16:06:20 +08:00
fit2cloud-chenyw
1aa5b483fb perf: rest请求优化为json文件请求 2021-08-03 16:05:05 +08:00
junjie
1ceee0f445 feat: 函数库flyway 2021-08-03 15:06:40 +08:00
junjie
a76ab93009 feat: 函数库flyway 2021-08-03 14:35:39 +08:00
fit2cloud-chenyw
b1096a6151 fix: 打包后样式错误 2021-08-03 14:14:35 +08:00
junjie
ddcfd700ff feat: 函数库flyway 2021-08-03 13:24:35 +08:00
taojinlong
41f3b001a7 Merge branch 'dev' into pr@dev@sqlserver 2021-08-03 12:23:23 +08:00
fit2cloud-chenyw
70ee578133 fix: maven打包错误，指定maven-resources-plugin版本解决 2021-08-03 10:46:01 +08:00
fit2cloud-chenyw
6fa6cc83a1 fix: 资源权限逻辑错误 2021-08-03 09:52:49 +08:00
taojinlong
532cdf67b4 fix: 执行问任务后删除文件 2021-08-02 21:18:33 +08:00
taojinlong
ac8f71577b Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-02 18:33:10 +08:00
taojinlong
e5c4606334 feat: 可配置kettle 相关的文件是否保留 2021-08-02 18:32:44 +08:00
fit2cloud-chenyw
f9493fe2d7 fix: token过期点击确定没有跳转到登录 2021-08-02 18:27:03 +08:00
taojinlong
fbb884bcbf Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-02 18:13:33 +08:00
taojinlong
6261dff6cc fix: 校验增量更新sql 2021-08-02 18:13:24 +08:00
fit2cloud-chenyw
e459225f3b feat: 完善全局token 2021-08-02 17:52:43 +08:00
XiaJunjie2020
c2674f738d
Merge pull request #463 from dataease/pr@dev@feat_支持公式编辑 
feat: 支持字段编辑
 2021-08-02 16:37:16 +08:00
taojinlong
4b5d272f63 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-02 16:36:39 +08:00
taojinlong
285c48143f fix: 更新任务状态 2021-08-02 16:36:23 +08:00
junjie
28d93227f4 feat: 支持字段编辑 2021-08-02 16:34:11 +08:00
fit2cloud-chenyw
91b2b29108
Merge pull request #461 from dataease/pr@dev@feat_去除openApi 
feat: 去除openApi
 2021-08-02 16:09:28 +08:00
fit2cloud-chenyw
17585b4239 feat: 去除openApi 2021-08-02 16:07:59 +08:00
junjie
15cfbaaea8 feat: 字段支持公式计算 2021-08-02 15:46:12 +08:00
fit2cloud-chenyw
de5022a1fb fix: 公共链接分享未启用密码保护出现空白页面 2021-08-02 15:41:36 +08:00
fit2cloud-chenyw
22faf33a01
Merge pull request #456 from dataease/pr@dev@feat_完善api 
feat: 补齐api
 2021-08-02 15:02:05 +08:00
fit2cloud-chenyw
b3c63dda62 feat: 补齐api 2021-08-02 15:00:46 +08:00
taojinlong
350303baf3 refactor: 去掉无用代码 2021-08-02 14:34:18 +08:00
taojinlong
96e6ab150c 支持 sqlserver 2021-08-02 14:30:35 +08:00
taojinlong
cc2bf3e3c1 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-02 13:39:40 +08:00
taojinlong
7376becd68 fix： 处理 excel 公式错误 2021-08-02 13:39:30 +08:00
fit2cloud-chenyw
81ee2455fd
Merge pull request #454 from dataease/feat_完善api 
fix: 删除无用代码 增加knife4j api文档
 2021-08-02 12:14:08 +08:00
fit2cloud-chenyw
b3d0b32e19 fix: 删除无用代码 增加knife4j api文档 2021-08-02 12:01:29 +08:00
taojinlong
084aab5e92 feat： 优化查询任务日志 2021-08-02 10:08:33 +08:00
taojinlong
e59864c5ee feat： 优化查询任务日志 2021-08-02 10:08:31 +08:00
taojinlong
4352479850 feat： 优化查询任务日志 2021-08-01 15:12:42 +08:00
junjie
57f131d86d fix: tree搜索 2021-07-31 16:55:53 +08:00
junjie
4c5290d87b fix: tree搜索 2021-07-31 16:13:53 +08:00
wangjiahao
dde57617ba refactor:恢复v17 flyway 2021-07-30 17:04:54 +08:00
junjie
91a0f71a35 fix: doris类型转换 2021-07-30 16:34:27 +08:00
taojinlong
5da8de3332 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-30 12:27:30 +08:00
taojinlong
577fa304f0 fix: 识别 excel 类型 2021-07-30 12:27:14 +08:00
fit2cloud-chenyw
ed1fcd7671 fix: 标记已读未记录查看时间 2021-07-30 12:02:39 +08:00
taojinlong
0ab579b4fe Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-29 19:22:52 +08:00
taojinlong
0a0a38c9d7 fix: 任务管理增加权限-> 用户只能管理拥有[管理权限]的数据集的任务 2021-07-29 19:22:29 +08:00
fit2cloud-chenyw
bcd786c48c refactor: 查看分享链接使用独立拦截器 2021-07-29 16:46:17 +08:00
taojinlong
3db9e41108 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-29 16:17:14 +08:00
taojinlong
42b8840a58 fix: 校验 excel 空单元格 2021-07-29 16:17:03 +08:00
XiaJunjie2020
70cacc656a
Merge pull request #411 from dataease/pr@dev@feat_数据集字段管理支持公式函数等运算（UI与CRUD） 
fix: 数据集切换页面权限问题
 2021-07-29 15:31:27 +08:00
junjie
be0b530bfe feat(数据集): 数据集字段支持公式运算等操作（UI和CRUD） 2021-07-29 15:13:18 +08:00
junjie
b99d9e2d8b feat(数据集): 数据集字段支持公式运算等操作（UI和CRUD） 2021-07-29 15:12:29 +08:00
wangjiahao
ecd06677fb refactor:去掉数据库创建函数root用户限制 2021-07-29 15:09:53 +08:00
wangjiahao
fdf8ca012d fix:修复普通用户创建视图权限查不到的问题 2021-07-29 15:05:23 +08:00
taojinlong
86f0791a4f fix: 任务列表上次执行时间与执行记录执行时间不一致 2021-07-29 12:18:29 +08:00
taojinlong
9536f730ed Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-29 11:29:03 +08:00
taojinlong
14b456f32a fix: 校验 excel 第一行不能有空格 2021-07-29 11:28:50 +08:00
wangjiahao
6a29e2b45c refactor:调整flyway 2021-07-29 10:52:44 +08:00
wangjiahao
33da6c00d0 refactor:菜单权限控制增加显示标志，可以区分菜单师傅接受权限控制 2021-07-29 10:48:17 +08:00
xiajunjie
0e95154a4d fix: 底层sql逻辑 2021-07-28 21:37:23 +08:00
junjie
333df18a7f fix: 底层sql逻辑 2021-07-28 19:47:10 +08:00
junjie
dd411588e1 fix: 自定义数据集关联问题 2021-07-28 18:57:52 +08:00
junjie
62a0d51144 test: doris 测试 2021-07-28 18:27:55 +08:00
fit2cloud-chenyw
dffed82491 fix: 定不定阅总是能接收到"默认消息" 2021-07-28 17:48:28 +08:00
wangjiahao
e10579cb57 Merge remote-tracking branch 'origin/dev' into dev 2021-07-28 17:47:56 +08:00
wangjiahao
5c98e39451 fix:视图按钮权限控制，同步在仪表板编辑时也适用 2021-07-28 17:47:39 +08:00
junjie
4abdd3a6cb fix: 过滤兼容 2021-07-28 17:26:07 +08:00
XiaJunjie2020
ce2ad0ce9c
Merge pull request #387 from dataease/pr@dev@fix_flyway兼容 
fix: flyway兼容
 2021-07-28 17:11:39 +08:00
junjie
3098ea882d fix: flyway兼容 2021-07-28 17:10:41 +08:00
taojinlong
7cc006fe4a fix: 修复excel 替换/追加 2021-07-28 16:48:44 +08:00
wangjiahao
594d20eb4d refactor:代码格式化 2021-07-28 14:40:22 +08:00
taojinlong
988efcee1b
Merge pull request #379 from dataease/pr@dev@oracle 
fix: 修复抽取oracle数据
 2021-07-28 14:18:21 +08:00
taojinlong
bdadbfa2f2 fix: 修复抽取oracle数据 2021-07-28 14:17:08 +08:00
wangjiahao
c25adf6ba2 refactor:代码格式化 2021-07-28 14:04:59 +08:00
XiaJunjie2020
4d0165f46a
Merge pull request #370 from dataease/pr@dev@fix_新建视图后权限问题 
fix: 新建视图后权限问题
 2021-07-28 12:18:15 +08:00
junjie
c6fd782d39 fix: 新建视图后权限问题 2021-07-28 12:16:59 +08:00
taojinlong
7ea80cd633 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-28 12:09:35 +08:00
taojinlong
67d66c5481 fix: 判断excel 第一行不为空并且不能有空单元格 2021-07-28 12:09:16 +08:00
junjie
89a7d4b311 fix: 过滤器多条件异常问题；编辑数据集切换到添加数据集界面异常问题 2021-07-28 11:41:06 +08:00
wangjiahao
180020c75b fix:不参与授权的菜单授权页面不再显示 2021-07-27 18:57:07 +08:00
taojinlong
beeae23d9f Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-27 18:54:59 +08:00
taojinlong
fa00806f4d fix: 定时任务权限标识 2021-07-27 18:54:49 +08:00
junjie
b3145c680f fix: 数据集预览条数 2021-07-27 18:39:38 +08:00
taojinlong
6678a9b5a7 fix: 抽取oracle数据时有多余空格 2021-07-27 17:59:10 +08:00
taojinlong
1d55507388
Merge branch 'dev' into pr@dev@task 2021-07-27 16:09:41 +08:00