Commit Graph

3825 Commits

Author SHA1 Message Date
taojinlong
1e0d699afd fix: 行权限未清除之前的选择 2021-12-28 16:52:51 +08:00
wangjiahao
f90466bc23 Merge remote-tracking branch 'origin/dev' into dev 2021-12-28 15:16:51 +08:00
wangjiahao
a725f0fa5d refactor: 移动端视图明细背景优化 2021-12-28 15:15:55 +08:00
taojinlong
ec29826365 fix: token 过期时,上传 excel 跳转登陆页 2021-12-28 15:14:17 +08:00
taojinlong
df3a88a004 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-28 13:12:43 +08:00
taojinlong
16270dd457 fix: 普通用户个人信息、修改密码、关于 页面跳转后404 2021-12-28 13:12:33 +08:00
王嘉豪
f3225713a1
Merge pull request #1538 from dataease/pr@dev@fix_panel-filter
fix: 修复编辑文本过滤组件后,显示错位问题
2021-12-28 12:26:33 +08:00
wangjiahao
40081b3c09 fix: 修复编辑文本过滤组件后,显示错位问题 2021-12-28 12:26:01 +08:00
王嘉豪
e5da7bb582
Merge pull request #1537 from dataease/pr@dev@fix_panel-filter
fix: 修复编辑文本过滤组件后,显示错位问题
2021-12-28 12:13:41 +08:00
wangjiahao
4a0e577ad1 fix: 修复编辑文本过滤组件后,显示错位问题 2021-12-28 12:12:46 +08:00
fit2cloud-chenyw
d6a91f1fda
Merge pull request #1536 from dataease/pr@dev@refactor_axios_timeout
refactor: 去除所有前端api自定义超时时间
2021-12-28 11:47:37 +08:00
fit2cloud-chenyw
87d3ec69f2 refactor: 去除所有前端api自定义超时时间 2021-12-28 11:46:10 +08:00
wangjiahao
8d0a667092 refactor: 去掉代码中固定的超时时间 2021-12-28 11:40:19 +08:00
fit2cloud-chenyw
90e584da1f
Merge pull request #1535 from dataease/pr@dev@fix_dynamic_range_time
fix: 时间范围动态时间限制
2021-12-28 11:33:58 +08:00
fit2cloud-chenyw
aa0cb3d725 fix: 时间范围动态时间限制 2021-12-28 11:32:48 +08:00
taojinlong
29dd75617e Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-27 21:33:56 +08:00
taojinlong
a42539ffdf fix: sqlserver 数据库名称有特殊字符 2021-12-27 21:33:47 +08:00
taojinlong
0f691b9f35 perf: 优化查询时间 2021-12-27 21:31:18 +08:00
xiajunjie
77224697be fix: 关联数据集字段关键字 2021-12-27 20:54:37 +08:00
fit2cloud-chenyw
558f041926
Merge pull request #1533 from dataease/pr@dev@fix_兼容老版时间范围
fix: 时间范围动态时间兼容老版本
2021-12-27 18:41:20 +08:00
fit2cloud-chenyw
62a9a50899 fix: 时间范围动态时间兼容老版本 2021-12-27 18:28:55 +08:00
fit2cloud-chenyw
f678ae96ef
Merge pull request #1532 from dataease/pr@dev@feat_date_range_dynamic
feat: 日期范围动态时间
2021-12-27 18:09:13 +08:00
fit2cloud-chenyw
8b0c98e9cd feat: 日期范围动态时间 2021-12-27 18:04:59 +08:00
王嘉豪
1e7986e585
fix: 数据集查询出多余目录问题 (#1531) 2021-12-27 17:43:51 +08:00
fit2cloudrd
c8814f9daa
fix: 文本搜索组件在预览和编辑时显示不一致 (#1529)
fix: 文本搜索组件在预览和编辑时显示不一致
2021-12-27 16:34:27 +08:00
taojinlong
46c45315db Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-27 16:27:27 +08:00
taojinlong
4786d23d2c feat: 数据集页面支持行权限 2021-12-27 16:26:59 +08:00
fit2cloud-chenyw
9fd8b7f147
Merge pull request #1527 from dataease/pr@dev@style_panel_filter
style: 过滤组件样式
2021-12-27 15:20:50 +08:00
fit2cloud-chenyw
4cab403cb5
Merge branch 'dev' into pr@dev@style_panel_filter 2021-12-27 15:18:52 +08:00
fit2cloud-chenyw
d672f0ef49 style: 过滤组件样式 2021-12-27 15:15:09 +08:00
王嘉豪
66bc618550
Merge pull request #1526 from dataease/pr@dev@refactor_panel-edit
refactor: 地图组件移动端适配调整
2021-12-27 14:34:13 +08:00
wangjiahao
215b4936c1 refactor: 地图组件移动端适配调整 2021-12-27 14:33:31 +08:00
王嘉豪
14d6e1c21b
Merge pull request #1525 from dataease/pr@dev@refactor_panel-edit
refactor: 移动端布局等待区域优化地图,时间组件排列方式
2021-12-27 14:21:51 +08:00
wangjiahao
4f8ea205d3 refactor: 移动端布局等待区域优化地图,时间组件排列方式 2021-12-27 14:21:00 +08:00
王嘉豪
4ef1f50069
Merge pull request #1524 from dataease/pr@dev@refactor_panel-edit
refactor: 移动端布局组件等待区域靠左排列
2021-12-27 12:07:50 +08:00
wangjiahao
0c8454323a refactor: 移动端布局组件等待区域靠左排列 2021-12-27 12:06:42 +08:00
王嘉豪
723bd91f5b
Merge pull request #1523 from dataease/pr@dev@refactor_panel-edit
fix: 仪表板下拉列表组件选择未靠左排列
2021-12-27 11:16:48 +08:00
wangjiahao
9485610a77 fix: 仪表板下拉列表组件选择未靠左排列 2021-12-27 11:16:11 +08:00
wangjiahao
ebf8c155e6 Merge remote-tracking branch 'origin/dev' into refactor_panel-edit 2021-12-27 11:15:07 +08:00
fit2cloud-chenyw
a89a9a47a5
Merge pull request #1522 from dataease/pr@dev@fix_map_switch_error
fix: 空地图试图切换错误
2021-12-27 11:13:42 +08:00
fit2cloud-chenyw
55d8022b5b fix: 空地图试图切换错误 2021-12-27 11:12:21 +08:00
fit2cloud-chenyw
a30fcc9212
Merge pull request #1520 from dataease/pr@dev@style_zoom_button
style: 解决仪表板中缩放按钮遮盖
2021-12-25 14:55:44 +08:00
fit2cloud-chenyw
8409f1dd65 style: 解决仪表板中缩放按钮遮盖 2021-12-25 14:54:46 +08:00
fit2cloud-chenyw
0263d2ce45
Merge pull request #1519 from dataease/pr@dev@feat_map_zoom_box
feat: 地图增加缩放重置按钮
2021-12-25 14:43:12 +08:00
fit2cloud-chenyw
73ceca7477 feat: 地图增加缩放重置按钮 2021-12-25 14:42:07 +08:00
fit2cloud-chenyw
e069f2d0a9
Merge pull request #1518 from dataease/pr@dev@fix_de_date
fix: 兼容老版本日期控件
2021-12-24 19:05:08 +08:00
fit2cloud-chenyw
30564208ce fix: 兼容老版本日期控件 2021-12-24 19:04:05 +08:00
fit2cloud-chenyw
a7be631244
Merge pull request #1517 from dataease/pr@dev@fix_filters_logic
fix: 过滤组件逻辑
2021-12-24 18:44:33 +08:00
fit2cloud-chenyw
26047142ea fix: 过滤组件逻辑 2021-12-24 18:43:29 +08:00
junjie
f6a82359a7 feat: doris field type 2021-12-24 18:35:53 +08:00