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

1893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
XiaJunjie2020
6700c63955
Merge pull request #293 from dataease/pr@dev@refactor_视图样式界面调整 
refactor: 视图样式界面优化
 2021-07-22 18:21:52 +08:00
junjie
f2ac1b6a6c refactor: 视图样式界面优化 2021-07-22 18:20:44 +08:00
fit2cloud-chenyw
fc4e032e72
Merge pull request #292 from dataease/pr@dev@fix_数据集消息跳转 
fix: 完善数据集消息任务跳转
 2021-07-22 18:10:17 +08:00
fit2cloud-chenyw
deaf1aa3a9 fix: 完善数据集消息任务跳转 2021-07-22 18:08:39 +08:00
fit2cloud-chenyw
0cd687ade7
Merge pull request #291 from dataease/pr@dev@fix_数据集消息跳转 
fix: 数据集消息任务跳转
 2021-07-22 17:29:29 +08:00
fit2cloud-chenyw
c3af183fdb fix: 数据集消息任务跳转 2021-07-22 17:27:49 +08:00
fit2cloud-chenyw
5603108c7d
Merge pull request #290 from dataease/pr@v1.1@fix_消息通知 
fix: 1.类型拍戏报错
 2021-07-22 17:03:59 +08:00
fit2cloud-chenyw
aaf9f958a0 fix: 1.类型拍戏报错 
2.分页数据错误
     3.全部消息取消默认状态排序
     4.数据集同步消息跳转路由修改
 2021-07-22 16:59:34 +08:00
XiaJunjie2020
e2051479bd
Merge pull request #286 from dataease/pr@dev@refactor_坐标轴图表滚轮缩放优化 
refactor: 坐标轴图表滚轮缩放优化
 2021-07-22 16:20:09 +08:00
王嘉豪
7e12879de5
Merge pull request #288 from dataease/pr@dev@fix_panel_other-component 
fix:修复编辑过滤组件时，悬浮组件依然在遮罩上方
 2021-07-22 16:19:53 +08:00
wangjiahao
2e7e958b2f fix:修复编辑过滤组件时，悬浮组件依然在遮罩上方 2021-07-22 16:18:07 +08:00
fit2cloud-chenyw
c0dc8e6265
Merge pull request #287 from dataease/pr@dev@fix_过滤组件国际化 
fix: 仪表板过滤组件国际化
 2021-07-22 15:34:26 +08:00
fit2cloud-chenyw
d3494ea3cb fix: 仪表板过滤组件国际化 2021-07-22 15:27:44 +08:00
junjie
f85db005e1 refactor: 坐标轴图表滚轮缩放优化 2021-07-22 15:00:01 +08:00
王嘉豪
403ccd7215
Merge pull request #285 from dataease/pr@dev@feat_panel_rectangle-radius 
feat:仪表板矩形组件增加边框弧度设置
 2021-07-22 14:09:36 +08:00
wangjiahao
a0174c77e4 feat:仪表板矩形组件增加边框弧度设置 2021-07-22 14:05:41 +08:00
fit2cloud-chenyw
9582bed910
Merge pull request #284 from dataease/pr@dev@feat_仪表板数值区间组件 
feat: 仪表板过滤组件数值区间
 2021-07-22 13:59:20 +08:00
fit2cloud-chenyw
f9bfbd93e8 feat: 仪表板过滤组件数值区间 2021-07-22 13:56:28 +08:00
XiaJunjie2020
0d580d6e48
Merge pull request #282 from dataease/pr@dev@feat_支持仪表板数字区间过滤 
feat: 支持仪表板数字区间过滤
 2021-07-22 12:44:39 +08:00
junjie
a450a023aa feat: 支持仪表板数字区间过滤 2021-07-22 12:43:52 +08:00
XiaJunjie2020
03c3695f6e
Merge pull request #281 from dataease/pr@dev@fix_视图样式 
fix: 视图样式
 2021-07-22 12:27:47 +08:00
junjie
c7450f65c6 fix: 视图样式 2021-07-22 12:26:22 +08:00
XiaJunjie2020
0f5209173f
Merge pull request #280 from dataease/pr@dev@refactor_视图样式调整 
refactor: 视图样式调整
 2021-07-22 12:08:50 +08:00
