Commit Graph

3954 Commits

Author SHA1 Message Date
wangjiahao
944c160e99 Merge remote-tracking branch 'origin/dev' into dev 2021-12-29 11:54:31 +08:00
wangjiahao
83134fe15e fix: 修复视图分组图标可能被修改的问题 2021-12-29 11:54:17 +08:00
fit2cloud-chenyw
a58363b166
Merge pull request #1549 from dataease/pr@dev@fix_动态时间失效
fix: 动态时间组件无效
2021-12-29 11:53:31 +08:00
wangjiahao
4ad858d5dc Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-29 11:53:02 +08:00
fit2cloud-chenyw
cfcf7c9513 fix: 动态时间组件无效 2021-12-29 11:47:31 +08:00
taojinlong
f9f1bea6f5 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-29 11:43:11 +08:00
taojinlong
d5f8ce4abd fix: 每个字段,同一类型的行權限,限制只有一条记录 2021-12-29 11:42:57 +08:00
wangjiahao
9fa671d166 style: tab组件样式修改 2021-12-29 11:39:21 +08:00
wangjiahao
e051792bde refactor: 仪表板新建视图关闭取消按钮 2021-12-29 11:25:27 +08:00
fit2cloud-chenyw
c7c0b5b1c3
Merge pull request #1548 from dataease/pr@dev@fix_eqp_type
fix: BS/MS多端统一入口
2021-12-29 10:58:38 +08:00
fit2cloud-chenyw
644f5e59ba fix: BS/MS多端统一入口 2021-12-29 10:57:46 +08:00
wangjiahao
60814ebc5f style: 仪表板树样式修改 2021-12-29 10:52:46 +08:00
Gin
8ec7b93481
Merge pull request #1546 from dataease/pr@dev@fix_table
fix: 表格分页问题
2021-12-29 10:30:07 +08:00
junjie
34a048d07a fix: 表格分页问题 2021-12-29 10:28:31 +08:00
taojinlong
8bb5d5b427 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-29 10:04:48 +08:00
wangjiahao
398d40520c Merge remote-tracking branch 'origin/dev' into dev 2021-12-28 18:45:16 +08:00
taojinlong
69e9931d5c Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-28 18:44:33 +08:00
taojinlong
6bb37f0d4e fix: 公共链接行权限 2021-12-28 18:44:11 +08:00
wangjiahao
63f87ad59d refactor: 未获取地图数据,控制台不用报错 2021-12-28 18:44:03 +08:00
wangjiahao
dfe1fd4859 refactor: 代码回退 2021-12-28 18:23:47 +08:00
fit2cloud-chenyw
6f9eb29ca7
Merge pull request #1544 from dataease/pr@dev@fix_preview_filter_valid
fix: 仪表板预览过滤条件失效
2021-12-28 18:11:36 +08:00
fit2cloud-chenyw
a39ed6a8c0 fix: 仪表板预览过滤条件失效 2021-12-28 18:09:54 +08:00
wangjiahao
56ebd857cc Merge remote-tracking branch 'origin/dev' into dev 2021-12-28 17:53:02 +08:00
wangjiahao
892a967d24 refactor: 仪表板命名,相同目录下的仪表板和目录允许重名 2021-12-28 17:52:31 +08:00
taojinlong
96a830ebaf Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-28 17:18:00 +08:00
wangjiahao
4cb9e722a5 fix: 新建仪表板刷新浏览器第一次不出现问题 2021-12-28 17:03:48 +08:00
fit2cloud-chenyw
b44ccef5fa
Merge pull request #1542 from dataease/pr@dev@fix_radio_cancel
fix: 下拉列表单选框不能取消
2021-12-28 17:02:10 +08:00
fit2cloud-chenyw
7ebb9b3be4 fix: 下拉列表单选框不能取消 2021-12-28 17:00:34 +08:00
taojinlong
1e0d699afd fix: 行权限未清除之前的选择 2021-12-28 16:52:51 +08:00
wangjiahao
f47609fce5 refactor: 移动端布局等待区域排列优化 2021-12-28 16:35:30 +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