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 |
|
@changcode
|
7dfc34f9c2
|
NEZ-1145 fix: System node exporter alert nums页面存在两个悬浮框
|
2021-11-01 16:35:58 +08:00 |
|
zhangyu
|
7108810a36
|
Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-10-29 14:16:19 +08:00 |
|
zhangyu
|
ed40692867
|
NEZ-1127 fix： 添加未选中的置灰效果
|
2021-10-29 14:16:04 +08:00 |
|
@changcode
|
47d1863111
|
style: 优化select公用样式，及类名
|
2021-10-29 12:02:34 +08:00 |
|
@changcode
|
ab87e01394
|
style: table列表样式调整
|
2021-10-28 17:53:27 +08:00 |
|
@changcode
|
9acb8c0b5d
|
fix: 修复el-popover trigger 触发
|
2021-10-28 16:54:03 +08:00 |
|
@changcode
|
b0765eeb62
|
NEZ-1119 fix: 修复user 详细视图 - terminal log state 缺少图标
|
2021-10-28 16:43:57 +08:00 |
|
zhangyu
|
5510b84b73
|
fix：roles name 显示保持原有逻辑
|
2021-10-28 14:21:52 +08:00 |
|
zhangyu
|
a4845f13e6
|
NEZ-1116 fix： Asset model页面设置默认列设置后页面有空白
|
2021-10-28 14:13:37 +08:00 |
|
zhangyu
|
5c58986971
|
NEZ-1115 fix：Alert silence页面设置默认列设置后页面有空白
|
2021-10-28 14:13:14 +08:00 |
|
zhangyu
|
90571f9de2
|
NEZ-1113 fix： Role修改name后，页面不显示
|
2021-10-28 14:00:55 +08:00 |
|
zhangyu
|
5bdc5e9001
|
NEZ-1114 fix：User页面设置默认列设置后页面有空白
|
2021-10-28 14:00:24 +08:00 |
|
@changcode
|
d9c7196768
|
style: 调整element,popover组件弹出效果
|
2021-10-27 14:32:26 +08:00 |
|
@changcode
|
586246d34f
|
style: endpoint Configuration列，鼠标移入弹框样式调整
|
2021-10-27 10:59:54 +08:00 |
|
zhangyu
|
ffb6cb23ea
|
NEZ-1088 fix：Project页面点击Alert字段不能跳转到Alert message页面
|
2021-10-27 10:49:53 +08:00 |
|
@changcode
|
5fa7833656
|
fix: 修复explore页面和log二级bottomBox页面的使用同一组件的条件冲突
|
2021-10-27 10:17:09 +08:00 |
|
@changcode
|
5a831004f5
|
NEZ-1080 style: 鼠标悬浮样式调整
|
2021-10-26 17:47:49 +08:00 |
|
@changcode
|
9e82c52436
|
NEZ-1079 perf: 将各处列表、dashboard等页面中多处下拉框的弹出触发方式统一为点击触发
|
2021-10-25 17:16:40 +08:00 |
|
@changcode
|
bbe760999d
|
style: 样式调整
|
2021-10-25 14:45:28 +08:00 |
|
@changcode
|
989d464e8f
|
fix: Metrics 补充nodata样式
|
2021-10-25 11:09:34 +08:00 |
|
@changcode
|
2351baa8f3
|
fix: 列表no data样式展示异常问题
|
2021-10-22 19:39:49 +08:00 |
|
zhangyu
|
fa2da5a3c1
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
# nezha-fronted/src/components/common/language/cn.js
# nezha-fronted/src/components/common/language/en.js
|
2021-10-22 18:08:37 +08:00 |
|
@changcode
|
ad8bef81ec
|
NEZ-1075 feat: state 样式调整
|
2021-10-22 17:47:42 +08:00 |
|
zhangyu
|
ede38e6627
|
fix：修改 termailLog的图标 以及显示
|
2021-10-22 09:55:57 +08:00 |
|
zhangyu
|
1eb9a59bd4
|
NEZ-1071 feat:terminal log state 改为图标
|
2021-10-21 18:12:07 +08:00 |
|
zhangyu
|
42854089b9
|
fix： 修改 顶部搜索样式
|
2021-10-18 17:40:21 +08:00 |
|
zhangyu
|
e878dabfe8
|
feat：asset 自定义label显示图标
|
2021-10-15 16:57:17 +08:00 |
|
zhangyu
|
08f0733052
|
fix： 修改打开asset Bottom的下弹框 切换详细视图 图表显示错误的问题
|
2021-10-15 16:41:14 +08:00 |
|
zhangyu
|
07c8acf92f
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-10-15 10:30:59 +08:00 |
|
zhangyu
|
d387aa0288
|
fix；补充国际化
|
2021-10-14 14:45:06 +08:00 |
|
zhangyu
|
cfca72366c
|
feat： asset详细视图 基本功能实现
|
2021-10-13 18:24:09 +08:00 |
|
@changcode
|
d8cf47501b
|
fix: userTable列表页面，language列展示内容调整
|
2021-10-13 14:37:21 +08:00 |
|
zhangyu
|
24d6e7a218
|
fix：搜索内容调整 modeil以及more未完善
|
2021-10-13 11:12:26 +08:00 |
|
zhangyu
|
464f0d38ed
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
|
2021-10-12 17:10:24 +08:00 |
|
@changcode
|
a18d4fed1d
|
NEZ-1052 feat: user 编辑页面 增加 language 属性
|
2021-10-12 16:27:37 +08:00 |
|
zhangyu
|
2aab2cb550
|
feat:优化视图与列表的切换速度
|
2021-10-11 16:12:09 +08:00 |
|
zhangyu
|
13bd9a0d8d
|
NEZ-1048 feat：asset详细视图 右侧内容区域 以及部分优化
|
2021-10-11 14:05:07 +08:00 |
|
zhangyu
|
46930a8878
|
feat： asset详细视图 切换部分 以及 左侧菜单部分的添加
|
2021-10-09 16:47:38 +08:00 |
|
@changcode
|
3be22533ec
|
fix: agentBox protocol 统一参数
|
2021-10-08 14:08:00 +08:00 |
|
@changcode
|
4f53c91128
|
NEZ-1045 fix: agent 编辑页面增加 protocol 下拉框
|
2021-10-08 13:41:53 +08:00 |
|
@changcode
|
c1ed41785a
|
style： alert Rule 下拉框样式调整
|
2021-09-27 15:39:23 +08:00 |
|
@changcode
|
9542e1a63a
|
style: Box 样式调整
|
2021-09-26 18:14:47 +08:00 |
|
@changcode
|
5879ca0c8a
|
style:下拉选择器样式统一
|
2021-09-26 11:56:36 +08:00 |
|
zhangyu
|
2a3d307902
|
style: alert rule & datacenter user.name调整
|
2021-09-24 14:29:19 +08:00 |
|
zhangyu
|
3f62634ccd
|
NEZ-1027 feat: alert rule & datacenter 编辑页面 user 下拉列表修改
|
2021-09-24 14:10:50 +08:00 |
|
zhangyu
|
278c91338b
|
fix； 处理啊alertRule 删除时alertMessage有时会空白的问题
|
2021-09-22 17:47:17 +08:00 |
|
@changcode
|
5416a7c117
|
fix: asset label type 列表,图标和内容展示错误
|
2021-09-22 14:20:44 +08:00 |
|
@changcode
|
012bee8e51
|
fix: 修复Terminal log 列表错位
|
2021-09-17 18:33:40 +08:00 |
|