Commit Graph

1928 Commits

Author SHA1 Message Date
fit2cloud-chenyw
fce416e60e
Merge pull request #478 from dataease/pr@v1.1@refactor_token过期提示弹框
refactor: 优化token过期提示框
2021-08-03 11:18:58 +08:00
fit2cloud-chenyw
0fcef89247
Merge branch 'v1.1' into pr@v1.1@refactor_token过期提示弹框 2021-08-03 11:18:29 +08:00
fit2cloud-chenyw
45f26735e5 refactor: 优化token过期提示框 2021-08-03 11:12:35 +08:00
taojinlong
9d2d51b7a2 Merge branch 'v1.1' of github.com:dataease/dataease into v1.1 2021-08-03 11:09:12 +08:00
taojinlong
722aa6ca8a feat: 登录过期弹框->重新登录;优化任务日志查询 2021-08-03 11:08:57 +08:00
XiaJunjie2020
fa94b6e09f
Merge pull request #475 from dataease/pr@v1.1@fix_雷达图tooltip
fix: 雷达图tooltip
2021-08-03 10:58:49 +08:00
junjie
024f48b46b fix: 雷达图tooltip 2021-08-03 10:57:52 +08:00
fit2cloud-chenyw
f1c46e5b51
Merge pull request #473 from dataease/pr@v1.1@fix_资源权限逻辑错误
fix: 资源权限逻辑错误
2021-08-03 09:50:11 +08:00
fit2cloud-chenyw
ca02eb904c fix: 资源权限逻辑错误 2021-08-03 09:46:56 +08:00
taojinlong
fd779d628d fix: 执行问任务后删除文件 2021-08-02 21:19:12 +08:00
taojinlong
84807396a5 Merge branch 'v1.1' of github.com:dataease/dataease into v1.1 2021-08-02 18:36:22 +08:00
taojinlong
4caa2f8432 feat: 可配置kettle 相关的文件是否保留 2021-08-02 18:33:43 +08:00
fit2cloud-chenyw
b8dc616997 fix: token过期点击确定没有跳转到登录 2021-08-02 18:30:35 +08:00
XiaJunjie2020
b68497807a
Merge pull request #468 from dataease/pr@v1.1@fix_关联字段选择数据集及时刷新
fix: 关联字段数据集及时刷新
2021-08-02 18:21:49 +08:00
junjie
e6cb7e7d7a fix: 关联字段数据集及时刷新 2021-08-02 18:21:01 +08:00
taojinlong
d0b8d42ca6 Merge branch 'v1.1' of github.com:dataease/dataease into v1.1 2021-08-02 18:10:02 +08:00
taojinlong
88d0b0f80c fix: 校验增量更新sql 2021-08-02 18:09:20 +08:00
XiaJunjie2020
420d33fcd1
Merge pull request #464 from dataease/pr@v1.1@fix_视图维度指标显示错误
fix: 视图维度指标显示错误
2021-08-02 17:15:12 +08:00
junjie
c66a9c49ee fix: 视图维度指标显示错误 2021-08-02 17:14:22 +08:00
taojinlong
9bffc6a25d Merge branch 'v1.1' of github.com:dataease/dataease into v1.1 2021-08-02 16:35:59 +08:00
taojinlong
5d109c0b21 fix: 更新任务状态 2021-08-02 16:35:08 +08:00
XiaJunjie2020
bd19953a75
Merge pull request #462 from dataease/pr@v1.1@refactor_左侧tree暂时优化
refactor: tree编辑后右侧界面保持原状态
2021-08-02 16:27:14 +08:00
junjie
b9f3d0c41c refactor: tree编辑后右侧界面保持原状态 2021-08-02 16:26:19 +08:00
XiaJunjie2020
9d6a066d90
Merge pull request #460 from dataease/pr@v1.1@refactor_视图控制台报错;tree编辑后右侧界面保持原状态
refactor: 视图控制台报错;tree编辑后右侧界面保持原状态
2021-08-02 15:58:51 +08:00
junjie
8f68ad7336 refactor: 视图控制台报错;tree编辑后右侧界面保持原状态 2021-08-02 15:58:03 +08:00
fit2cloud-chenyw
4dea5ceda1
Merge pull request #458 from dataease/pr@v1.1@fix_去除已读消息搜索
fix: 去除已读消息搜索
2021-08-02 15:39:08 +08:00
fit2cloud-chenyw
7c4a1c5961 fix: 去除已读消息搜索 2021-08-02 15:37:47 +08:00
fit2cloud-chenyw
b011f9822e
Merge pull request #457 from dataease/pr@v1.1@fix_仪表板公共链接
fix: 公共链接分享未启用密码保护出现空白页面
2021-08-02 15:25:24 +08:00
fit2cloud-chenyw
4af3d69cfc fix: 公共链接分享未启用密码保护出现空白页面 2021-08-02 15:24:09 +08:00
taojinlong
d92452b3f6 Merge branch 'v1.1' of github.com:dataease/dataease into v1.1 2021-08-02 13:39:05 +08:00
taojinlong
956f9b45f4 fix: 处理 excel 公式错误 2021-08-02 13:38:56 +08:00
王嘉豪
d81eb8f476
Merge pull request #453 from dataease/pr@v1.1@refactor_change_timeout
refactor:修改整体查询超时时间为20s,增加部分api超时时间
2021-08-02 10:50:16 +08:00
wangjiahao
a376245400 refactor:修改整体查询超时时间为20s,增加部分api超时时间 2021-08-02 10:48:44 +08:00
taojinlong
c94ec45503 feat: 优化查询任务日志 2021-08-01 23:19:13 +08:00
taojinlong
9a68bbe9a6 feat: 优化查询任务日志 2021-08-01 15:48:48 +08:00
taojinlong
6baf1953c7 Merge branch 'v1.1' of github.com:dataease/dataease into v1.1 2021-08-01 15:11:58 +08:00
taojinlong
097e55fb8d feat: 优化查询任务日志 2021-08-01 15:11:36 +08:00
XiaJunjie2020
741f2a4ebc
Merge pull request #448 from dataease/pr@v1.1@fix_tree搜索
fix: tree搜索
2021-07-31 16:56:59 +08:00
junjie
32b19e2cdb fix: tree搜索 2021-07-31 16:55:34 +08:00
XiaJunjie2020
2c4e1d9d1e
Merge pull request #446 from dataease/pr@v1.1@fix_tree搜索
fix: tree搜索
2021-07-31 16:16:07 +08:00
junjie
557e4c6294 fix: tree搜索 2021-07-31 16:13:20 +08:00
XiaJunjie2020
e328260402
Merge pull request #445 from dataease/pr@v1.1@fix_视图表格组件行高优化
fix: 视图表格组件行高优化
2021-07-30 19:27:04 +08:00
junjie
03659d9316 fix: 视图表格组件行高优化 2021-07-30 19:26:15 +08:00
XiaJunjie2020
a70c64ced1
Merge pull request #443 from dataease/pr@v1.1@refactor_视图tree优化
refactor: 视图分组tree优化
2021-07-30 18:43:08 +08:00
junjie
ef53ff5ca5 refactor: 视图分组tree优化 2021-07-30 18:42:17 +08:00
XiaJunjie2020
a11eefa560
Merge pull request #441 from dataease/pr@v1.1@refactor_视图提示文案修改
refactor: 视图提示文案修改
2021-07-30 18:19:10 +08:00
junjie
5f002fc5df refactor: 视图提示文案修改 2021-07-30 18:18:13 +08:00
XiaJunjie2020
aa6a66b3d2
Merge pull request #440 from dataease/pr@v1.1@fix_数据集接口请求时间调整;视图tree优化
refactor: 视图tree增加分组默认展开;数据集数据预览接口请求时间延长
2021-07-30 18:09:57 +08:00
junjie
6f0d7721fb refactor: 视图tree增加分组默认展开;数据集数据预览接口请求时间延长 2021-07-30 18:08:59 +08:00
XiaJunjie2020
fa7a3b369e
Merge pull request #435 from dataease/pr@v1.1@fix_doris类型转换
fix: doris类型转换
2021-07-30 16:09:20 +08:00