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

1164 Commits

Author SHA1 Message Date
fit2cloud-chenyw
ad9f8b19f9
Merge pull request #807 from dataease/pr@dev@feat_oidc_sso 
fix: 新增用户邮箱重复报错提示
 2021-09-10 17:13:25 +08:00
fit2cloud-chenyw
ca42c98c53 fix: 新增用户邮箱重复报错提示 2021-09-10 17:04:31 +08:00
fit2cloud-chenyw
4930ec17fe feat: 新增oidc配置 2021-09-10 15:52:45 +08:00
wangjiahao
3d59c010d2 fix:视图更换数据集可能导致联动失效的问题 2021-09-10 11:22:41 +08:00
fit2cloud-chenyw
b9eecf8e21 fix: 修复有lic但没有验证器报错 2021-09-09 18:22:21 +08:00
junjie
078179ba98 feat(视图): 尝试接入G2制作视图；增加水波图 2021-09-09 17:01:06 +08:00
fit2cloud-chenyw
a24e0561ba
Merge pull request #802 from dataease/pr@dev@fix_ldap_support 
fix: 修复无插件情况ldap_support报错
 2021-09-09 16:31:54 +08:00
fit2cloud-chenyw
1c233972c5 fix: 修复无插件情况ldap_support报错 2021-09-09 16:30:47 +08:00
wangjiahao
4156102aa3 refactor:文案修改 2021-09-09 15:07:55 +08:00
fit2cloud-chenyw
436fa186e6 feat: 增加ldap的flyway 2021-09-09 11:37:00 +08:00
junjie
5bc410dc01 fix: rollback 2021-09-08 18:38:30 +08:00
junjie
5003fa84a7 fix: doris日期过滤 2021-09-08 17:45:58 +08:00
junjie
b5bb3bf574 feat(视图): 尝试接入G2制作视图；增加水波图 2021-09-08 17:17:24 +08:00
taojinlong
a68b7d28c0 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-09-08 16:37:00 +08:00
taojinlong
18e8fd1dbc feat: 支持直连模式（elasticsearch） 2021-09-08 16:36:19 +08:00
fit2cloud-chenyw
e1a5d84f33 feat: ldap相关flyway 2021-09-08 16:13:29 +08:00
taojinlong
43d0f227e0
Merge pull request #789 from dataease/pr@dev@es 
feat: 支持直连模式（elasticsearch）
 2021-09-08 15:51:01 +08:00
taojinlong
5a6ff503f5 feat: 支持直连模式（elasticsearch） 2021-09-08 15:49:25 +08:00
fit2cloud-chenyw
f2daa5b232
Merge branch 'dev' into pr@dev@feat_ldap 2021-09-08 15:44:34 +08:00
fit2cloud-chenyw
db3e8f6065 feat: 对接ldap基本功能 2021-09-08 15:37:39 +08:00
junjie
7cf90a2654 fix(数据集): 增加自定义数据集字段校验 2021-09-07 10:26:45 +08:00
fit2cloud-chenyw
b7bcdd1fbf feat: 新增ldap 2021-09-06 18:35:46 +08:00
junjie
bcbe24cfe0 feat(视图): 组合图双y轴 2021-09-06 16:58:33 +08:00
junjie
b9d10f5899 feat(视图): 各数据源支持明细表计算逻辑 2021-09-06 14:18:27 +08:00
junjie
53b6510859 feat(视图): 增加明细表 2021-09-06 14:06:10 +08:00
王嘉豪
cec9a85be0
Merge pull request #767 from dataease/pr@dev@refactor_panel-pdf 
feat:仪表板和仪表板分组允许移动
 2021-09-03 18:00:06 +08:00
