Commit Graph

6999 Commits

Author SHA1 Message Date
fit2cloud-chenyw
6c8e3594c3
Merge branch 'dev' into pr@dev@fix_import_user_error_tip 2022-08-31 18:14:12 +08:00
fit2cloud-chenyw
41169bf62e fix(系统管理-用户管理): 导入用户错误提示 2022-08-31 18:07:40 +08:00
wangjiahao
630087dc91 style: Tab组件中富文本视图不需显示明显放大按钮 2022-08-31 17:23:39 +08:00
wangjiahao
f32663b298 Merge remote-tracking branch 'origin/dev' into dev 2022-08-31 16:56:45 +08:00
wangjiahao
193423bb98 refactor: 样式设置缩略图增加分类部署读取方式 2022-08-31 16:56:34 +08:00
taojinlong
05e96c94e2 fix(数据集): sql 数据集变量 2022-08-31 16:53:45 +08:00
taojinlong
549ee2a4ad refactor(数据集): 国际化 2022-08-31 16:39:46 +08:00
taojinlong
ee9a8d6906 fix(数据集): api 数据集换行问题 2022-08-31 16:37:23 +08:00
wangjiahao
d86a9b46f1 Merge remote-tracking branch 'origin/dev' into dev 2022-08-31 16:23:34 +08:00
wangjiahao
742fdf422a style(仪表板): 辅助网格按钮样式修改 2022-08-31 16:23:21 +08:00
dataeaseShu
18d3c8fbd4
Merge pull request #3016 from dataease/pr@dev_station_msg
Pr@dev station msg
2022-08-31 16:17:01 +08:00
dataeaseShu
6871a6b005 Merge branch 'dev' into pr@dev_station_msg 2022-08-31 16:16:06 +08:00
dataeaseShu
0ba75bb98c fix: 筛选组件 国际化优化 2022-08-31 16:13:59 +08:00
taojinlong
7d2b885764 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-08-31 15:59:24 +08:00
taojinlong
13b87ea796 refactor(国际化): 梳理国际化 2022-08-31 15:59:12 +08:00
fit2cloud-chenyw
2d6d7449a3
Merge pull request #3015 from dataease/pr@dev@fix_clear_button
fix(仪表板-下拉列表过滤器): 清空按钮触发不能重置下拉列表的全选框
2022-08-31 15:19:51 +08:00
fit2cloud-chenyw
13987e32a6 fix(仪表板-下拉列表过滤器): 清空按钮触发不能重置下拉列表的全选框 2022-08-31 15:19:09 +08:00
fit2cloud-chenyw
d645081747
Merge pull request #3014 from dataease/pr@dev@fix_mobile_layout_switch
fix(仪表板-过滤器): 仪表板编辑状态下切换移动布局再切回来过滤器逻辑错误
2022-08-31 14:50:13 +08:00
fit2cloud-chenyw
222ba6565d fix(仪表板-过滤器): 仪表板编辑状态下切换移动布局再切回来过滤器逻辑错误 2022-08-31 14:47:44 +08:00
王嘉豪
21c1402907
Merge pull request #3012 from dataease/pr@dev@style_view
style(视图): 富文本视图编辑区去掉维度指标前斜杠
2022-08-31 14:28:51 +08:00
wangjiahao
32b5c935c3 style(视图): 富文本视图编辑区去掉维度指标前斜杠 2022-08-31 14:24:55 +08:00
taojinlong
3030a0d656 fix(数据集): 定时任务 2022-08-31 14:22:20 +08:00
taojinlong
6c8dbbef12 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-08-31 13:34:58 +08:00
taojinlong
cf8f0cb5e4 fix(数据集): API 数据集报错 2022-08-31 13:34:49 +08:00
fit2cloud-chenyw
6335dc2738
Merge pull request #3008 from dataease/pr@dev@fix_filter_sort
fix(仪表板-下拉框过滤器): 拖入多个字段排序字段无法展示
2022-08-31 13:12:03 +08:00
fit2cloud-chenyw
2ea8a41d75 fix(仪表板-下拉框过滤器): 拖入多个字段排序字段无法展示 2022-08-31 13:11:22 +08:00
junjun
e0efb332ff fix(视图): 解决js日期适配问题 2022-08-31 11:46:13 +08:00
taojinlong
074d925432 fix(数据集): 定时同步,显示数据不全 2022-08-31 11:43:11 +08:00
junjun
0d17501a81 Merge remote-tracking branch 'origin/dev' into dev 2022-08-31 11:30:17 +08:00
junjun
a0f4372c97 fix(数据集): 解决sql加密导致拼接错误 2022-08-31 11:29:58 +08:00
fit2cloud-chenyw
765909db1d
Merge pull request #3007 from dataease/pr@dev@fix_del_unuse_menu
perf(系统管理-消息管理): 删除已读消息未读消息菜单
2022-08-31 11:27:11 +08:00
junjun
ce840d90cf fix(数据集): 解决sql加密导致拼接错误 2022-08-31 11:26:55 +08:00
fit2cloud-chenyw
75e0e41e21 perf(系统管理-消息管理): 删除已读消息未读消息菜单 2022-08-31 11:25:55 +08:00
fit2cloud-chenyw
ba10fd8041
Merge pull request #3006 from dataease/pr@dev@fix_email_task_view
perf(系统管理-定时报告): 定时报告带模版视图数据报错
2022-08-31 11:18:46 +08:00
fit2cloud-chenyw
f9eca82ed7 perf(系统管理-定时报告): 定时报告带模版视图数据报错 2022-08-31 11:15:37 +08:00
王嘉豪
b15c2e6ef7
Merge pull request #3005 from dataease/pr@dev@refactor-structure
refactor: 优化代码结构
2022-08-31 10:45:15 +08:00
wangjiahao
2d66c2b0b6 refactor: 优化代码结构 2022-08-31 10:44:40 +08:00
junjun
b6ba0080a4 feat(视图): 仪表盘仅支持百分比模式 2022-08-31 10:09:13 +08:00
fit2cloud-chenyw
decc462dc8
Merge pull request #3003 from dataease/pr@dev@fix_oidc_login
fix(登录-oidc): 修改系统默认密码后再次登录oidc用户失败
2022-08-30 22:07:43 +08:00
fit2cloud-chenyw
0301840a8d fix(登录-oidc): 修改系统默认密码后再次登录oidc用户失败 2022-08-30 22:06:39 +08:00
dataeaseShu
cd0651d7df
Merge pull request #3002 from dataease/pr@dev_station_msg
Pr@dev station msg
2022-08-30 21:29:11 +08:00
dataeaseShu
9189bb1b70
Merge branch 'dev' into pr@dev_station_msg 2022-08-30 21:28:47 +08:00
fit2cloud-chenyw
e62730018a
Merge pull request #3001 from dataease/pr@dev@fix_log_export
fix(系统管理-日志管理): 导出日志没有带过滤条件
2022-08-30 21:25:38 +08:00
dataeaseShu
bacd5c65be Merge branch 'pr@dev_station_msg' of https://github.com/dataease/dataease into pr@dev_station_msg 2022-08-30 21:25:20 +08:00
dataeaseShu
f36fdc0e6f fix: 左侧图标适配主题 表格列bug 2022-08-30 21:25:11 +08:00
dataeaseShu
fad65004ef feat: 操作日志 详情筛选 修改密码优化 日期组件优化 2022-08-30 21:25:10 +08:00
fit2cloud-chenyw
b2bd496306 fix(系统管理-日志管理): 导出日志没有带过滤条件 2022-08-30 21:24:56 +08:00
dataeaseShu
dd237e93de fix: 左侧图标适配主题 表格列bug 2022-08-30 21:23:35 +08:00
fit2cloud-chenyw
52b6f14334
Merge pull request #3000 from dataease/pr@dev@fix_log_api
perf(系统管理-日志管理): 优化查询日志api过滤条件
2022-08-30 21:18:21 +08:00
fit2cloud-chenyw
44ef6be371 perf(系统管理-日志管理): 优化查询日志api过滤条件 2022-08-30 21:17:32 +08:00