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
|
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
|
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
|
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
|
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 |
|
@changcode
|
d8cf47501b
|
fix: userTable列表页面，language列展示内容调整
|
2021-10-13 14:37:21 +08:00 |
|
@changcode
|
a18d4fed1d
|
NEZ-1052 feat: user 编辑页面 增加 language 属性
|
2021-10-12 16:27:37 +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
|
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 |
|
@changcode
|
012bee8e51
|
fix: 修复Terminal log 列表错位
|
2021-09-17 18:33:40 +08:00 |
|
zhangyu
|
12cf613172
|
NEZ-1009 feat：操作日志&终端日志 补充 排序
|
2021-09-17 11:52:41 +08:00 |
|
@changcode
|
9e50d7b389
|
fix: 修复新增或复制时 endpoint state 字段展示不全
|
2021-09-15 16:58:27 +08:00 |
|
@changcode
|
afdfbd74d3
|
style: credentials,endpoin,apiKey,页面 table 列表样式调整
|
2021-09-13 15:07:14 +08:00 |
|
@changcode
|
b749bb6fc3
|
fix: 优化 alertRuleBox type 下拉选择器
|
2021-09-09 10:32:43 +08:00 |
|
zhangyu
|
b395e3b936
|
fix：修改chartTepm logs显示错误的问题 以及图标的替换
|
2021-09-06 16:22:05 +08:00 |
|
zhangyu
|
3df236391c
|
feat: 表格 添加 copy功能
|
2021-08-26 18:05:40 +08:00 |
|
zhangyu
|
7afc73effc
|
NEZ-938 feat:列表页面增加 duplicate按钮
|
2021-08-26 14:51:38 +08:00 |
|
zhangyu
|
1af455f864
|
NEZ-934 style：样式调整
|
2021-08-26 10:43:08 +08:00 |
|
zhangyu
|
039404b451
|
fix： 删除页面console
|
2021-08-26 09:49:01 +08:00 |
|
@changcode
|
83621db245
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
|
2021-08-25 16:19:52 +08:00 |
|
@changcode
|
faa6a330d1
|
fix: 修复样式，补充国际化，清除console
|
2021-08-25 16:19:44 +08:00 |
|
zhangyu
|
e381ff7717
|
NEZ-935 fix:monitor endpoint 页面 删除 qiery，bottom boxQuery 改为 metrics ，以及 查询参数的问题
|
2021-08-25 16:05:33 +08:00 |
|
zhangyu
|
d54d2abe03
|
fix： 修改 chart-list-group里面的图表 resize时的问题
|
2021-08-24 17:22:09 +08:00 |
|
zhangyu
|
8c21e51c89
|
style： 修改endpointTable的state的展示
|
2021-08-24 15:11:34 +08:00 |
|
@changcode
|
6a2e4675d0
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
|
2021-08-24 11:07:21 +08:00 |
|
@changcode
|
b7d891eecc
|
fix: 个人中心样式修复
|
2021-08-24 11:07:14 +08:00 |
|
zhangyu
|
0771dd1437
|
fix： 修改endpoint Configuration无法复制的问题
|
2021-08-24 09:56:04 +08:00 |
|
@changcode
|
f0b701b259
|
NEZ-910 fix: 个人中心页面实现
|
2021-08-18 19:15:40 +08:00 |
|
zhangyu
|
1d7bd5967d
|
fix：修改 auth 输入数字后不能输入英文的问题
|
2021-08-17 10:49:18 +08:00 |
|
zhangyu
|
f9bc341c0a
|
style： 修改重置2FA按钮
|
2021-08-17 10:25:06 +08:00 |
|