Commit Graph

6133 Commits

Author SHA1 Message Date
taojinlong
ad233b2881 Merge branch 'v1.12' into dev 2022-07-04 00:46:11 +08:00
taojinlong
09557ac539 Merge branch 'v1.12' of github.com:dataease/dataease into v1.12 2022-07-04 00:45:34 +08:00
taojinlong
f5c8c5422e fix(数据集): 数据集参数传递支持 IN 2022-07-04 00:45:03 +08:00
taojinlong
4474970b2d fix(数据源): 超时时间无法修改 2022-07-03 22:02:01 +08:00
fit2cloud-chenyw
43b406ce08 fix(仪表板): 下拉过滤器排序字段出现sql注入参数后依然能够点击确认 2022-07-03 21:46:26 +08:00
fit2cloud-chenyw
9130a7c0a3
Merge pull request #2559 from dataease/pr@dev@fix_select_sql_inject
fix(仪表板): 下拉过滤器排序字段出现sql注入参数后依然能够点击确认
2022-07-03 21:44:36 +08:00
fit2cloud-chenyw
7aa833d048 fix(仪表板): 下拉过滤器排序字段出现sql注入参数后依然能够点击确认 2022-07-03 21:43:38 +08:00
fit2cloud-chenyw
b9d989b4f2 fix(仪表板): 下拉过滤器选择多字段枚举值出现空白选项 2022-07-03 21:23:43 +08:00
fit2cloud-chenyw
da9d8d19ae
Merge pull request #2558 from dataease/pr@dev@fix_el_select_mult_field
fix(仪表板): 下拉过滤器选择多字段枚举值出现空白选项
2022-07-03 21:22:34 +08:00
fit2cloud-chenyw
66d2cb157e fix(仪表板): 下拉过滤器选择多字段枚举值出现空白选项 2022-07-03 21:21:33 +08:00
dataeaseShu
c3b3c47bbb
Merge pull request #2557 from dataease/pr@dev_filter_position_style
fix: 修复过滤组件不同状态初始化 位置设置不生效 以及下拉框和下拉树 多选时tag 标签样式不生效问题
2022-07-01 18:23:25 +08:00
dataeaseShu
7105c6a405 fix: 修复过滤组件不同状态初始化 位置设置不生效 以及下拉框和下拉树 多选时tag 标签样式不生效问题 2022-07-01 18:22:51 +08:00
taojinlong
c100179997 refactor(数据集): 解决冲突 2022-07-01 18:19:14 +08:00
taojinlong
99866c8df4 fix(数据集): sql 变量管理按钮丢失 2022-07-01 18:16:02 +08:00
taojinlong
27c4247e9a Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-01 18:11:15 +08:00
taojinlong
969b3d2fcf feat(数据集): 参数值只在编辑 sql 时生效 2022-07-01 18:11:06 +08:00
王嘉豪
06e6297109
Merge pull request #2556 from dataease/pr@dev@refactor_canvase-clear
refactor(仪表板): 仪表板清除画布只清理组件数据保留仪表板画布当前样式
2022-07-01 17:54:10 +08:00
wangjiahao
ab9895f468 refactor(仪表板): 仪表板清除画布只清理组件数据保留仪表板画布当前样式 2022-07-01 17:53:24 +08:00
王嘉豪
28b01bf588
Merge pull request #2555 from dataease/dev
dev merge
2022-07-01 17:49:49 +08:00
王嘉豪
4b74acc128
Merge pull request #2554 from dataease/pr@dev@fix_edit-unpublished
fix(仪表板): 修复下架有权限的仪表板,编辑预览时提示已下架问题
2022-07-01 17:48:45 +08:00
wangjiahao
6f7dd7dd7a fix(仪表板): 修复下架有权限的仪表板,编辑预览时提示已下架问题 2022-07-01 17:47:52 +08:00
taojinlong
8d13c10d97 fix(API): 去掉默认 http client 请求头 2022-07-01 17:43:29 +08:00
taojinlong
94871bdbc3 fix(抽取数据): 调整 doris 建表语句 2022-07-01 17:34:11 +08:00
taojinlong
77592e9a01 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-01 17:11:16 +08:00
王嘉豪
400b1c7878
Merge pull request #2553 from dataease/pr@dev@fix_bar-max-show
fix(视图): 横向柱状图最大值输入不了数据问题
2022-07-01 17:10:33 +08:00
taojinlong
883c54b3c5 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-01 17:09:25 +08:00
taojinlong
3a8fb1de26 fix(抽取数据): 调整 doris 建表语句 2022-07-01 17:09:16 +08:00
wangjiahao
38d832448f fix(视图): 横向柱状图最大值输入不了数据问题 2022-07-01 17:07:26 +08:00
王嘉豪
ac6b43ed3e
Merge pull request #2552 from dataease/pr@dev@refactor_tab-enlarge
refactor(仪表板): 卡片组件内部视图增加放大功能
2022-07-01 16:59:33 +08:00
wangjiahao
998369e920 refactor(仪表板): 卡片组件内部视图增加放大功能 2022-07-01 16:57:02 +08:00
dataeaseShu
55eae355a5
Merge pull request #2551 from dataease/pr@dev_filter_visu
fix(修复过滤组件添加虚拟化功能后,导致的自定义样式不生效):
2022-07-01 16:50:47 +08:00
dataeaseShu
c81e7f1852 fix(修复过滤组件添加虚拟化功能后,导致的自定义样式不生效): 2022-07-01 16:50:05 +08:00
fit2cloud-chenyw
ca52139c3c
Merge pull request #2550 from dataease/pr@dev@fix_symoel_map_table_detail
fix(视图): 符号地图查看数据明细样式错位
2022-07-01 16:43:09 +08:00
fit2cloud-chenyw
19804617ea fix(视图): 符号地图查看数据明细样式错位 2022-07-01 16:41:54 +08:00
taojinlong
c4afe835dd fix(数据集): SQL 变量管理的按钮挤占到下一行 2022-07-01 16:39:06 +08:00
fit2cloud-chenyw
b5e7e27275
Merge pull request #2549 from dataease/pr@dev@fix_number_select_param
fix: 数字下拉参数无法显示
2022-07-01 13:58:44 +08:00
fit2cloud-chenyw
947328063e fix: 数字下拉参数无法显示 2022-07-01 13:57:57 +08:00
王嘉豪
56824de37a
Merge pull request #2548 from dataease/pr@dev@fix_table-not-show
fix: 部分表格组件放大不显示问题
2022-07-01 13:55:12 +08:00
wangjiahao
11e5919719 fix: 部分表格组件放大不显示问题 2022-07-01 13:54:24 +08:00
王嘉豪
a6ca784dfc
Merge pull request #2546 from dataease/dev
merge dev
2022-07-01 12:25:52 +08:00
王嘉豪
da03efd1ec
Merge pull request #2545 from dataease/pr@dev@refactor_template-static
refactor: 优化模板使用,上传模板时模板预览图片使用静态文件存储
2022-07-01 12:24:37 +08:00
wangjiahao
59e771d605 refactor: 优化模板使用,上传模板时模板预览图片使用静态文件存储 2022-07-01 12:23:39 +08:00
taojinlong
dc89c6935b Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-01 11:31:29 +08:00
taojinlong
84bfda9332 fix: sql 变量 2022-07-01 11:31:18 +08:00
王嘉豪
94d686f1f1
Merge pull request #2544 from dataease/pr@dev@fix_echarts-rader
fix: echarts雷达图没有指标
2022-07-01 11:15:59 +08:00
wangjiahao
397b9da6db fix: echarts雷达图没有指标 2022-07-01 11:14:03 +08:00
王嘉豪
a2148e9dd5
Merge pull request #2542 from dataease/dev
dev->v1.12
2022-07-01 10:41:58 +08:00
王嘉豪
459b0d49c2
Merge pull request #2541 from dataease/pr@dev@refactor_slow-sql
refactor: 优惠插件菜单同步慢sql
2022-07-01 10:38:39 +08:00
wangjiahao
d1d116e86d refactor: 优惠插件菜单同步慢sql 2022-07-01 10:34:27 +08:00
taojinlong
b6fa97383a fix: sql 变量 2022-06-30 22:18:25 +08:00