Commit Graph

6339 Commits

Author SHA1 Message Date
zhangyu
34e5274cd3 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-14 17:17:28 +08:00
zhangyu
a9c59468f9 NEZ-2876 fix:table图表value列排序功能不符合预期 2023-06-14 17:15:05 +08:00
zyh
7adada6348 fix:修复assetDiscovery返回数据为underfind时 表格排序错误 2023-06-14 15:53:00 +08:00
zyh
eae570aef8 Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-06-14 15:41:11 +08:00
zyh
cc88c7330f fix:解决冲突 2023-06-14 15:40:15 +08:00
zyh
39ad58fb8e Merge branch 'dev-3.5' of git.mesalab.cn:nezha/nezha-fronted into dev-3.6 2023-06-14 15:26:45 +08:00
zyh
8ef46f1ac0 fix:修复tool表格prop为对象时 排序错误 2023-06-14 15:25:42 +08:00
zyh
5ac8ceaf58 NEZ-2875 feat:更新about页面release note 2023-06-14 14:39:15 +08:00
zyh
33c5034aa7 fix:修复冲突 2023-06-14 14:05:34 +08:00
zyh
ae79015d10 fix:调整页面边距 2023-06-14 13:55:07 +08:00
zyh
394a3892db Merge branch 'dev-3.6' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7 2023-06-14 10:47:10 +08:00
zyh
5c58f6adb7 fix:explore 导出snapshot loading样式错误 2023-06-14 10:46:19 +08:00
zyh
4905efdb02 NEZ-2870 fix:修复explore snapshot导出结果未支持table / row 切换 2023-06-13 18:07:24 +08:00
zyh
5c884bf12b fix:解决冲突 2023-06-13 16:01:58 +08:00
zyh
5d576fa89f NEZ-2868 fix:修复asset discovery imported按钮点击无效 2023-06-13 15:56:37 +08:00
zhangyu
70a3729e21 fix:资产发现页面 补充国际化 2023-06-12 18:06:54 +08:00
zhangyu
7497d2b255 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-12 17:56:09 +08:00
zhangyu
8fe77529a7 fix:修复 chartDiagram 保存后 编辑框显示不正确的问题 2023-06-12 17:41:12 +08:00
zyh
7c327afed1 NEZ-2869 fix:explore 导出snapshot loading 样式错误 2023-06-12 17:26:35 +08:00
zhangyu
eb0cf39cc2 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-12 16:53:58 +08:00
zhangyu
81bf5e78cc fix:修复 chartDiagram 新增报错 2023-06-12 16:51:56 +08:00
zhangyu
99653fc87a fix: 修复高级搜索 反向匹配 显示不正确的问题 2023-06-12 16:44:02 +08:00
zhangyu
6577730e80 fix:修复高级搜索 编辑时层级不对 以及 select 滚动加载未触发的问题 2023-06-12 11:46:54 +08:00
zyh
e4e952d405 Merge branch 'dev-3.8' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-06-12 10:51:21 +08:00
zyh
5fff9ef786 fix:防止图表mousedown触发clickoutside事件 2023-06-12 10:51:09 +08:00
zhangyu
032a7def90 fix:处理chartDiagram 首次加载的问题 2023-06-12 10:17:57 +08:00
zhangyu
d690967f7e fix:处理chartDiagram 首次加载的问题 2023-06-12 09:54:29 +08:00
zhangyu
d5668a2622 Merge branch 'dev-3.8' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-12 09:37:41 +08:00
zhangyu
f8c8e71267 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-12 09:37:27 +08:00
zhangyu
fb769d45b4 fix:chartDiagram 样式调整 2023-06-12 09:36:38 +08:00
zyh
43fcb64291 Merge branch 'dev-3.8' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-06-09 18:22:17 +08:00
zyh
a3ddf5e4e0 NEZ-2863 fix:data link 未实现url变量替换 2023-06-09 18:22:06 +08:00
zhangyu
5788831ce7 fix:修改 topology Elements 单位无法保存的问题 2023-06-09 18:03:16 +08:00
zhangyu
fc255757a7 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-09 17:36:58 +08:00
zhangyu
afb91ec928 fix: chartDiagram 细节微调 2023-06-09 17:35:11 +08:00
zhangyu
6873868df8 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-09 16:20:23 +08:00
zhangyu
5b0a9a7492 fix:修复 chartDiagram 选择图片时 会回退到编辑页面的问题 2023-06-09 16:19:14 +08:00
zhangyu
2f5e87f588 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-09 15:17:19 +08:00
zhangyu
4c58a2b2fa fix: 修复 因为 clickOutside 大小写问题导致关闭提示不触发的问题 2023-06-09 15:16:54 +08:00
zhangyu
e8fb226f96 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-09 15:10:07 +08:00
zhangyu
059c9e9600 fix:修复 chartRightBox clickOutside 不触发的问题 2023-06-09 15:09:39 +08:00
zhangyu
2b89139120 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-09 14:44:09 +08:00
zhangyu
edfd6f0973 fix:处理chartDiagram 无法选择图片的问题 2023-06-09 14:43:24 +08:00
zhangyu
661a6f8d4e fix:处理chartDiagram 图片不显示的问题 2023-06-09 14:23:19 +08:00
zhangyu
79290f66f3 Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8 2023-06-09 14:07:18 +08:00
zhangyu
3e7b1903d4 Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7 2023-06-09 14:05:36 +08:00
zhangyu
a9e29ba327 Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6 2023-06-09 14:04:29 +08:00
zhangyu
a5f72d69e7 NEZ-2865 fix:chart-Group 内部chart移动时 chart-Group高度计算错误 导致dashboard错位 2023-06-09 14:03:16 +08:00
zyh
ede2cb386b Merge branch 'dev-3.8' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8 2023-06-09 13:44:38 +08:00
zyh
e1050174fe fix:修改时序图data link悬浮框为点击的节点数据 2023-06-09 13:44:27 +08:00