Commit Graph

6913 Commits

Author SHA1 Message Date
fit2cloud-chenyw
81c8a5caa5 style(系统管理-外观配置): 优化默认主题配色 2022-08-30 11:25:35 +08:00
junjun
35e4b2b95e fix(视图): 修复Impala指标过滤报错 2022-08-30 10:48:50 +08:00
taojinlong
7b9d5f6cfd Merge branch 'dev' of github.com:dataease/dataease into dev 2022-08-30 10:33:18 +08:00
taojinlong
3265f78d76 refactor: 梳理国际化 2022-08-30 10:29:50 +08:00
fit2cloud-chenyw
96f0cf7797
Merge pull request #2976 from dataease/pr@dev@fix_log_api_filter
perf(系统管理-日志管理): 查询日志api增加关键字模糊查询
2022-08-29 22:17:23 +08:00
fit2cloud-chenyw
9b67d68d89 perf(系统管理-日志管理): 查询日志api增加关键字模糊查询 2022-08-29 22:16:00 +08:00
fit2cloud-chenyw
25e46f41f8
Merge pull request #2975 from dataease/pr@dev@fix_login_foot_setting
fix(系统管理-外观配置): 登录页脚富文本编辑器删除非必要功能
2022-08-29 21:51:44 +08:00
fit2cloud-chenyw
1c434ec5ec fix(系统管理-外观配置): 登录页脚富文本编辑器删除非必要功能 2022-08-29 21:50:55 +08:00
dataeaseShu
045a1140d5
Merge pull request #2973 from dataease/pr@dev_station_msg
fix: lodash引用错误
2022-08-29 18:46:34 +08:00
dataeaseShu
49128f1688 fix: lodash引用错误 2022-08-29 18:45:05 +08:00
dataeaseShu
cce3ed4946
Merge pull request #2971 from dataease/pr@dev_station_msg
Pr@dev station msg
2022-08-29 18:17:22 +08:00
dataeaseShu
8a4eef1a99 Merge branch 'pr@dev_station_msg' of https://github.com/dataease/dataease into pr@dev_station_msg 2022-08-29 18:16:50 +08:00
dataeaseShu
bbf6d0a0b4 feat: 操作日志样式新增 模版管理优化 国际化样式bug 日期组件自定义主题 2022-08-29 18:16:46 +08:00
dataeaseShu
319f29d3aa feat: 操作日志样式新增 模版管理优化 国际化样式bug 日期组件自定义主题 2022-08-29 18:16:07 +08:00
taojinlong
5e5e1dd801 fix(数据源): API 数据集编辑后无变化 2022-08-29 18:14:56 +08:00
wangjiahao
74c1d2b249 refactor(仪表板): 增加自动缓存的附加信息,防止编辑界面没有显示名称 2022-08-29 17:59:41 +08:00
wangjiahao
5c171db343 Merge remote-tracking branch 'origin/dev' into dev 2022-08-29 17:31:23 +08:00
wangjiahao
d28f8fba02 refactor(仪表板): 增加自动缓存的附加信息,防止编辑界面没有显示名称 2022-08-29 17:31:09 +08:00
fit2cloud-chenyw
702da60c24
Merge pull request #2970 from dataease/pr@dev@fix_sql_dataset
fix(视图-气泡地图): sql数据集以分号结尾时气泡地图报错
2022-08-29 17:08:54 +08:00
fit2cloud-chenyw
458be2e666 fix(视图-气泡地图): sql数据集以分号结尾时气泡地图报错 2022-08-29 17:08:14 +08:00
wangjiahao
b29197d796 Merge remote-tracking branch 'origin/dev' into dev 2022-08-29 16:58:35 +08:00
wangjiahao
279736ccf4 fix(视图): 修复表格联动可能出现目标视图没有数据问题 2022-08-29 16:58:18 +08:00
taojinlong
42986de1fa Merge branch 'dev' of github.com:dataease/dataease into dev 2022-08-29 16:46:27 +08:00
fit2cloud-chenyw
9be493cacb
Merge pull request #2969 from dataease/pr@dev@style_filter_sure_button
style(仪表板-查询按钮): 按钮宽度未自适应
2022-08-29 16:42:28 +08:00
taojinlong
cfff619121 fix: sql 变量 2022-08-29 16:40:43 +08:00
fit2cloud-chenyw
a84e09fbca style(仪表板-查询按钮): 按钮宽度未自适应 2022-08-29 04:40:06 -04:00
fit2cloud-chenyw
76bc37f970
Merge pull request #2968 from dataease/pr@dev@fix_mobie_map
fix(视图-气泡地图): 移动端放大查看气泡地图样式模糊
2022-08-29 16:31:29 +08:00
fit2cloud-chenyw
ac628cbf18 fix(视图-气泡地图): 移动端放大查看气泡地图样式模糊 2022-08-29 04:30:37 -04:00
wangjiahao
e09b420fe2 refactor(仪表板): 增加使用旧版本仪表板模板的提示 2022-08-29 16:03:17 +08:00
wangjiahao
1ce3ddf574 Merge remote-tracking branch 'origin/dev' into dev 2022-08-29 15:52:20 +08:00
wangjiahao
33e63c7928 refactor(视图): echarts去掉不用的内容格式设置项 2022-08-29 15:52:00 +08:00
fit2cloud-chenyw
402ded93cf
Merge pull request #2967 from dataease/pr@dev@fix_time_com_default
fix(仪表板-其他组件): 时间组件默认值格式
2022-08-29 15:29:11 +08:00
fit2cloud-chenyw
83eec22071 fix(仪表板-其他组件): 时间组件默认值格式 2022-08-29 03:28:30 -04:00
wangjiahao
326abdb644 style(首页): 首页样式修改 2022-08-29 15:09:07 +08:00
wangjiahao
cb6ef78e16 Merge remote-tracking branch 'origin/dev' into dev 2022-08-29 15:01:49 +08:00
wangjiahao
6b197005a0 feat(首页): 更换新首页 2022-08-29 15:01:26 +08:00
fit2cloud-chenyw
6a1853ff4b
Merge pull request #2964 from dataease/pr@dev@fix_ck_time_filter
fix(仪表板-过滤器): ck数据源不能使用时间过滤器
2022-08-29 14:06:48 +08:00
fit2cloud-chenyw
2fb8e8ad9d fix(仪表板-过滤器): ck数据源不能使用时间过滤器 2022-08-29 14:05:50 +08:00
taojinlong
6caf958c4d Merge branch 'dev' of github.com:dataease/dataease into dev 2022-08-29 11:45:01 +08:00
taojinlong
a28ab4e81a fix: 去除重名变量 2022-08-29 11:44:40 +08:00
junjun
8616f0e2d2 refactor(视图): 切换数据集动态值重置 2022-08-29 11:03:06 +08:00
fit2cloud-chenyw
7edebc36cd
Merge pull request #2963 from dataease/pr@dev@fix_reset_button_and_select_all
fix(仪表板-清空按钮): 过滤器全选后清空按钮无法重置全选状态
2022-08-29 10:27:10 +08:00
taojinlong
719ca79c7c Merge branch 'v1.14' into dev 2022-08-29 10:26:15 +08:00
fit2cloud-chenyw
be7e501390 fix(仪表板-清空按钮): 过滤器全选后清空按钮无法重置全选状态 2022-08-29 10:26:07 +08:00
taojinlong
e140941c0d Merge branch 'v1.14' of github.com:dataease/dataease into v1.14 2022-08-29 10:19:11 +08:00
Zhimin Ruan
f39d15a7f9 chore: cleanup unnecessary console log 2022-08-26 22:22:23 +08:00
dataeaseShu
b2e48eefe5
Merge pull request #2957 from dataease/pr@dev_station_msg
Pr@dev station msg
2022-08-26 18:05:39 +08:00
dataeaseShu
47ae49047f Merge branch 'pr@dev_station_msg' of https://github.com/dataease/dataease into pr@dev_station_msg 2022-08-26 18:01:39 +08:00
dataeaseShu
ffc6f7dbe9 fix: 导航栏图标更换 逻辑修改 2022-08-26 18:01:34 +08:00
dataeaseShu
675db63496 fix: 导航栏图标更换 逻辑修改 2022-08-26 17:58:14 +08:00