Commit Graph

6639 Commits

Author SHA1 Message Date
fit2cloud-chenyw
25a72fe68a
Merge pull request #2731 from dataease/pr@dev@fix_time_filter
fix(仪表板-过滤器): 时间过滤组件过滤精度到毫秒的视图有误差
2022-07-28 22:13:21 +08:00
fit2cloud-chenyw
76ee642459 fix(仪表板-过滤器): 时间过滤组件过滤精度到毫秒的视图有误差 2022-07-28 22:11:32 +08:00
fit2cloud-chenyw
c38a346414
Merge pull request #2730 from dataease/pr@dev@fix_date_ranger
fix(仪表板-过滤器): 日期范围过滤器失效
2022-07-28 20:33:14 +08:00
fit2cloud-chenyw
a703eb3cd5 fix(仪表板-过滤器): 日期范围过滤器失效 2022-07-28 20:32:28 +08:00
taojinlong
3dd8c45e92 fix(数据集): sql数据集变量 2022-07-28 18:34:49 +08:00
dataeaseShu
f1a302871c
Merge pull request #2727 from dataease/pr@dev_filter_search
Pr@dev filter search
2022-07-28 17:55:23 +08:00
fit2cloud-chenyw
c0c07f7d04
Merge pull request #2728 from dataease/pr@dev@perf_email_task_view
perf(系统管理-定时报告): 发送视图信息需要带入过滤条件
2022-07-28 17:53:29 +08:00
fit2cloud-chenyw
68591b8bda perf(系统管理-定时报告): 发送视图信息需要带入过滤条件 2022-07-28 17:52:15 +08:00
dataeaseShu
ddca5c8e4d Merge branch 'pr@dev_filter_search' of https://github.com/dataease/dataease into pr@dev_filter_search 2022-07-28 17:49:38 +08:00
dataeaseShu
2de5f85393 fix: 用户管理筛选bug修复 过滤组件添加全选 清除功能 2022-07-28 17:48:42 +08:00
dataeaseShu
8d24cc3ba1 fix: 用户管理筛选bug修复 过滤组件添加全选 清除功能 2022-07-28 17:47:59 +08:00
wangjiahao
39f01c2ba6 Merge remote-tracking branch 'origin/dev' into dev 2022-07-28 17:37:20 +08:00
wangjiahao
9104c1e0bd refactor(仪表板): 调整设置增加维度排序,按钮样式优化 2022-07-28 17:37:09 +08:00
taojinlong
bbc9f0d8b0 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-28 17:27:58 +08:00
taojinlong
085c162e4a fix(数据源): ck 字段识别错误 2022-07-28 17:26:30 +08:00
junjun
5ce82e474a refactor(视图): 记录数字段不应有去重计数聚合方式 2022-07-28 17:24:18 +08:00
taojinlong
d4371270d6 fix(数据集): 处理sql变量错误 2022-07-28 17:19:13 +08:00
taojinlong
a5e292f901 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-28 17:15:58 +08:00
taojinlong
f2942f2d3a Merge branch 'v1.13' into dev 2022-07-28 17:15:34 +08:00
taojinlong
c97b9a1ae6 fix(数据源): 数据源校验时事务锁表时间太长 2022-07-28 17:09:46 +08:00
junjun
ad93321cb0 fix(视图): 修复阈值小数类型字段图标不显示的问题 2022-07-28 16:50:29 +08:00
taojinlong
a039241691 fix(数据集): 数据集列权限空指针异常 2022-07-28 16:35:04 +08:00
taojinlong
9419f6ff67 fix(数据集): 识别 pg 表的字段错误 2022-07-28 16:16:56 +08:00
taojinlong
23aea04795 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-28 16:16:22 +08:00
wangjiahao
bd956d4333 style: 更换favicon.ico图标 2022-07-28 16:15:19 +08:00
taojinlong
449d56b31b fix(数据集): 识别 pg 表的字段错误 2022-07-28 15:51:12 +08:00
wangjiahao
1a4a3f6898 refactor(仪表板): 修改仪表板跳转设置拼接http逻辑,改为跳转时刻再进行检查拼接 2022-07-28 15:19:10 +08:00
王嘉豪
2f7eff48cb
Merge pull request #2724 from dataease/fix_panel-jump
style(模板市场): 模板市场交互优化
2022-07-28 14:34:05 +08:00
wangjiahao
45730d47fb style(模板市场): 模板市场交互优化 2022-07-28 14:33:38 +08:00
taojinlong
e5ca3808ee Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-28 14:25:07 +08:00
王嘉豪
e863221a6f
Merge pull request #2723 from dataease/fix_panel-jump
refactor(xpack): 权限管理交互优化
2022-07-28 11:09:38 +08:00
wangjiahao
c14c0a9cba refactor(xpack): 权限管理交互优化 2022-07-28 11:09:05 +08:00
fit2cloud-chenyw
e9145f847b
Merge pull request #2719 from dataease/pr@dev@revert_time
revert(仪表板): 时间过滤组件设置默认GMT时区
2022-07-27 21:47:17 +08:00
fit2cloud-chenyw
1d8f843d18 revert(仪表板): 时间过滤组件设置默认GMT时区 2022-07-27 21:46:27 +08:00
fit2cloud-chenyw
7d39d089f0
Merge pull request #2718 from dataease/pr@dev@fix_filter_time
fix(仪表板): 时间过滤组件设置默认GMT时区
2022-07-27 18:59:50 +08:00
fit2cloud-chenyw
2f6cbf3ac6 fix(仪表板): 时间过滤组件设置默认GMT时区 2022-07-27 18:58:11 +08:00
taojinlong
2089f9fb46 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-27 18:19:06 +08:00
taojinlong
31f68d95b6 fix(数据集): 检测数据集同步状态 2022-07-27 18:18:50 +08:00
王嘉豪
eec9180e94
Merge pull request #2716 from dataease/fix_panel-jump
refactor(xpack): 权限管理交互优化
2022-07-27 18:08:37 +08:00
wangjiahao
ce5f95d791 refactor(xpack): 权限管理交互优化 2022-07-27 18:07:28 +08:00
fit2cloud-chenyw
08795f851d
Merge pull request #2715 from dataease/pr@dev@fix_user_permission
fix(系统管理-用户管理): 修改用户角色后其他客户端不能实时同步信息
2022-07-27 14:58:00 +08:00
fit2cloud-chenyw
5c279293be fix(系统管理-用户管理): 修改用户角色后其他客户端不能实时同步信息 2022-07-27 14:57:05 +08:00
dataeaseShu
23e81bc9d6
Merge pull request #2713 from dataease/pr@dev_user_role_dept
Pr@dev user role dept
2022-07-27 12:26:05 +08:00
dataeaseShu
1a0ef867ca Merge branch 'pr@dev_user_role_dept' of https://github.com/dataease/dataease into pr@dev_user_role_dept 2022-07-27 12:25:25 +08:00
dataeaseShu
8ec64258b3 fix: 按钮hover修改 国际化 2022-07-27 12:25:08 +08:00
dataeaseShu
b4e96b9c2e fix: 按钮hover修改 国际化 2022-07-27 12:23:46 +08:00
taojinlong
1cf7a728f4 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-27 11:43:20 +08:00
taojinlong
cd2703c503 fix(数据源): 校验 API 数据源字段重复 2022-07-27 11:43:06 +08:00
junjun
24e8c300f5 fix(视图): 修复计算字段下钻异常 2022-07-27 10:47:44 +08:00
taojinlong
23dda3e22f Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-27 10:12:40 +08:00