Commit Graph

2394 Commits

Author SHA1 Message Date
wangjiahao
d8a9b0a0a8 refactor:代码回退 2021-08-13 14:10:15 +08:00
fit2cloud-chenyw
3872db731b
Merge pull request #619 from dataease/pr@dev@fix_public_url_pwd_in_iframe
fix: 外部链接带密码嵌在iframe
2021-08-13 14:01:59 +08:00
fit2cloud-chenyw
8300139508 fix: 外部链接带密码嵌在iframe 2021-08-13 14:00:12 +08:00
王嘉豪
babf7b6f65
Merge pull request #618 from dataease/pr@dev@refactor_panel-resize
refactor:优化仪表板元素拖动,大小变动延迟渲染,移动使用原始dom
2021-08-13 13:59:49 +08:00
wangjiahao
4e69aa6e1d refactor:优化仪表板元素拖动,大小变动延迟渲染,移动使用原始dom 2021-08-13 13:58:27 +08:00
XiaJunjie2020
76bdbd7170
Merge pull request #617 from dataease/pr@dev@feat_map
feat: 地图颜色
2021-08-13 13:37:09 +08:00
junjie
14f28e8baf feat: 地图颜色 2021-08-13 13:36:10 +08:00
XiaJunjie2020
248cb81172
Merge pull request #616 from dataease/pr@dev@feat_map_style
feat: 地图样式
2021-08-13 12:43:50 +08:00
junjie
f96e8a2a88 feat: 地图样式 2021-08-13 12:42:59 +08:00
XiaJunjie2020
866744ae75
Merge pull request #615 from dataease/pr@dev@refactor_remove_code
refactor: 移除注释
2021-08-13 12:11:27 +08:00
fit2cloud-chenyw
48f6889fe5
Merge pull request #614 from dataease/pr@dev@fix_外部链接token机制
fix: 外部链接token存储使用vuex不实用cookie
2021-08-13 12:10:48 +08:00
junjie
cc8587aade refactor: 移除注释 2021-08-13 12:10:36 +08:00
fit2cloud-chenyw
2482fc11c8 fix: 外部链接token存储使用vuex不实用cookie 2021-08-13 12:09:41 +08:00
taojinlong
af79e725a3 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-13 12:04:31 +08:00
taojinlong
8f494f3755 feat: 替换excel时,替换成功后,才更新数据集字段 2021-08-13 12:04:17 +08:00
fit2cloud-chenyw
811729e4c6
Merge pull request #612 from dataease/pr@dev@feat_地图联动
feat: 地图联动
2021-08-13 11:36:28 +08:00
XiaJunjie2020
0de0462378
Merge pull request #613 from dataease/pr@dev@feat_chart_drill
feat: 视图下钻路径
2021-08-13 11:31:03 +08:00
junjie
15f06584d4 feat: 视图下钻路径 2021-08-13 11:30:15 +08:00
taojinlong
db3e6fe7b5 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-13 11:23:37 +08:00
fit2cloud-chenyw
f7699aae6b feat: 地图联动 2021-08-13 11:23:35 +08:00
taojinlong
4632545091 feat: 支持excel多sheet页 2021-08-13 11:23:27 +08:00
王嘉豪
865558b2ba
Merge pull request #611 from dataease/pr@dev@refactor_i18n
refactor:增加国际化信息
2021-08-13 11:15:16 +08:00
wangjiahao
39b1c8f6a3 refactor:增加国际化信息 2021-08-13 10:55:25 +08:00
taojinlong
6c85851f88 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-13 09:52:07 +08:00
taojinlong
c36fd88f3f feat: 支持excel多sheet页 2021-08-13 09:51:54 +08:00
taojinlong
7796cfe5ef
Merge pull request #610 from dataease/pr@dev@excel
Merge branch 'dev' of github.com:dataease/dataease into dev
2021-08-12 19:24:18 +08:00
taojinlong
b4a09f37dc Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-12 19:23:16 +08:00
taojinlong
4a9009dee1 feat: 支持同时导入excel的多sheet页 2021-08-12 19:23:01 +08:00
fit2cloud-chenyw
c70c6cffa7
Merge pull request #609 from dataease/pr@dev@feat_恢复地图缓存
feat: 地图缓存 地图联动预留接口
2021-08-12 18:21:46 +08:00
fit2cloud-chenyw
49441ace63 feat: 地图缓存 地图联动预留接口 2021-08-12 18:18:37 +08:00
王嘉豪
f701ff69f0
Merge pull request #607 from dataease/pr@dev@refactor_panel-view-show
refacotr:仪表板联动下钻等,无需重新加载视图
2021-08-12 17:20:51 +08:00
wangjiahao
1a5cc7cc71 refacotr:仪表板联动下钻等,无需重新加载视图 2021-08-12 17:19:26 +08:00
王嘉豪
2d2735faaf
Merge pull request #604 from dataease/pr@dev@fix_bug-fix
fix:前端cosole报错问题
2021-08-12 16:46:33 +08:00
wangjiahao
18e8854afa fix:前端cosole报错问题 2021-08-12 16:45:21 +08:00
fit2cloud-chenyw
1bd7b6056b
Merge pull request #603 from dataease/pr@dev@panal_map_drill
feat: 仪表板增加地图下钻上卷
2021-08-12 15:16:47 +08:00
fit2cloud-chenyw
30d70b9d66
Merge branch 'dev' into pr@dev@panal_map_drill 2021-08-12 15:16:10 +08:00
XiaJunjie2020
38c3b28672
Merge pull request #602 from dataease/pr@dev@feat_stackDrill
feat: 堆叠图下钻
2021-08-12 15:13:33 +08:00
fit2cloud-chenyw
2c5be327b6 feat: 仪表板增加地图下钻上卷 2021-08-12 15:11:57 +08:00
junjie
b2718c6c14 feat: 堆叠图下钻 2021-08-12 15:11:54 +08:00
XiaJunjie2020
c8fb6dc5c5
Merge pull request #601 from dataease/pr@dev@feat_chartDrill
feat: 视图下钻
2021-08-12 14:18:50 +08:00
junjie
a8cd74434b feat: 视图下钻 2021-08-12 14:18:04 +08:00
fit2cloud-chenyw
dbf87fb68c
Merge pull request #600 from dataease/pr@dev@feat_map_drill
feat: 地图增加下钻上卷
2021-08-12 13:53:19 +08:00
fit2cloud-chenyw
a04262f5ba feat: 地图增加下钻上卷 2021-08-12 13:51:37 +08:00
王嘉豪
f6058ed78b
Merge pull request #599 from dataease/pr@dev@feat_panel-up-drill
refactor:恢复超级管理员无需授权功能
2021-08-12 11:57:29 +08:00
wangjiahao
db3a3c3f27 refactor:恢复超级管理员无需授权功能 2021-08-12 11:52:02 +08:00
王嘉豪
62a3c61a0a
Merge pull request #598 from dataease/pr@dev@feat_panel-up-drill
feat:【用户管理】增加根据角色/组织进行查询的支持
2021-08-12 11:24:03 +08:00
wangjiahao
d714f146a0 feat:【用户管理】增加根据角色/组织进行查询的支持,增加查看指定用户拥有的所有权限的功能 2021-08-12 11:22:27 +08:00
王嘉豪
d033d359a3
Merge pull request #596 from dataease/pr@dev@feat_panel-up-drill
feat:仪表板视图根据一个视图是否有多事件来确认是否出现弹框,单事件直接触发
2021-08-12 10:16:21 +08:00
wangjiahao
d9c7885c88 feat:仪表板视图根据一个视图是否有多事件来确认是否出现弹框,单事件直接触发 2021-08-12 10:15:10 +08:00
XiaJunjie2020
05ef2e59e7
Merge pull request #595 from dataease/pr@dev@feat_视图下钻
feat: 视图下钻
2021-08-11 18:45:01 +08:00