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 |
|
zhangyu
|
e41207305b
|
fix: 修改 alertRule 关联 dashboard后 dashboard 在alertMessageInfo不显示的问题
|
2023-06-09 13:39:33 +08:00 |
|
zhangyu
|
5f8fb7ea50
|
fix：修改 chartTemp 复制报错的问题
|
2023-06-09 11:10:42 +08:00 |
|
zhangyu
|
7cb3a7e521
|
fix：lodash名称修改
|
2023-06-09 10:39:08 +08:00 |
|
zhangyu
|
753e5164e3
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-09 10:38:20 +08:00 |
|
zhangyu
|
ba33fa124e
|
fix：修改 chartDiagram
|
2023-06-09 10:36:48 +08:00 |
|
zyh
|
9dc9f81374
|
NEZ-2864 fix：时序图表未配置 data link时，鼠标cursor样式错误
|
2023-06-09 09:42:11 +08:00 |
|
zhangyu
|
7f9d2f12a0
|
fix ：修改 chartDiagram
|
2023-06-08 19:13:05 +08:00 |
|
zyh
|
3546a473bd
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8
|
2023-06-08 16:54: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 |
|
zhangyu
|
07ad9d121a
|
fix：处理alertMessage时间回显错误的问题
|
2023-06-08 16:39:51 +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
|
c8cf46a677
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
# Conflicts:
# nezha-fronted/src/components/chart/chartHeaderMixin.js
|
2023-06-08 15:38:52 +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
|
1f0617aba7
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-07 16:02: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 |
|
zhangyu
|
cf683627e7
|
NEZ-2842 feat：新增alert message页面 高级搜索 回显
|
2023-06-07 14:45:51 +08:00 |
|
zyh
|
930a4d1755
|
fix：解决冲突
|
2023-06-07 09:41:23 +08:00 |
|
zyh
|
731418eca9
|
fix：修改底部弹窗cursor样式
|
2023-06-07 09:36:09 +08:00 |
|
zyh
|
9734dc8a6a
|
Merge branch 'dev-3.8' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8
|
2023-06-06 17:55:28 +08:00 |
|
zyh
|
e6672a4aa4
|
解决样式冲突
|
2023-06-06 17:55:11 +08:00 |
|
zyh
|
530276e1b2
|
NEZ-2857 fix：鼠标光标cursor样式统一
|
2023-06-06 17:46:16 +08:00 |
|
zhangyu
|
97937b4989
|
NEZ-2842 feat： 添加历史记录 以及国际化补充
|
2023-06-06 17:09:01 +08:00 |
|
zyh
|
8c0ea18ad9
|
fix：解决冲突
|
2023-06-06 11:47:54 +08:00 |
|
zyh
|
8d7859e680
|
NEZ-2856 fix：module页面 project缺少鼠标悬浮提示信息
|
2023-06-06 11:29:25 +08:00 |
|
zhangyu
|
29c22d889c
|
NEZ-2842 feat： 处理valueList的滚动加载
|
2023-06-06 10:12:55 +08:00 |
|
zhangyu
|
f6f577e895
|
NEZ-2842 feat： 新增可编辑已添加的条件
|
2023-06-05 18:35:48 +08:00 |
|
zyh
|
a93ec987b5
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8
|
2023-06-05 17:03:42 +08:00 |
|
zyh
|
29b4d284d6
|
fix：修复计数器值为整数
|
2023-06-05 17:03:15 +08:00 |
|