Commit Graph

6860 Commits

Author SHA1 Message Date
zyh
868c20cd12 Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-07-14 18:16:05 +08:00
zyh
0ac88c020b NEZ-2974 style:调整SNMP browser set弹窗样式 2023-07-14 18:15:02 +08:00
zyh
cedb3a4016 Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-07-14 15:59:48 +08:00
zyh
5b62ee22ec Merge branch 'dev-3.6' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7 2023-07-14 15:59:08 +08:00
zyh
234143ed08 Merge branch 'dev-3.5' of git.mesalab.cn:nezha/nezha-fronted into dev-3.6 2023-07-14 15:56:16 +08:00
zyh
b42f3468ec NEZ-2986 fix:clock图表多次渲染 未清除上次的定时器 2023-07-14 15:55:41 +08:00
zhangyu
473b506a69 NEZ-2977 fix:调整required 位置 2023-07-13 17:16:52 +08:00
zyh
946abe2fa0 Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-07-13 16:06:13 +08:00
zyh
2a8e03b5c7 Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7 2023-07-13 16:05:44 +08:00
zyh
c7e56e15d0 NEZ-2985 fix:Asset attributes选择group 下拉菜单点击后未消失 2023-07-13 16:05:29 +08:00
zhangyu
27730934c7 NEZ-2977 feat:asset attribute 调整 name列宽 2023-07-13 14:11:23 +08:00
zhangyu
257683fe97 feat: asset attribute 添加 description列 2023-07-13 14:05:50 +08:00
zhangyu
ace4436914 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-07-13 13:48:40 +08:00
zhangyu
d660ac1d73 fix:修复 asset批量修改属性时部分类型不生效的问题 2023-07-13 13:47:44 +08:00
zhangyu
0e32d59a6c NEZ-2977 fix:asset attribute text等类型增加 default 参数配置及显示 2023-07-13 13:44:55 +08:00
zhangyu
2e869e9e1f NEZ-2977 fix:asset attribute text等类型增加 default 参数配置及显示 (50%) 2023-07-12 16:44:13 +08:00
zyh
547edb3433 Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-07-12 16:09:36 +08:00
zyh
5da6130427 Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7 2023-07-12 16:08:44 +08:00
zyh
234b8e065a NEZ-2979 fix:Explore保存图表 选择Dashboard 鼠标移出弹窗后 已选的dashboard被清空 2023-07-12 16:08:35 +08:00
zhangyu
2ce2e2a6fd Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-07-12 13:49:30 +08:00
zhangyu
3503a32f31 fix:报错提示为空时 不再提示 2023-07-12 13:49:03 +08:00
zhangyu
e02fa8fbe8 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-07-12 09:49:03 +08:00
zhangyu
4c3a8effd8 fix:修改 el-select placeholder 国际化的问题 2023-07-12 09:48:33 +08:00
zhangyu
736e3a9041 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-07-11 16:28:58 +08:00
zhangyu
5d08a255d6 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7 2023-07-11 16:28:12 +08:00
zhangyu
3f951aae8a NEZ-2976 fix:topology 图片首次删除 蒙层错误 2023-07-11 16:27:43 +08:00
zyh
ee5320137f Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-07-11 14:55:37 +08:00
zyh
84dc980132 Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7 2023-07-11 14:55:17 +08:00
zyh
6d2e05b2f1 NEZ-2974 feat:SNMP browser 增加set 功能 2023-07-11 14:55:02 +08:00
zhangyu
d9c84cc738 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-07-10 16:13:46 +08:00
zhangyu
fa4508b847 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7 2023-07-10 16:11:31 +08:00
zhangyu
353aebdf36 NEZ-2971 fix:asset attribute 取消 multitext 类型 2023-07-10 16:11:19 +08:00
zyh
5abbb94395 Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-07-10 15:49:38 +08:00
zyh
8a4be89b74 NEZ-2972 fix:表格边框样式错误 2023-07-10 15:47:43 +08:00
zyh
83566bf8ef Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-07-10 11:16:44 +08:00
zyh
9c96ab84e9 NEZ-2970 fix:asset comments调整大小后 底部弹窗样式错误 2023-07-10 11:15:55 +08:00
zyh
9a0f24f521 Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-07-06 17:58:45 +08:00
zyh
47b860d51d Merge branch 'dev-3.6' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7 2023-07-06 17:57:44 +08:00
zyh
da649d407d fix:修复dashboard变量name重复时 修改其中一个name 另一个校验未消失 2023-07-06 17:53:40 +08:00
zhangyu
794a9502c1 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-07-06 17:11:11 +08:00
zhangyu
7819cec20d Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7 rel-23.04.06 2023-07-06 17:10:46 +08:00
zhangyu
03885df704 fix: 登录成功后,依然跳转到了 setup 页面 2023-07-06 17:08:34 +08:00
zhangyu
ca2a4dc5e4 NEZ-2969 fix:登录成功后,依然跳转到了 setup 页面 2023-07-06 17:07:46 +08:00
zhangyu
1dd57d730b Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-07-04 17:10:58 +08:00
zhangyu
ae3461d2d6 style: 修复 aseet Comments input不显示下边框的问题 rel-23.04.05 2023-07-04 17:09:28 +08:00
zhangyu
d5f3d70b46 Merge branch 'dev-3.8' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-07-03 16:18:07 +08:00
zyh
a0f90796f2 NEZ-2962 fix:explore页面部分国际化修改 2023-07-03 16:16:55 +08:00
zhangyu
9922b71dda Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-07-03 14:36:30 +08:00
zhangyu
df5458154e fix: Comments输入框 设置最小高度 2023-07-03 14:35:54 +08:00
zhangyu
d8a421ac36 NEZ-2959 fix:建议编辑Comments时用户可自动拖拽输入框大小 2023-07-03 14:35:27 +08:00