Commit Graph

2081 Commits

Author SHA1 Message Date
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
XiaJunjie2020
ddae50a762
Merge pull request #382 from dataease/pr@dev@test_数据集字段编辑测试
test: 数据集字段编辑测试
2021-07-28 15:25:19 +08:00
junjie
d95b995b41 test: 数据集字段编辑测试 2021-07-28 15:23:46 +08:00
fit2cloud-chenyw
4cbb74855e fix: 设置用户名称长度限制 2021-07-28 14:45:32 +08:00
wangjiahao
594d20eb4d refactor:代码格式化 2021-07-28 14:40:22 +08:00
wangjiahao
343ea39385 Merge remote-tracking branch 'origin/dev' into dev 2021-07-28 14:30:49 +08:00
wangjiahao
aa2a1c7864 refactor:代码格式化 2021-07-28 14:30:31 +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
王嘉豪
73e5bf47f5
Merge pull request #378 from dataease/refactor_code_format
refactor:代码格式化
2021-07-28 14:16:59 +08:00
wangjiahao
6dbed17bf8 refactor:代码格式化 2021-07-28 14:16:01 +08:00
王嘉豪
aad84e8724
Merge pull request #377 from dataease/pr@dev@refactor_code_format
refactor:代码格式化
2021-07-28 14:06:17 +08:00
wangjiahao
c25adf6ba2 refactor:代码格式化 2021-07-28 14:04:59 +08:00
王嘉豪
8102e564e2
Merge pull request #374 from dataease/pr@dev@fix_panel_edit-close
fix:关闭仪表板编辑界面时清空画布缓存,修复过滤组件回显问题
2021-07-28 13:49:36 +08:00
fit2cloud-chenyw
a5d5b658c9
Merge pull request #373 from dataease/pr@dev@feat_地图工具栏
feat: 增加地图工具栏
2021-07-28 13:43:36 +08:00
fit2cloud-chenyw
f502c4d656 feat: 增加地图工具栏 2021-07-28 13:42:33 +08:00
XiaJunjie2020
2b7adc44c4
Merge pull request #372 from dataease/pr@dev@fix_数据集从编辑切换至添加界面的问题
fix: 数据集从编辑切换至添加界面的显示问题
2021-07-28 13:41:29 +08:00
junjie
6a8f5511c3 fix: 数据集从编辑切换至添加界面的显示问题 2021-07-28 13:40:38 +08:00
wangjiahao
f0447a5f92 fix:关闭仪表板编辑界面时清空画布缓存,修复过滤组件回显问题 2021-07-28 12:46:49 +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
XiaJunjie2020
ce1cd9131c
Merge pull request #368 from dataease/pr@dev@fix_过滤器多条件异常问题;编辑数据集切换到添加数据集界面异常问题
fix: 过滤器多条件异常问题;编辑数据集切换到添加数据集界面异常问题
2021-07-28 11:42:06 +08:00
junjie
89a7d4b311 fix: 过滤器多条件异常问题;编辑数据集切换到添加数据集界面异常问题 2021-07-28 11:41:06 +08:00
junjie
62301c881d Merge remote-tracking branch 'origin/dev' into dev 2021-07-28 11:39:27 +08:00
junjie
990c6778df fix: 编辑数据集页面切换添加数据集页面异常问题 2021-07-28 11:37:41 +08:00
wangjiahao
09d6ae7396 reactor:去掉无用的日志等 2021-07-28 11:36:51 +08:00
王嘉豪
559c30c8b6
Merge pull request #367 from dataease/pr@dev@fix_panel_filter-auto-save
fix:过滤组件参数变动也可以进行保存
2021-07-28 11:35:18 +08:00
wangjiahao
5d97212c50 fix:过滤组件参数变动也可以进行保存 2021-07-28 11:30:53 +08:00
XiaJunjie2020
f1aac17711
Merge pull request #365 from dataease/pr@dev@fix_数据集切换页面权限问题
fix: 数据集切换页面权限问题
2021-07-27 19:21:30 +08:00
junjie
f7132e9e71 fix: 数据集切换页面权限问题 2021-07-27 19:19:35 +08:00
XiaJunjie2020
fb538a8da8
Merge pull request #363 from dataease/pr@dev@fix_数据集切换页面权限问题
fix: 数据集切换界面权限问题
2021-07-27 19:14:15 +08:00
junjie
f952c1f0f1 fix: 数据集切换界面权限问题 2021-07-27 19:13:22 +08:00
王嘉豪
67f3724a9b
Merge pull request #361 from dataease/pr@dev@fix_system_auth-search-dev
fix:不参与授权的菜单授权页面不再显示
2021-07-27 18:58:20 +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
XiaJunjie2020
78712f5678
Merge pull request #358 from dataease/pr@dev@fix_数据集预览条数
fix: 数据集预览条数
2021-07-27 18:40:44 +08:00
junjie
b3145c680f fix: 数据集预览条数 2021-07-27 18:39:38 +08:00
XiaJunjie2020
e1ce57c154
Merge pull request #357 from dataease/pr@dev@fix_数据集预览翻页不显示数据;国际化
fix: 数据集翻页不显示数据;国际化
2021-07-27 18:14:00 +08:00
junjie
50c8def3ab fix: 数据集翻页不显示数据;国际化 2021-07-27 18:11:49 +08:00
fit2cloud-chenyw
59236d7f13
Merge pull request #355 from dataease/pr@dev@perf_地图前端缓存
perf: 地图坐标json使用缓存
2021-07-27 18:05:27 +08:00
fit2cloud-chenyw
a6a24db963 perf: 地图坐标json使用缓存 2021-07-27 18:04:04 +08:00
fit2cloud-chenyw
c805f28089 perf: 地图坐标json使用缓存 2021-07-27 18:03:56 +08:00
taojinlong
a680a1819d Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-27 17:59:30 +08:00
taojinlong
6678a9b5a7 fix: 抽取oracle数据时有多余空格 2021-07-27 17:59:10 +08:00
XiaJunjie2020
9fb8c031ed
Merge pull request #353 from dataease/pr@dev@refactor_字段计算UI优化
refactor: 字段编辑UI优化
2021-07-27 17:27:46 +08:00