junjie
acace5e57d refactor: 视图样式调整 2021-07-22 12:07:17 +08:00
wangjiahao
8b435075ca Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	frontend/src/components/canvas/components/RectangleAttr.vue
 2021-07-22 11:46:03 +08:00
wangjiahao
b71a1d0a29 feat:仪表板矩形组件增加透明度样式设置 2021-07-22 11:44:57 +08:00
XiaJunjie2020
4fffb7ca04
Merge pull request #279 from dataease/pr@dev@fix_视图样式 
fix: 视图样式
 2021-07-22 11:18:37 +08:00
junjie
4087b60366 fix: 视图样式 2021-07-22 11:02:33 +08:00
XiaJunjie2020
2d7b9abc11
Merge pull request #278 from dataease/pr@dev@refactor_界面样式调整 
refactor: 界面样式调整
 2021-07-22 10:50:14 +08:00
junjie
fa257167e6 refactor: 界面样式调整 2021-07-22 10:49:23 +08:00
wangjiahao
cafca05eee feat:仪表板矩形组件增加透明度样式设置 2021-07-22 10:20:38 +08:00
wangjiahao
5f95db6a53 Merge remote-tracking branch 'origin/dev' into dev 2021-07-22 10:02:31 +08:00
wangjiahao
ad1b829356 fix:Mac M1 arm64 chrome浏览器版本适配，修复仪表板编辑是全屏模式可能出现滚动条问题 2021-07-22 10:02:17 +08:00
XiaJunjie2020
43a369319c
Merge pull request #277 from dataease/pr@dev@fix_堆叠bug修复 
fix: 堆叠bug修复
 2021-07-21 18:58:27 +08:00
junjie
ee0ecadfcb fix: 堆叠bug修复 2021-07-21 18:57:16 +08:00
XiaJunjie2020
cfe171d87f
Merge pull request #276 from dataease/pr@dev@fix_过滤器兼容flyway 
feat: 过滤器兼容flyway
 2021-07-21 18:34:17 +08:00
junjie
6825383d9a feat: 过滤器兼容flyway 2021-07-21 18:30:13 +08:00
XiaJunjie2020
7ebe7d96e4
Merge pull request #275 from dataease/pr@dev@feat_视图字段排序增加icon标识 
feat: 视图字段排序增加icon标识
 2021-07-21 18:18:59 +08:00
junjie
3a8adf4023 feat: 视图字段排序增加icon标识 2021-07-21 18:17:30 +08:00
fit2cloud-chenyw
1ef870c8cc
Merge pull request #272 from dataease/pr@dev@feat_行政区代码表 
feat: 行政区划代码表
 2021-07-21 18:00:15 +08:00
fit2cloud-chenyw
62ef6d01af
Merge pull request #273 from dataease/pr@dev@fix_菜单滚动条 
fix: 添加菜单滚动条
 2021-07-21 17:56:53 +08:00
fit2cloud-chenyw
08f1e10654 fix: 添加菜单滚动条 2021-07-21 17:53:36 +08:00
fit2cloud-chenyw
0620d58313 feat: 行政区划代码表 2021-07-21 17:51:03 +08:00
XiaJunjie2020
5cf91bb848
Merge pull request #270 from dataease/pr@dev@feat_堆叠图支持堆叠项 
feat: 堆叠图支持堆叠项
 2021-07-21 17:37:58 +08:00
junjie
a8e6e2d0e1 feat: 堆叠图支持堆叠项 2021-07-21 17:36:50 +08:00
fit2cloud-chenyw
13ccfb2073
Merge pull request #269 from dataease/pr@dev@feat_图标类型地图 
feat: 替换缩略图
 2021-07-21 17:25:34 +08:00
fit2cloud-chenyw
5715563714 feat: 替换缩略图 2021-07-21 17:23:58 +08:00
fit2cloud-chenyw
f0a2532b51 feat: 视图图表类型增加地图 2021-07-21 17:12:40 +08:00
taojinlong
7285eb11bf feat: SAX 解析 excel 2021-07-21 15:11:58 +08:00
taojinlong
b03598db1d
Merge pull request #267 from dataease/pr@dev@excel 
Merge branch 'dev' into pr@dev@excel
 2021-07-21 15:10:52 +08:00