Commit Graph

6490 Commits

Author SHA1 Message Date
zyh
7ac443915a Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-06-21 14:10:55 +08:00
zyh
8d4d63f508 Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7 2023-06-21 14:09:26 +08:00
zhangyu
c115dcdffe NEZ-2904 style:Asset list-Dashboard页面,鼠标悬浮在Apply time range按钮上,按钮显示为空白 2023-06-21 14:06:56 +08:00
zyh
d597be65e0 Merge branch 'dev-3.6' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7 2023-06-21 14:05:51 +08:00
zyh
bb388bcfdd fix:修复el-message高度错误 2023-06-21 14:04:33 +08:00
zhangyu
85b3c020e1 NEZ-2886 fix:Agents新建时,首次选择Data center下拉框出现闪动 2023-06-21 13:56:44 +08:00
zyh
14f78cef9e Merge branch 'dev-3.5' of git.mesalab.cn:nezha/nezha-fronted into dev-3.6 2023-06-21 13:44:40 +08:00
zyh
850f8d0f81 NEZ-2899 fix:Record rules复制Name过长数据时,自动补充错误 2023-06-21 13:41:13 +08:00
zyh
3d667687be Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-06-21 10:44:40 +08:00
zyh
ecbf64943f Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7 2023-06-21 10:41:06 +08:00
zyh
00653a2be8 Merge branch 'dev-3.6' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7 2023-06-21 10:40:57 +08:00
zyh
58dc677c8d NEZ-2898 fix:修复terminal select asset 未国际化 2023-06-21 10:39:54 +08:00
zhangyu
5b37517e20 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-20 18:04:12 +08:00
zhangyu
e43b4cb70e fix:处理 topology tooltip 单位默认为第一个legend 2023-06-20 18:02:05 +08:00
zhangyu
f455d071a2 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-20 17:05:46 +08:00
zhangyu
2150fa71d1 NEZ-2895 fix: Tooltip.title & Tooltip.Legends.Alias 支持 变量取值 2023-06-20 16:59:46 +08:00
zhangyu
c39e8d1ae8 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-20 15:23:25 +08:00
zhangyu
d5bf4733d8 NEZ-2894 fix:Topo Legend 选择框 不支持 搜索&自定义输入 2023-06-20 15:22:57 +08:00
zhangyu
c9a188a712 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-20 15:13:18 +08:00
zhangyu
451006713f NEZ-2893 fix:Topo 操作画布元素时,自动跳转 Element 页面 2023-06-20 15:12:58 +08:00
zhangyu
c409017727 fix: 高级搜索样式调整 2023-06-20 14:38:51 +08:00
zyh
bf7f1ed1f0 Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-06-20 11:45:07 +08:00
zyh
e12e767c3e Merge branch 'dev-3.6' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7 2023-06-20 11:42:34 +08:00
zyh
5f0b21be80 Merge branch 'dev-3.5' of git.mesalab.cn:nezha/nezha-fronted into dev-3.6 2023-06-20 11:32:10 +08:00
zhangyu
651eed57f0 fix:修复chartDiagram 无法编辑的问题 2023-06-20 11:31:56 +08:00
zyh
0116f915b4 NEZ-2887 fix:修复search input 查询条件显示有遮挡 2023-06-20 11:31:39 +08:00
zhangyu
d0116edfd2 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-20 11:16:19 +08:00
zhangyu
9da4ce5df5 fix:修复 销毁其他diagram后 其他diagram 缩放后 节点位置不正常的问题 2023-06-20 11:11:42 +08:00
zhangyu
b6c29c8542 NEZ-2891 fix:chart-diagram 点击编辑 后直接退出 缩放后 节点位置不正确 2023-06-20 11:10:13 +08:00
zhangyu
0f130f61f3 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-20 10:37:36 +08:00
zhangyu
8cdb9c7beb fix:修改 diagram resize报错的问题 2023-06-20 10:37:03 +08:00
zhangyu
7209d0c5bb Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-20 09:46:32 +08:00
zhangyu
5b993ba118 fix:处理 chartDiagram 编辑时触发submit的问题 2023-06-19 18:11:24 +08:00
zhangyu
286ec0391d NEZ-2842 fix: alert message页面 高级搜索样式调整 2023-06-19 17:00:23 +08:00
zhangyu
dc047649bd Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-19 10:52:07 +08:00
zhangyu
5ac08202b6 fix:修改topology 选择legend的宽度 2023-06-19 10:50:30 +08:00
zyh
88e5ceca4c perf:集成代码块复制按钮增加title 2023-06-16 16:20:36 +08:00
zyh
05d40ab946 Merge branch 'dev-3.8' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-06-16 14:21:32 +08:00
zyh
aa35441355 NEZ-2878 feat:集成配置页面代码块增加 复制按钮 2023-06-16 14:21:18 +08:00
zhangyu
e76a5e323b Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-15 18:49:01 +08:00
zhangyu
3b92b32981 Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7 rel-23.04.03 2023-06-15 18:48:23 +08:00
zhangyu
aed1832ae9 Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6
# Conflicts:
#	nezha-fronted/src/components/common/mixin/exportHtml.js
2023-06-15 18:46:12 +08:00
zhangyu
2cee77db39 fix: 处理 快照因为网络波动导致的下载文件不全的问题 2023-06-15 18:29:33 +08:00
zhangyu
ac77a3eff2 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-15 14:03:00 +08:00
zhangyu
72745b3d2c Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7 2023-06-15 14:01:49 +08:00
zhangyu
d2ef2a92cf NEZ-2688 fix:Explore使用快照后单位有误 2023-06-15 13:49:29 +08:00
zhangyu
7ace824b0b Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6
# Conflicts:
#	nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue
2023-06-15 13:45:25 +08:00
zhangyu
ed052e4f07 NEZ-2688 fix:Explore使用快照后单位有误 2023-06-15 11:43:36 +08:00
zhangyu
aa67176fd9 Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6 2023-06-15 10:52:06 +08:00
zhangyu
1007414e61 fix:处理chart-tooltip 单位显示不正确的问题 2023-06-15 10:50:13 +08:00