Commit Graph

3755 Commits

Author SHA1 Message Date
@changcode
758eb6cea8 style: 颜色选择器样式调整 2021-12-02 13:59:38 +08:00
zhangyu
a6ad26068d Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.2 2021-12-02 11:14:36 +08:00
zhangyu
64023fdbb0 feat : logs 复用 以及 添加表单校验 2021-12-02 11:14:27 +08:00
@changcode
ddb1acce18 fix: 2fa验证登陆成功后,修复主题颜色类名动态赋值为null 2021-12-02 10:44:21 +08:00
chenjinsong
010890813b NEZ-1280 feat: 全屏功能实现 2021-12-01 20:27:23 +08:00
zhangyu
294eee526c fix: 修改 valueMapping 颜色未保存的问题 2021-12-01 18:17:23 +08:00
@changcode
6867402a94 style: 主题样式调整 2021-12-01 18:10:50 +08:00
zhangyu
9aa66facc6 feat: 新增 切换 datasource 以及 type 清空部分不需要的参数 2021-12-01 17:12:02 +08:00
zhangyu
cc6bfbbdc2 feat: legend 以及 valueMapping的配置 2021-12-01 16:34:50 +08:00
@changcode
9496d7f8ed style: endpoint 批量新增样式调整 2021-12-01 15:40:07 +08:00
@changcode
c6a6dab65a style: asset批量修改和endpoint批量新增 主题样式调整 2021-12-01 15:23:54 +08:00
@changcode
39b5df3713 style: overview 主题颜色调整 2021-12-01 10:20:39 +08:00
chenjinsong
8cdd610963 NEZ-1280 feat: 实现自定义stack 2021-11-30 19:28:50 +08:00
chenjinsong
42bd653ae1 NEZ-1280 feat: 实现自定义stack 2021-11-30 19:21:59 +08:00
zhangyu
f9e20e292a feat: 抽取chartrightbox 子组件的公共参数 2021-11-30 17:51:09 +08:00
zhangyu
61791c20a0 feat: 添加六方图组件 2021-11-30 17:15:29 +08:00
zhangyu
cb0888017c Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.2 2021-11-30 16:48:12 +08:00
zhangyu
02da69a79e NEZ-1379 fix:时间范围选择器 end time 默认为 23:59:59 2021-11-30 16:47:35 +08:00
zhangyu
a69105d783 feat: 新增 chartRightBox 2021-11-30 16:39:21 +08:00
@changcode
8bdfd769ec style: 去除无用属性名,调整metrics,logs页面主题颜色 2021-11-30 16:08:02 +08:00
@changcode
1f0fc53526 style: 调整 switch 开关主题颜色 2021-11-30 14:36:51 +08:00
@changcode
895e84b77c style alsetMessage 样式调整 2021-11-29 18:03:24 +08:00
@changcode
3cb9e7d4b1 style: 修复列表页面样式错误问题 2021-11-29 17:02:48 +08:00
zhangyu
cb49f461ba Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.2 2021-11-29 16:47:51 +08:00
zhangyu
8d58425967 NEZ-1370 fix: Asset新建图表预览时,点击刷新按钮,图表名称前面区分内容消失 2021-11-29 16:47:34 +08:00
chenjinsong
28e9e55c0e merge: 处理冲突 2021-11-29 16:46:53 +08:00
chenjinsong
339e437a6e merge: 删除无用文件 2021-11-29 16:36:43 +08:00
chenjinsong
f39d41adab merge: 3.1代码合并 2021-11-29 16:28:58 +08:00
chenjinsong
7581b30f2c Merge remote-tracking branch 'origin/dev-3.1' into dev-3.2
# Conflicts:
#	nezha-fronted/src/assets/css/common/rightBoxCommon.scss
#	nezha-fronted/src/assets/css/components/common/project/topology.scss
#	nezha-fronted/src/components/common/bottomBox/tabs/chartTempPreview.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
#	nezha-fronted/src/components/common/popBox/selectPanel.vue
#	nezha-fronted/src/components/common/project/popData/Info.vue
#	nezha-fronted/src/components/common/project/topologyL5.vue
#	nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
#	nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
#	nezha-fronted/src/components/page/config/changePin.vue
#	nezha-fronted/src/components/page/dashboard/explore/editor.vue
#	nezha-fronted/src/components/page/dashboard/metricPreview.vue
#	nezha-fronted/src/components/page/dashboard/panel.vue
#	nezha-fronted/src/permission.js
#	nezha-fronted/src/store/user.js
2021-11-29 16:19:13 +08:00
chenjinsong
d0cf76513e merge: 主题代码合并 2021-11-29 15:44:47 +08:00
chenjinsong
214003e9ca Merge remote-tracking branch 'origin/dev-3.1.1_theme' into dev-3.2 2021-11-29 15:43:27 +08:00
chenjinsong
4d30133907 NEZ-1280 feat: 时间序列chart微调 2021-11-29 15:43:07 +08:00
zhangyu
85a35de8d0 NEZ-1369 fix:chart box 修改图表表达式时,点击任意位置退出,不会弹出提示框 2021-11-29 15:37:08 +08:00
zhangyu
8f12539996 style: 修改 cilck-search搜索框 下拉选择 清除选择后 宽度不变的问题 2021-11-29 14:53:47 +08:00
zhangyu
4238552b5d NEZ-1366 fix: Alert rule搜索框按指定字段搜索时,选中字段,标题出错,通过键盘删除时无法删除,内容出错 2021-11-29 09:49:32 +08:00
zhangyu
627175acc7 NEZ-1351 fix:ser详情界面搜索时有选项框的内容,无法通过键盘进行删除,点击删除键后,鼠标光标无法选中输入框 2021-11-29 09:48:54 +08:00
chenjinsong
56077e2fc2 NEZ-1365 fix: 修复explore-log更换语句重新搜索后,log-table的筛选条件没有重置的问题 2021-11-27 19:28:01 +08:00
zhangyu
50e1763cf9 fix: 修改 chart-alert-list 预览不显示操作列 2021-11-27 15:38:19 +08:00
zhangyu
5a15a5000e fix:修改 chart-alert-list labels不是字符串的问题 2021-11-27 15:22:37 +08:00
zhangyu
b96e23950f fix: 修改panel line-chart nodata的高度问题 2021-11-27 13:50:41 +08:00
zhangyu
62ab3ef6bd fix: 修改多次刷新图表 堆叠事件重复添加的问题 2021-11-27 13:41:26 +08:00
zhangyu
aa6c4f16c2 NEZ-1322 fix:修改Endpoint查看表达式图表时,切换时间图表没有变化,切换回原时间,时间参数不对的问题 2021-11-27 13:08:05 +08:00
zhangyu
5078715039 fix: panel 以及下弹窗panel 同步时添加loading 2021-11-27 12:07:25 +08:00
zhangyu
dc638be860 NEZ-1328 fix: line-chart 数值为null时不显示tooltip 2021-11-27 11:42:27 +08:00
zhangyu
d15931a5bf NEZ-1364 fix: Chart 点击选择 0 值曲线,切换其他曲线,发现无法显示 2021-11-27 10:40:47 +08:00
chenjinsong
fb43f27bad fix: 修复token失效后可能无法加载页面的问题 2021-11-26 20:31:16 +08:00
chenjinsong
d892f4e645 NEZ-1254 feat: chart架构、时序图定义 2021-11-26 20:13:54 +08:00
chenjinsong
ed9bf789d1 Merge branch 'dev-3.1.1_theme' into dev-3.2 2021-11-26 20:04:51 +08:00
zhangyu
38d012dfb3 NEZ-1350 fix:当用户另外开启标签时,不用再次登陆 2021-11-26 18:47:00 +08:00
zhangyu
8a4e97ed09 fix: 处理页面报错信息 2021-11-26 18:14:45 +08:00