Commit Graph

1953 Commits

Author SHA1 Message Date
junjie
e5c46a0711 feat(数据集): 关联数据集 2021-11-30 15:43:04 +08:00
wangjiahao
60c5c88304 fix: 过滤组件修改标题字间距选项会跟着一起改变间距问题 2021-11-30 15:37:28 +08:00
王嘉豪
2673af28f0
Merge pull request #1331 from dataease/pr@dev@refactor_auth-model
fix: 修复默认仪表板保存时无法实时显示在列表中的问题
2021-11-30 15:26:09 +08:00
wangjiahao
37d6623db5 fix: 修复默认仪表板保存时无法实时显示在列表中的问题 2021-11-30 15:24:51 +08:00
XiaJunjie2020
c365c5c7c1
Merge pull request #1330 from dataease/pr@dev@feat_union_ds
feat(数据集): 关联数据集
2021-11-30 15:21:21 +08:00
junjie
c7aa73cdd0 feat(数据集): 关联数据集 2021-11-30 15:19:51 +08:00
王嘉豪
748158ecb5
Merge pull request #1329 from dataease/pr@dev@refactor_auth-model
fix: 优化仪表板编辑时,边界可能间隙不一致
2021-11-30 15:17:09 +08:00
wangjiahao
ef6ae66859 fix: 优化仪表板编辑时,边界可能间隙不一致 2021-11-30 15:14:43 +08:00
taojinlong
d19f0f2a24 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-30 13:55:21 +08:00
junjie
68f6a6e749 fix(权限): 统一授权数据集tree 2021-11-30 13:38:50 +08:00
taojinlong
f8279b1141 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-30 12:28:42 +08:00
taojinlong
e654cafa68 refactor: 调整表单样式 2021-11-30 12:28:22 +08:00
wangjiahao
1fdb21a103 fix: 文本组件根据仪表板缩放比例自动缩放文本大小和间隙,防止编辑和预览不一致 2021-11-30 11:46:47 +08:00
王嘉豪
2cd38021be
Merge pull request #1320 from dataease/pr@dev@refactor_panel-speed
refactor: 代码回退
2021-11-30 10:33:15 +08:00
wangjiahao
7a605320d8 refactor: 代码回退 2021-11-30 10:31:57 +08:00
junjie
2b2db1c8fc feat(数据集): 关联数据集 2021-11-30 10:06:04 +08:00
王嘉豪
e65b15b89b
Merge pull request #1318 from dataease/pr@dev@refactor_panel-speed
refactor: 过滤组件样式边界优化
2021-11-29 19:20:31 +08:00
wangjiahao
02bcadae10 refactor: 过滤组件样式边界优化 2021-11-29 19:18:12 +08:00
junjie
ff7c93ed3c feat(数据集): 关联数据集 2021-11-29 18:28:51 +08:00
taojinlong
dbd2159a6d Merge branch 'dev' of github.com:dataease/dataease into dev
# Conflicts:
#	frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
2021-11-29 17:55:45 +08:00
taojinlong
65da67cdc0 fix(数据集): 错别字 2021-11-29 17:49:29 +08:00
taojinlong
63d3e5d015 feat(数据集): 添加同步任务时,过滤掉空目录 2021-11-29 17:48:41 +08:00
XiaJunjie2020
4e6f2f94fe
Merge pull request #1314 from dataease/pr@dev@feat_union_ds
feat(数据集): 关联数据集
2021-11-29 17:21:55 +08:00
fit2cloud-chenyw
b28c84319e
Merge pull request #1313 from dataease/pr@dev@fix_条件组件弹框样式
fix: 条件组件弹框样式
2021-11-29 17:21:03 +08:00
junjie
b2dc85232a feat(数据集): 关联数据集 2021-11-29 17:21:02 +08:00
fit2cloud-chenyw
c48e2ef9d6 fix: 条件组件弹框样式 2021-11-29 17:19:41 +08:00
王嘉豪
b912c1fb97
Merge pull request #1312 from dataease/pr@dev@refactor_panel-speed
refactor: 仪表板视图过滤弹框,去掉搜索条件时无需关闭
2021-11-29 15:56:38 +08:00
wangjiahao
079f24d7c8 refactor: 仪表板视图过滤弹框,去掉搜索条件时无需关闭 2021-11-29 15:55:48 +08:00
XiaJunjie2020
95f55ddf8e
Merge branch 'dev' into pr@dev@feat_union_dataset 2021-11-29 15:33:43 +08:00
junjie
a6e8d16ccf fix(视图): 修复图表类型有时样式错乱 2021-11-29 15:18:10 +08:00
王嘉豪
3c8ce0e31d
Merge pull request #1306 from dataease/pr@dev@refactor_panel-speed
refactor: 前端增加菜单缓存,加快相应速度
2021-11-29 14:55:20 +08:00
wangjiahao
7cc5169ab7 refactor: 前端增加菜单缓存,加快相应速度 2021-11-29 14:54:24 +08:00
junjie
199af4407c feat(数据集): 关联数据集 2021-11-29 14:50:45 +08:00
fit2cloud-chenyw
4a2e1b0ae2 fix: 多个时间控件相互影响 2021-11-29 14:35:05 +08:00
fit2cloud-chenyw
33c6fba964 fix: 公共链接分享密码错误提示位置覆盖 2021-11-29 14:26:21 +08:00
fit2cloud-chenyw
8f00ea4783
Merge pull request #1301 from dataease/pr@dev@fix_my_share_tree
fix: 我分享的没有及时刷新
2021-11-29 13:53:37 +08:00
fit2cloud-chenyw
b9348f13ac fix: 我分享的没有及时刷新 2021-11-29 13:52:35 +08:00
wangjiahao
521b35f9b5 refactor: 优化系统响应速度 2021-11-29 11:35:51 +08:00
junjie
79349604fe feat(数据集): 关联数据集 2021-11-26 18:13:27 +08:00
王嘉豪
13198c7c15
Merge pull request #1285 from dataease/pr@dev@fix_panel-edit
fix: 修复antV视图多事件弹框点击不显示问题
2021-11-26 12:10:40 +08:00
wangjiahao
ff1a52d7c4 fix: 修复antV视图多事件弹框点击不显示问题 2021-11-26 12:09:48 +08:00
taojinlong
5899876a09 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-26 11:39:42 +08:00
fit2cloud-chenyw
07440bfa8f
Merge pull request #1284 from dataease/pr@dev@refactor_multiple_entry
fix: 前端改为单页面应用
2021-11-26 11:39:39 +08:00
taojinlong
436770fe34 fix(数据集): 先选择定时同步再选择数据库可实现不支持定时同步的数据库定时同步 2021-11-26 11:39:30 +08:00
fit2cloud-chenyw
26c54d41bc fix: 前端改为单页面应用 2021-11-26 11:38:25 +08:00
wangjiahao
06b4d0624d fix: 修复简单表盘复制后不显示问题 2021-11-26 10:56:45 +08:00
wangjiahao
f4e23f7f60 fix: 修复系统主题标题错位问题 2021-11-26 10:28:43 +08:00
taojinlong
f8f285155d Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-25 22:02:15 +08:00
taojinlong
04871b182b fix(数据源): 删除数据源时,同时清理页面缓存 2021-11-25 22:02:07 +08:00
fit2cloudrd
5c8ae8289d
refactor: 优化顶部菜单栏隐藏条件
Co-authored-by: wangjiahao <1522128093@qq.com>
2021-11-25 17:07:31 +08:00