Commit Graph

1812 Commits

Author SHA1 Message Date
taojinlong
0755babcff refactor: 版本升级 -> 1.1.0 2021-07-23 15:15:22 +08:00
fit2cloud-chenyw
a8959dc9f5 Merge branch 'v1.1' of fit2cloud:dataease/dataease into v1.1 2021-07-23 13:46:44 +08:00
XiaJunjie2020
c5541a6dfd
Merge pull request #311 from dataease/pr@v1.1@fix_数据集字段编辑后全不选弹框报错
fix: 编辑字段全不选后弹框报错
2021-07-23 13:45:50 +08:00
fit2cloud-chenyw
9fb4b4e295 fix: 消息跳转到同步任务记录后加载有延时 2021-07-23 13:44:56 +08:00
junjie
fae2900b15 fix: 编辑字段全不选后弹框报错 2021-07-23 13:42:53 +08:00
taojinlong
d6c6c17fb2 Merge branch 'v1.1' of github.com:dataease/dataease into v1.1 2021-07-23 12:05:12 +08:00
taojinlong
214b6f86f0 解决冲突 2021-07-23 11:59:19 +08:00
taojinlong
bdb4d839c3 feat: 更改历史任务状态 2021-07-23 11:52:13 +08:00
fit2cloud-chenyw
f8164dbf78
Merge pull request #305 from dataease/pr@v1.1@fix_数据集消息flyway
fix: 1.数据集同步消息跳转路由flyway;2.消息内容增加任务名称
2021-07-23 11:50:58 +08:00
fit2cloud-chenyw
5e07c423b1 fix: 1.数据集同步消息跳转路由flyway;2.消息内容增加任务名称 2021-07-23 11:48:33 +08:00
taojinlong
c66aa8130f feat: 调整定时任务 2021-07-23 11:42:08 +08:00
王嘉豪
45a4e90c75
Merge pull request #304 from dataease/pr@V1.1@fix_panel_edit-attr
fix:修复编辑过滤组件时,悬浮组件依然在遮罩上方
2021-07-23 11:34:22 +08:00
王嘉豪
25f6acecde
Merge pull request #303 from dataease/pr@v1.1@fix_panel_edit-havemove
fix:矩阵设计模式下点击一次组件也不需保存镜像
2021-07-23 11:32:15 +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
taojinlong
7285eb11bf feat: SAX 解析 excel 2021-07-21 15:11:58 +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
junjie
694022ad71 feat: 视图维度指标拖动区域文案细节优化 2021-07-20 13:35:48 +08:00
XiaJunjie2020
13b90feeb9
Merge pull request #262 from dataease/pr@dev@feat_视图过滤重新设计,支持单维度指标展示
feat: 视图过滤重新设计,支持单维度指标展示
2021-07-20 12:18:59 +08:00
junjie
7411ba40da feat: 视图过滤重新设计,支持单维度指标展示 2021-07-20 12:16:37 +08:00
XiaJunjie2020
e803a2cbfd
Merge pull request #261 from dataease/pr@dev@feat_过滤组件条件调整,视图界面调整
feat: 过滤组件条件调整,视图界面调整
2021-07-19 16:06:31 +08:00
junjie
c429821c5c feat: 过滤组件条件调整,视图界面调整 2021-07-19 16:04:51 +08:00
XiaJunjie2020
15cc4cef7c
Merge pull request #260 from dataease/pr@dev@feat_过滤组件调整
feat: 过滤组件条件调整
2021-07-19 15:51:01 +08:00
junjie
7957ac5a40 feat: 过滤组件条件调整 2021-07-19 15:47:23 +08:00
XiaJunjie2020
678b748d21
Merge pull request #257 from dataease/pr@dev@refactor_视图UI布局初步调整
refactor: 视图UI布局初步调整
2021-07-19 12:37:27 +08:00
junjie
5c4bb9f7c5 refactor: 视图UI布局初步调整 2021-07-19 12:36:25 +08:00
wangjiahao
f1e25099a7 fix:增加仪表板,视图等请求超时时间 2021-07-19 11:54:33 +08:00
fit2cloud-chenyw
e4c3da41a5
Merge pull request #255 from dataease/pr@dev@fix_恢复默认请求超时时间10s
fix: 默认请求超时时间10s
2021-07-19 11:28:25 +08:00
fit2cloud-chenyw
0589488167 fix: 默认请求超时时间10s 2021-07-19 11:24:18 +08:00
fit2cloud-chenyw
89dd680593
Merge pull request #254 from dataease/pr@dev@feat_禁止token续命白名单
feat: 前端增加token免续命白名单
2021-07-19 11:10:55 +08:00
fit2cloud-chenyw
aca2a9b19f feat: 前端增加token免续命白名单 2021-07-19 11:08:00 +08:00
王嘉豪
65c4b67e68
Merge pull request #253 from dataease/pr@dev@fix仪表板Mac-M1版电脑保存模板时失败的问题
fix:仪表板Mac M1版电脑保存模板时失败的问题
2021-07-16 17:55:51 +08:00
wangjiahao
a42e37aa47 fix:仪表板Mac M1版电脑保存模板时失败的问题 2021-07-16 17:55:00 +08:00
XiaJunjie2020
08a09f3217
Merge pull request #251 from dataease/pr@dev@fix_tree搜索后无法折叠
fix: tree搜索后无法折叠
2021-07-16 15:00:00 +08:00
junjie
e787aa235e fix: tree搜索后无法折叠 2021-07-16 14:59:01 +08:00
XiaJunjie2020
22a1694e16
Merge pull request #250 from dataease/pr@dev@feat_更换数据集确认按钮调整
feat: 更换数据集确认按钮调整
2021-07-16 12:42:56 +08:00
junjie
4f37bda3f8 feat: 更换数据集确认按钮调整 2021-07-16 12:42:04 +08:00
taojinlong
da17d8f19c
Merge pull request #248 from dataease/pr@dev@errorlog
feat: 适配oracle 11g
2021-07-15 18:33:51 +08:00
taojinlong
f9f74f072c feat: 适配oracle 11g 2021-07-15 18:32:39 +08:00
XiaJunjie2020
0a94d8f388
Merge pull request #247 from dataease/pr@dev@feat_视图增加默认padding
feat: 视图增加默认padding
2021-07-15 18:31:20 +08:00
junjie
7596debca6 feat: 视图增加默认padding 2021-07-15 18:30:16 +08:00