3825 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
junjie	81a2b4753e	feat(视图): 过滤器支持and、or逻辑	2021-12-14 15:26:33 +08:00
王嘉豪	60df023918	Merge pull request #1438 from dataease/pr@dev@feat_panel-link-jump ... feat: 仪表板处于公共链接模式，跳转的目标仪表板也以公共链接跳转，同时支持传参数	2021-12-14 15:23:06 +08:00
wangjiahao	2ea9678dd8	feat: 仪表板处于公共链接模式，跳转的目标仪表板也以公共链接跳转，同时支持传参数	2021-12-14 15:22:03 +08:00
taojinlong	4683181a6b	refactor: 回退	2021-12-14 15:20:44 +08:00
taojinlong	fc5bbd3689	Merge branch 'dev' of github.com:dataease/dataease into dev	2021-12-14 15:07:06 +08:00
taojinlong	82a5e142d2	fxi: 定时同步 db2	2021-12-14 15:06:47 +08:00
王嘉豪	791a76ca3c	Merge pull request #1437 from dataease/pr@dev@fix_panel-filter ... feat: 仪表板tab组件内视图，支持放大和编辑	2021-12-14 11:45:24 +08:00
wangjiahao	beb295f38f	feat: 仪表板tab组件内视图，支持放大和编辑	2021-12-14 11:43:41 +08:00
XiaJunjie2020	a079a97aac	Merge pull request #1436 from dataease/pr@dev@permission ... feat(视图): 行权限	2021-12-14 11:37:36 +08:00
junjie	d11021934b	feat(视图): 行权限	2021-12-14 11:35:35 +08:00
junjie	f4d81ef552	feat: 行权限构建	2021-12-14 11:10:04 +08:00
junjie	9505e3101b	feat: 行权限构建	2021-12-14 11:09:38 +08:00
XiaJunjie2020	1d61309804	Merge pull request #1435 from dataease/pr@dev@feat_logic ... feat(视图): 过滤器支持and、or逻辑	2021-12-14 10:14:51 +08:00
junjie	955d72cb75	feat(视图): 过滤器支持and、or逻辑	2021-12-14 10:14:02 +08:00
junjie	def246cc54	fix: rollback	2021-12-13 17:50:25 +08:00
XiaJunjie2020	92fa47d623	Merge pull request #1434 from dataease/pr@dev@feat_filter ... feat(视图): 过滤器支持and、or逻辑	2021-12-13 17:15:18 +08:00
junjie	6cb70f33a5	feat(视图): 过滤器支持and、or逻辑	2021-12-13 16:38:22 +08:00
taojinlong	96b4d2cf41	fxi: sql 拼接	2021-12-10 23:39:26 +08:00
taojinlong	87ea43b09d	fxi: sql 拼接	2021-12-10 23:37:01 +08:00
taojinlong	1f94e7cbda	Merge pull request #1433 from dataease/pr@dev@variable ... Merge branch 'dev' into pr@dev@variable	2021-12-10 23:23:58 +08:00
taojinlong	14536b648a	Merge branch 'dev' into pr@dev@variable	2021-12-10 23:21:01 +08:00
taojinlong	1e60188abd	feat(数据源): 数据集行权限	2021-12-10 23:20:17 +08:00
王嘉豪	9d7c2859db	Merge pull request #1431 from dataease/pr@devfix_panel-filter ... Pr@devfix panel filter	2021-12-10 17:02:43 +08:00
wangjiahao	2f109a94c9	Merge remote-tracking branch 'origin/dev' into pr@devfix_panel-filter	2021-12-10 17:02:05 +08:00
wangjiahao	31b76c1574	feat: 仪表板选项卡组件内视图支持放大编辑	2021-12-10 17:00:19 +08:00
junjie	139bd804ad	feat(视图): 同比环比	2021-12-10 15:58:01 +08:00
XiaJunjie2020	37cb956213	Merge pull request #1429 from dataease/pr@dev@feat_compare ... feat(视图): 同比环比	2021-12-10 11:38:24 +08:00
junjie	ea3133dd96	feat(视图): 同比环比	2021-12-10 11:37:26 +08:00
XiaJunjie2020	675b58093c	Merge pull request #1428 from dataease/pr@dev@feat_union_ds ... feat(数据集): 关联数据集	2021-12-10 11:25:42 +08:00
junjie	96fa9cc53e	feat(数据集): 关联数据集	2021-12-10 11:23:07 +08:00
XiaJunjie2020	e8fe0f22ef	Merge pull request #1427 from dataease/pr@dev@refactor_chart ... refactor(视图): 指标结果优化	2021-12-10 11:02:35 +08:00
junjie	deb5456d91	refactor(视图): 指标结果优化	2021-12-10 11:01:26 +08:00
XiaJunjie2020	94ad20200e	Merge pull request #1426 from dataease/pr@dev@feat_compare ... feat(视图): 同比环比	2021-12-10 10:44:41 +08:00
junjie	bfa247cbc3	feat(视图): 同比环比	2021-12-10 10:43:34 +08:00
fit2cloud-chenyw	562169320f	Merge pull request #1425 from dataease/pr@dev@revert_image ... revert: 镜像回退	2021-12-09 21:27:37 +08:00
fit2cloud-chenyw	44f721d3ae	revert: 镜像回退	2021-12-09 21:25:13 +08:00
fit2cloud-chenyw	7353b40ae7	Merge pull request #1424 from dataease/pr@dev@fix_image_sh ... feat: 修改镜像运行脚本	2021-12-09 19:00:08 +08:00
fit2cloud-chenyw	82a71052eb	feat: 修改镜像运行脚本	2021-12-09 18:59:01 +08:00
XiaJunjie2020	a78248e2fc	Merge pull request #1423 from dataease/pr@dev@feat_compare ... feat(视图): 同比环比	2021-12-09 18:33:16 +08:00
junjie	bcabbf905d	feat(视图): 同比环比	2021-12-09 18:32:30 +08:00
王嘉豪	1f65069e09	Merge pull request #1422 from dataease/pr@dev@fix_panel-filter ... fix: 仪表板编辑移入过滤组件时，点击叉号关闭出现占位未取消的问题	2021-12-09 18:27:39 +08:00
wangjiahao	99c6cfd9e4	fix: 仪表板编辑移入过滤组件时，点击叉号关闭出现占位未取消的问题	2021-12-09 18:26:42 +08:00
fit2cloud-chenyw	fa37c31fee	Merge pull request #1421 from dataease/pr@dev@feat_report_task_test ... feat: 定时报告镜像测试	2021-12-09 17:59:47 +08:00
fit2cloud-chenyw	12878873c3	feat: 定时报告镜像测试	2021-12-09 17:58:41 +08:00
junjie	ff2445d195	feat(数据集): 关联数据集	2021-12-09 16:51:21 +08:00
junjie	aead715995	feat(数据集): 关联数据集	2021-12-09 16:24:45 +08:00
wangjiahao	6b0acb4967	Merge remote-tracking branch 'origin/dev' into dev	2021-12-09 14:58:21 +08:00
wangjiahao	530c8e808a	feat: 增加移动端仪表板预览入口	2021-12-09 14:57:58 +08:00
fit2cloud-chenyw	5fafcd610b	Merge pull request #1419 from dataease/pr@dev@mobile_star_status ... feat: 移动端收藏状态	2021-12-09 12:48:18 +08:00
fit2cloud-chenyw	142ff835ca	feat: 移动端收藏状态	2021-12-09 12:47:07 +08:00