Commit Graph

3165 Commits

Author SHA1 Message Date
zhangyu
ddc5f7e923 NEZ-2059 fix:panel 变量 未完全渲染 2022-07-21 18:32:25 +08:00
likexuan
4f65ad4e4b fix : agent提示框更改(全英文) 2022-07-21 17:05:51 +08:00
zyh
f11d7974ce Merge branch 'dev-3.4' of git.mesalab.cn:nezha/nezha-fronted into dev-3.4 2022-07-21 10:50:51 +08:00
zyh
c3faf9ae21 NEZ-2037 feat:新增chart类型bubble 2022-07-21 10:33:20 +08:00
likexuan
759152129c fix : chartRightBox 国际化更改 2022-07-20 15:32:15 +08:00
likexuan
e4b0475bf4 NEZ-2043 fix : 全局搜索详情 骨架屏 样式错误 2022-07-20 15:09:41 +08:00
likexuan
45b7d25b99 fix : 国际化更改 2022-07-20 15:07:54 +08:00
zhangyu
49df64db13 fix:chart 编辑页面 改为 只有 type = group 显示 show/hidden 配置项 2022-07-20 14:21:40 +08:00
zhangyu
17c46d8737 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-20 10:04:14 +08:00
zhangyu
5f8474146d Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-07-20 10:03:17 +08:00
zhangyu
1712e7c926 NEZ-2051 fix:console 报错 2022-07-20 09:54:12 +08:00
zhangyu
aaeaf98de7 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-19 16:31:52 +08:00
zhangyu
517ce4bbe1 NEZ-2047 fix: bug1 bug2 修改 2022-07-19 16:31:08 +08:00
likexuan
985687ad49 NEZ-2045 fix : project topology 侧滑页面样式错误 2022-07-19 16:09:44 +08:00
likexuan
d82dadf5c0 NEZ-2046 fix : chart legend 提示信息 样式错误 2022-07-19 14:59:07 +08:00
zhangyu
e5d219a60d NEZ-2048 fix: dashboard variable 下拉框 选中行为 优化 2022-07-19 14:36:33 +08:00
likexuan
11c17db9f3 fix : chartRightBox显示隐藏 国际化更改 2022-07-19 12:46:55 +08:00
zhangyu
514acb13e4 NEZ-2044 fix: chart 编辑页面 操作卡顿响应慢 2022-07-19 10:54:09 +08:00
zyh
199d9be7b5 Merge branch 'dev-3.4' of git.mesalab.cn:nezha/nezha-fronted into dev-3.4 2022-07-18 16:25:17 +08:00
zyh
34eec55d4b perf:chart显示隐藏下拉选择设置默认值 2022-07-18 16:25:02 +08:00
zhangyu
13bf4905c1 NEZ-2040 fix:修改拖拽时显示横向滚动条的问题 2022-07-18 16:15:54 +08:00
zyh
e8fbc137df Merge branch 'dev-3.4' of git.mesalab.cn:nezha/nezha-fronted into dev-3.4 2022-07-18 11:04:14 +08:00
zyh
52d48b7e3f NEZ-2029 feat:columns display配置项增加提示信息 2022-07-18 11:03:49 +08:00
likexuan
22cad8e696 fix : agents 页面提示框增加条件 2022-07-18 10:32:51 +08:00
zhangyu
819ce51804 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-15 17:30:08 +08:00
zhangyu
ab7750cdfa Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/common/project/topologyL5.vue
2022-07-15 17:16:04 +08:00
zhangyu
80e52ead27 fix:修改定时时间错误的问题 2022-07-15 17:06:39 +08:00
zhangyu
60671e1d3b fix:删除控制台console 2022-07-15 17:05:03 +08:00
zyh
86ac46586d Merge branch 'dev-3.4' of git.mesalab.cn:nezha/nezha-fronted into dev-3.4 2022-07-15 15:07:10 +08:00
zyh
3dd3768b18 NEZ-2023 feat:chart支持根据variable值显示隐藏 2022-07-15 15:06:56 +08:00
likexuan
740440dcae NEZ-2032 fix : alert rule 时间计划详情提示框 样式错误 2022-07-15 11:53:02 +08:00
likexuan
6d44b127a6 fix : 类名大小写问题更改 2022-07-15 10:50:20 +08:00
likexuan
5d1c3001c1 Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-15 10:42:14 +08:00
likexuan
9d39d0231c NEZ-1965 feat : 补充 复制功能 2022-07-15 10:42:09 +08:00
zhangyu
7810e4a7b8 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-14 18:09:34 +08:00
zhangyu
4f140057c4 fix:修改 alertMessage 不正确显示的问题 2022-07-14 18:07:52 +08:00
zhangyu
d6288b771c Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-14 17:53:52 +08:00
zhangyu
95582130f6 fix:修改 alertMessage clickSearch 不正常换行的问题 2022-07-14 17:33:52 +08:00
zhangyu
9842b8a69c Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-14 14:00:17 +08:00
zhangyu
db7f526b1e NEZ-2024 fix:{{A.$labels}} 变量展示错误 2022-07-14 13:59:52 +08:00
zhangyu
5002a51051 fix:删除console 2022-07-14 13:59:22 +08:00
likexuan
4c9b207729 fix : alert Message 样式调整 2022-07-14 13:30:17 +08:00
zhangyu
a175997be5 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4
# Conflicts:
#	nezha-fronted/src/components/page/dashboard/panel.vue
2022-07-14 11:36:45 +08:00
zhangyu
6644b111bf Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/common/ChartDiagram/diagram.vue
2022-07-14 11:33:43 +08:00
zhangyu
5061a0dd37 fix: 补充注释的监听事件 以及 diagram组件修改 2022-07-14 11:31:03 +08:00
zhangyu
2c91184bb0 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	.gitignore
#	nezha-fronted/src/assets/css/font/iconfont.js
#	nezha-fronted/src/components/chart/chart/chartAutotopology.vue
#	nezha-fronted/src/components/common/ChartDiagram/diagram.vue
#	nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
#	nezha-fronted/src/components/common/js/common.js
#	nezha-fronted/src/components/common/js/tools.js
#	nezha-fronted/src/components/common/project/topologyL5.vue
#	nezha-fronted/static/config.json
2022-07-14 10:19:06 +08:00
zhangyu
73b71d578f fix:修改 topology 源码 删除创建的节点以及给节点创建的对应的事件 2022-07-14 09:55:10 +08:00
zhangyu
739fa3e82f fix:处理 topoLogy的缓存 2022-07-13 15:35:56 +08:00
zhangyu
878411720d fix:处理 topoLogy的缓存问题 2022-07-13 15:07:13 +08:00
zhangyu
d372a6b8e1 fix:topology 缓存处理 2022-07-13 14:38:10 +08:00