Commit Graph

2548 Commits

Author SHA1 Message Date
junjie
b8ab1d7485 fix: rollback 2021-09-28 15:25:44 +08:00
XiaJunjie2020
aeb35b0134
Merge pull request #848 from dataease/pr@v1.2@fix_doris_type
fix: Doris类型
2021-09-22 15:43:34 +08:00
junjie
ecd13b5fa7 fix: Doris类型 2021-09-22 15:42:00 +08:00
taojinlong
3cb889a492 fix: mysql 数据源参数 2021-09-16 15:03:23 +08:00
junjie
206be1c202 fix: 计算字段不参与关联于制作自定义数据集 2021-09-15 18:27:50 +08:00
XiaJunjie2020
c55a258719
Merge pull request #822 from dataease/pr@v1.2@fix_unions
fix: 两个表多字段关联后,创建自定义数据集出错
2021-09-15 17:49:17 +08:00
junjie
b5b94752d5 fix: 两个表多字段关联后,创建自定义数据集出错 2021-09-15 17:47:57 +08:00
XiaJunjie2020
0480451b69
Merge pull request #820 from dataease/pr@v1.2@fix_stack_time_item
fix: 堆叠项为时间类型错误
2021-09-15 17:03:38 +08:00
junjie
ec94ee9139 fix: 堆叠项为时间类型错误 2021-09-15 17:02:17 +08:00
fit2cloud-chenyw
8b2bb960f4
Merge pull request #818 from dataease/pr@v1.2@fix_map_drill
fix: 修复 数据没有钻取但地图切换了
2021-09-15 16:36:15 +08:00
fit2cloud-chenyw
005bb6bb21 fix: 修复 数据没有钻取但地图切换了 2021-09-15 16:35:14 +08:00
fit2cloud-chenyw
fee310857e
Merge pull request #806 from dataease/pr@v1.2@fix_email_repeat_error
fix: 新增用户邮箱重复报错提示
2021-09-10 17:01:02 +08:00
fit2cloud-chenyw
be1c979d47 fix: 新增用户邮箱重复报错提示 2021-09-10 16:59:54 +08:00
wangjiahao
e09e294349 Merge remote-tracking branch 'origin/v1.2' into v1.2 2021-09-10 11:25:17 +08:00
wangjiahao
f041b088ba fix:视图更换数据集可能导致联动失效的问题 2021-09-10 11:25:04 +08:00
fit2cloud-chenyw
dcd4273181
Merge pull request #804 from dataease/pr@v1.2@fix_licbar_error
fix: 修复有lic但没有验证器报错
2021-09-09 18:19:56 +08:00
fit2cloud-chenyw
4d2a7919b8 fix: 修复有lic但没有验证器报错 2021-09-09 18:18:56 +08:00
XiaJunjie2020
88bffba2f4
Merge pull request #796 from dataease/pr@v1.2@fix_rollback
fix: rollback
2021-09-08 18:43:32 +08:00
junjie
ac0da75502 fix: rollback 2021-09-08 18:41:27 +08:00
XiaJunjie2020
d4f8991085
Merge pull request #794 from dataease/pr@v1.2@fix_doris_date
fix: doris日期过滤
2021-09-08 17:55:52 +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