Commit Graph

2367 Commits

Author SHA1 Message Date
wangjiahao
009c6ac9d0 refactor:修复仪表板矩形悬浮框部分样式设置 2021-07-27 14:42:00 +08:00
王嘉豪
750444610d
Merge pull request #344 from dataease/pr@dev@fix_panel_edit_view-menu
fix:修复仪表板view弹出菜单,控制台中有错误日志问题
2021-07-27 14:06:07 +08:00
wangjiahao
c0e86e6e30 fix:修复仪表板view弹出菜单,控制台中有错误日志问题 2021-07-27 14:04:57 +08:00
fit2cloud-chenyw
6718d15cf0 fix: 跳转任务消息延时 2021-07-27 12:30:29 +08:00
王嘉豪
45cc314c47
Merge pull request #341 from dataease/pr@dev@fix_panel_preview_scroll
fix:预览模式下部分尺寸的显示屏仪表板抖动问题
2021-07-27 11:39:55 +08:00
wangjiahao
6407b278ea fix:预览模式下部分尺寸的显示屏仪表板抖动问题 2021-07-27 11:37:31 +08:00
fit2cloud-chenyw
e03b2894ea fix: 删除未读消息列选择器 2021-07-27 10:35:38 +08:00
fit2cloud-chenyw
1e33054903 feat: everyone默认订阅仪表板分享、任务失败消息通知 2021-07-26 21:37:08 +08:00
XiaJunjie2020
38f700f560
Merge pull request #337 from dataease/pr@dev@refactor_全局滚动条样式调整,字段编辑样式调整
refactor: 全局滚动条样式调整,字段编辑样式调整
2021-07-26 16:48:40 +08:00
junjie
51e1856411 refactor: 全局滚动条样式调整,字段编辑样式调整 2021-07-26 16:45:11 +08:00
XiaJunjie2020
fdcd400fbd
Merge pull request #336 from dataease/pr@dev@refactor_数据集字段将维度指标归类展示
refactor: 数据集字段将维度指标分类展示,后续维度和指标具有不同的操作,为配置钻取目录、字段计算做前置准备
2021-07-26 16:09:16 +08:00
junjie
67f5160312 refactor: 数据集字段将维度指标分类展示,后续维度和指标具有不同的操作,为配置钻取目录、字段计算做前置准备 2021-07-26 16:08:14 +08:00
fit2cloud-chenyw
43f038ab65
Merge pull request #335 from dataease/pr@dev@feat_过滤组件下拉列表
feat: 增加过滤组件下拉列表
2021-07-26 15:16:36 +08:00
fit2cloud-chenyw
9890d02e6c feat: 增加过滤组件下拉列表 2021-07-26 15:05:26 +08:00
王嘉豪
e55d94d37c
Merge pull request #334 from dataease/pr@dev@refactor_panel_component-icon
refactor:修改视图悬浮图标
2021-07-26 15:00:04 +08:00
wangjiahao
26247568e0 refactor:修改视图悬浮图标 2021-07-26 14:58:43 +08:00
王嘉豪
47582f6261
Merge pull request #332 from dataease/pr@dev@fix_panel_filter-date
fix:全屏预览模式下日期控件下拉不显示问题
2021-07-26 14:50:37 +08:00
wangjiahao
48b037e237 fix:全屏预览模式下日期控件下拉不显示问题 2021-07-26 14:46:55 +08:00
XiaJunjie2020
9d570916ab
Merge pull request #331 from dataease/pr@dev@fix_视图缩放
fix: 视图缩放
2021-07-26 14:23:15 +08:00
junjie
482f06bf76 fix: 视图缩放 2021-07-26 14:22:19 +08:00
XiaJunjie2020
0424577538
Merge pull request #330 from dataease/pr@dev@refactor_视图缩放暂时去掉
refactor: 视图缩放暂时去掉
2021-07-26 14:01:32 +08:00
junjie
3671a33984 refactor: 视图缩放暂时去掉 2021-07-26 14:00:45 +08:00
XiaJunjie2020
5a7e4fafce
Merge pull request #328 from dataease/pr@dev@fix_视图表格组件高度问题
fix: 视图表格组件高度问题
2021-07-26 11:16:49 +08:00
junjie
c0870cc0ea fix: 视图表格组件高度问题 2021-07-26 11:15:48 +08:00
XiaJunjie2020
eb85ac7b4a
Merge pull request #323 from dataease/pr@dev@refactor_维度指标色彩区分
refactor: 维度指标色彩区分
2021-07-24 10:21:09 +08:00
junjie
078a0f5b58 refactor: 维度指标色彩区分 2021-07-24 10:19:24 +08:00
XiaJunjie2020
3835fa23b1
Merge pull request #322 from dataease/pr@dev@refactor_视图字段拖拽区增加placeholder
refactor: 视图字段拖拽区增加placeholder
2021-07-24 10:07:03 +08:00
junjie
d3b7dfc19b refactor: 视图字段拖拽区增加placeholder 2021-07-24 10:06:16 +08:00
taojinlong
d324ff8c6e fix: 更新任务状态 2021-07-23 18:37:56 +08:00
XiaJunjie2020
82c2b1259e
Merge pull request #320 from dataease/pr@dev@refactor_视图拖拽块增加placeholder
refactor: 视图拖拽块增加placeholder
2021-07-23 17:04:31 +08:00
junjie
99b2ac0c7a refactor: 视图拖拽块增加placeholder 2021-07-23 17:02:50 +08:00
王嘉豪
333a7a5640
Merge pull request #317 from dataease/pr@dev@fix_panel-edit-view-copy-dev
fix:在编辑仪表板时,复制堆叠柱状图时出错
2021-07-23 16:10:13 +08:00
wangjiahao
17ef829166 fix:在编辑仪表板时,复制堆叠柱状图时出错 2021-07-23 16:06:12 +08:00
王嘉豪
32a2f673a6
Merge pull request #316 from dataease/pr@dev@fix_panel-drag-image-dev
fix:【仪表板】同一张图片无法连续两次被导入到仪表盘
2021-07-23 15:37:03 +08:00
wangjiahao
1826a7025b fix:【仪表板】同一张图片无法连续两次被导入到仪表盘 2021-07-23 15:35:38 +08:00
XiaJunjie2020
149fc98916
Merge pull request #314 from dataease/pr@dev@refactor_视图拖拽块增加placeholder
refactor: 视图拖拽块增加placeholder
2021-07-23 14:43:21 +08:00
junjie
0e56bea06f refactor: 视图拖拽块增加placeholder 2021-07-23 14:42:15 +08:00
王嘉豪
3895fec15d
Merge pull request #313 from dataease/fix_panel_edit_attr-auto-save
feat:组件样式修改时可以延迟保存组件镜像
2021-07-23 14:02:44 +08:00
wangjiahao
35c9802381 Merge remote-tracking branch 'origin/dev' into fix_panel_edit_attr-auto-save
# Conflicts:
#	frontend/src/components/canvas/components/RectangleAttr.vue
#	frontend/src/views/Tinymce/RectangleAttr.vue
#	frontend/src/views/system/task/TaskRecord.vue
#	frontend/src/views/system/task/dataset.vue
2021-07-23 14:00:28 +08:00
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
fit2cloud-chenyw
e74463a462
Merge pull request #310 from dataease/pr@v1.1@fix_消息跳转任务加载延时
fix: 消息跳转到同步任务记录后加载有延时
2021-07-23 13:39:35 +08:00
fit2cloud-chenyw
f40073a8ca fix: 消息跳转到同步任务记录后加载有延时 2021-07-23 13:35:27 +08:00
XiaJunjie2020
35dfa1b6d1
Merge pull request #308 from dataease/pr@dev@fix_编辑字段后全不选弹框报错
fix: 编辑字段全不选后弹框报错
2021-07-23 12:45:57 +08:00
junjie
065b334064 fix: 编辑字段全不选后弹框报错 2021-07-23 12:42:33 +08:00
fit2cloud-chenyw
6ab95f1cea
Merge pull request #307 from dataease/pr@dev@fix_v1.1冲突
fix: 合并冲突解决
2021-07-23 12:28:08 +08:00
fit2cloud-chenyw
bc06646e32 fix: 合并冲突解决 2021-07-23 12:20:15 +08:00
fit2cloud-chenyw
f1e3621fac fix: 合并v1.1fix 2021-07-23 12:18:05 +08:00
taojinlong
af5475465f
Merge pull request #301 from dataease/pr@dev@task
feat: 调整定时任务
2021-07-23 11:33:04 +08:00
taojinlong
0415c14c51 feat: 更改历史任务状态 2021-07-23 11:32:09 +08:00