Commit Graph

1818 Commits

Author SHA1 Message Date
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
王嘉豪
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
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
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