Commit Graph

6860 Commits

Author SHA1 Message Date
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
zhangyu
a2925a4e00 NEZ-2877 fix:修复单位为none时 处理数据null报错的问题 2023-06-15 10:44:58 +08:00
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