Commit Graph

4314 Commits

Author SHA1 Message Date
王嘉豪
0cb8e67e12
Merge pull request #1590 from dataease/dev
Dev
2022-01-04 16:10:19 +08:00
wangjiahao
071d236d77 refactor: 增加移动端布局示例 2022-01-04 16:01:36 +08:00
fit2cloud-chenyw
b80174b762
Merge pull request #1588 from dataease/pr@v1.6@fix_version
fix: 移动端版本号
2022-01-04 15:29:18 +08:00
fit2cloud-chenyw
0c11a13368 fix: 移动端版本号 2022-01-04 15:28:12 +08:00
taojinlong
5df13789b9 refactor: 版本号 2022-01-04 15:20:34 +08:00
taojinlong
8f50764fa2 Merge branch 'v1.6' of github.com:dataease/dataease into v1.6 2022-01-04 12:08:37 +08:00
taojinlong
d35c03d828 fix: 查询数据时,先校验数据源有效性 2022-01-04 12:06:21 +08:00
taojinlong
07d019b33c Merge branch 'dev' of github.com:dataease/dataease into dev 2022-01-04 12:05:30 +08:00
taojinlong
9f98c73e08 fix: 查询数据时,先校验数据源有效性 2022-01-04 12:04:43 +08:00
fit2cloud-chenyw
adf0d251e2 fix: 移动端目录上下滑动不顺畅 2022-01-04 11:53:42 +08:00
fit2cloud-chenyw
9b15f26ccb refactor: 移动端代码合并 2022-01-04 11:53:10 +08:00
fit2cloud-chenyw
a50c94fbd5 fix: 移动端分页api 2022-01-04 11:52:46 +08:00
fit2cloud-chenyw
f7a95d7d93
Merge pull request #1586 from dataease/pr@dev@fix_mobile_dir_scroll
fix: 移动端目录上下滑动不顺畅
2022-01-04 11:49:25 +08:00
fit2cloud-chenyw
8152b53b2f fix: 移动端目录上下滑动不顺畅 2022-01-04 11:48:04 +08:00
taojinlong
832c244736 fix: 定时任务过滤数据集 2022-01-04 11:15:51 +08:00
taojinlong
a5216ba596 build: v1.6 2022-01-04 11:15:49 +08:00
taojinlong
6ce8e851d6 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-01-04 11:15:09 +08:00
taojinlong
8ca71983e1 fix: 定时任务过滤数据集 2022-01-04 11:14:19 +08:00
fit2cloud-chenyw
834657e570
Merge pull request #1584 from dataease/pr@dev@refactor_mobile
refactor: 移动端代码合并
2022-01-03 21:15:04 +08:00
fit2cloud-chenyw
2ba5690ba9 refactor: 移动端代码合并 2022-01-03 21:13:45 +08:00
fit2cloud-chenyw
ddfe79a552
Merge pull request #1583 from dataease/pr@dev@fix_mobile_api
fix: 移动端分页api
2022-01-03 20:36:13 +08:00
fit2cloud-chenyw
b246111524 fix: 移动端分页api 2022-01-03 20:34:56 +08:00
taojinlong
f0cad41560 build: v1.6 2021-12-31 17:46:06 +08:00
taojinlong
64e5c34f05 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-31 17:42:29 +08:00
taojinlong
927bdbdebf fix: mongo sql 拼接问题 2021-12-31 16:34:21 +08:00
wangjiahao
abf8d04569 style: 样式修改 2021-12-31 16:16:30 +08:00
wangjiahao
69d53f0bb6 fix: 过滤组件标题不同仪表板大小时显示位置不同问题 2021-12-31 15:34:05 +08:00
fit2cloud-chenyw
a313f0e280
Merge pull request #1581 from dataease/pr@dev@fix_public_link_jump
fix: 公共链接跳转白名单
2021-12-31 11:47:38 +08:00
fit2cloud-chenyw
765ab7587f fix: 公共链接跳转白名单 2021-12-31 11:46:03 +08:00
王嘉豪
6be06f128b
Merge pull request #1580 from dataease/pr@dev@refactor_panel-details
refactor: 优化文字组件FontSize值范围设置
2021-12-31 11:40:27 +08:00
wangjiahao
239b649bca refactor: 优化文字组件FontSize值范围设置 2021-12-31 11:27:36 +08:00
taojinlong
0e52dd0d73 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-31 10:43:11 +08:00
taojinlong
55459dd8aa Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-31 10:42:52 +08:00
taojinlong
8d727a7758 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-31 10:37:44 +08:00
taojinlong
a8885c31f5 fix: 限制行权限 2021-12-31 10:37:05 +08:00
fit2cloud-chenyw
e4c47b2e97
Merge pull request #1579 from dataease/pr@dev@fix_select_grid
fix: 下拉列表逻辑
2021-12-31 10:31:14 +08:00
fit2cloud-chenyw
5701437698 fix: 下拉列表逻辑 2021-12-31 10:29:26 +08:00
xiajunjie
fcbe38d040 fix: 字段重名 2021-12-31 00:22:07 +08:00
xiajunjie
1eb4dc6e01 fix: 字段重名 2021-12-31 00:21:01 +08:00
xiajunjie
a17e55c2d7 fix: 字段重名 2021-12-30 20:55:53 +08:00
xiajunjie
7812d73545 fix: 字段重名 2021-12-30 20:31:01 +08:00
xiajunjie
0c8d930ee5 fix: 视图加载大数据 2021-12-30 20:30:31 +08:00
fit2cloud-chenyw
3d4e6a391f
Merge pull request #1576 from dataease/pr@dev@fix_mult_focus
fix: 我的分享多个焦点
2021-12-30 19:45:41 +08:00
fit2cloud-chenyw
c43fd82ba1 fix: 我的分享多个焦点 2021-12-30 19:31:28 +08:00
王嘉豪
6b7c0671bd
Merge pull request #1575 from dataease/pr@dev@feat-mobile-reset
refactor: 过滤组件初始化优化,适配历史过滤组件
2021-12-30 19:05:29 +08:00
wangjiahao
34455d7ef2 refactor: 过滤组件初始化优化,适配历史过滤组件 2021-12-30 19:04:23 +08:00
王嘉豪
80a502e989
Merge pull request #1574 from dataease/pr@dev@feat-mobile-reset
refactor: 过滤组件初始化优化,适配历史过滤组件
2021-12-30 18:32:54 +08:00
wangjiahao
678581d484 refactor: 过滤组件初始化优化,适配历史过滤组件 2021-12-30 18:31:57 +08:00
fit2cloud-chenyw
fff5288e35
Merge pull request #1573 from dataease/pr@dev@fix_dockerfile_path_error
fix: dockerfile路径错误
2021-12-30 17:35:09 +08:00
fit2cloud-chenyw
c8805bceb2 fix: dockerfile路径错误 2021-12-30 17:34:09 +08:00