Commit Graph

93 Commits

Author SHA1 Message Date
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
zhangyu
1174dd58c2 NEZ-1122 fix:chanrtBox页面元素重合 2021-10-29 10:58:41 +08:00
@changcode
d2f6dee57d style: agent 下载弹框,下拉选择器样式调整 2021-10-11 15:16:13 +08:00
zhangyu
cd72fad4b7 fix: 优化 metrics 的数据 不再频繁调用接口 2021-09-28 16:54:07 +08:00
@changcode
9542e1a63a style: Box 样式调整 2021-09-26 18:14:47 +08:00
zhangyu
1933ab8229 NEZ-978 feat:alert rule 页面功能重构 2021-09-08 17:15:59 +08:00
@changcode
55a644c6ac fix: 调整 promlInput 组件 和 chaartBox Legend 样式 2021-09-03 17:23:41 +08:00
@changcode
022551b4bd fix: alertRuleBox expr input 组件类名调整 2021-09-03 11:44:38 +08:00
@changcode
bb5f8cfd0a fix: 样式调整 2021-09-02 15:37:01 +08:00
zhangyu
cfdb06bd39 feat: 修改promqlInput 2021-09-02 10:14:17 +08:00
@changcode
24ead781dc fix: 样式调整 2021-08-27 17:13:26 +08:00
chenjinsong
9c3ee55cbd fix: 恢复merge错误 2021-08-02 20:36:10 +08:00
@changcode
60ce814186 fix: 解决冲突 2021-07-27 09:48:35 +08:00
@changcode
7e73021bf5 fix: explore logging样式 2021-07-26 18:14:31 +08:00
zhangyu
f2277d7014 NEZ-770 feat:chart类型添加 2021-07-01 15:56:24 +08:00
@changcode
72db4f864b fix: promainput弹框 超出部分隐藏 2021-06-21 17:00:19 +08:00
@changcode
fd5888c734 fix: NEZ-742 修复新建图表时,选择表达式后,页面弹出窗口字段显示问题 2021-06-17 18:10:52 +08:00
@changcode
ccf8013050 fix: 修复Expression metric-input不正确 2021-05-28 11:28:33 +08:00
@changcode
7ddc9bc67c NEZ-668 style: nezha 系统中输入框字符长度问题 2021-05-28 10:43:41 +08:00
chenjinsong
ef3dd84bf7 NEZ-670 fix: 修改prominput错位问题 2021-05-26 16:56:45 +08:00
zhangyu
c923bcdd9c NEZ-636 fix:修改 metrics输入框bug 2021-05-18 16:13:15 +08:00
zhangyu
0459627b78 feat: 补充国际化 2021-05-14 18:24:38 +08:00
@changcode
b68ac91ea9 feat: 国际化修改 2021-05-14 17:51:02 +08:00
zhangyu
51d3479b21 feat:补充图片 2021-05-13 14:59:03 +08:00
zhangyu
29dc51afd0 fix:修改 表达式输入框 选择后根据光标位置插入 ,修改部分国际化 2021-05-13 10:06:03 +08:00
zhangyu
cd505a0d05 fix:修改 alertRule的相关bug 2021-05-12 19:07:07 +08:00
zhangyu
d8c07bca23 feat:使用向导完善 2021-05-12 16:19:43 +08:00
zhangyu
4b85b3ced5 fix:修改 表达式模板 调用tree接口 2021-05-11 14:11:24 +08:00
zhangyu
31c169d8e1 fix:修改因为时区导致的查不到数据的问题 以及 修改metrics的正则 2021-05-07 14:29:07 +08:00
zhangyu
7c6e568541 style:project topo 样式调整 2021-05-06 13:33:07 +08:00
chenjinsong
06f988caac perf: explore样式 2021-04-30 18:54:11 +08:00
chenjinsong
66409db79f feat: label搜索开关、asset-label列等 2021-04-29 22:24:38 +08:00
zhangyu
d262a18b86 fix:修复拖动节点 频繁调用接口的问题 2021-04-28 19:26:49 +08:00
chenjinsong
2b3047b413 feat: asset功能、panel样式修复 2021-04-26 21:42:15 +08:00
wangwenrui
4fe0b1356c fix:补充 eslint 格式化 2021-04-22 18:03:56 +08:00
zhangyu
897ca6c6bb fix:修改表达式模板 无法正确选择的问题 2021-04-21 10:57:53 +08:00
zhangyu
9fa43c13f4 feat:使用模板表达式时 没有参数 直接放入表达式 2021-04-08 11:47:40 +08:00
zhangyu
0a41e3247d feat: chart添加group 并修改样式 2021-04-07 19:18:22 +08:00
zhangyu
68030b1565 fix:exprTemp 传 id 2021-03-22 16:02:58 +08:00