Commit Graph

1786 Commits

Author SHA1 Message Date
wangjiahao
a2425538fa Merge remote-tracking branch 'origin/dev' into fix_panel_edit_attr-auto-save
# Conflicts:
#	frontend/src/components/canvas/components/RectangleAttr.vue
2021-07-23 13:58:13 +08:00
wangjiahao
e09e352f46 feat:组件样式修改时可以延迟保存组件镜像 2021-07-23 13:45:01 +08:00
wangjiahao
b2ea0c7123 fix:修复编辑过滤组件时,悬浮组件依然在遮罩上方 2021-07-23 11:30:33 +08:00
wangjiahao
747e79ebe9 fix:矩阵设计模式下点击一次组件也不需保存镜像 2021-07-23 11:26:40 +08:00
fit2cloud-chenyw
eb6b190d4f fix: 修复跳转后菜单不打开 2021-07-23 10:47:30 +08:00
fit2cloud-chenyw
409e5a1e82 fix: 完善数据集消息任务跳转 2021-07-23 10:47:24 +08:00
fit2cloud-chenyw
4b4bd65065 fix: 数据集消息任务跳转 2021-07-23 10:47:13 +08:00
fit2cloud-chenyw
14a58ac561 fix: 1.类型拍戏报错
2.分页数据错误
     3.全部消息取消默认状态排序
     4.数据集同步消息跳转路由修改
2021-07-23 10:47:06 +08:00
fit2cloud-chenyw
66335c3880 fix: 添加菜单滚动条 2021-07-23 10:46:35 +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
taojinlong
403350e3b9 Merge branch 'dev' into pr@dev@excel 2021-07-21 15:09:48 +08:00
taojinlong
d4a95c28f3 feat: SAX 解析 excel 2021-07-21 15:07:51 +08:00
XiaJunjie2020
7ed6e64242
Merge pull request #266 from dataease/pr@dev@fix_创建视图报错
fix: 创建视图报错
2021-07-20 19:00:02 +08:00
junjie
4316db704a fix: 创建视图报错 2021-07-20 18:58:49 +08:00
XiaJunjie2020
6b6372fd43
Merge pull request #265 from dataease/pr@dev@fix_单指标图表可能下标越界
fix: 单指标图表可能下标越界
2021-07-20 17:53:42 +08:00
junjie
8369a8ffc6 fix: 单指标图表可能下标越界 2021-07-20 17:52:51 +08:00
XiaJunjie2020
12e2388a59
Merge pull request #263 from dataease/pr@dev@refactor_视图文案优化
feat: 视图维度指标拖动区域文案细节优化
2021-07-20 13:36:42 +08:00