Commit Graph

2695 Commits

Author SHA1 Message Date
XiaJunjie2020
bd361131f1
Merge pull request #736 from dataease/pr@dev@feat_chart_mix
feat: 视图增加组合图
2021-08-31 17:17:00 +08:00
junjie
5b83a779f5 feat: 视图增加组合图 2021-08-31 17:15:20 +08:00
taojinlong
3d118a7119 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-31 16:57:14 +08:00
taojinlong
4b20298adc fix: oracle 时间转换 2021-08-31 16:57:01 +08:00
fit2cloud-chenyw
90abc434d4 fix: 个人信息表单中角色信息展示错误 2021-08-31 16:33:45 +08:00
fit2cloud-chenyw
0cbe6b4160
Merge pull request #735 from dataease/pr@v1.2@fix_personinfo_role_error
fix: 个人信息表单中角色信息展示错误
2021-08-31 16:29:40 +08:00
fit2cloud-chenyw
3b05a56aa9 fix: 个人信息表单中角色信息展示错误 2021-08-31 16:28:42 +08:00
fit2cloud-chenyw
e4480d1f7b fix: 日期组件必须点左侧挂件才能弹出日期 2021-08-31 16:18:56 +08:00
fit2cloud-chenyw
efd215cad4 fix: 收藏列表仪表板名称过长展示... 2021-08-31 16:18:43 +08:00
fit2cloud-chenyw
be6d377521
Merge pull request #734 from dataease/pr@v1.2@fix_some_bug
fix: 日期组件必须点左侧挂件才能弹出日期
2021-08-31 16:16:16 +08:00
fit2cloud-chenyw
ca80014096 fix: 日期组件必须点左侧挂件才能弹出日期 2021-08-31 16:15:10 +08:00
fit2cloud-chenyw
ddd53d9c69 fix: 收藏列表仪表板名称过长展示... 2021-08-31 16:14:34 +08:00
fit2cloud-chenyw
ad7569badb fix: 完善sql注入拦截器 2021-08-31 15:30:10 +08:00
fit2cloud-chenyw
d974e217f3
Merge pull request #733 from dataease/pr@v1.2@fix_sql_injection_error
fix: 完善sql注入拦截器
2021-08-31 15:28:54 +08:00
fit2cloud-chenyw
6b1f54808b fix: 完善sql注入拦截器 2021-08-31 15:26:49 +08:00
fit2cloud-chenyw
338b3104c6 fix: 修改删除组织提示信息 2021-08-31 13:02:05 +08:00
fit2cloud-chenyw
254ecb40bb
Merge pull request #732 from dataease/pr@v1.2@fix_delete_org_msg
fix: 修改删除组织提示信息
2021-08-31 13:01:34 +08:00
fit2cloud-chenyw
17ca2b2164 fix: 修改删除组织提示信息 2021-08-31 13:00:26 +08:00
taojinlong
9f51920c55 fix: 抽取excel 数据 2021-08-31 12:52:21 +08:00
taojinlong
439e9da1ab fix: 处理 oracle sql 2021-08-31 12:52:18 +08:00
fit2cloud-chenyw
09dd11b5b2 refactor: 地图上所有数据为0时 显示灰白色 2021-08-31 12:51:13 +08:00
fit2cloud-chenyw
c89de8719d
Merge pull request #731 from dataease/pr@refactor_empty_map_color
refactor: 地图上所有数据为0时 显示灰白色
2021-08-31 12:49:53 +08:00
taojinlong
d699d184e4 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-31 12:49:33 +08:00
taojinlong
08f42aa86d fix: 抽取excel 数据 2021-08-31 12:49:15 +08:00
fit2cloud-chenyw
2c267172c5 refactor: 地图上所有数据为0时 显示灰白色 2021-08-31 12:48:10 +08:00
XiaJunjie2020
067a5979c5
Merge pull request #730 from dataease/pr@v1.2@fix_radar
fix: 雷达图空数据报错
2021-08-31 12:45:51 +08:00
XiaJunjie2020
c9fbefd92e
Merge pull request #729 from dataease/pr@dev@fix_radar
fix: 雷达图空数据报错
2021-08-31 12:45:27 +08:00
junjie
41c5de5f9a fix: 雷达图空数据报错 2021-08-31 12:44:42 +08:00
junjie
9e9c104969 fix: 雷达图空数据报错 2021-08-31 12:43:06 +08:00
taojinlong
50e9e333e4 fix: 处理 oracle sql 2021-08-31 12:29:04 +08:00
taojinlong
70387ead68 feat: 默认去掉数据源参数里首尾空格 2021-08-31 11:52:10 +08:00
taojinlong
816178a4a4 Merge branch 'v1.2' of github.com:dataease/dataease into v1.2 2021-08-31 11:50:14 +08:00
taojinlong
e72b70d45e feat: 默认去掉数据源参数里首尾空格 2021-08-31 11:50:03 +08:00
fit2cloud-chenyw
6b925f73ad fix: 仪表板多个地图resize错误 2021-08-31 11:19:17 +08:00
fit2cloud-chenyw
68b2d4358c
Merge pull request #728 from dataease/pr@v1.2@fix_map_resize_error
fix: 仪表板多个地图resize错误
2021-08-31 11:14:42 +08:00
fit2cloud-chenyw
d0bb428ac1 fix: 仪表板多个地图resize错误 2021-08-31 11:13:31 +08:00
wangjiahao
1fcc794a1c refactor:视图下钻提示优化 2021-08-31 10:29:20 +08:00
fit2cloud-chenyw
740922f982 fix:条件组件值回显错误 2021-08-30 17:31:00 +08:00
fit2cloud-chenyw
8f055c016f
Merge pull request #724 from dataease/pr@v1.2@fix_condition_fill_value_error
fix:条件组件值回显错误
2021-08-30 17:22:59 +08:00
fit2cloud-chenyw
136bbd9a28 fix:条件组件值回显错误 2021-08-30 17:21:54 +08:00
taojinlong
a90bc12900 fix: 数据集移动 2021-08-30 16:18:31 +08:00
taojinlong
d303ae90fe fix: 数据集移动 2021-08-30 16:18:03 +08:00
taojinlong
d2674bd472 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-30 15:51:29 +08:00
taojinlong
b2e0089277 fix: 数据集重命名 2021-08-30 15:51:21 +08:00
taojinlong
7dfe9ccf34 fix: 数据集重命名 2021-08-30 15:47:39 +08:00
fit2cloud-chenyw
b23f2f3456 fix: 顶级地名错误 2021-08-30 10:08:22 +08:00
XiaJunjie2020
74a140931f
Merge pull request #721 from dataease/pr@v1.2@fix_ui_chart
fix: 颜色选择器去掉清空;矩形树图标签修复;doris 计算字段支持小数
2021-08-27 18:40:39 +08:00
junjie
5d36a577b4 fix: 颜色选择器去掉清空;矩形树图标签修复;doris 计算字段支持小数 2021-08-27 18:36:58 +08:00
XiaJunjie2020
102ea590c0
Merge pull request #720 from dataease/pr@dev@fix_ui_data
fix: 颜色选择器去掉清空;矩形树图标签修复;doris 计算字段支持小数
2021-08-27 18:22:04 +08:00
junjie
21af196e17 fix: 颜色选择器去掉清空;矩形树图标签修复;doris 计算字段支持小数 2021-08-27 18:21:02 +08:00