2641 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
XiaJunjie2020	7ddb4ad0a3	Merge pull request #793 from dataease/pr@dev@fix_doris_date ... fix: doris日期过滤	2021-09-08 17:46:53 +08:00
junjie	5003fa84a7	fix: doris日期过滤	2021-09-08 17:45:58 +08:00
XiaJunjie2020	0e727df970	Merge pull request #792 from dataease/pr@dev@feat_chart_liquid ... feat(视图): 尝试接入G2制作视图；增加水波图	2021-09-08 17:18:48 +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	075862ad83	Merge pull request #790 from dataease/pr@dev@feat_ldap_sql ... feat: ldap相关flyway	2021-09-08 16:14:57 +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	f4c53cf3ed	Merge pull request #788 from dataease/pr@dev@feat_ldap ... feat: 对接ldap基本功能	2021-09-08 15:45:47 +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
XiaJunjie2020	fbb8ee658b	Merge pull request #787 from dataease/pr@dev@feat_chart_table_info ... feat(视图): 增加明细表	2021-09-08 11:00:08 +08:00
junjie	a23a7e0a62	feat(视图): 增加明细表	2021-09-08 10:59:19 +08:00
王嘉豪	9c88350986	Merge pull request #786 from dataease/pr@dev@refactor_panel-pdf ... refactor:导出pdf模板支持设置常用参数	2021-09-07 17:37:57 +08:00
wangjiahao	6a5bfb21cf	refactor:导出pdf模板支持设置常用参数	2021-09-07 17:36:43 +08:00
XiaJunjie2020	78789c46a3	Merge pull request #784 from dataease/pr@dev@refactor_chart_size ... feat(视图): 增加明细表	2021-09-07 16:57:25 +08:00
junjie	7c633fd578	feat(视图): 增加明细表	2021-09-07 16:56:33 +08:00
王嘉豪	ac3c093509	Merge pull request #781 from dataease/pr@dev@refactor_panel-pdf ... refactor:PDF导出默认适配横向大屏	2021-09-07 14:15:26 +08:00
wangjiahao	6054b8b566	refactor:PDF导出默认适配横向大屏	2021-09-07 14:14:24 +08:00
XiaJunjie2020	bd31a69ad0	Merge pull request #779 from dataease/pr@dev@refactor_treemap_legend ... refactor(视图)：去除矩形树图图例	2021-09-07 14:09:01 +08:00
junjie	996185995a	refactor(视图)：去除矩形树图图例	2021-09-07 14:08:16 +08:00
XiaJunjie2020	2bcb9e8a07	Merge pull request #777 from dataease/pr@dev@feat_ds_ext_yaxis ... feat(视图): 组合图双y轴	2021-09-07 11:45:29 +08:00
junjie	6ef08b469a	feat(视图): 组合图双y轴	2021-09-07 11:44:36 +08:00
XiaJunjie2020	b0fcf8ded5	Merge pull request #776 from dataease/pr@dev@fix_ds_field ... fix(数据集): 增加自定义数据集字段校验	2021-09-07 10:27:41 +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
XiaJunjie2020	1bd0242588	Merge pull request #775 from dataease/pr@dev@feat_chart_yaxis_ext ... feat(视图): 组合图双y轴	2021-09-06 17:29:04 +08:00
junjie	62759d2b66	feat(视图): 组合图双y轴	2021-09-06 17:27:59 +08:00
XiaJunjie2020	fc90d4b12d	Merge pull request #773 from dataease/pr@dev@feat_chart_yaxis_ext ... feat(视图): 组合图双y轴	2021-09-06 16:59:23 +08:00
junjie	bcbe24cfe0	feat(视图): 组合图双y轴	2021-09-06 16:58:33 +08:00
XiaJunjie2020	bd747ea5e4	Merge pull request #771 from dataease/pr@dev@feat_chart_info ... feat(视图): 增加明细表	2021-09-06 14:55:33 +08:00
junjie	c3315de47d	feat(视图): 增加明细表	2021-09-06 14:54:31 +08:00
XiaJunjie2020	b12d07e54f	Merge pull request #770 from dataease/pr@dev@feat_ds_table_info ... feat(视图): 各数据源支持明细表计算逻辑	2021-09-06 14:19:13 +08:00
junjie	b9d10f5899	feat(视图): 各数据源支持明细表计算逻辑	2021-09-06 14:18:27 +08:00
XiaJunjie2020	584b99dde3	Merge pull request #769 from dataease/pr@dev@feat_chart_table_info ... feat(视图): 增加明细表	2021-09-06 14:06:59 +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
XiaJunjie2020	6f3f668efc	Merge pull request #766 from dataease/pr@dev@fix_ds_filter ... fix: 过滤时间类型字段可能出错	2021-09-03 16:59:15 +08:00
junjie	a47c54c2a6	fix: 过滤时间类型字段可能出错	2021-09-03 16:56:51 +08:00
XiaJunjie2020	176742748d	Merge pull request #763 from dataease/pr@dev@fix_ds_filter ... fix: 过滤时间类型字段可能出错	2021-09-03 16:37:45 +08:00
junjie	bc17daf1ed	fix: 过滤时间类型字段可能出错	2021-09-03 16:36:19 +08:00
fit2cloud-chenyw	10565dc9c6	Merge pull request #762 from dataease/pr@dev@fix_二级菜单主题 ... fix: 二级菜单选中时候显示主题悬浮色	2021-09-03 16:30:24 +08:00
fit2cloud-chenyw	e3b93d953a	fix: 二级菜单选中时候显示主题悬浮色	2021-09-03 16:28:53 +08:00
fit2cloud-chenyw	ba589d0187	Merge pull request #760 from dataease/pr@dev@feat_theme_switch ... feat: 切换主题基本功能	2021-09-03 14:49:07 +08:00
fit2cloud-chenyw	b68888bc27	Merge branch 'dev' into pr@dev@feat_theme_switch	2021-09-03 14:48:43 +08:00