Commit Graph

2529 Commits

Author SHA1 Message Date
junjie
ac0da75502 fix: rollback 2021-09-08 18:41:27 +08:00
junjie
73e7b9f771 fix: doris日期过滤 2021-09-08 17:53:08 +08:00
XiaJunjie2020
437507d3be
Merge pull request #780 from dataease/pr@v1.2@refactor_treemap_legend
refactor(视图):去除矩形树图图例
2021-09-07 14:14:16 +08:00
junjie
e161c8ff0e refactor(视图):去除矩形树图图例 2021-09-07 14:12:24 +08:00
junjie
67e89d0617 Merge remote-tracking branch 'origin/v1.2' into v1.2 2021-09-07 10:30:08 +08:00
junjie
c838e4d18b fix(数据集): 增加自定义数据集字段校验
# Conflicts:
#	backend/src/main/resources/i18n/messages_en_US.properties
#	backend/src/main/resources/i18n/messages_zh_TW.properties
2021-09-07 10:30:02 +08:00
taojinlong
08964e1b58 Merge branch 'v1.2' of github.com:dataease/dataease into v1.2 2021-09-03 17:28:01 +08:00
taojinlong
6b125a65ab fix: 处理二进制类型 2021-09-03 17:27:50 +08:00
XiaJunjie2020
5fc8adc49e
Merge pull request #765 from dataease/pr@v1.2@fix_ds_filter
fix: 过滤时间类型字段可能出错
2021-09-03 16:56:13 +08:00
junjie
5b0fe3b1f3 fix: 过滤时间类型字段可能出错 2021-09-03 16:55:26 +08:00
XiaJunjie2020
d920cb4da7
Merge pull request #764 from dataease/pr@v1.2@fix_ds_filter
fix: 过滤时间类型字段可能出错
2021-09-03 16:44:06 +08:00
junjie
d995dd10d6 fix: 过滤时间类型字段可能出错 2021-09-03 16:41:09 +08:00
taojinlong
5cb91c80bd Merge branch 'v1.2' of github.com:dataease/dataease into v1.2 2021-09-02 15:18:57 +08:00
taojinlong
11a24505a3 fix: 校验sqlserver schema 非空 2021-09-02 15:18:38 +08:00
wangjiahao
06145622db refactor:增加管理员菜单权限 2021-09-01 16:00:02 +08:00
wangjiahao
93e40832fb fix:全屏模式下输入框输入内容自动退出的问题 2021-09-01 15:14:50 +08:00
wangjiahao
7f862b1fc7 refactor:仪表版视图列表组件列表排序方式和视图保持一致 2021-09-01 14:14:22 +08:00
wangjiahao
6cda486cf0 Merge remote-tracking branch 'origin/v1.2' into v1.2 2021-09-01 14:04:27 +08:00
wangjiahao
22e0d8f307 fix:1.重做按钮不生效问题;2.输入文字保存按钮依然是灰的问题 2021-09-01 14:03:55 +08:00
XiaJunjie2020
2040441de3
Merge pull request #742 from dataease/pr@v1.2@fix_ds_sql
fix: 数据源查询计算过滤完善
2021-09-01 13:28:51 +08:00
junjie
554e9c1572 fix: 数据源查询计算过滤完善 2021-09-01 13:28:05 +08:00
XiaJunjie2020
fb5b66532e
Merge pull request #741 from dataease/pr@v1.2@fix_ds_sql
fix: 数据源查询计算过滤完善
2021-09-01 12:03:20 +08:00
junjie
2d367809d7 fix: 数据源查询计算过滤完善 2021-09-01 12:02:36 +08:00
taojinlong
37977644dd feat: 默认去掉数据源参数里首尾空格 2021-08-31 22:44:28 +08:00
taojinlong
7f0cdcd1bd fix: oracle 表名支持小写字母 2021-08-31 21:55:59 +08:00
taojinlong
60b1275395 fix: 抽取数据 2021-08-31 20:41:57 +08:00
taojinlong
46cd685522 Merge branch 'v1.2' of github.com:dataease/dataease into v1.2 2021-08-31 18:05:27 +08:00
taojinlong
2e3152d0de fix: 校验任务状态 2021-08-31 18:05:18 +08:00
taojinlong
ac4fc7ef92 fix: oracle 时间转换 2021-08-31 18:05:16 +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
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
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
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
c89de8719d
Merge pull request #731 from dataease/pr@refactor_empty_map_color
refactor: 地图上所有数据为0时 显示灰白色
2021-08-31 12:49:53 +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
junjie
41c5de5f9a fix: 雷达图空数据报错 2021-08-31 12:44:42 +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
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
8f055c016f
Merge pull request #724 from dataease/pr@v1.2@fix_condition_fill_value_error
fix:条件组件值回显错误
2021-08-30 17:22:59 +08:00