Commit Graph

10973 Commits

Author SHA1 Message Date
dataeaseShu
e2888e55c1
Merge pull request #7471 from dataease/pr@dev_one_dot_x
fix: 视图过滤国际化
2023-12-29 14:16:22 +08:00
dataeaseShu
e9feee7041 fix: 视图过滤国际化 2023-12-29 14:13:46 +08:00
王嘉豪
1f41d5108f
Merge pull request #7470 from dataease/pr@dev@refactor_public-filter
refactor: 优化公共链接过滤器参数匹配方式
2023-12-29 12:50:10 +08:00
wangjiahao
1a97e90cf8 refactor: 优化公共链接过滤器参数匹配方式 2023-12-29 12:42:09 +08:00
王嘉豪
7fe0e5c4d4
Merge pull request #7464 from dataease/pr@dev@fix_app-filter
fix: 修复应用记录中无法筛选的问题
2023-12-29 11:11:28 +08:00
wangjiahao
bf95c0c358 fix: 修复应用记录中无法筛选的问题 2023-12-29 11:10:37 +08:00
王嘉豪
f18d7ecc38
Merge pull request #7460 from dataease/pr@dev@fix_app
fix: 修复应用管理中,应用应用成功后在应用记录中无法编辑问题 #7252
2023-12-28 21:34:24 +08:00
wangjiahao
ddf6915bd9 fix: 修复应用管理中,应用应用成功后在应用记录中无法编辑问题 #7252 2023-12-28 21:33:19 +08:00
王嘉豪
d38239c3d1
Merge pull request #7459 from dataease/pr@dev@refactor_filter-adptor
refactor: 过滤跳转适配
2023-12-28 21:01:37 +08:00
wangjiahao
a2c13b461d refactor: 过滤跳转适配 2023-12-28 20:59:08 +08:00
王嘉豪
6a8f17a020
Merge pull request #7458 from dataease/pr@dev@refactor_label
refactor: 修改文案
2023-12-28 18:57:31 +08:00
wangjiahao
ae0406e64b refactor: 修改文案 2023-12-28 18:56:35 +08:00
王嘉豪
ec8286ad0f
Merge pull request #7456 from dataease/pr@dev@style_label
style: 修改文案
2023-12-28 18:48:25 +08:00
wangjiahao
105ea0e226 style: 修改文案 2023-12-28 18:45:29 +08:00
王嘉豪
310be1771d
Merge pull request #7454 from dataease/pr@dev@fix_template
fix: 修复部分有告警线模版复用视图无法显示问题
2023-12-28 18:23:01 +08:00
wangjiahao
f48468004d fix: 修复部分有告警线模版复用视图无法显示问题 2023-12-28 18:20:00 +08:00
taojinlong
30c4eaccfb
Merge pull request #7452 from dataease/pr@dev@fixSql
Pr@dev@fix sql
2023-12-28 18:09:24 +08:00
taojinlong
48cdabfb15 fix: 解析sql失败 2023-12-28 17:52:33 +08:00
taojinlong
feae0b9169 fix: 解析sql失败 2023-12-28 15:38:41 +08:00
fit2cloud-chenyw
b5084614d6
Merge pull request #7448 from dataease/pr@dev@fix_panel_error
fix: 仪表板报错
2023-12-28 14:54:01 +08:00
fit2cloud-chenyw
7173b53d16 fix: 仪表板报错 2023-12-28 14:52:50 +08:00
dataeaseShu
1a30b2e8fe
Merge pull request #7445 from dataease/pr@dev_one_dot_x
fix: 目录/仪表板/视图标题可输入空格创建[Bug] #7255
2023-12-28 14:23:28 +08:00
dataeaseShu
3ff7a14f48 fix: 目录/仪表板/视图标题可输入空格创建[Bug] #7255 2023-12-28 14:16:34 +08:00
王嘉豪
0cb9226e90
Merge pull request #7441 from dataease/pr@dev@fix_mobile-adaptor
fix: 修复关闭组件自适应后,在手机端查看仪表板,视图字号特别大问题
2023-12-28 13:27:47 +08:00
wangjiahao
d91a55550c fix: 修复关闭组件自适应后,在手机端查看仪表板,视图字号特别大问题 2023-12-28 13:25:51 +08:00
Junjun
4f33987711
Merge pull request #7438 from dataease/pr@dev@chore_remove_log
chore: remove log
2023-12-28 12:04:18 +08:00
junjun
13d8da50ad chore: remove log 2023-12-28 12:03:14 +08:00
Junjun
7a1c4c8efd
Merge pull request #7436 from dataease/pr@dev@fix_filter
fix: 视图插件支持与或过滤器
2023-12-28 11:49:54 +08:00
junjun
e1f1f10d42 fix: 视图插件支持与或过滤器 2023-12-28 11:49:11 +08:00
Junjun
2e54af1df0
Merge pull request #7435 from dataease/pr@dev@chore_log
chore: log
2023-12-28 11:30:43 +08:00
junjun
7ef9826106 chore: log 2023-12-28 11:29:17 +08:00
dataeaseShu
7d0b8e42d2
Merge pull request #7434 from dataease/pr@dev_one_dot_x
fix: 视图过滤器标签文字字号不对、标签背景高度不对
2023-12-28 11:18:51 +08:00
dataeaseShu
412100c984 fix: 视图过滤器标签文字字号不对、标签背景高度不对 2023-12-28 11:18:29 +08:00
dataeaseShu
279fdf7998
Merge pull request #7432 from dataease/pr@dev_one_dot_x
fix: 视图过滤器标签文字字号不对、标签背景高度不对
2023-12-28 11:14:42 +08:00
dataeaseShu
19d7f22ef8 fix: 视图过滤器标签文字字号不对、标签背景高度不对 2023-12-28 11:14:08 +08:00
Junjun
32632d5a25
Merge pull request #7430 from dataease/pr@dev@chore_l
chore: log
2023-12-28 11:00:17 +08:00
junjun
899f0ca2e5 chore: log 2023-12-28 10:58:24 +08:00
Junjun
049bb979af
Merge pull request #7429 from dataease/pr@dev@chore_log
chore: log
2023-12-28 10:41:02 +08:00
junjun
b666e1a093 chore: log 2023-12-28 10:38:57 +08:00
fit2cloud-chenyw
497e85833d
Merge pull request #7427 from dataease/pr@dev@fix_selector_filter
fix: 下拉过滤器设置首项和必填删除过滤器视图未更新
2023-12-28 10:23:28 +08:00
fit2cloud-chenyw
2204cad555 fix: 下拉过滤器设置首项和必填删除过滤器视图未更新 2023-12-28 10:21:47 +08:00
fit2cloud-chenyw
80d0822a24
Merge pull request #7418 from dataease/pr@dev@fix_filter_select_options
fix: 下拉过滤器选项先排序去重再取1000条
2023-12-27 18:07:16 +08:00
fit2cloud-chenyw
017dcffe67 fix: 下拉过滤器选项先排序去重再取1000条 2023-12-27 18:05:36 +08:00
dataeaseShu
f98bdf9a50
Merge pull request #7417 from dataease/pr@dev_one_dot_x
fix: 系统管理-任务管理-数据同步,点击“添加任务”后,页面左侧导航栏自动消失 #7373
2023-12-27 18:05:01 +08:00
dataeaseShu
9023b65fb4 fix: 系统管理-任务管理-数据同步,点击“添加任务”后,页面左侧导航栏自动消失 #7373 2023-12-27 18:02:15 +08:00
dataeaseShu
2ed9d7832a
Merge pull request #7412 from dataease/pr@dev_one_dot_x
Pr@dev one dot x
2023-12-27 16:08:10 +08:00
dataeaseShu
67592ee968 Merge branch 'dev' into pr@dev_one_dot_x 2023-12-27 16:07:28 +08:00
dataeaseShu
f27dd9483a fix: 过滤组件编辑状态选择多个选项无法被选中 2023-12-27 16:04:32 +08:00
dataeaseShu
b8c4378ad2
Merge pull request #7404 from dataease/pr@dev_one_dot_x
fix: 字体
2023-12-27 15:16:44 +08:00
王嘉豪
5369093668
Merge pull request #7403 from dataease/pr@dev@refactor_loading
refactor: 去掉插件加载非必要的loading提示
2023-12-27 15:16:00 +08:00