Commit Graph

7224 Commits

Author SHA1 Message Date
dataeaseShu
341cc2dac1
Merge pull request #3026 from dataease/pr@dev_station_msg
Pr@dev station msg
2022-08-31 23:57:27 +08:00
dataeaseShu
ee1283326e Merge branch 'dev' into pr@dev_station_msg 2022-08-31 23:56:22 +08:00
dataeaseShu
eb6ec58cfb fix: 用户筛选国际化 2022-08-31 23:55:04 +08:00
dataeaseShu
bc36300c06 fix: 执行记录信息提示 2022-08-31 23:54:37 +08:00
dataeaseShu
fc0934d240 fix: 操作日志筛选 2022-08-31 23:53:53 +08:00
dataeaseShu
950024225c fix: 未读信息按钮状态 2022-08-31 23:53:31 +08:00
dataeaseShu
9b260f53ac fix: 管理员不可删除 2022-08-31 23:51:35 +08:00
fit2cloud-chenyw
11426fc96b
Merge pull request #3025 from dataease/pr@dev@fix_scroll_s2_error
fix(视图-s2表格): 预览s2表格后切换到空仪表板拖动浏览器控制台报错
2022-08-31 22:34:41 +08:00
fit2cloud-chenyw
004054f3ba fix(视图-s2表格): 预览s2表格后切换到空仪表板拖动浏览器控制台报错 2022-08-31 22:33:48 +08:00
fit2cloud-chenyw
72d1c316e3
Merge pull request #3024 from dataease/pr@dev@fix_map_init_style
fix(视图-地图): 深色主题新建地图缩放按钮依然是浅色
2022-08-31 21:41:08 +08:00
fit2cloud-chenyw
c9f72476ab fix(视图-地图): 深色主题新建地图缩放按钮依然是浅色 2022-08-31 21:40:14 +08:00
dataeaseShu
12f211401c
Merge pull request #3023 from dataease/pr@dev_station_msg
Pr@dev station msg
2022-08-31 21:35:33 +08:00
dataeaseShu
fe8632f10b Merge branch 'dev' into pr@dev_station_msg 2022-08-31 21:34:32 +08:00
dataeaseShu
e0b4c668d6 fix: 任务管理 筛选bug 2022-08-31 21:31:48 +08:00
dataeaseShu
841eaf1489 fix: 默认系统主题优化 2022-08-31 21:31:01 +08:00
dataeaseShu
f5bdc4aa29 fix: 模版管理 删除bug 2022-08-31 21:30:18 +08:00
dataeaseShu
807a78bec0 fix: 添加用户 背景色添加 2022-08-31 21:29:42 +08:00
dataeaseShu
d4ed421955 fix: 定时任务样式统一 2022-08-31 21:28:42 +08:00
taojinlong
0decf28426 fix(数据集): 校验API数据源 2022-08-31 20:30:19 +08:00
dataeaseShu
d308f906e8
Merge pull request #3022 from dataease/pr@dev_station_msg
Pr@dev station msg
2022-08-31 18:42:30 +08:00
dataeaseShu
1ba1c30355 Merge branch 'dev' into pr@dev_station_msg 2022-08-31 18:41:38 +08:00
dataeaseShu
52497a0aeb fix: 任务管理优化 2022-08-31 18:39:25 +08:00
fit2cloud-chenyw
74e0e8cba5
Merge pull request #3020 from dataease/pr@dev@fix_plugin_info
fix(系统管理-插件管理): 修改插件信息
2022-08-31 18:29:23 +08:00
fit2cloud-chenyw
1bd7d171c2 fix(系统管理-插件管理): 修改插件信息 2022-08-31 18:28:16 +08:00
fit2cloud-chenyw
e4d85fb8d3
Merge pull request #3019 from dataease/pr@dev@fix_import_user_error_tip
fix(系统管理-用户管理): 导入用户错误提示
2022-08-31 18:14:26 +08:00
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