Commit Graph

1428 Commits

Author SHA1 Message Date
taojinlong
386d15b7e9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-16 18:05:59 +08:00
taojinlong
d7f363e97b feat: 数据源高级参数设置 2021-08-16 18:05:46 +08:00
junjie
6e1300f937 feat: 视图支持简单颜色修改 2021-08-16 16:34:12 +08:00
junjie
3386b1dd73 feat: 视图支持简单颜色修改 2021-08-16 16:23:57 +08:00
fit2cloud-chenyw
928384c6e2 fix: 组件弹框树节点增加tip 2021-08-16 16:01:55 +08:00
fit2cloud-chenyw
4d5b35b038 fix: 文本列表组件快速检索无效 2021-08-16 15:40:37 +08:00
fit2cloud-chenyw
cc726fe738 feat: 文本列表组件增加滚动条 2021-08-16 14:45:34 +08:00
taojinlong
ede4ebded2 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-16 14:09:23 +08:00
taojinlong
9cda59e224 feat: 定时检测数据源状态信息 2021-08-16 14:09:02 +08:00
fit2cloud-chenyw
268db1c0ea
Merge pull request #631 from dataease/pr@dev@fix_下钻地图空白
fix: axios异步执行导致地图切换错误
2021-08-16 13:38:22 +08:00
fit2cloud-chenyw
97f9305605 fix: axios异步执行导致地图切换错误 2021-08-16 13:34:23 +08:00
taojinlong
b8f4a819f9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-16 12:47:35 +08:00
taojinlong
4c8e061e1d feat: 定时检测数据源状态信息 2021-08-16 12:46:34 +08:00
junjie
7bd5f3dc0f fix: 地图code,json 2021-08-16 11:18:48 +08:00
fit2cloud-chenyw
10a4b2cefa fix: 增加下钻方法返回值 2021-08-16 11:03:13 +08:00
junjie
7905c85110 feat: 地图json,区域 2021-08-16 09:56:19 +08:00
王嘉豪
74fff3caf3
Merge pull request #622 from dataease/pr@dev@refactor_drill-toobar
fix:其他组件图标变小问题
2021-08-13 17:15:18 +08:00
wangjiahao
ea87c39705 fix:其他组件图标变小问题 2021-08-13 17:14:25 +08:00
taojinlong
19d08770a9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-13 17:11:15 +08:00
taojinlong
1e67e6669c fix: 解析excel失败 2021-08-13 17:10:59 +08:00
fit2cloud-chenyw
93b2dc8b78 fix: 删除行政区划代码前端缓存 2021-08-13 17:06:24 +08:00
wangjiahao
7f2daa04df refactor:优化下钻,联动弹出窗口 2021-08-13 15:45:43 +08:00
wangjiahao
af5af6411a Merge remote-tracking branch 'origin/dev' into dev 2021-08-13 14:10:48 +08:00
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
wangjiahao
4e69aa6e1d refactor:优化仪表板元素拖动,大小变动延迟渲染,移动使用原始dom 2021-08-13 13:58:27 +08:00
junjie
14f28e8baf feat: 地图颜色 2021-08-13 13:36:10 +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
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
fit2cloud-chenyw
811729e4c6
Merge pull request #612 from dataease/pr@dev@feat_地图联动
feat: 地图联动
2021-08-13 11:36:28 +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
wangjiahao
39b1c8f6a3 refactor:增加国际化信息 2021-08-13 10:55:25 +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
wangjiahao
1a5cc7cc71 refacotr:仪表板联动下钻等,无需重新加载视图 2021-08-12 17:19:26 +08:00
wangjiahao
18e8854afa fix:前端cosole报错问题 2021-08-12 16:45:21 +08:00
fit2cloud-chenyw
30d70b9d66
Merge branch 'dev' into pr@dev@panal_map_drill 2021-08-12 15:16:10 +08:00
fit2cloud-chenyw
2c5be327b6 feat: 仪表板增加地图下钻上卷 2021-08-12 15:11:57 +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
wangjiahao
d714f146a0 feat:【用户管理】增加根据角色/组织进行查询的支持,增加查看指定用户拥有的所有权限的功能 2021-08-12 11:22:27 +08:00