Commit Graph

3710 Commits

Author SHA1 Message Date
Gin
cd4b93c487
Merge pull request #1466 from dataease/pr@dev@feat_filter_enum
feat(视图): 文本类型过滤组件支持枚举
2021-12-17 18:19:54 +08:00
junjie
fe37d09a9e feat(视图): 文本类型过滤组件支持枚举 2021-12-17 18:16:18 +08:00
王嘉豪
5c619821ef
Merge pull request #1465 from dataease/pr@dev@refactor_panel-scale
refactor: 移动端,web端视图内部属性可以根据屏幕缩放比例自动缩放
2021-12-17 18:12:43 +08:00
wangjiahao
9a4469d7a5 refactor: 移动端,web端视图内部属性可以根据屏幕缩放比例自动缩放 2021-12-17 18:11:39 +08:00
fit2cloud-chenyw
adca61d450
Merge pull request #1460 from dataease/pr@dev@fix_chrome_image
fix: 使用与操作系统匹配的apk镜像
2021-12-17 11:40:28 +08:00
fit2cloud-chenyw
cc65c514b1 fix: 使用与操作系统匹配的apk镜像 2021-12-17 11:39:25 +08:00
fit2cloud-chenyw
f6ab7f870e
Merge pull request #1459 from dataease/pr@dev@fix_仪表板死循环
fix: 老版本过滤组件导致死循环
2021-12-17 11:06:50 +08:00
fit2cloud-chenyw
5217a52c5b fix: 老版本过滤组件导致死循环 2021-12-17 11:05:20 +08:00
fit2cloud-chenyw
7b2e42877f
Merge pull request #1456 from dataease/pr@dev@feat_chrome_image
feat: chrome镜像
2021-12-16 18:51:24 +08:00
fit2cloud-chenyw
3704ee0070 feat: chrome镜像 2021-12-16 18:49:22 +08:00
wangjiahao
8ed4024bd6 refactor: 代码冲突回退 2021-12-16 18:24:50 +08:00
fit2cloud-chenyw
b3caf75aab
Merge pull request #1454 from dataease/pr@dev@refactor_filter_default_value
feat: 新增时间控件动态默认值
2021-12-16 18:20:15 +08:00
fit2cloud-chenyw
21e5624c22
Merge branch 'dev' into pr@dev@refactor_filter_default_value 2021-12-16 18:19:51 +08:00
fit2cloud-chenyw
3a3055280f feat: 新增时间控件动态默认值 2021-12-16 18:16:24 +08:00
wangjiahao
1fba59cc5b refactor: 兼容移动端,下拉类型组件去掉输入事件,防止再调用键盘事件 2021-12-16 17:59:16 +08:00
王嘉豪
322404c3fb
Merge pull request #1453 from dataease/pr@dev@fix_panel-style
refactor: 过滤组件可以跟随仪表板缩放
2021-12-16 17:09:43 +08:00
wangjiahao
732cb32abf refactor: 过滤组件可以跟随仪表板缩放 2021-12-16 17:08:54 +08:00
junjie
cf1be88225 feat(视图): 支持过滤组件多字段过滤 2021-12-16 16:17:02 +08:00
王嘉豪
2b42af9235
Merge pull request #1451 from dataease/pr@dev@fix_panel-style
refactor: 代码回退
2021-12-16 12:08:36 +08:00
wangjiahao
0a16c91158 refactor: 代码回退 2021-12-16 12:02:37 +08:00
王嘉豪
fc82546aaa
Merge pull request #1450 from dataease/pr@dev@fix_panel-style
refactor: 移动端仪表板视图明细优化,手机端明细展开改为全屏模式
2021-12-16 11:12:51 +08:00
wangjiahao
01b4924707 refactor: 移动端仪表板视图明细优化,手机端明细展开改为全屏模式 2021-12-16 11:10:50 +08:00
wangjiahao
5e4281c0f3 Merge remote-tracking branch 'origin/v1.5' into fix_panel-style 2021-12-16 10:59:08 +08:00
王嘉豪
e09705aa7e
Merge pull request #1448 from dataease/pr@dev@fix_panel-style
fix: 移动端布局重新打开编辑可能出现错位问题
2021-12-15 17:27:22 +08:00
wangjiahao
40d1df6074 fix: 移动端布局重新打开编辑可能出现错位问题 2021-12-15 17:26:23 +08:00
王嘉豪
4bff55b1e4
Merge pull request #1444 from dataease/pr@dev@fix_panel-style
refactor: 调整仪表板其他组件图标大小
2021-12-15 13:47:55 +08:00
wangjiahao
1eedfb7ad4 refactor: 调整仪表板其他组件图标大小 2021-12-15 13:47:11 +08:00
王嘉豪
95faaf1dcd
Merge pull request #1443 from dataease/pr@dev@fix_panel-style
fix: 设置联动信息是,目标视图选项存在uuid问题
2021-12-15 11:44:51 +08:00
wangjiahao
fe35463a4a fix: 设置联动信息是,目标视图选项存在uuid问题 2021-12-15 11:34:32 +08:00
王嘉豪
1559cf941d
Merge pull request #1442 from dataease/pr@dev@fix_panel-style
fix: 仪表板Tab组件预览模式图层不明确问题
2021-12-15 11:28:26 +08:00
wangjiahao
bbb082371d fix: 仪表板Tab组件预览模式图层不明确问题 2021-12-15 11:26:50 +08:00
王嘉豪
5b3d4f3cae
Merge pull request #1439 from dataease/pr@dev@fix_panel-line
fix: 修复仪表板内组件移动时没有对齐标线问题
2021-12-14 17:53:54 +08:00
wangjiahao
76cce15c53 fix: 修复仪表板内组件移动时没有对齐标线问题 2021-12-14 17:52:28 +08:00
taojinlong
2b18d64c7c Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-14 16:27:50 +08:00
taojinlong
4a7d8efe7c feat: 行权限支持"与/或" 2021-12-14 16:27:32 +08:00
junjie
81a2b4753e feat(视图): 过滤器支持and、or逻辑 2021-12-14 15:26:33 +08:00
王嘉豪
60df023918
Merge pull request #1438 from dataease/pr@dev@feat_panel-link-jump
feat: 仪表板处于公共链接模式,跳转的目标仪表板也以公共链接跳转,同时支持传参数
2021-12-14 15:23:06 +08:00
wangjiahao
2ea9678dd8 feat: 仪表板处于公共链接模式,跳转的目标仪表板也以公共链接跳转,同时支持传参数 2021-12-14 15:22:03 +08:00
taojinlong
4683181a6b refactor: 回退 2021-12-14 15:20:44 +08:00
taojinlong
fc5bbd3689 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-14 15:07:06 +08:00
taojinlong
82a5e142d2 fxi: 定时同步 db2 2021-12-14 15:06:47 +08:00
王嘉豪
791a76ca3c
Merge pull request #1437 from dataease/pr@dev@fix_panel-filter
feat: 仪表板tab组件内视图,支持放大和编辑
2021-12-14 11:45:24 +08:00
wangjiahao
beb295f38f feat: 仪表板tab组件内视图,支持放大和编辑 2021-12-14 11:43:41 +08:00
XiaJunjie2020
a079a97aac
Merge pull request #1436 from dataease/pr@dev@permission
feat(视图): 行权限
2021-12-14 11:37:36 +08:00
junjie
d11021934b feat(视图): 行权限 2021-12-14 11:35:35 +08:00
junjie
f4d81ef552 feat: 行权限构建 2021-12-14 11:10:04 +08:00
junjie
9505e3101b feat: 行权限构建 2021-12-14 11:09:38 +08:00
XiaJunjie2020
1d61309804
Merge pull request #1435 from dataease/pr@dev@feat_logic
feat(视图): 过滤器支持and、or逻辑
2021-12-14 10:14:51 +08:00
junjie
955d72cb75 feat(视图): 过滤器支持and、or逻辑 2021-12-14 10:14:02 +08:00
junjie
def246cc54 fix: rollback 2021-12-13 17:50:25 +08:00