3038 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
junjie	c5f997ac4e	fix: antv点击坐标	2021-10-29 13:39:14 +08:00
XiaJunjie2020	e1d9cd3c23	Merge pull request #1048 from dataease/pr@dev@feat_chart_count ... feat: 视图支持设置结果展示	2021-10-29 10:33:31 +08:00
junjie	69e0f49c8e	feat: 视图支持设置结果展示	2021-10-29 10:32:06 +08:00
王嘉豪	ae889b1391	Merge pull request #1046 from dataease/pr@dev@refactor_panel-edit ... refactor:代码回退	2021-10-28 18:37:01 +08:00
wangjiahao	d9071fdc52	refactor:代码回退	2021-10-28 18:36:05 +08:00
王嘉豪	a83bb70553	Merge pull request #1045 from dataease/pr@dev@refactor_panel-edit ... fix:视图复制名称过长报错问题	2021-10-28 18:13:00 +08:00
王嘉豪	4d3ffc794d	Merge branch 'dev' into pr@dev@refactor_panel-edit	2021-10-28 18:12:52 +08:00
wangjiahao	26b601ae53	fix:视图复制名称过长报错问题	2021-10-28 18:10:55 +08:00
王嘉豪	b7e70dd79b	Merge pull request #1044 from dataease/pr@dev@refactor_panel-edit ... refactor:仪表板排序名称优先	2021-10-28 18:06:52 +08:00
wangjiahao	5f1ada2865	refactor:仪表板排序名称优先	2021-10-28 18:05:28 +08:00
XiaJunjie2020	ac1425cf91	Merge pull request #1043 from dataease/pr@dev@feat_chart_count ... feat: 视图支持设置结果展示	2021-10-28 18:05:09 +08:00
junjie	5d57b7ad1e	feat: 视图支持设置结果展示	2021-10-28 18:02:56 +08:00
XiaJunjie2020	b72b3bcca3	Merge pull request #1041 from dataease/pr@dev@feat_chart_count ... feat: 视图支持设置结果展示	2021-10-28 17:24:00 +08:00
junjie	d7ad1b86d2	feat: 视图支持设置结果展示	2021-10-28 17:22:46 +08:00
wangjiahao	1a5159f40d	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # backend/src/main/resources/db/migration/V27__de1.4.sql	2021-10-28 17:05:50 +08:00
wangjiahao	8ec93a1337	feat:仪表板支持仪表板之间跳转，外部链接跳转	2021-10-28 17:05:16 +08:00
XiaJunjie2020	c3215c739b	Merge pull request #1039 from dataease/pr@dev@feat_table_info ... feat: 明细表page size属性位置调整	2021-10-28 14:34:20 +08:00
junjie	34df55d281	feat: 明细表page size属性位置调整	2021-10-28 14:33:21 +08:00
XiaJunjie2020	92a7daa5d0	Merge pull request #1037 from dataease/pr@dev@feat_table_summary ... feat: 表格合计调整	2021-10-28 11:38:48 +08:00
junjie	2f46571f17	feat: 表格合计调整	2021-10-28 11:37:50 +08:00
taojinlong	3792298919	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-10-26 12:05:16 +08:00
taojinlong	129e101453	feat: 支持CTE语法	2021-10-26 12:05:06 +08:00
junjie	18c2c190d2	fix: rollback	2021-10-25 17:01:05 +08:00
taojinlong	1ef965357d	feat: 登录时，对用户名密码加密	2021-10-25 15:36:51 +08:00
taojinlong	042f447286	refactor: 优化一下	2021-10-25 14:48:18 +08:00
taojinlong	54ef74ff4b	feat: 支持mongodb	2021-10-25 12:22:01 +08:00
fit2cloud-chenyw	b2606600c1	Merge pull request #1009 from dataease/pr@dev@fix_msg_page_error ... fix: 消息列表分页错误	2021-10-22 15:56:32 +08:00
fit2cloud-chenyw	82361e0f90	fix: 消息列表分页错误	2021-10-22 15:55:29 +08:00
fit2cloud-chenyw	1e4b40dd23	Merge pull request #1007 from dataease/pr@dev@feat_basic_setting ... feat: 增加超时时间配置	2021-10-22 15:08:41 +08:00
fit2cloud-chenyw	b609955a44	feat: 增加超时时间配置	2021-10-22 15:06:50 +08:00
junjie	027844a850	feat:瀑布图	2021-10-22 10:19:30 +08:00
junjie	11f2ae5b67	feat:瀑布图	2021-10-22 10:05:53 +08:00
fit2cloud-chenyw	4928831805	Merge pull request #1006 from dataease/pr@dev@style_ui_fine_tuning ... style: UI微调	2021-10-21 18:27:10 +08:00
fit2cloud-chenyw	dc3288dba3	style: UI微调	2021-10-21 18:26:10 +08:00
fit2cloud-chenyw	03ca1530fa	Merge pull request #1005 from dataease/pr@dev@fix_timer_component ... feat: 完善仪表板时间组件	2021-10-21 17:47:28 +08:00
fit2cloud-chenyw	19c4962979	feat: 完善仪表板时间组件	2021-10-21 17:46:24 +08:00
junjie	6fd580e2f7	feat:antv	2021-10-21 17:37:13 +08:00
junjie	90c2b261ba	feat:antv	2021-10-21 16:11:51 +08:00
taojinlong	af1dc6cb6c	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-10-21 15:30:13 +08:00
taojinlong	8e50280de8	refactor: 优化一下	2021-10-21 15:30:04 +08:00
fit2cloud-chenyw	463b8653c2	Merge pull request #1003 from dataease/pr@dev@fix_timer ... fix: 去除仪表板分享有效期'此刻'	2021-10-21 14:39:04 +08:00
fit2cloud-chenyw	4bbbee07e0	fix: 去除仪表板分享有效期'此刻'	2021-10-21 14:38:06 +08:00
fit2cloud-chenyw	18d7561aec	Merge pull request #999 from dataease/pr@dev@feat_email ... feat: 增加邮件配置	2021-10-21 13:51:24 +08:00
fit2cloud-chenyw	d3952387c1	feat: 增加邮件配置	2021-10-21 13:49:58 +08:00
taojinlong	7f3f550304	feat: 支持mongo	2021-10-21 12:38:44 +08:00
taojinlong	a4d3dbe50c	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-10-21 12:37:38 +08:00
taojinlong	54dcf9ee1a	fix: es 支持https	2021-10-21 12:37:17 +08:00
XiaJunjie2020	e97b33ae5b	Merge pull request #995 from dataease/pr@dev@feat_antv ... feat:antv	2021-10-21 12:17:19 +08:00
junjie	59fd5ceef4	feat:antv	2021-10-21 12:15:55 +08:00
XiaJunjie2020	bf32ef6174	Merge pull request #994 from dataease/pr@dev@feat_waterfall ... feat:瀑布图	2021-10-21 11:37:33 +08:00