wangjiahao
d10e4b5ca6 feat:仪表板和仪表板分组允许移动 2021-09-03 17:59:20 +08:00
taojinlong
3de59dee36 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-09-03 17:31:34 +08:00
taojinlong
6ad719bd5e fix: 处理二进制类型 2021-09-03 17:31:25 +08:00
junjie
a47c54c2a6 fix: 过滤时间类型字段可能出错 2021-09-03 16:56:51 +08:00
junjie
bc17daf1ed fix: 过滤时间类型字段可能出错 2021-09-03 16:36:19 +08:00
fit2cloud-chenyw
b68888bc27
Merge branch 'dev' into pr@dev@feat_theme_switch 2021-09-03 14:48:43 +08:00
fit2cloud-chenyw
9a69f8a23f feat: 主题切换sql依赖 2021-09-03 14:46:06 +08:00
wangjiahao
de717cd026 feat:仪表板新增复制功能 2021-09-03 11:19:01 +08:00
wangjiahao
139d7ef5f8 feat:仪表板导出支持模板选择功能 2021-09-02 19:02:41 +08:00
wangjiahao
32b8ae4886 feat:仪表板导出支持模板选择功能 2021-09-02 18:59:21 +08:00
taojinlong
c09286183a Merge branch 'dev' of github.com:dataease/dataease into dev 2021-09-02 15:19:41 +08:00
taojinlong
dcfb19fab9 fix: 校验sqlserver schema 非空 2021-09-02 15:19:30 +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
7f862b1fc7 refactor:仪表版视图列表组件列表排序方式和视图保持一致 2021-09-01 14:14:22 +08:00
junjie
b3e3e667af fix: 数据源查询计算过滤完善 2021-09-01 13:31:12 +08:00
junjie
554e9c1572 fix: 数据源查询计算过滤完善 2021-09-01 13:28:05 +08:00
junjie
2d367809d7 fix: 数据源查询计算过滤完善 2021-09-01 12:02:36 +08:00
junjie
9c8eb79e1a fix: 数据源查询计算过滤完善 2021-09-01 11:55:30 +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
junjie
5b83a779f5 feat: 视图增加组合图 2021-08-31 17:15:20 +08:00
taojinlong
4b20298adc fix: oracle 时间转换 2021-08-31 16:57:01 +08:00
fit2cloud-chenyw
ad7569badb fix: 完善sql注入拦截器 2021-08-31 15:30:10 +08:00
fit2cloud-chenyw
6b1f54808b fix: 完善sql注入拦截器 2021-08-31 15:26:49 +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
taojinlong
08f42aa86d fix: 抽取excel 数据 2021-08-31 12:49:15 +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
e72b70d45e feat: 默认去掉数据源参数里首尾空格 2021-08-31 11:50:03 +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
junjie
5d36a577b4 fix: 颜色选择器去掉清空；矩形树图标签修复；doris 计算字段支持小数 2021-08-27 18:36:58 +08:00
junjie
21af196e17 fix: 颜色选择器去掉清空；矩形树图标签修复；doris 计算字段支持小数 2021-08-27 18:21:02 +08:00
taojinlong
cdee8d66f9 fix: sqlserver 字段识别 2021-08-27 18:07:19 +08:00
taojinlong
2cc028a219 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-27 18:05:34 +08:00
taojinlong
7c09002c9b fix: sqlserver 字段识别 2021-08-27 18:05:04 +08:00
fit2cloud-chenyw
2ff07ba064
Merge pull request #719 from dataease/pr@dev@feat_ds_invalid_msg 
feat: 完善数据源失效消息
 2021-08-27 17:58:03 +08:00
fit2cloud-chenyw
a9123035d7 feat: 完善数据源失效消息 2021-08-27 17:56:10 +08:00
taojinlong
ee8370a078
Merge pull request #718 from dataease/pr@v1.2@excel 
fix: 解析excel出错
 2021-08-27 17:43:49 +08:00
taojinlong
39026784e0
Merge pull request #717 from dataease/pr@v1.2@excel 
fix: 解析excel出错
 2021-08-27 17:43:03 +08:00
