5921 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
fit2cloud-chenyw	3d2e4f5edd	Merge pull request #2461 from dataease/pr@dev@fix_api_auth_error_i18n ... fix: api权限错误提示国际化	2022-06-21 14:40:45 +08:00
fit2cloud-chenyw	32e76cdf82	fix: api权限错误提示国际化	2022-06-21 14:39:40 +08:00
dataeaseShu	d796226601	Merge pull request #2460 from dataease/pr@dev_filter_input_style_custom ... feat: 过滤组件自定义样式	2022-06-21 14:39:17 +08:00
dataeaseShu	1d63c2234e	feat: 过滤组件自定义样式	2022-06-21 14:37:08 +08:00
junjun	2620ddd16d	feat: 视图支持计算字段	2022-06-21 11:31:44 +08:00
fit2cloud-chenyw	c3c642612c	Merge pull request #2459 from dataease/pr@dev@fix_font_timeout_notnull ... fix: 前端超时时间非空判断	2022-06-21 11:19:59 +08:00
fit2cloud-chenyw	92f037658d	fix: 前端超时时间非空判断	2022-06-21 11:18:35 +08:00
fit2cloud-chenyw	0722b86673	Merge pull request #2458 from dataease/pr@dev@fix_plugin_upload_error ... fix: 安装插件错误提示简化	2022-06-21 10:05:22 +08:00
fit2cloud-chenyw	4e256ce68f	fix: 安装插件错误提示简化	2022-06-21 10:02:06 +08:00
junjun	71dab8280f	Merge remote-tracking branch 'origin/dev' into dev	2022-06-20 18:35:12 +08:00
junjun	1d0e0e92ad	feat: 视图支持计算字段	2022-06-20 18:35:00 +08:00
maninhill	24b4d0a98f	Update README.md ... 增加模板市场链接。	2022-06-20 18:30:44 +08:00
taojinlong	e5538941ce	Merge branch 'dev' of github.com:dataease/dataease into dev	2022-06-20 17:40:49 +08:00
junjun	78022a8244	fix: 视图计算字段权限问题	2022-06-20 17:40:13 +08:00
taojinlong	7e5a78334b	fix: 获取数据源类型	2022-06-20 17:39:44 +08:00
fit2cloud-chenyw	3cf23370fe	Merge pull request #2456 from dataease/pr@dev@fix_plugin_error_tip ... fix: 插件上传错误提示	2022-06-20 17:19:26 +08:00
fit2cloud-chenyw	e39ee7844f	fix: 插件上传错误提示	2022-06-20 17:18:07 +08:00
fit2cloud-chenyw	d29eaac857	Merge pull request #2455 from dataease/pr@dev@perf_filter_tree ... perf: 树过滤组件模糊搜索后全选只选中展示的节点	2022-06-20 17:10:17 +08:00
fit2cloud-chenyw	48199f9116	perf: 树过滤组件模糊搜索后全选只选中展示的节点	2022-06-20 17:08:47 +08:00
fit2cloud-chenyw	7cdc0600f6	Merge pull request #2453 from dataease/pr@dev@feat_filter_dataset_back ... feat: 过滤组件选择数据集时支持逐级返回	2022-06-20 16:19:19 +08:00
fit2cloud-chenyw	5eb0a652e8	feat: 过滤组件选择数据集时支持逐级返回	2022-06-20 16:18:22 +08:00
junjun	ab7eb50165	feat: 视图仪表盘改造	2022-06-20 15:41:39 +08:00
taojinlong	179776fa4b	Merge branch 'dev' of github.com:dataease/dataease into dev	2022-06-20 15:00:12 +08:00
taojinlong	f29aa2ca95	fix: 解析 sql 空指针异常	2022-06-20 14:59:02 +08:00
junjun	b53392762b	feat: 视图仪表盘改造	2022-06-20 14:52:38 +08:00
fit2cloud-chenyw	8f3bbc56c9	Merge pull request #2446 from dataease/pr@dev@fix_log_condition ... fix: 日志类型模糊搜索选择目标后词条消失	2022-06-20 10:14:08 +08:00
fit2cloud-chenyw	eb01ec59ea	fix: 日志类型模糊搜索选择目标后词条消失	2022-06-20 10:12:30 +08:00
junjun	d9e967a0c3	fix: echarts辅助线删除后存在缓存	2022-06-17 20:08:12 +08:00
fit2cloud-chenyw	4cb4b36aae	Merge pull request #2444 from dataease/pr@dev@fix_log_grid_condition ... fix: 日志类型增加模糊搜索	2022-06-17 19:33:50 +08:00
fit2cloud-chenyw	f15f3cc90c	fix: 日志类型增加模糊搜索	2022-06-17 19:31:19 +08:00
taojinlong	05f510d3af	fix: 回滚代码	2022-06-17 17:17:14 +08:00
Zhimin Ruan	4c3c925510	chore: pom.xml 格式化	2022-06-17 14:38:20 +08:00
taojinlong	8870903e0d	Merge branch 'dev' of github.com:dataease/dataease into dev	2022-06-17 13:31:17 +08:00
taojinlong	2cfc3b457e	fix: 依赖冲突	2022-06-17 13:26:40 +08:00
fit2cloud-chenyw	a4d82e1ee7	Merge pull request #2443 from dataease/pr@dev@perf_cas_tips ... perf: 优化cas切换api提示	2022-06-17 11:41:10 +08:00
fit2cloud-chenyw	016ef078c5	perf: 优化cas切换api提示	2022-06-17 11:40:04 +08:00
taojinlong	1e12eb5b64	Merge branch 'dev' of github.com:dataease/dataease into dev	2022-06-17 11:36:55 +08:00
taojinlong	20bb6f4ea5	fix: 同步字段时，顺序错误	2022-06-17 11:36:45 +08:00
fit2cloud-chenyw	c59591515d	Merge pull request #2442 from dataease/pr@dev@perf_cas_reset_tips ... perf: 增加cas切换默认登录方式api提示	2022-06-17 11:35:40 +08:00
fit2cloud-chenyw	9e84312073	perf: 增加cas切换默认登录方式api提示	2022-06-17 11:18:15 +08:00
wangjiahao	a3e607c5ac	style: 弹框样式修改	2022-06-17 11:16:03 +08:00
wangjiahao	9fe2d14656	revert: 删除workflows CodeQL	2022-06-17 11:07:08 +08:00
wangjiahao	fc94f23edb	Merge remote-tracking branch 'origin/dev' into dev	2022-06-17 10:55:57 +08:00
wangjiahao	524e9abd79	refactor: 扫描问题优化	2022-06-17 10:55:44 +08:00
fit2cloud-chenyw	c65e461fa8	Merge pull request #2441 from dataease/pr@dev@perf_cas_reset ... perf: 重置cas登录方式api增加管理员校验	2022-06-17 10:35:46 +08:00
fit2cloud-chenyw	3642805e67	perf: 重置cas登录方式api增加管理员校验	2022-06-17 10:34:41 +08:00
taojinlong	4036018676	Merge pull request #2440 from dataease/pr@dev@params ... feat: sql 数据集传参	2022-06-16 23:04:20 +08:00
taojinlong	6c9191e9bd	refactor: 解决冲突	2022-06-16 23:03:07 +08:00
taojinlong	3293f3a870	feat: 参数管理	2022-06-16 22:41:09 +08:00
fit2cloud-chenyw	a18964f0b7	Merge pull request #2439 from dataease/pr@dev@feat_fit_xpack_cas ... feat: 适配xpack-cas单点登录	2022-06-16 18:42:06 +08:00