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

289 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
zhangyu
b93a586d79 fix： 修改cilckSearch 回显的问题 2021-10-27 17:36:59 +08:00
zhangyu
c51d1293bd fix：记录组合筛选的状态 2021-10-26 15:55:57 +08:00
@changcode
05c837be66 NEZ-1077 fix: panel 输入搜索条件 ，没有符合条件chart nodata样式 2021-10-25 14:38:43 +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
f7f7c8bb5e Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-22 09:47:57 +08:00
@changcode
8d0f1cd5ba NEZ-1073 feat: asset 编辑页面 state 下拉框显示 remark 内容 2021-10-21 18:37:35 +08:00
zhangyu
ab61f75347 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1 2021-10-19 09:47:35 +08:00
zhangyu
42854089b9 fix： 修改 顶部搜索样式 2021-10-18 17:40:21 +08:00
zhangyu
c2267a983d fix：修改asset 详细视图切换时 没有保存分页信息，修改endpoint 搜索部分的数据来源 2021-10-18 14:55:16 +08:00
zhangyu
08f0733052 fix： 修改打开asset Bottom的下弹框 切换详细视图 图表显示错误的问题 2021-10-15 16:41:14 +08:00
zhangyu
f635c87740 fix： 样式调整 2021-10-15 15:59:46 +08:00
zhangyu
ed24261c5e fix：修改assetCilckSearch的样式 2021-10-15 10:22:02 +08:00
zhangyu
4e501cfc11 feat：asset 详细视图添加 2021-10-14 14:14:25 +08:00
zhangyu
cfca72366c feat： asset详细视图 基本功能实现 2021-10-13 18:24:09 +08:00
zhangyu
3029a0db41 feat： asset详细视图的回显完成 2021-10-13 14:44:34 +08:00
zhangyu
24d6e7a218 fix：搜索内容调整 modeil以及more未完善 2021-10-13 11:12:26 +08:00
zhangyu
133275d66d feat：添加顶部搜索选择 2021-10-12 16:53:59 +08:00
zhangyu
b591445d91 feat：asset搜素部分添加 2021-10-12 12:25:20 +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
zhangyu
fb7a7a349a fix； 搜索框 下拉类型 禁止输入 2021-09-27 18:06:41 +08:00
zhangyu
27cd1031a2 fix： 修改asset复制时 信息不全的问题 2021-09-13 17:05:06 +08:00
chenjinsong
dc8d5c2561 NEZ-944 fix: table高度修复 2021-08-29 21:35:27 +08:00
zhangyu
63a18d7576 NEZ-938 fix:二级页面 endpoint编辑按钮点击console 报错 2021-08-26 15:38:45 +08:00
zhangyu
191c8987fd style: 修改asset endpoint的表格的边框样式 2021-08-26 15:05:26 +08:00
@changcode
d46b8eaaf5 fix: 分页增加判断条件 2021-08-23 18:50:08 +08:00
@changcode
5a8614395e fix asset talon 开关绑定对应值 2021-08-18 15:27:53 +08:00
@changcode
d1ca46aed6 NEZ-909 fix: asset talon 配置调整 2021-08-16 10:48:58 +08:00
zhangyu
614a9c183f NEZ-887：当用户未创建 dashboard panel 时，chart 查询错误数据的问题 2021-07-29 16:23:15 +08:00
chenjinsong
fe594d6066 NEZ-819 fix: 修复asset顶部过滤加载慢、抖动的问题 2021-07-19 16:34:24 +08:00
zhangyu
9ae70267bf fix:处理 asset Sub 切换底部选项 出现多个subAsset的问题 2021-07-16 09:56:18 +08:00
zhangyu
bd3eda24da NEZ-747 fix：修改前端导出的文件名 2021-06-30 16:56:18 +08:00
chenjinsong
5f5f94bc0b NEZ-698 perf: 过滤筛选框调整 2021-06-07 15:09:11 +08:00
zhangyu
64bebade30 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0 2021-06-02 16:55:24 +08:00
zhangyu
9ee8b0f7ba NEX-717 fix：bug修改 2021-06-02 16:55:17 +08:00
chenjinsong
38166bbdfb fix: 修复asset筛选框显示更多不对的问题 2021-06-02 15:23:38 +08:00
chenjinsong
481e8c3c43 NEZ-701 fix: 修复terminal-record样式 2021-06-01 17:10:54 +08:00
zhangyu
3a36dccf18 fix：修改 弹窗为右滑框 2021-06-01 15:19:47 +08:00
zhangyu
2ee081df1a NEZ-699： 增加告警静默一键配置功能 2021-06-01 14:26:09 +08:00
zhangyu
6ec63ff6f3 fix：修改asset connect点击报错 ，panel-addByTemplate穿梭框,varIds传参不正确,以及assetmodel编辑框中chart-template回显问题 2021-05-25 14:21:14 +08:00
@changcode
9488eef644 fix: 搜索条件列表国际化补充 2021-05-20 11:39:12 +08:00
zhangyu
fd77ced048 feat： 所有表格 添加 loading 2021-05-18 19:18:14 +08:00
zhangyu
5a2828503a feat： 所有导入导出 放入新组件内 2021-05-17 16:41:01 +08:00
zhangyu
9eab693062 fix：将asset的搜索条件放到头部 2021-05-14 18:32:47 +08:00
zhangyu
97813ee1da fix：将批量删除按钮放入顶部下拉菜单中 2021-05-14 17:19:21 +08:00
zhangyu
e2636bee95 fix：修改asset 顶部按钮，修改assetModel 上滑，修改module endpoint上滑编辑页面 2021-05-14 17:09:57 +08:00