Commit Graph

131 Commits

Author SHA1 Message Date
zhangyu
a3cf8e1f90 fix: 修改 topology 編輯時 metrics 无法点击语句中间的问题 2022-09-08 10:16:19 +08:00
zhangyu
f95f86c88e Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.5 2022-08-24 11:49:18 +08:00
zhangyu
0cb0b7131c fix:修改 alertRule 复制无法修改type的问题 2022-08-24 11:48:25 +08:00
zyh
302dad4eaf NEZ-2105 feat:chart编辑metric/log表达式支持调整顺序 2022-08-05 10:26:43 +08:00
zhangyu
352672bbfe NEZ-2083 fix: 删除多条指标数据时,输入框数据出错 2022-08-01 19:47:48 +08:00
zhangyu
c74a88cf88 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-08-01 14:43:45 +08:00
zhangyu
681d10be5d Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-11 11:43:57 +08:00
zhangyu
fce041202b fix:修改 查询写死访问地址的问题 2022-07-11 11:35:37 +08:00
zyh
a6c7ed87d5 style:修改explore图标title 2022-07-04 16:55:59 +08:00
likexuan
4954c09897 Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-04 14:46:16 +08:00
likexuan
2a21578480 NEZ-1999 fix : metric 二级下拉列表 一级菜单未正确合并 2022-07-04 14:46:10 +08:00
zyh
4f6cca60fa feat:explore图标增加title 2022-07-04 09:24:47 +08:00
zyh
9759dba7e5 feat:explore保存图表增加state状态 2022-07-01 17:34:28 +08:00
zyh
280025f090 Merge branch 'dev-3.4' of git.mesalab.cn:nezha/nezha-fronted into dev-3.4 2022-07-01 15:42:35 +08:00
zyh
21af829654 NEZ-1992 feat:explore页面增加表达式是否启用按钮 2022-07-01 15:42:08 +08:00
likexuan
4064987ef5 NEZ-1990 feat :补充 icon/button title 2022-07-01 09:39:20 +08:00
zhangyu
c5dfe7b6be NEZ-1973 fix:选择Metric时出现重影现象样式调整 2022-06-23 15:50:05 +08:00
zhangyu
466ccce8b1 NEZ-1968 style:黑色主题样式修改 2022-06-23 09:31:42 +08:00
zhangyu
2f69f0e8ee NEZ-1963 fix: 没有变量的metrics的模板不生效 2022-06-22 13:51:27 +08:00
zhangyu
2b92eb3d01 fix:修复 projectTopo metrics 删除会删除节点的问题 2022-06-21 10:46:59 +08:00
zhangyu
bee63f211f NEZ-1925 fix:Projects编辑拓扑图时选择不同Metric会出现界面卡死现象 2022-06-14 11:13:39 +08:00
zhangyu
00b4d5d5d2 NEZ-1924 fix:Explore保存Metrics时不显示表达式 2022-06-13 18:55:11 +08:00
likexuan
edb6c48123 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-06-10 14:55:52 +08:00
likexuan
a094f651e3 perf : 统一 textarea样式 2022-06-10 14:55:46 +08:00
zyh
3c1c2a867f NEZ-1912 fix:Explore查询Metrics时输入框会出现重复表达式 2022-06-10 11:42:44 +08:00
zhangyu
c4ed46e956 fix:promql 表达式输入框 宽度调整 2022-06-02 10:26:32 +08:00
zhangyu
29258f31d3 feat:添加 promql-input metrics 以及 logs 的切换 2022-04-25 14:47:40 +08:00
zhangyu
647cd8c9e5 fix: 时间选择器 样式调整 以及 修改已登录的用户 未获取用户主题的问题 2022-04-25 14:43:54 +08:00
zhangyu
9914919747 NEZ-1787 feat: 时间选择器组件 优化 2022-04-24 18:02:26 +08:00
zhangyu
aebe62f3b9 feat: 添加promethods 联想输入 2022-04-22 18:55:50 +08:00
zhangxiaolong
e6c1e546a3 NEZ-1795 feat : explore页面动态添加实现、修复alertrules的rightbox无法正常回显的问题、调整实现选择值添加到输入框尾 2022-04-21 17:26:06 +08:00
zhangxiaolong
5f0490ef6f fix : 实现下拉框选择值显示 、save提交正常 edit回显仍有问题 2022-04-21 10:58:53 +08:00
zhangyu
2258d4c058 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
2022-04-20 19:26:24 +08:00
zhangyu
a4fb1a3963 fix: 提交 输入框 跟接口 相关 2022-04-20 19:22:40 +08:00
zhangxiaolong
236b0b4bc6 fix : 解决codemirror选择后会关闭rightbox的问题 修改功能代码 2022-04-20 19:17:08 +08:00
zhangyu
bc9359b691 fix: 補充main。js 2022-04-20 16:57:14 +08:00
zhangxiaolong
52181ff912 feat : codemirror 2022-04-19 11:57:55 +08:00
@changcode
b1e4745909 NEZ-1739 feat: 补充loading 动画 2022-03-25 15:40:05 +08:00
zhangyu
ae57653e4d feat: cahrt system 添加 filter(10%) 2022-02-21 10:40:12 +08:00
zhangyu
070c9931b0 feat: metrics 支持拖拽 2021-12-03 15:48:03 +08:00
@changcode
26d71dca07 style: explore 主题颜色调整 2021-11-17 18:12:03 +08:00
chenjinsong
561313d68c NEZ-1072 feat: 主题内容 2021-11-04 09:29:01 +08:00
chenjinsong
d1efdde2ba NEZ-1072 feat: 主题切换冲突解决 2021-11-01 23:05:28 +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
0b99acc067 Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-11-01 09:57:54 +08:00
zhangyu
709f60062a NEZ-1143 fix: Alert rule页面Expression输入框元素位置错误 2021-11-01 09:57:30 +08:00
@changcode
d32811dc52 fix: 修复chartBox样式问题 2021-10-29 18:57:24 +08:00
zhangyu
fc2cf74d1a NEZ-1122 fix: Endpoint页面元素重合 2021-10-29 18:11:45 +08:00
zhangyu
764e45c348 NEZ-1123 fix: Endpoint页面元素超出边框 2021-10-29 11:38:01 +08:00