center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
2,677 Commits 1 Branch 86 Tags 417 MiB
4ef83c477e
Commit Graph

2677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
junjie
12b192bcfc feat: 组合图 2021-09-01 18:14:03 +08:00
王嘉豪
5edb7dad3c
Merge pull request #744 from dataease/v1.2 
V1.2
 2021-09-01 16:11:02 +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
cbb574d418
Merge pull request #743 from dataease/pr@dev@fix_ds_sql 
fix: 数据源查询计算过滤完善
 2021-09-01 13:33:11 +08:00
junjie
b3e3e667af fix: 数据源查询计算过滤完善 2021-09-01 13:31:12 +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
XiaJunjie2020
ea6dbc3f76
Merge pull request #740 from dataease/pr@dev@fix_ds_sql 
fix: 数据源查询计算过滤完善
 2021-09-01 11:57:37 +08:00
junjie
9c8eb79e1a fix: 数据源查询计算过滤完善 2021-09-01 11:55:30 +08:00
XiaJunjie2020
a9fd56ac67
Merge pull request #739 from dataease/pr@dev@feat_chart_mix 
refactor: 视图编辑样式优化
 2021-09-01 10:19:47 +08:00
junjie
b9512d9271 refactor: 视图编辑样式优化 2021-09-01 10:18:49 +08:00
XiaJunjie2020
50d27e1f12
Merge pull request #738 from dataease/pr@dev@feat_chart_mix 
feat: 视图增加组合图;折线面积优化
 2021-09-01 10:13:14 +08:00
junjie
7a3efa6804 feat: 视图增加组合图;折线面积优化 2021-09-01 10:12:24 +08:00
taojinlong
58a607eddd feat: 默认去掉数据源参数里首尾空格 2021-08-31 22:45:30 +08:00
taojinlong
9ce84c7236 fix: oracle 表名支持小写字母 2021-08-31 22:45:28 +08:00
taojinlong
e35059ad53 fix: 抽取数据 2021-08-31 22:45:25 +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
taojinlong
138cf51b90 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-31 18:02:50 +08:00
taojinlong
632d94d27f fix: 校验任务状态 2021-08-31 18:01:16 +08:00
XiaJunjie2020
7f135b42e0
Merge pull request #737 from dataease/pr@dev@feat_chart_mix 
feat: 视图增加组合图
 2021-08-31 17:44:51 +08:00
junjie
f8dc9dc9f7 feat: 视图增加组合图 2021-08-31 17:42:26 +08:00
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