Commit Graph

2367 Commits

Author SHA1 Message Date
王嘉豪
f87ac3cabc
Merge pull request #549 from dataease/pr@dev@feat_panel-linkage-set
feat:仪表板联动设置浮层
2021-08-06 17:25:14 +08:00
wangjiahao
d46a40dcd2 feat:仪表板联动设置浮层 2021-08-06 17:24:17 +08:00
XiaJunjie2020
4f81ca0f40
Merge pull request #548 from dataease/pr@dev@refactor_scatter优化
refactor: scatter优化
2021-08-06 16:47:04 +08:00
junjie
f8980b59e2 refactor: scatter优化 2021-08-06 16:40:48 +08:00
XiaJunjie2020
21a1b6803a
Merge pull request #547 from dataease/pr@dev@feat_散点图、气泡图
feat: 散点图、气泡图
2021-08-06 16:16:50 +08:00
junjie
911573673b feat: 散点图、气泡图 2021-08-06 16:15:59 +08:00
taojinlong
4ec3cdb68d Merge branch 'dev' into pr@dev@sqlserver 2021-08-06 12:25:22 +08:00
taojinlong
c983b661ff feat: sqlserver 2021-08-06 12:19:25 +08:00
xuwei-fit2cloud
9ec5e80880 chore: 修改工程属性 2021-08-06 10:27:57 +08:00
taojinlong
1b26790db3 refactor: 恢复覆盖的sql 2021-08-06 10:25:59 +08:00
taojinlong
74b849d0b9 feat: sqlserver 2021-08-06 10:21:50 +08:00
wangjiahao
7598584b07 Merge remote-tracking branch 'origin/dev' into dev 2021-08-05 18:42:03 +08:00
wangjiahao
49ce82cac7 refactor:临时提交 2021-08-05 18:41:47 +08:00
taojinlong
a72c679631 feat: 新增示例数据 2021-08-05 17:58:45 +08:00
wangjiahao
3a2bb24ca8 refactor:设置弹出框优化 2021-08-05 16:54:47 +08:00
wangjiahao
ea72141d45 refactor:代码回退 2021-08-05 14:02:39 +08:00
wangjiahao
9e609dae00 Merge remote-tracking branch 'origin/dev' into dev 2021-08-05 13:48:07 +08:00
wangjiahao
ad42815ca2 refactor:图片修改为自适应,不保持宽高比例 2021-08-05 13:47:48 +08:00
taojinlong
ddb6e767fd feat: sqlserver 2021-08-05 13:43:33 +08:00
王嘉豪
c1a4d084db
Merge pull request #539 from dataease/pr@dev@fix_panel-image
refactor:优化联动设置
2021-08-05 13:33:42 +08:00
wangjiahao
4838839e2b refactor:优化联动设置 2021-08-05 13:31:31 +08:00
XiaJunjie2020
4b71d5e81d
Merge pull request #537 from dataease/pr@dev@refactor_指标卡样式选项优化
refactor: 指标卡样式选项优化
2021-08-05 11:19:57 +08:00
junjie
5ae6475da7 refactor: 指标卡样式选项优化 2021-08-05 11:19:06 +08:00
XiaJunjie2020
a58fa5bbb7
Merge pull request #534 from dataease/pr@dev@fix_恢复flyway误删
fix: 恢复flyway误删
2021-08-05 10:20:47 +08:00
fit2cloud-chenyw
a4abd9deb4
Merge pull request #533 from dataease/pr@dev@refactor_dockerfile_version
refactor: Dockerfile中version改为动态
2021-08-05 10:20:41 +08:00
junjie
41259ae347 fix: 恢复flyway误删 2021-08-05 10:19:58 +08:00
fit2cloud-chenyw
d4e3fb938d refactor: Dockerfile中version改为动态 2021-08-05 10:19:31 +08:00
fit2cloud-chenyw
97366b448a
Merge pull request #532 from dataease/pr@dev@feat_modify_version
feat: dev版本号升1.2.0
2021-08-05 10:12:12 +08:00
fit2cloud-chenyw
ed0f59097a feat: dev版本号升1.2.0 2021-08-05 10:11:00 +08:00
fit2cloud-chenyw
8c480310f7
Merge pull request #531 from dataease/pr@dev@fix_删除重复flyway
fix: flywaysql去除重复信息
2021-08-05 09:50:24 +08:00
fit2cloud-chenyw
d51a1c46b0 fix: flywaysql去除重复信息 2021-08-05 09:49:19 +08:00
王嘉豪
ecc6ea53ff
Merge pull request #527 from dataease/pr@dev@refactor_panel-likage-show
refactor:仪表板联动目标视图获取方式优化
2021-08-04 21:46:22 +08:00
wangjiahao
9dd6e403c6 refactor:仪表板联动目标视图获取方式优化 2021-08-04 21:44:50 +08:00
taojinlong
dfe654c547 feat: sqlserver 2021-08-04 21:27:37 +08:00
fit2cloud-chenyw
4807a51e0f
Merge pull request #526 from dataease/pr@dev@fix_sql注入白名单
fix: 增加sql注入白名单;sql注入拦截器只验证排序字段
2021-08-04 18:12:48 +08:00
fit2cloud-chenyw
c64343a289 fix: 增加sql注入白名单;sql注入拦截器只验证排序字段 2021-08-04 18:11:37 +08:00
XiaJunjie2020
c419c1fec4
Merge pull request #525 from dataease/pr@dev@feat_视图下钻
feat: 视图下钻
2021-08-04 18:08:03 +08:00
junjie
2d9b13570d feat: 视图下钻 2021-08-04 18:07:06 +08:00
王嘉豪
d0e18a54d7
Merge pull request #523 from dataease/pr@dev@feat_panel-linkage
Pr@dev@feat panel linkage
2021-08-04 17:01:21 +08:00
wangjiahao
6bfb5a74c1 Merge branch 'pr@dev@feat_panel-linkage' of github.com:dataease/dataease into feat_panel-linkage 2021-08-04 17:00:29 +08:00
wangjiahao
b09a935a06 refactor:增加视图联动相关表结构等 2021-08-04 16:57:16 +08:00
王嘉豪
ac8c4aa117
Merge pull request #522 from dataease/pr@dev@feat_panel-linkage
feat:仪表板联动增加源联动视图虚化样式,过滤非视图组件等
2021-08-04 16:54:30 +08:00
王嘉豪
c856d1c91d
Merge branch 'dev' into pr@dev@feat_panel-linkage 2021-08-04 16:54:22 +08:00
wangjiahao
1c91e0e831 feat:仪表板联动增加源联动视图虚化样式,过滤非视图组件等 2021-08-04 16:52:49 +08:00
XiaJunjie2020
958cbabb6f
Merge pull request #521 from dataease/pr@dev@feat_视图钻取
feat: 视图钻取
2021-08-04 16:50:55 +08:00
XiaJunjie2020
bbb80f1210
Merge pull request #520 from dataease/pr@dev@fix_sql注入排除减号
fix: sql注入排除减号
2021-08-04 16:48:40 +08:00
junjie
05e9f8274e fix: sql注入排除减号 2021-08-04 16:47:11 +08:00
junjie
68a80e2cc8 feat: 视图钻取 2021-08-04 16:40:53 +08:00
fit2cloud-chenyw
2f06f3720e fix: sql注入和xss攻击 2021-08-04 15:18:12 +08:00
XiaJunjie2020
44845c3a60
Merge pull request #512 from dataease/pr@dev@refactor_tree菜单位置飘移优化
refactor: tree菜单位置飘移优化
2021-08-04 11:58:26 +08:00