zhangyu
|
e937b24b4c
|
NEZ-2943 fix：Silences-Alert页面，删除告警报错，Request method 'DELETE' not supported
rel-23.04.04
|
2023-06-29 17:20:03 +08:00 |
|
zhangyu
|
27beb95fbd
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-29 16:33:43 +08:00 |
|
zhangyu
|
3c8904f224
|
NEZ-2951 fix：修复clock 不加载的问题
|
2023-06-29 16:31:49 +08:00 |
|
zyh
|
2ae5342870
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8
|
2023-06-29 14:23:16 +08:00 |
|
zyh
|
4c8b42544f
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7
|
2023-06-29 14:22:34 +08:00 |
|
zyh
|
9bb1b1aba2
|
NEZ-2948 fix：Endpoints弹窗选择资产表头未国际化
|
2023-06-29 14:22:20 +08:00 |
|
zhangyu
|
ed9dea68ab
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-29 14:18:58 +08:00 |
|
zhangyu
|
6757b0da7c
|
fix：中文下Users模块Name与详情下Name不一致
|
2023-06-29 14:18:12 +08:00 |
|
zhangyu
|
e44e4042b7
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-29 10:02:41 +08:00 |
|
zhangyu
|
daa35d5df1
|
NEZ-2945 fix：查看告警详情时开启同比后下方选项被遮挡
|
2023-06-29 10:01:07 +08:00 |
|
zhangyu
|
7c6875b9c9
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-28 17:09:47 +08:00 |
|
zhangyu
|
49ba836760
|
NEZ-2944 fix：Project拓扑图点击非下拉框位置时，下拉框被展开
|
2023-06-28 17:07:46 +08:00 |
|
zhangyu
|
0cf64684b7
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-28 16:28:58 +08:00 |
|
zhangyu
|
7e73403dc5
|
NEZ-2942 fix：告警静默-告警页面，ID和确认查询条件未生效
|
2023-06-28 16:28:20 +08:00 |
|
zhangyu
|
1e4f6aca7a
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-28 15:58:24 +08:00 |
|
zhangyu
|
7fb5ec2c1f
|
fix：修改 meta删除后表格不刷新的问题
|
2023-06-28 15:57:01 +08:00 |
|
zhangyu
|
b3bc6f69e7
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-28 15:11:39 +08:00 |
|
zhangyu
|
4ea9b5411d
|
NEZ-2941 fix：Users模块Web terminal log搜索记录中State未显示实际值
|
2023-06-28 15:10:03 +08:00 |
|
zhangyu
|
c0880530d9
|
NEZ-2941 fix：Users模块Web terminal log搜索记录中State未显示实际值
|
2023-06-28 15:09:10 +08:00 |
|
zhangyu
|
54913c21bf
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-28 14:45:34 +08:00 |
|
zhangyu
|
f45b563144
|
NEZ-2939 style：拓扑图Thumbnail 添加主题
|
2023-06-28 14:44:59 +08:00 |
|
zhangyu
|
5920005710
|
Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-06-28 14:36:36 +08:00 |
|
zhangyu
|
f80f0dc3c9
|
Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6
|
2023-06-28 14:35:06 +08:00 |
|
zhangyu
|
5c36266eea
|
NEZ-2940 fix：Users模块重置2FA按钮缺少图标
|
2023-06-28 14:32:26 +08:00 |
|
zhangyu
|
b619aedc0d
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-28 10:05:37 +08:00 |
|
zhangyu
|
310a699471
|
NEZ-2933 fix：添加mac地址的正则表达式
|
2023-06-27 15:44:02 +08:00 |
|
zhangyu
|
48968749d4
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-27 15:28:45 +08:00 |
|
zhangyu
|
cc591b79ce
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-06-27 15:27:35 +08:00 |
|
zhangyu
|
844fc835e8
|
Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-06-27 15:27:21 +08:00 |
|
zhangyu
|
f502b7a74f
|
Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6
|
2023-06-27 15:25:04 +08:00 |
|
zhangyu
|
6a7db88f91
|
NEZ-2935 fix：告警规则页面，有效时间日期与新增时显示的不一致
|
2023-06-27 15:22:31 +08:00 |
|
zyh
|
aa9435b726
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8
|
2023-06-27 15:19:37 +08:00 |
|
zyh
|
37ddf4acda
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7
|
2023-06-27 15:15:48 +08:00 |
|
zyh
|
29c6580d32
|
NEZ-2929 fix：IPAM新建时Type下拉框靠后位置无法点击
|
2023-06-27 15:15:15 +08:00 |
|
zhangyu
|
3086e5e6c4
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-27 14:45:38 +08:00 |
|
zhangyu
|
654952e489
|
Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-06-27 14:44:52 +08:00 |
|
zhangyu
|
4f30b66ba4
|
Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6
# Conflicts:
# nezha-fronted/src/assets/css/common.scss
# nezha-fronted/src/components/chart/chartList.vue
|
2023-06-27 14:43:59 +08:00 |
|
zhangyu
|
245c737b2c
|
NEZ-2932 fix：Map of datacenter 全屏后Tooltip位置异常
|
2023-06-27 14:39:44 +08:00 |
|
zhangyu
|
06f849fb66
|
NEZ-2928 fix：开启多个页面，存在不同语言的情况下，在界面开启Rules的定时计划提示信息语言不一致
|
2023-06-27 14:27:53 +08:00 |
|
zyh
|
dc07a09bf2
|
Merge branch 'dev-3.8' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8
|
2023-06-27 11:29:51 +08:00 |
|
zyh
|
c6e4c17fa2
|
NEZ-2903 feat：dashboard 表格图表增加默认排序等配置项
|
2023-06-27 11:29:37 +08:00 |
|
zhangyu
|
aa372ffe2e
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-26 15:46:29 +08:00 |
|
zhangyu
|
ea62255cd1
|
fix： IPAM详情的State列内容在中文下未进行翻译
|
2023-06-26 15:45:36 +08:00 |
|
zhangyu
|
c6c75c1e70
|
NEZ-2925 fix：建议zoom仅保留整数
|
2023-06-26 15:43:25 +08:00 |
|
zhangyu
|
c6d0d52000
|
fix：处理历史记录没有国际化的问题
|
2023-06-26 14:23:13 +08:00 |
|
zhangyu
|
dce454a9e2
|
NEZ-2923 fix：Edit module页面，Pipelines下拉框，Transform stages字段有遮挡
|
2023-06-26 13:44:02 +08:00 |
|
zhangyu
|
966de386da
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-26 10:38:11 +08:00 |
|
zhangyu
|
4ebea0b205
|
fix：修复 Dashboard templates中文下未对type列内容进行翻译
|
2023-06-26 10:37:30 +08:00 |
|
zhangyu
|
2d2cab2d02
|
NEZ-2920 fix：修复 Tools 外层删除时 未检查all 的状态
|
2023-06-26 10:34:42 +08:00 |
|
zhangyu
|
ed1b97b8d2
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-26 09:52:33 +08:00 |
|