center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
3,576 Commits 1 Branch 86 Tags 417 MiB
99c6cfd9e4
Commit Graph

3576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
taojinlong
d19f0f2a24 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-30 13:55:21 +08:00
XiaJunjie2020
db04aabd1e
Merge pull request #1326 from dataease/pr@dev@fix_auth_tree 
fix(权限): 统一授权数据集tree
 2021-11-30 13:41:27 +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
王嘉豪
6f50a9ca56
Merge pull request #1324 from dataease/pr@dev@refactor_auth-model 
fix: 文本组件根据仪表板缩放比例自动缩放文本大小和间隙，防止编辑和预览不一致
 2021-11-30 11:47:32 +08:00
wangjiahao
1fdb21a103 fix: 文本组件根据仪表板缩放比例自动缩放文本大小和间隙，防止编辑和预览不一致 2021-11-30 11:46:47 +08:00
王嘉豪
7f637899a6
Merge pull request #1322 from dataease/pr@dev@refactor_auth-model 
refactor: 增加权限模型字段优化查询条件
 2021-11-30 11:07:31 +08:00
wangjiahao
700fe805af refactor: 增加权限模型字段优化查询条件 2021-11-30 11:05:39 +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
XiaJunjie2020
7b4c53b2e9
Merge pull request #1319 from dataease/pr@dev@feat_union_ds 
feat(数据集): 关联数据集
 2021-11-30 10:06:52 +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
taojinlong
8177d67a2a Merge branch 'dev' of github.com:dataease/dataease into dev 2021-11-29 18:53:12 +08:00
taojinlong
296d1813ee fix: sqlserver 增量sql 2021-11-29 18:50:07 +08:00
XiaJunjie2020
80229d3593
Merge pull request #1316 from dataease/pr@dev@feat_union_ds 
feat(数据集): 关联数据集
 2021-11-29 18:30:19 +08:00
junjie
ff7c93ed3c feat(数据集): 关联数据集 2021-11-29 18:28:51 +08:00
taojinlong
1df9c12c60 fix: 识别 bit 字段长度 2021-11-29 18:22:47 +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
b44f152cab
Merge pull request #1311 from dataease/pr@dev@feat_union_dataset 
feat(数据集): 关联数据集
 2021-11-29 15:34:19 +08:00
XiaJunjie2020
95f55ddf8e
Merge branch 'dev' into pr@dev@feat_union_dataset 2021-11-29 15:33:43 +08:00
XiaJunjie2020
035a290d5a
Merge pull request #1307 from dataease/pr@dev@fix_chart_type 
fix(视图): 修复图表类型有时样式错乱
 2021-11-29 15:18:58 +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
5d7bd59930
Merge pull request #1304 from dataease/pr@dev@fix_多个时间控件日期显示 
fix: 多个时间控件相互影响
 2021-11-29 14:36:08 +08:00
fit2cloud-chenyw
4a2e1b0ae2 fix: 多个时间控件相互影响 2021-11-29 14:35:05 +08:00
fit2cloud-chenyw
db181cc8e5
Merge pull request #1303 from dataease/pr@dev@fix_公共链接分享密码错误提示位置覆盖 
fix: 公共链接分享密码错误提示位置覆盖
 2021-11-29 14:27:15 +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
taojinlong
712e212eb1 Merge branch 'v1.5' into dev 2021-11-29 11:54:18 +08:00
王嘉豪
a6245443b8
Merge pull request #1300 from dataease/pr@dev@refactor_panel-speed 
refactor: 优化系统响应速度
 2021-11-29 11:36:44 +08:00
wangjiahao
521b35f9b5 refactor: 优化系统响应速度 2021-11-29 11:35:51 +08:00
XiaJunjie2020
c2a5081359
Merge pull request #1297 from dataease/pr@dev@fix_field 
fix(数据集): 编辑数据集可能会出现重复字段
 2021-11-29 10:13:49 +08:00
junjie
c73fbfb91c fix(数据集): 编辑数据集可能会出现重复字段 2021-11-29 10:12:41 +08:00
XiaJunjie2020
3a5aaf0699
Merge pull request #1296 from dataease/pr@v1.5@fix_field 
fix(数据集): 编辑数据集可能会出现重复字段
 2021-11-29 10:11:15 +08:00
junjie
b3a014c1a6 fix(数据集): 编辑数据集可能会出现重复字段 2021-11-29 10:10:05 +08:00
王嘉豪
0d0b4ccd31
Merge pull request #1295 from dataease/dev 
Dev
 2021-11-26 18:24:52 +08:00