2831 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
taojinlong	acc28ccd39	fix: 校验es 状态	2021-09-28 18:34:13 +08:00
taojinlong	8e3f09eed6	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-09-28 16:42:28 +08:00
taojinlong	a6fd382529	fix: oralce 拼接sql时，加上schema	2021-09-28 16:42:03 +08:00
junjie	aa83d7a196	fix: rollback	2021-09-28 15:04:28 +08:00
taojinlong	bc23fb6306	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-09-27 16:54:17 +08:00
taojinlong	cf5cf54363	feat: 【数据源】数据源类型增加mariadb和doris分类	2021-09-27 16:54:07 +08:00
fit2cloud-chenyw	49f8c0e335	Merge pull request #887 from dataease/pr@dev@fix_ldap_validate ... fix: 修复ldap用户重复验证	2021-09-27 11:19:32 +08:00
fit2cloud-chenyw	cb4904fd1f	fix: 修复ldap用户重复验证	2021-09-27 11:17:29 +08:00
fit2cloud-chenyw	d3929f5f03	Merge pull request #886 from dataease/pr@dev@style_de_tabs ... style: 调整仪表板tabs组件样式	2021-09-26 17:56:25 +08:00
taojinlong	12755fa546	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-09-26 17:55:41 +08:00
fit2cloud-chenyw	09b3477b4d	style: 调整仪表板tabs组件样式	2021-09-26 17:55:31 +08:00
taojinlong	ae90ed3ab9	fix: ck 时间过滤	2021-09-26 17:54:57 +08:00
fit2cloud-chenyw	38c4bf00b8	Merge pull request #885 from dataease/pr@dev@perf_sso_login ... feat: 完善单点登录	2021-09-26 16:50:17 +08:00
fit2cloud-chenyw	4f064dc23b	feat: 完善单点登录	2021-09-26 16:49:10 +08:00
taojinlong	236c761677	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-09-26 15:13:51 +08:00
taojinlong	2fd77e0dc8	fix: sqlserver 2008 分页问题	2021-09-26 15:13:12 +08:00
fit2cloud-chenyw	de3f925d15	Merge pull request #881 from dataease/pr@dev@fix_remove_oidc_cookie ... fix: 及时删除oidc错误信息cookie	2021-09-26 13:38:07 +08:00
fit2cloud-chenyw	75fc0f1cf0	fix: 及时删除oidc错误信息cookie	2021-09-26 13:37:02 +08:00
fit2cloud-chenyw	001ce37969	Merge pull request #880 from dataease/pr@dev@fix_oidc_error_msg ... fix: 修复oidc缺失信息报错方式	2021-09-26 13:16:33 +08:00
fit2cloud-chenyw	21939ae1aa	fix: 修复oidc缺失信息报错方式	2021-09-26 13:15:22 +08:00
XiaJunjie2020	ddd2135631	Merge pull request #879 from dataease/pr@dev@feat_table_info ... feat(视图): 增加明细表	2021-09-26 11:29:49 +08:00
junjie	0335d2327b	feat(视图): 增加明细表	2021-09-26 11:28:45 +08:00
taojinlong	78bbdc8aea	refactor: 去掉废弃代码	2021-09-25 15:41:04 +08:00
王嘉豪	92ca6401ba	Merge pull request #873 from dataease/pr@dev@refactor_panel-revert ... refactor:代码回退	2021-09-24 18:29:17 +08:00
wangjiahao	bb1947630c	refactor:代码回退	2021-09-24 18:28:11 +08:00
fit2cloud-chenyw	7f8de5ce57	Merge pull request #872 from dataease/pr@dev@fix_sso_info_validate ... fix: 修复sso用户信息缺失验证	2021-09-24 18:19:42 +08:00
fit2cloud-chenyw	04416c2ca0	fix: 修复sso用户信息缺失验证	2021-09-24 18:18:36 +08:00
fit2cloud-chenyw	751a5998b0	Merge pull request #871 from dataease/pr@dev@fix_de_tabs_style ... fix: 修复仪表板tab组件样式	2021-09-24 17:29:18 +08:00
fit2cloud-chenyw	2586a4b37d	fix: 修复仪表板tab组件样式	2021-09-24 17:27:47 +08:00
taojinlong	c74e3863e0	fix: 识别es 数据类型	2021-09-24 16:42:30 +08:00
taojinlong	fb9ccc05e1	fix: 识别es 数据类型	2021-09-24 16:00:37 +08:00
taojinlong	4e0fa6c33d	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-09-24 15:30:37 +08:00
taojinlong	fe0071665e	fix: 识别es 数据类型	2021-09-24 15:30:09 +08:00
fit2cloud-chenyw	dcb1768323	Merge pull request #863 from dataease/pr@dev@fix_repeat_ldap_user ... fix: 修复重复ldap用户	2021-09-23 18:58:09 +08:00
fit2cloud-chenyw	2e1ec00ad4	fix: 修复重复ldap用户	2021-09-23 18:57:10 +08:00
fit2cloud-chenyw	97a4c8bd72	Merge pull request #862 from dataease/pr@dev@perf_ldap ... perf: 优化ldap	2021-09-23 18:43:13 +08:00
fit2cloud-chenyw	b680f091ed	perf: 优化ldap	2021-09-23 18:39:56 +08:00
王嘉豪	db02c9d74c	Merge pull request #861 from dataease/pr@dev@feat_panel-edit ... fix:修复pdf导出图片显示不全问题	2021-09-23 18:39:26 +08:00
wangjiahao	f27163145a	fix:修复pdf导出图片显示不全问题	2021-09-23 18:38:24 +08:00
taojinlong	9158bdb9a1	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-09-23 17:14:41 +08:00
taojinlong	2683a2405a	refactor: 去掉无用依赖	2021-09-23 17:14:26 +08:00
王嘉豪	5dc43393ff	Merge pull request #860 from dataease/pr@dev@feat_panel-edit ... feat:仪表板自定义刷新时间	2021-09-23 17:01:22 +08:00
wangjiahao	dba9d42efe	feat:仪表板自定义刷新时间	2021-09-23 17:00:13 +08:00
taojinlong	7063e0b0b5	fix: 导入excel失败	2021-09-23 16:51:59 +08:00
taojinlong	c8dcd383ec	Merge pull request #859 from dataease/pr@dev@datasourceview ... feat: 支持添加数据源下的视图	2021-09-23 16:13:30 +08:00
taojinlong	b7817ef8d9	feat: 支持添加数据源下的视图	2021-09-23 16:12:38 +08:00
fit2cloud-chenyw	c86156bd5c	Merge pull request #858 from dataease/pr@dev@feat_de_tabs ... feat: 替换tabs图标	2021-09-23 15:43:38 +08:00
fit2cloud-chenyw	2778d9eb43	Merge branch 'dev' into pr@dev@feat_de_tabs	2021-09-23 15:43:31 +08:00
fit2cloud-chenyw	a72a4a1143	feat: 替换tabs图标	2021-09-23 15:37:40 +08:00
fit2cloud-chenyw	7dac4702c8	feat: 仪表板tabs组件	2021-09-23 15:30:11 +08:00