Commit Graph

897 Commits

Author SHA1 Message Date
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
taojinlong
585755a37a fix: 更新任务状态 2021-07-27 16:07:03 +08:00
fit2cloud-chenyw
6718d15cf0 fix: 跳转任务消息延时 2021-07-27 12:30:29 +08:00
fit2cloud-chenyw
1e33054903 feat: everyone默认订阅仪表板分享、任务失败消息通知 2021-07-26 21:37:08 +08:00
junjie
67f5160312 refactor: 数据集字段将维度指标分类展示,后续维度和指标具有不同的操作,为配置钻取目录、字段计算做前置准备 2021-07-26 16:08:14 +08:00
taojinlong
d324ff8c6e fix: 更新任务状态 2021-07-23 18:37:56 +08:00
wangjiahao
17ef829166 fix:在编辑仪表板时,复制堆叠柱状图时出错 2021-07-23 16:06:12 +08:00
junjie
065b334064 fix: 编辑字段全不选后弹框报错 2021-07-23 12:42:33 +08:00
fit2cloud-chenyw
bc06646e32 fix: 合并冲突解决 2021-07-23 12:20:15 +08:00
fit2cloud-chenyw
f1e3621fac fix: 合并v1.1fix 2021-07-23 12:18:05 +08:00
taojinlong
0415c14c51 feat: 更改历史任务状态 2021-07-23 11:32:09 +08:00
taojinlong
4b2f68b484 feat: 调整定时任务 2021-07-23 10:54:44 +08:00
junjie
b2c45730f9 fix: 回退 2021-07-22 19:34:16 +08:00
junjie
b7936b91f9 fix: 视图中数据集权限校验 2021-07-22 18:59:36 +08:00
fit2cloud-chenyw
aaf9f958a0 fix: 1.类型拍戏报错
2.分页数据错误
     3.全部消息取消默认状态排序
     4.数据集同步消息跳转路由修改
2021-07-22 16:59:34 +08:00
junjie
a450a023aa feat: 支持仪表板数字区间过滤 2021-07-22 12:43:52 +08:00
junjie
6825383d9a feat: 过滤器兼容flyway 2021-07-21 18:30:13 +08:00
fit2cloud-chenyw
0620d58313 feat: 行政区划代码表 2021-07-21 17:51:03 +08:00
junjie
a8e6e2d0e1 feat: 堆叠图支持堆叠项 2021-07-21 17:36:50 +08:00
fit2cloud-chenyw
f0a2532b51 feat: 视图图表类型增加地图 2021-07-21 17:12:40 +08:00
taojinlong
403350e3b9 Merge branch 'dev' into pr@dev@excel 2021-07-21 15:09:48 +08:00
taojinlong
d4a95c28f3 feat: SAX 解析 excel 2021-07-21 15:07:51 +08:00
junjie
4316db704a fix: 创建视图报错 2021-07-20 18:58:49 +08:00
junjie
8369a8ffc6 fix: 单指标图表可能下标越界 2021-07-20 17:52:51 +08:00
junjie
7411ba40da feat: 视图过滤重新设计,支持单维度指标展示 2021-07-20 12:16:37 +08:00
taojinlong
da17d8f19c
Merge pull request #248 from dataease/pr@dev@errorlog
feat: 适配oracle 11g
2021-07-15 18:33:51 +08:00