taojinlong
2fd29a71e4 fix: 解析excel出错 2021-08-27 17:40:25 +08:00
fit2cloud-chenyw
9132355ebc fix: 顶级地名错误 2021-08-27 16:36:55 +08:00
fit2cloud-chenyw
aac751b08d feat:增加数据源无效消息 2021-08-27 16:34:40 +08:00
fit2cloud-chenyw
74cc2bb0e1 feat:未读消息列表增加一键全部已读 2021-08-27 13:25:18 +08:00
wangjiahao
044faf7845 refactor:增加demo 2021-08-26 18:14:54 +08:00
wangjiahao
8be42ca584 refactro:更换demo 2021-08-26 16:34:38 +08:00
taojinlong
5f0ad8d200 fix: 数据源高级设置不能编辑 2021-08-26 12:35:54 +08:00
taojinlong
bba0c57f39 fix: excel 多sheets页面 2021-08-25 21:51:09 +08:00
taojinlong
1ba98b57b3 fix: excel 多sheets页面 2021-08-25 18:40:42 +08:00
wangjiahao
8d6d49eb14 refactor:优化页面查询速度 2021-08-24 16:51:09 +08:00
taojinlong
e83510f4b7 fix: 数据源校验 2021-08-24 15:03:17 +08:00
taojinlong
461f5135de Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-24 11:54:29 +08:00
taojinlong
7adf045701 fix: 时间类型长度 2021-08-24 11:52:42 +08:00
fit2cloud-chenyw
f26adc38c9 fix: 公共链接弹出登录框 2021-08-23 17:23:11 +08:00
taojinlong
4eaaf2273e feat: 校验数据源状态时，同时刷新左侧菜单中数据源的状态 2021-08-23 16:27:05 +08:00
taojinlong
378a034f85 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-23 12:12:29 +08:00
taojinlong
9c910893ce fix: 识别日期类型 2021-08-23 12:12:12 +08:00
fit2cloud-chenyw
aef2d49f35 fix: api验证lic 2021-08-23 11:36:52 +08:00
fit2cloud-chenyw
ad10184c1f
Merge pull request #679 from dataease/pr@dev@feat_完善apiModelProperty 
feat: 完善apiModelProperties
 2021-08-23 11:34:16 +08:00
fit2cloud-chenyw
96291da02a feat: 完善apiModelProperties 2021-08-23 11:33:07 +08:00
taojinlong
85d840d91a fix: 尝试解决导入excle 报找不到字段的问题 2021-08-23 10:17:22 +08:00
taojinlong
130cbb23cf fix: 尝试解决导入excle 报找不到字段的问题 2021-08-20 17:55:50 +08:00
taojinlong
df0c6a0759 fix: 尝试解决导入excle 报找不到字段的问题 2021-08-20 17:14:07 +08:00
taojinlong
f7baa9a032 fix: 尝试解决导入excle 报找不到字段的问题 2021-08-19 22:22:06 +08:00
taojinlong
4681c10b76 fix: 尝试解决导入excle 报找不到字段的问题 2021-08-19 16:42:41 +08:00
taojinlong
53fc333341 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-19 16:22:54 +08:00
taojinlong
371750f70d fix: 尝试解决导入excle 报找不到字段的问题 2021-08-19 16:22:41 +08:00
wangjiahao
1556b1fc91 refactor:增加新的demo仪表板 2021-08-19 15:49:34 +08:00
fit2cloud-chenyw
6883911ccc
Merge pull request #668 from dataease/pr@dev@feat_public_short_link 
feat: 公共链接分享增加短链接
 2021-08-19 14:55:39 +08:00
fit2cloud-chenyw
acab3ceb24 feat: 公共链接分享增加短链接 2021-08-19 14:54:32 +08:00
taojinlong
36b0a2a614 fix: 检测数据源状态 2021-08-19 14:09:51 +08:00
taojinlong
e1835b5326 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-19 10:10:36 +08:00
taojinlong
5f60eb3faf feat: 抽取数据适配[新增字段] 2021-08-19 09:55:23 +08:00
junjie
f3902e3bac fix: 计算字段dataease name 2021-08-19 09:54:12 +08:00
taojinlong
b84225bee7 feat: 抽取数据适配[新增字段] 2021-08-19 09:48:33 +08:00
junjie
3b5bb9b17b feat: 字段编辑优化界面显示 2021-08-18 14:01:56 +08:00
wangjiahao
1dca2e0ff7 refactor:去除无用代码 2021-08-17 17:55:56 +08:00
taojinlong
ffbd32febf Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-17 16:19:32 +08:00
taojinlong
f1f20b2dbe feat: 抽取数据适配[新增字段] 2021-08-17 16:16:04 +08:00
wangjiahao
81a84a54e3 refactor:去除无用代码 2021-08-17 14:40:01 +08:00
fit2cloud-chenyw
24ed0baeb2
Merge pull request #644 from dataease/pr@dev@fix_msg_timer_error 
fix: 定时查询未读消息条数错误
 2021-08-17 12:26:32 +08:00
