Commit Graph

250 Commits

Author SHA1 Message Date
chenjinsong
7581b30f2c Merge remote-tracking branch 'origin/dev-3.1' into dev-3.2
# Conflicts:
#	nezha-fronted/src/assets/css/common/rightBoxCommon.scss
#	nezha-fronted/src/assets/css/components/common/project/topology.scss
#	nezha-fronted/src/components/common/bottomBox/tabs/chartTempPreview.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
#	nezha-fronted/src/components/common/popBox/selectPanel.vue
#	nezha-fronted/src/components/common/project/popData/Info.vue
#	nezha-fronted/src/components/common/project/topologyL5.vue
#	nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
#	nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
#	nezha-fronted/src/components/page/config/changePin.vue
#	nezha-fronted/src/components/page/dashboard/explore/editor.vue
#	nezha-fronted/src/components/page/dashboard/metricPreview.vue
#	nezha-fronted/src/components/page/dashboard/panel.vue
#	nezha-fronted/src/permission.js
#	nezha-fronted/src/store/user.js
2021-11-29 16:19:13 +08:00
chenjinsong
214003e9ca Merge remote-tracking branch 'origin/dev-3.1.1_theme' into dev-3.2 2021-11-29 15:43:27 +08:00
zhangyu
b96e23950f fix: 修改panel line-chart nodata的高度问题 2021-11-27 13:50:41 +08:00
zhangyu
62ab3ef6bd fix: 修改多次刷新图表 堆叠事件重复添加的问题 2021-11-27 13:41:26 +08:00
zhangyu
dc638be860 NEZ-1328 fix: line-chart 数值为null时不显示tooltip 2021-11-27 11:42:27 +08:00
zhangyu
d15931a5bf NEZ-1364 fix: Chart 点击选择 0 值曲线,切换其他曲线,发现无法显示 2021-11-27 10:40:47 +08:00
zhangyu
8a4e97ed09 fix: 处理页面报错信息 2021-11-26 18:14:45 +08:00
zhangyu
a1c9b34a8b fix:处理panel 页面报错信息 2021-11-26 16:24:58 +08:00
zhangyu
fc0b5a1fcb NEZ-1358 fix: 处理Panel切换后无法加载 以及部分页面报错的问题 2021-11-26 09:56:53 +08:00
zhangyu
1fb059926a fix: panel请求保存的问题 2021-11-25 13:51:06 +08:00
@changcode
404054a621 style:主题颜色调整 2021-11-25 11:32:08 +08:00
zhangyu
cb9cc7ed9b fix: 修改 nullType 二次转码的问题 2021-11-25 10:48:24 +08:00
zhangyu
7cf4a696e9 NEZ-1332 feat: alert message 查看请求参数调整(metrics,logs) 2021-11-24 20:27:15 +08:00
zhangyu
6cdb1ae22e NEZ-1336 fix: 修改因为value格式化后 排序不对的问题 2021-11-24 11:05:35 +08:00
zhangyu
483b70dbab NEZ-1330 fix: Panel选择图表内单条数据查看时,图表显示错误 2021-11-24 10:30:23 +08:00
zhangyu
7fd703c449 NEZ-1335 fix:Line Chart total 没有值 2021-11-24 09:51:41 +08:00
zhangyu
99dca724f1 NEZ-1276 fix: 通过搜索记录查询 选项错乱的问题 2021-11-18 17:18:16 +08:00
zhangyu
87b49de83f NEZ-1262 fix: 切换 legend时 未切换Y轴刻度 2021-11-18 10:37:26 +08:00
zhangyu
170b6a4749 fix: 抽取修改别名方法为全局 修改正则 2021-11-17 18:24:30 +08:00
zhangyu
c76c0511c9 NEZ-1263 fix: Chart legend 匹配内容有误 2021-11-17 17:27:14 +08:00
zhangyu
78d56bedf1 NEZ-1253 fix: Chart Previous 之前一小时对比数值有误 2021-11-16 15:32:09 +08:00
chenjinsong
721c290739 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme 2021-11-16 09:43:06 +08:00
zhangyu
bec2d345fc NEZ-1245 fix:部分图表的统计legend位置异常 2021-11-15 18:20:21 +08:00
zhangyu
46fcce7de5 fix: 修改图表全屏 不显示name的问题 2021-11-15 17:05:39 +08:00
chenjinsong
a0dcb8d877 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue
2021-11-11 11:28:19 +08:00
zhangyu
97e1a263d2 NEZ-1207 fix: 全屏后自动刷新按钮无效 2021-11-09 15:11:20 +08:00
chenjinsong
ef664be5ef Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/assets/css/common.scss
#	nezha-fronted/src/assets/css/common/tableCommon.scss
#	nezha-fronted/src/assets/stylus/main.scss
#	nezha-fronted/src/components/charts/chart-list.vue
#	nezha-fronted/src/components/charts/logs.vue
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/alert/alertRuleInfo.vue
#	nezha-fronted/src/components/common/bottomBox/bottomBox.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
#	nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue
#	nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue
#	nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue
#	nezha-fronted/src/components/common/detailView/nzDetailView.vue
#	nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
#	nezha-fronted/src/components/common/multipleTime.vue
#	nezha-fronted/src/components/common/pickTime.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/project/L5/topoTooltip.vue
#	nezha-fronted/src/components/common/project/popData/Info.vue
#	nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
#	nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
#	nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
#	nezha-fronted/src/components/common/table/settings/userTable.vue
#	nezha-fronted/src/components/layout/header.vue
#	nezha-fronted/src/components/page/alert/alertMessage.vue
#	nezha-fronted/src/components/page/alert/nzAlertTag.vue
#	nezha-fronted/src/components/page/asset/components/operation.vue
#	nezha-fronted/src/components/page/config/mibBrowser.vue
#	nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
#	nezha-fronted/src/components/page/dashboard/explore/logTab.vue
#	nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
#	nezha-fronted/src/components/page/dashboard/panel.vue
2021-11-01 18:24:01 +08:00
chenjinsong
914c096463 NEZ-1072 feat: 主题切换 2021-11-01 17:23:01 +08:00
zhangyu
bde7b8708b fix: 修复 panel 同比 时间显示错误的问题 2021-10-29 15:39:49 +08:00
zhangyu
20f423e2ab NEZ-1135 fix; 图表中没有最下方的边框线 2021-10-29 15:24:03 +08:00
zhangyu
867dc08ce6 NEZ-1100 fix; 修改 chart-group立马打开会一直显示loading的问题 2021-10-27 15:01:39 +08:00
@changcode
d9c7196768 style: 调整element,popover组件弹出效果 2021-10-27 14:32:26 +08:00
zhangyu
38383e5174 NEZ-1090 fix:Line Chart 按钮悬停信息被遮挡 2021-10-27 13:58:25 +08:00
@changcode
9e82c52436 NEZ-1079 perf: 将各处列表、dashboard等页面中多处下拉框的弹出触发方式统一为点击触发 2021-10-25 17:16:40 +08:00
zhangyu
15f8ab4a40 fix:修改 chart-group 默认折叠 打开后 图表x轴刻度不对的问题 2021-10-19 11:37:09 +08:00
zhangyu
0558619ad6 Merge branch 'dev-2.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
#	nezha-fronted/src/components/common/ChartDiagram/diagram.vue
#	nezha-fronted/src/components/common/project/L5/CanvasProps.vue
#	nezha-fronted/src/components/layout/header.vue
2021-10-14 14:52:52 +08:00
zhangyu
2b404c7bb5 NEZ-1036 fix:group chart 配置折叠,显示时展开样式错误 2021-10-08 14:08:08 +08:00
chenjinsong
0780f1448c fix: 修复有些机器上图表Y轴数据被遮挡的问题 2021-09-27 18:15:13 +08:00
@changcode
1afdff8de1 NEZ-963 chart 鼠标移入悬浮提示 2021-09-02 14:43:06 +08:00
chenjinsong
0e6a2a8a33 NEZ-953 fix: 优化tooltip数字 2021-08-31 16:49:31 +08:00
zhangyu
335ede10b7 fix: 图表的时间轴刻度跟图表宽度关联(小于500时) 2021-07-28 17:05:03 +08:00
zhangyu
48cc2ae1fe NEZ-863 fix:修改panel 页面 搜素后样式错乱的问题 2021-07-23 15:49:18 +08:00
zhangyu
030ecd4e75 NEZ-860 feat:cabinet 列表页面增加 批量删除按钮 2021-07-22 14:13:38 +08:00
zhangyu
fd9ac901cf NEZ-854 fix:图表坐标轴 以及tooltip的精度 由默认两位改为有效数字两位 2021-07-22 14:03:03 +08:00
zhangyu
1b713493a7 NEZ-839 feat:diagram 图表支持 font 配置 & tooltip 增加 description 配置项及展示 2021-07-19 10:32:03 +08:00
zhangyu
c5be6b8143 fix: 修改 diagram tooltip的时间 未跟panel一致的问题 2021-07-16 09:56:48 +08:00
zhangyu
cfccac90e7 NEZ-829 feat:aseet添加子集表格 2021-07-15 14:38:55 +08:00
zhangyu
0dc5d06a72 NEZ-781 fix:project页面跳转问题回退的问题 2021-07-02 14:45:38 +08:00
zhangyu
c778cf2eb4 NEZ-784 NEZ-770 :endpoint 名字拼接后过长从中间截取一部分 ,以及新增 Diagram 图表类型 2021-07-01 19:15:08 +08:00
zhangyu
f2277d7014 NEZ-770 feat:chart类型添加 2021-07-01 15:56:24 +08:00