wangjiahao
|
3a58ab86a9
|
refactor:修改demo数据
|
2021-08-05 18:41:26 +08:00 |
|
taojinlong
|
6b5cc87141
|
feat: 新增示例数据
|
2021-08-05 16:43:29 +08:00 |
|
taojinlong
|
d77aa35d01
|
feat: 增加示例数据
|
2021-08-05 16:17:01 +08:00 |
|
taojinlong
|
9b87e1da88
|
feat: 新增示例数据
|
2021-08-05 15:57:39 +08:00 |
|
wangjiahao
|
8be040973e
|
refactor:删除仪表板的同时，清空画布数据
|
2021-08-05 15:27:09 +08:00 |
|
wangjiahao
|
bef9dc2446
|
refactor:修改demo数据日期格式
|
2021-08-05 14:25:19 +08:00 |
|
wangjiahao
|
dbfce8cc6f
|
Merge remote-tracking branch 'origin/v1.1' into v1.1
|
2021-08-05 13:45:43 +08:00 |
|
wangjiahao
|
c1554decd8
|
refactor:修改原仪表板数据示例
|
2021-08-05 13:45:27 +08:00 |
|
XiaJunjie2020
|
2c44af7d9d
|
Merge pull request #538 from dataease/pr@v1.1@refactor_指标卡样式设置优化
refactor: 指标卡样式选项优化
|
2021-08-05 11:25:43 +08:00 |
|
junjie
|
4d68e78f83
|
refactor: 指标卡样式选项优化
|
2021-08-05 11:24:53 +08:00 |
|
XiaJunjie2020
|
37aa3b93b0
|
Merge pull request #536 from dataease/pr@v1.1@refactor_颜色选择器更换为原生组件
refactor: 颜色选择器更换为原生组件
|
2021-08-05 11:07:00 +08:00 |
|
junjie
|
88f4a80171
|
refactor: 颜色选择器更换为原生组件
|
2021-08-05 11:05:55 +08:00 |
|
fit2cloud-chenyw
|
dbc59b4618
|
Merge pull request #530 from dataease/pr@v1.1@fix_flywaysql
fix: flywaysql去除navicat信息
|
2021-08-05 09:50:02 +08:00 |
|
fit2cloud-chenyw
|
5506e6961f
|
fix: flywaysql去除navicat信息
|
2021-08-05 09:44:37 +08:00 |
|
fit2cloud-chenyw
|
7fb330f390
|
Revert "fix: sql注入和xss攻击"
This reverts commit 5e34d52d6d.
|
2021-08-04 17:35:06 +08:00 |
|
fit2cloud-chenyw
|
cacd1b564e
|
Revert "fix: sql注入排除减号"
This reverts commit 6ba4cc0b38.
|
2021-08-04 17:33:47 +08:00 |
|
XiaJunjie2020
|
421debbecd
|
Merge pull request #519 from dataease/pr@v1.1@fix_sql注入排除减号
fix: sql注入排除减号
|
2021-08-04 16:46:25 +08:00 |
|
junjie
|
6ba4cc0b38
|
fix: sql注入排除减号
|
2021-08-04 16:43:00 +08:00 |
|
fit2cloud-chenyw
|
de00760f9b
|
Merge pull request #515 from dataease/pr@v1.1@fix_sql注入和xss攻击
fix: sql注入和xss攻击
|
2021-08-04 15:16:12 +08:00 |
|
fit2cloud-chenyw
|
5e34d52d6d
|
fix: sql注入和xss攻击
|
2021-08-04 15:14:47 +08:00 |
|
XiaJunjie2020
|
14c6963c52
|
Merge pull request #513 from dataease/pr@v1.1@refactor_tree菜单飘移优化
refactor: tree菜单位置飘移优化
|
2021-08-04 12:04:04 +08:00 |
|
junjie
|
ba1d20b07b
|
refactor: tree菜单位置飘移优化
|
2021-08-04 12:03:03 +08:00 |
|
taojinlong
|
9579d08b72
|
fix: 原始表添加列时，同步失败
|
2021-08-04 10:33:12 +08:00 |
|
taojinlong
|
2e888d3587
|
fix: 更新任务状态-> 执行结束
|
2021-08-03 18:58:17 +08:00 |
|
taojinlong
|
7f537ba1a6
|
fix: 没有经过全量更新不能进行增量更新，并记录日志
|
2021-08-03 18:30:51 +08:00 |
|
XiaJunjie2020
|
dcf5354afd
|
Merge pull request #504 from dataease/pr@v1.1@refactor_视图请求优化；数据集tree搜索修复
refactor: 去掉多余请求;数据集tree修复
|
2021-08-03 17:02:08 +08:00 |
|
junjie
|
38838e3162
|
refactor: 去掉多余请求;数据集tree修复
|
2021-08-03 17:01:16 +08:00 |
|
taojinlong
|
5eaaa236f1
|
fix: 查询任务日志
|
2021-08-03 15:53:35 +08:00 |
|
taojinlong
|
703e2ded1e
|
Merge branch 'v1.1' of github.com:dataease/dataease into v1.1
|
2021-08-03 15:37:45 +08:00 |
|
taojinlong
|
673f4ea4a6
|
feat: 优化任务状态的切换
|
2021-08-03 15:37:32 +08:00 |
|
王嘉豪
|
05210694af
|
Merge pull request #487 from dataease/pr@dev@fix_panel-style-change-save
fix:仪表板样式修改保存按钮还是灰的问题
|
2021-08-03 13:22:05 +08:00 |
|
wangjiahao
|
afbad86b93
|
fix:仪表板样式修改保存按钮还是灰的问题
|
2021-08-03 13:18:21 +08:00 |
|
XiaJunjie2020
|
a48ee0155a
|
Merge pull request #482 from dataease/pr@v1.1@fix_雷达图数据结构
fix: 雷达图数据结构
|
2021-08-03 11:48:39 +08:00 |
|
junjie
|
d188ac0eeb
|
fix: 雷达图数据结构
|
2021-08-03 11:47:51 +08:00 |
|
XiaJunjie2020
|
091c8d4507
|
Merge pull request #481 from dataease/pr@v1.1@fix_标签引导线修复
fix: 标签引导线修复
|
2021-08-03 11:34:03 +08:00 |
|
junjie
|
4dd89219e3
|
fix: 标签引导线修复
|
2021-08-03 11:33:26 +08:00 |
|
fit2cloud-chenyw
|
dc789916a4
|
Merge pull request #479 from dataease/pr@v1.1@fix_解决冲突
fix: 解决冲突
|
2021-08-03 11:23:45 +08:00 |
|
fit2cloud-chenyw
|
cdb383b529
|
fix: 解决冲突
|
2021-08-03 11:22:44 +08:00 |
|
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 |
|