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

108 Commits

Author SHA1 Message Date
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
9542e1a63a style: Box 样式调整 2021-09-26 18:14:47 +08:00
zhangyu
614a9c183f NEZ-887：当用户未创建 dashboard panel 时，chart 查询错误数据的问题 2021-07-29 16:23:15 +08:00
zhangyu
b9829dc0f0 Nez-856 style： 修改表单元素样式未对齐的问题 2021-07-22 14:25:14 +08:00
@changcode
4191c8113f NEZ-835 fix: 新增页面添加标签页关闭提示功能 2021-07-15 11:56:25 +08:00
zhangyu
132b5f927c NEZ-789 fix： 添加报错提示 2021-07-02 14:03:17 +08:00
zhangyu
c778cf2eb4 NEZ-784 NEZ-770 ：endpoint 名字拼接后过长从中间截取一部分 ，以及新增 Diagram 图表类型 2021-07-01 19:15:08 +08:00
@changcode
57c77a8679 fix: 修复组件指定name重复问题 2021-06-17 11:24:38 +08:00
zhangyu
a6dfb7e510 NEZ-704： 创建 endponit 添加 state参数 2021-06-01 17:24:57 +08:00
chenjinsong
a202a88785 fix: 修复add-endpoint时会自动补全port问题 2021-05-21 18:29:40 +08:00
zhangyu
801180443f fix：修复 alertMessage 图表不显示的问题 以及 查看图表后 分页查询带了时间参数的问题 2021-05-14 15:24:32 +08:00
zhangyu
82977548f2 fix；修改所有的右滑 不再显示ID 以及修改endpoint无法修改的问题 2021-05-11 10:37:58 +08:00
zhangyu
e980a7e303 feat：alertMessage 上滑框 state 暂时默认给1 2021-05-08 18:22:18 +08:00
zhangyu
17ddaa3f64 feat：全局替换 key为password以及pwd的属性 换为 pin 2021-04-27 20:31:54 +08:00
zhangyu
257f27eedc fix：修改endpoint 显示问题 2021-04-27 19:24:26 +08:00
zhangyu
06584204ae fix：endpoint 显示bug修改 以及修改 chart 参数 2021-04-27 17:38:58 +08:00
chenjinsong
2b3047b413 feat: asset功能、panel样式修复 2021-04-26 21:42:15 +08:00
zhangyu
de5fe9f1c6 fix：解决asset。tableTitle 删除后的影响 2021-04-25 16:28:09 +08:00
zhangyu
9490f5c309 feat：修改 panel页面 pageSize未传的问题 以及chartTemp的预览 2021-04-25 14:58:03 +08:00
zhangyu
73f34335a2 feat：添加chart模板列表页面 2021-04-23 18:10:25 +08:00
zhangyu
d4374d89ed feat： 侧滑样式修改 添加chatTemp的列表 2021-04-23 11:47:38 +08:00
zhangyu
1583e4d0db Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0 2021-04-22 18:05:02 +08:00
zhangyu
1d9af5a0ba feat：将表达式模板抽至template内 2021-04-22 18:04:42 +08:00
wangwenrui
4fe0b1356c fix:补充 eslint 格式化 2021-04-22 18:03:56 +08:00
zhangyu
b4aafcd78f feat：添加权限 2021-04-22 15:52:32 +08:00
zhangyu
242d58aeef feat：添加endpoint 批量修改功能 2021-04-21 18:54:15 +08:00
zhangyu
2803cbe695 style： project modue endpoint 样式微调 2021-04-21 16:35:48 +08:00
zhangyu
538d1a76e0 feat：module添加下拉弹窗 
fix：修改panel chart不可移动的bug
 2021-04-20 14:38:24 +08:00
zhangyu
f92c046208 feat: 添加 project 路由跳转到 module 以及 endpoint 2021-04-16 17:02:38 +08:00
zhangyu
6f26ba3d03 feat：endpoint 接口调整 以及 ptoject 样式调整 2021-04-16 15:02:40 +08:00
zhangyu
783f22b880 feat：修改endpoint 搜索asset列表的接口 2021-04-15 11:47:44 +08:00
zhangyu
72b2362408 feat：添加endpoint列表 2021-04-14 18:55:01 +08:00
chenjinsong
337ee9a938 feat: 引入eslint 2021-03-19 18:52:19 +08:00
zhangyu
635b16b028 feat：样式调整 2021-02-09 17:12:42 +08:00
zhangyu
2943f38981 feat：修改所有侧滑表单 label在input或select上方 2021-02-09 15:14:19 +08:00
wangwenrui
b18a3bfa11 feat:补充自动化测试所需id 2021-02-04 11:21:00 +08:00
陈劲松
ae05c89ad6 feat: 权限精简 2021-01-21 17:29:29 +08:00
wangwenrui
2163d3f16f feat:编辑页面添加退出提示 2021-01-18 18:58:57 +08:00
zhangyu
69e339a5fe feat：避免保存、导入按钮重复点击提交 2020-12-21 14:16:13 +08:00
陈劲松
0764dcdd56 perf: 滚动条替换和toTop替换 2020-12-14 20:25:24 +08:00
陈劲松
fe416e6d48 feat：权限（除role的相关按钮外） 2020-12-08 21:53:37 +08:00
陈劲松
6b08ab4bbc feat: endpoint增加enabled 2020-11-26 14:16:46 +08:00
zhangyu
d25eb264e7 fix：选择model搜索后，去除条件选择type搜索，删除model条件 2020-11-21 11:44:44 +08:00
陈劲松
889b8ad24c perf: 去掉select框的选择提示语 2020-11-18 17:33:43 +08:00
陈劲松
3347202266 feat: addendpoint的asset增加model等内容 2020-11-18 17:32:20 +08:00
zhangyu
799b4a1bdd fix:.endpoint添加搜索asset列表 ，停用的asset也能被搜索 2020-11-17 16:42:27 +08:00
zhangyu
a73c47d9d1 fix：修改添加endpoint的ip为Host 2020-11-12 11:00:40 +08:00
zhangyu
0089029a5e feat： 修改经纬度默认不显示 alertmessage asset支持模糊查询 alertrule 添加说明 2020-11-12 09:54:42 +08:00