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
|
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
|
a9c59468f9
|
NEZ-2876 fix：table图表value列排序功能不符合预期
|
2023-06-14 17:15:05 +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
|
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 |
|
zhangyu
|
8fe77529a7
|
fix：修复 chartDiagram 保存后 编辑框显示不正确的问题
|
2023-06-12 17:41:12 +08:00 |
|
zhangyu
|
81bf5e78cc
|
fix：修复 chartDiagram 新增报错
|
2023-06-12 16:51:56 +08:00 |
|
zhangyu
|
032a7def90
|
fix：处理chartDiagram 首次加载的问题
|
2023-06-12 10:17:57 +08:00 |
|
zhangyu
|
fb769d45b4
|
fix：chartDiagram 样式调整
|
2023-06-12 09:36:38 +08:00 |
|
zhangyu
|
afb91ec928
|
fix: chartDiagram 细节微调
|
2023-06-09 17:35:11 +08:00 |
|
zhangyu
|
5b0a9a7492
|
fix：修复 chartDiagram 选择图片时 会回退到编辑页面的问题
|
2023-06-09 16:19:14 +08:00 |
|
zhangyu
|
4c58a2b2fa
|
fix： 修复 因为 clickOutside 大小写问题导致关闭提示不触发的问题
|
2023-06-09 15:16:54 +08:00 |
|
zhangyu
|
059c9e9600
|
fix：修复 chartRightBox clickOutside 不触发的问题
|
2023-06-09 15:09:39 +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
|
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 |
|
zhangyu
|
5f8fb7ea50
|
fix：修改 chartTemp 复制报错的问题
|
2023-06-09 11:10:42 +08:00 |
|
zhangyu
|
ba33fa124e
|
fix：修改 chartDiagram
|
2023-06-09 10:36:48 +08:00 |
|
zhangyu
|
7f9d2f12a0
|
fix ：修改 chartDiagram
|
2023-06-08 19:13:05 +08:00 |
|
zyh
|
7bf1a2ca87
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7
|
2023-06-08 16:53:30 +08:00 |
|
zyh
|
041e40bd68
|
fix：解决冲突
|
2023-06-08 16:53:16 +08:00 |
|
zyh
|
a956f8e88b
|
fix：优化变量校验方式
|
2023-06-08 16:43:17 +08:00 |
|
zyh
|
d12fe9615f
|
fix：解决冲突
|
2023-06-08 16:33:41 +08:00 |
|
zyh
|
045d1827c7
|
Merge branch 'dev-3.5' of git.mesalab.cn:nezha/nezha-fronted into dev-3.5
|
2023-06-08 16:14:58 +08:00 |
|
zyh
|
d83d832a9c
|
NEZ-2862 fix：打开底部弹窗时 悬浮窗被遮挡
|
2023-06-08 16:14:45 +08:00 |
|
zhangyu
|
19e12ca395
|
Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
# Conflicts:
# nezha-fronted/src/components/chart/panelChart.vue
|
2023-06-08 15:35:37 +08:00 |
|
zhangyu
|
459d2246f0
|
Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6
|
2023-06-08 15:34:34 +08:00 |
|
zhangyu
|
feecf7956a
|
NEZ-2860 fxi： Chart preview 时间范围错误
|
2023-06-08 15:33:35 +08:00 |
|
zhangyu
|
844772c937
|
NEZ-2860 fix：Chart preview 时间范围错误
|
2023-06-08 14:58:31 +08:00 |
|
zhangyu
|
36cfe4f29b
|
NEZ-2858 fix：Endpoint 列表 Configuration 颜色不正确的问题
|
2023-06-07 16:01:52 +08:00 |
|
zhangyu
|
4999a38192
|
Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-06-07 15:37:07 +08:00 |
|
zhangyu
|
c7cec9e908
|
NEZ-2858 fix：修改Endpoint 列表 Configuration 悬浮框 大小问题
|
2023-06-07 15:35:10 +08:00 |
|
zyh
|
731418eca9
|
fix：修改底部弹窗cursor样式
|
2023-06-07 09:36:09 +08:00 |
|
zyh
|
530276e1b2
|
NEZ-2857 fix：鼠标光标cursor样式统一
|
2023-06-06 17:46:16 +08:00 |
|
zyh
|
8d7859e680
|
NEZ-2856 fix：module页面 project缺少鼠标悬浮提示信息
|
2023-06-06 11:29:25 +08:00 |
|
zyh
|
29b4d284d6
|
fix：修复计数器值为整数
|
2023-06-05 17:03:15 +08:00 |
|
zhangyu
|
034c05b7df
|
style： chartList 样式调整
|
2023-06-02 09:39:01 +08:00 |
|
zhangyu
|
159c5e9a21
|
NEZ-2848 fix：hart-stat 因为滚动条出现导致的错位
|
2023-06-01 17:00:14 +08:00 |
|
zhangyu
|
deebca5c52
|
NEZ-2846 fix：Project拓扑图预览状态展示标题错误
rel-23.04.02
|
2023-05-31 14:15:45 +08:00 |
|
zhangyu
|
2379060f00
|
Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-05-26 17:38:21 +08:00 |
|