Commit Graph

1726 Commits

Author SHA1 Message Date
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
王嘉豪
5c15ac930f
Merge pull request #246 from dataease/pr@dev@panel
feat:增加过滤组件标题样式设置
2021-07-15 16:32:13 +08:00
wangjiahao
f9695bbe8d feat:增加过滤组件标题样式设置 2021-07-15 16:22:42 +08:00
fit2cloud-chenyw
33af016eaa
Merge pull request #245 from dataease/pr@dev@fix_过滤器弹框组件样式优化
fix: 过滤组件弹框样式错位
2021-07-15 15:20:46 +08:00
fit2cloud-chenyw
c2a0925d02 fix: 去除无用import 2021-07-15 15:16:38 +08:00
fit2cloud-chenyw
ad20039851 fix: 过滤组件弹框样式错位 2021-07-15 15:11:17 +08:00
XiaJunjie2020
d51029bcbe
Merge pull request #244 from dataease/pr@dev@feat_同数据源直连数据集支持数据关联
feat: 同数据源直连数据集之间支持数据关联
2021-07-15 14:38:16 +08:00
junjie
9c6c162e67 feat: 同数据源直连数据集之间支持数据关联 2021-07-15 14:37:01 +08:00
taojinlong
a4c7527a99
Merge pull request #243 from dataease/pr@dev@errorlog
fix: 抽取数据的错误日志
2021-07-15 11:32:45 +08:00
taojinlong
f527eefef0 fix: 抽取数据的错误日志 2021-07-15 11:30:40 +08:00
XiaJunjie2020
f8bc421ab8
Merge pull request #242 from dataease/pr@dev@feat_同数据源直连数据集之间支持数据关联
feat: 同数据源直连数据集之间支持数据关联
2021-07-15 11:09:13 +08:00
junjie
a68323de2f feat: 同数据源直连数据集之间支持数据关联 2021-07-15 11:05:11 +08:00
王嘉豪
1d927404d9
Merge pull request #241 from dataease/pr@dev@panel
fix:仪表板全屏预览过滤组件下拉框不显示问题
2021-07-15 09:57:53 +08:00
wangjiahao
f35cbc166b fix:仪表板全屏预览过滤组件下拉框不显示问题 2021-07-15 09:57:10 +08:00
taojinlong
a032fe9c88
Merge pull request #239 from dataease/pr@dev@errorlog
fix: 只打印错误日志
2021-07-14 18:40:09 +08:00
taojinlong
ae32cba668 fix: 只打印错误日志 2021-07-14 18:37:15 +08:00
fit2cloud-chenyw
ffd429c675
Merge pull request #238 from dataease/pr@dev@feat_仪表板条件组件标题
feat: 新增外部标题组件
2021-07-14 17:07:39 +08:00
fit2cloud-chenyw
644a0b7c4b feat: 新增外部标题组件 2021-07-14 17:06:39 +08:00
fit2cloud-chenyw
53e3d938d6
Merge pull request #237 from dataease/pr@dev@feat_仪表板条件组件标题
feat: 仪表板条件过滤组件增加标题
2021-07-14 17:05:27 +08:00
fit2cloud-chenyw
dfd0f04698 feat: 仪表板条件过滤组件增加标题 2021-07-14 16:58:07 +08:00
王嘉豪
aa99b45cf5
Merge pull request #235 from dataease/pr@dev@panel
feat:增加仪表板编辑餐单文案
2021-07-14 12:08:51 +08:00
wangjiahao
98e62eb07a feat:增加仪表板编辑餐单文案 2021-07-14 11:29:06 +08:00
王嘉豪
a10d4372c9
Merge pull request #234 from dataease/pr@dev@panel
feat:创建分组或者仪表板时,点击取消按钮,不发出目录树的请求
2021-07-14 10:55:28 +08:00
wangjiahao
39d5ea5aa5 feat:创建分组或者仪表板时,点击取消按钮,不发出目录树的请求 2021-07-14 10:53:47 +08:00
fit2cloud-chenyw
090d00534b
Merge pull request #233 from dataease/pr@dev@fix_flyway版本
fix: flyway版本号
2021-07-13 19:01:38 +08:00
fit2cloud-chenyw
9425ef38ec fix: flyway版本号 2021-07-13 19:00:03 +08:00
fit2cloud-chenyw
b7683b2503
Merge pull request #232 from dataease/pr@dev@feat_map
feat: 添加测试地图
2021-07-13 18:54:33 +08:00
fit2cloud-chenyw
84808a6e96 feat: 添加测试地图 2021-07-13 18:44:33 +08:00
taojinlong
8d144a4868
Merge pull request #231 from dataease/pr@dev@fix-task
fix: 执行记录状态修改;执行记录显示错误;简单执行增加描述
2021-07-13 18:35:07 +08:00
taojinlong
e42b8b73ab fix: 执行记录状态修改;执行记录显示错误;简单执行增加描述 2021-07-13 18:34:17 +08:00
王嘉豪
bfdb77fa8d
Merge pull request #230 from dataease/pr@dev@panel
feat:仪表板编辑不再使用右键操作,统一在组件右上角添加设置入口
2021-07-13 18:13:43 +08:00
wangjiahao
b11db93328 feat:仪表板编辑不再使用右键操作,统一在组件右上角添加设置入口 2021-07-13 18:11:42 +08:00
XiaJunjie2020
eaea27ea3d
Merge pull request #229 from dataease/pr@dev@feat_数据关联关系修改
feat: 数据关联改为左连接等方式
2021-07-13 15:58:43 +08:00
junjie
54820d6746 feat: 数据关联改为左连接等方式 2021-07-13 15:55:22 +08:00
XiaJunjie2020
0188ca497c
Merge pull request #223 from dataease/pr@dev@feat_excel上传后可修改字段类型再保存
feat: excel上传后可编辑字段类型再保存
2021-07-13 12:33:13 +08:00
junjie
ccd07cc85a feat: excel上传后可编辑字段类型再保存 2021-07-13 12:32:20 +08:00
王嘉豪
5a2a5830b1
Merge pull request #222 from dataease/pr@dev@panel
feat:编辑保存,放大效果等文案修改
2021-07-13 12:13:48 +08:00