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 |
|
wangjiahao
|
b2ea0c7123
|
fix:修复编辑过滤组件时，悬浮组件依然在遮罩上方
|
2021-07-23 11:30:33 +08:00 |
|
wangjiahao
|
747e79ebe9
|
fix:矩阵设计模式下点击一次组件也不需保存镜像
|
2021-07-23 11:26:40 +08:00 |
|
王嘉豪
|
364c748d5f
|
Merge pull request #302 from dataease/pr@dev@fix_panel_edit-matrix
fix:矩阵设计模式下点击一次组件也不需保存镜像
|
2021-07-23 11:14:32 +08:00 |
|
wangjiahao
|
01c4684e01
|
fix:矩阵设计模式下点击一次组件也不需保存镜像
|
2021-07-23 11:12:54 +08:00 |
|
taojinlong
|
4b2f68b484
|
feat: 调整定时任务
|
2021-07-23 10:54:44 +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 |
|
XiaJunjie2020
|
18a24f8e2d
|
Merge pull request #300 from dataease/pr@dev@fix_视图中数据集字段
fix: 视图中数据集字段
|
2021-07-23 10:45:57 +08:00 |
|
junjie
|
e73d004fd8
|
fix: 视图中数据集字段
|
2021-07-23 10:44:48 +08:00 |
|
XiaJunjie2020
|
18893dad69
|
Merge pull request #299 from dataease/pr@dev@fix_视图中数据集字段获取
fix: 视图中数据集字段获取
|
2021-07-23 10:22:51 +08:00 |
|
junjie
|
30c00ec79a
|
fix: 视图中数据集字段获取
|
2021-07-23 10:21:22 +08:00 |
|
XiaJunjie2020
|
589d7aa2b9
|
Merge pull request #298 from dataease/pr@dev@fix_rollback
fix: 回退
|
2021-07-22 19:35:31 +08:00 |
|
junjie
|
b2c45730f9
|
fix: 回退
|
2021-07-22 19:34:16 +08:00 |
|
XiaJunjie2020
|
d45916181c
|
Merge pull request #297 from dataease/pr@dev@feat_视图增加数据集权限校验
fix: 视图中数据集权限校验
|
2021-07-22 19:00:27 +08:00 |
|
junjie
|
b7936b91f9
|
fix: 视图中数据集权限校验
|
2021-07-22 18:59:36 +08:00 |
|
fit2cloud-chenyw
|
06e1fbde14
|
Merge pull request #296 from dataease/pr@dev@fix_数据集消息跳转
fix: 修复跳转后菜单不打开
|
2021-07-22 18:36:53 +08:00 |
|
fit2cloud-chenyw
|
c7c1ac02e8
|
fix: 修复跳转后菜单不打开
|
2021-07-22 18:34:27 +08:00 |
|
XiaJunjie2020
|
e4ccd75c68
|
Merge pull request #295 from dataease/pr@dev@refactor_颜色选择器更换element自带组件
refactor: 颜色选择器更换element自带组件
|
2021-07-22 18:32:11 +08:00 |
|
junjie
|
f11bb8305d
|
refactor: 颜色选择器更换element自带组件
|
2021-07-22 18:31:18 +08:00 |
|
XiaJunjie2020
|
3e9b4275fe
|
Merge pull request #294 from dataease/pr@dev@refactor_视图样式界面调整
fix: 数据集权限问题导致视图没有字段
|
2021-07-22 18:24:31 +08:00 |
|
junjie
|
6903d30de0
|
fix: 数据集权限问题导致视图没有字段
|
2021-07-22 18:23:33 +08:00 |
|
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 |
|