Commit Graph

1441 Commits

Author SHA1 Message Date
wangjiahao
8e7fe632d9 Merge remote-tracking branch 'origin/dev' into dev 2021-08-17 14:40:24 +08:00
wangjiahao
81a84a54e3 refactor:去除无用代码 2021-08-17 14:40:01 +08:00
junjie
b490c47feb feat: 字段编辑 2021-08-17 14:09:17 +08:00
fit2cloud-chenyw
2fbed9fdec fix: 定时查询未读消息条数错误 2021-08-17 12:25:22 +08:00
fit2cloud-chenyw
d2b6fe4356
Merge pull request #642 from dataease/pr@dev@refactor_system_style
refactor: 优化分享组织树
2021-08-17 11:09:23 +08:00
fit2cloud-chenyw
d99229dd44 refactor: 优化分享组织树 2021-08-17 11:08:11 +08:00
junjie
9439bcef01 feat: 视图支持简单颜色修改 2021-08-17 10:29:06 +08:00
taojinlong
948db7b6dd Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-16 18:43:49 +08:00
taojinlong
3a5fbf66ec Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-16 18:32:28 +08:00
wangjiahao
6db0747009 refactor:仪表板编辑视图样式优化 2021-08-16 18:31:32 +08:00
taojinlong
7c391ed8cf refactor: 代码格式化 2021-08-16 18:27:20 +08:00
junjie
c7f5ebbd98 feat: 视图支持简单颜色修改 2021-08-16 18:16:55 +08:00
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
fit2cloud-chenyw
a065ffda76 refactor: 优化用户列表样式 2021-08-16 17:36:21 +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