fit2cloud-chenyw
2fbed9fdec fix: 定时查询未读消息条数错误 2021-08-17 12:25:22 +08:00
taojinlong
238bc186fb Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-17 12:21:13 +08:00
taojinlong
d4d7261df9 feat: sqlserver、pg内置函数 2021-08-17 12:20:47 +08:00
junjie
1dc681216a fix: doris函数 2021-08-17 12:17:09 +08:00
fit2cloud-chenyw
d2b6fe4356
Merge pull request #642 from dataease/pr@dev@refactor_system_style 
refactor: 优化分享组织树
 2021-08-17 11:09:23 +08:00
fit2cloud-chenyw
d99229dd44 refactor: 优化分享组织树 2021-08-17 11:08:11 +08:00
taojinlong
7c391ed8cf refactor: 代码格式化 2021-08-16 18:27:20 +08:00
taojinlong
d7f363e97b feat: 数据源高级参数设置 2021-08-16 18:05:46 +08:00
taojinlong
9cda59e224 feat: 定时检测数据源状态信息 2021-08-16 14:09:02 +08:00
taojinlong
b8f4a819f9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-16 12:47:35 +08:00
taojinlong
4c8e061e1d feat: 定时检测数据源状态信息 2021-08-16 12:46:34 +08:00
junjie
3e6b61a88c fix: 地图code 2021-08-16 11:48:12 +08:00
junjie
7bd5f3dc0f fix: 地图code，json 2021-08-16 11:18:48 +08:00
junjie
7905c85110 feat: 地图json，区域 2021-08-16 09:56:19 +08:00
taojinlong
9623c15d01 fix: 解析excel失败 2021-08-13 17:31:18 +08:00
taojinlong
19d08770a9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-13 17:11:15 +08:00
taojinlong
1e67e6669c fix: 解析excel失败 2021-08-13 17:10:59 +08:00
fit2cloud-chenyw
93b2dc8b78 fix: 删除行政区划代码前端缓存 2021-08-13 17:06:24 +08:00
taojinlong
af79e725a3 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-13 12:04:31 +08:00
taojinlong
8f494f3755 feat: 替换excel时，替换成功后，才更新数据集字段 2021-08-13 12:04:17 +08:00
fit2cloud-chenyw
f7699aae6b feat: 地图联动 2021-08-13 11:23:35 +08:00
taojinlong
c36fd88f3f feat: 支持excel多sheet页 2021-08-13 09:51:54 +08:00
taojinlong
b4a09f37dc Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-12 19:23:16 +08:00
taojinlong
4a9009dee1 feat: 支持同时导入excel的多sheet页 2021-08-12 19:23:01 +08:00
junjie
b2718c6c14 feat: 堆叠图下钻 2021-08-12 15:11:54 +08:00
王嘉豪
f6058ed78b
Merge pull request #599 from dataease/pr@dev@feat_panel-up-drill 
refactor:恢复超级管理员无需授权功能
 2021-08-12 11:57:29 +08:00
wangjiahao
db3a3c3f27 refactor:恢复超级管理员无需授权功能 2021-08-12 11:52:02 +08:00
王嘉豪
62a3c61a0a
Merge pull request #598 from dataease/pr@dev@feat_panel-up-drill 
feat:【用户管理】增加根据角色/组织进行查询的支持
 2021-08-12 11:24:03 +08:00