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 |
|
zhangyu
|
4c7c5d6f46
|
NEZ-2919 fix：Project topology最上方无法展示监控状态
|
2023-06-26 09:49:33 +08:00 |
|
zhangyu
|
aca7f61d4b
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-25 15:28:52 +08:00 |
|
zhangyu
|
acef5e8bee
|
NEZ-2916 fix：Asset attributes页面，Group 选中Edit和Delete按钮，点击按钮空白处无效果
|
2023-06-25 15:26:41 +08:00 |
|
zhangyu
|
b53e415eb9
|
NEZ-2915 fix：Asset attributes页面，All数据，建议不显示Edit和Delect按钮
|
2023-06-25 15:14:43 +08:00 |
|
zhangyu
|
0328db0491
|
fix： el-seleect 可创建条目 以及 el-autocomplete 添加最大长度为64的限制
|
2023-06-25 14:52:20 +08:00 |
|
zhangyu
|
d3f2fa2767
|
NEZ-2914 fix：中文，新增标签页面，选择类型，选中数据应该显示为中文
|
2023-06-25 14:00:50 +08:00 |
|
zhangyu
|
fbf8550728
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-25 10:45:48 +08:00 |
|
zhangyu
|
7a53cf0a60
|
NEZ-2910 style：Explore页面，Metric查询，报错信息有遮挡
|
2023-06-25 10:15:13 +08:00 |
|
zhangyu
|
db2534c991
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-21 18:06:46 +08:00 |
|
zhangyu
|
f9017ac4df
|
Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-06-21 18:06:15 +08:00 |
|
zhangyu
|
cb4d0f3905
|
NEZ-2558 fix：当文件夹下文件及目录数量较大时，导致页面卡死
|
2023-06-21 18:05:03 +08:00 |
|
zhangyu
|
e34d77d563
|
NEZ-2882 fix： Web terminal查看中文文本时文字上方无法全部展示
|
2023-06-21 17:17:46 +08:00 |
|
zhangyu
|
1069d6c464
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-21 16:46:10 +08:00 |
|
zhangyu
|
41b78447fd
|
fix：修复 chartDiagram tooltip title宣誓显示错误的问题
|
2023-06-21 16:17:19 +08:00 |
|
zhangyu
|
cd72a41b35
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-21 15:37:25 +08:00 |
|
zhangyu
|
eb08fad0db
|
NEZ-2900 fix：批量修改资产页面，查询条件下拉内容建议和输入框对齐
|
2023-06-21 15:24:34 +08:00 |
|
zhangyu
|
c256f7f44d
|
NEZ-2901 fix：Record rules查看Metric时展开隐藏开关保存Chart，隐藏开关未被覆盖
|
2023-06-21 14:51:01 +08:00 |
|
zhangyu
|
8e8a7efaaa
|
NEZ-2902 fix：Record rules通过Metric保存Chart时，Group选项出现意外字符
|
2023-06-21 14:48:49 +08:00 |
|
zhangyu
|
913fa52530
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-06-21 14:22:26 +08:00 |
|
zhangyu
|
c4fc69cc2d
|
NEZ-2905 fix：Project编辑拓扑图时Thumbnail未同步更新
|
2023-06-21 14:22:17 +08:00 |
|