gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,370 Commits 31 Branches 139 Tags
d892f4e645f7f56d3e14788b9870adc4d6ff9cec
Commit Graph

298 Commits

Author SHA1 Message Date
chenjinsong
f27b6c2606 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme 
# Conflicts:
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/pagination.vue
#	nezha-fronted/src/components/common/searchInput.vue
#	nezha-fronted/src/components/common/table/settings/endpointTable.vue
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
 2021-11-15 14:06:42 +08:00
@changcode
c75c84156e style: endpointTable 页面去除多余样式 2021-11-11 17:48:59 +08:00
@changcode
e616322f05 Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-11-11 17:12:24 +08:00
@changcode
5e7f21c9f8 style: nzTooltip页面样式调整 2021-11-11 17:12:15 +08:00
zhangyu
11a05c0505 NEZ-1220 fix： license 默认隐藏，查询后若有需要再出现 2021-11-11 17:01:04 +08:00
zhangyu
b82cbedd22 fix： 划入 清除定时器 2021-11-11 16:46:54 +08:00
zhangyu
f9f2cb8a9e NEZ-1224 fix： 首次进入 Endpoint 页面加载缓慢 2021-11-11 16:43:17 +08:00
@changcode
22c5120bf7 style: endpoint config 弹框样式调整 2021-11-11 15:01:48 +08:00
@changcode
d4dd85ee8e NEZ-1218 fix: alert message 查看按钮 增加判断条件 当 rule_type 未logs时禁用 2021-11-11 13:55:04 +08:00
chenjinsong
a0dcb8d877 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme 
# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue
 2021-11-11 11:28:19 +08:00
@changcode
5d7d6c664e fix: 列表页面增加 v-has 权限 2021-11-10 18:09:05 +08:00
zhangyu
f7ba3bec13 NEZ-1205 fix： 英文状态下选择框内的提示语是中文 修改 2021-11-09 10:17:12 +08:00
zhangyu
fdeb00750c fix： 修改charttemp的国际化的问题 2021-11-05 11:09:25 +08:00
zhangyu
897fb7673c fix： 处理国际化的问题 2021-11-04 18:21:20 +08:00
@changcode
5f25238f70 fix: 统一数据 lang 中文为 zh 2021-11-04 16:00:20 +08:00
chenjinsong
a709585a9f Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme 
# Conflicts:
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
#	nezha-fronted/src/components/common/login.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
 2021-11-04 14:49:40 +08:00
zhangyu
219e71f7e0 fix: 修改 alertRule evalLog 时间错误的问题 2021-11-04 14:24:01 +08:00
@changcode
ab211e91ef style: 调整I18N列表页面表头最小宽度 2021-11-04 11:23:08 +08:00
chenjinsong
561313d68c NEZ-1072 feat: 主题内容 2021-11-04 09:29:01 +08:00
@changcode
7ecf2b9ecd NEZ-1158 feat: 国际化列表 页面& 编辑页面 2021-11-03 11:47:25 +08:00
zhangyu
08817f726f NEZ-1165 fix；alert rule 评估日志列表不需要 字段排序 2021-11-03 09:14:08 +08:00
zhangyu
dc7a102bf7 NEZ-1155 feat：添加 evallog页面 2021-11-02 18:34:00 +08:00
@changcode
efb0996777 fix: alertLabel页面增加判断，区分alertMessage页面，和chart-alert-lis全屏t页面 2021-11-02 10:17:26 +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
@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