Commit Graph

4767 Commits

Author SHA1 Message Date
zyh
c6b113fc8c perf:复制变量不继承折叠状态 2022-07-01 15:52:39 +08:00
zyh
280025f090 Merge branch 'dev-3.4' of git.mesalab.cn:nezha/nezha-fronted into dev-3.4 2022-07-01 15:42:35 +08:00
zyh
21af829654 NEZ-1992 feat:explore页面增加表达式是否启用按钮 2022-07-01 15:42:08 +08:00
likexuan
c1e3957f08 Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-07-01 09:39:29 +08:00
likexuan
4064987ef5 NEZ-1990 feat :补充 icon/button title 2022-07-01 09:39:20 +08:00
zhangyu
51ee7e385f NEZ-1989 feat:dashboard 变量 样式调整 2022-06-30 18:10:52 +08:00
zhangyu
27cd886f15 Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-06-30 17:37:53 +08:00
zhangyu
c0e877b66e NEZ-1989 feat:dashboard 展示页面增加 变量 2022-06-30 17:37:29 +08:00
zyh
9472bb6ed1 Merge branch 'dev-3.4' of git.mesalab.cn:nezha/nezha-fronted into dev-3.4 2022-06-30 15:55:07 +08:00
zyh
cb09345c42 perf:panelBox修改触发悬浮框元素 2022-06-30 15:54:45 +08:00
likexuan
21091355cf fix : chartBox Metric 聚焦样式 2022-06-29 14:00:16 +08:00
likexuan
21efc104b2 feat : config.user.Theme 国际化 2022-06-29 13:41:44 +08:00
zhangyu
91e9352494 Merge branch 'dev-3.4-report' into 'dev-3.4'
feat:添加panel假数据

See merge request nezha/nezha-fronted!11
2022-06-29 01:49:22 +00:00
zhangyu
a38c67e1f6 feat:添加panel假数据 2022-06-29 09:40:46 +08:00
zhangyu
0fb9221b2c Merge branch 'dev-3.4-report' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-06-29 09:22:08 +08:00
zhangyu
edb3286859 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-06-28 13:48:50 +08:00
zhangyu
3132b306d3 style:黑色主题 样式补充 rel-22.05.11 2022-06-28 13:48:13 +08:00
likexuan
f70a48e832 Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-06-28 11:02:58 +08:00
likexuan
e64d593b39 fix : chartRightBox Metric 聚焦时样式修改 2022-06-28 11:02:52 +08:00
zhangyu
4e7a4543f3 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-06-28 09:40:20 +08:00
zhangyu
9f932b5c4c NEZ-1984 fix: 限制 alertRule Evaluation interval 为 15 s - 24h 2022-06-27 17:35:24 +08:00
zhangyu
4dff6fc940 NEZ-1983 fix: 修改ipDetailBox 的 state为下拉 2022-06-27 17:11:04 +08:00
likexuan
0866e3be71 fix : 修改暗色环境中无数据的复选框大小 2022-06-27 16:00:40 +08:00
likexuan
a1ca417813 perf : panelBox report 功能时间校验 2022-06-27 15:47:44 +08:00
zhangyu
c58978082c fix:前端长度限制 2022-06-27 15:06:26 +08:00
zhangyu
3e7de5ea4b Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-06-27 10:30:49 +08:00
zhangyu
0192c6820c Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-06-27 10:30:29 +08:00
zhangyu
e9b3f2dae4 fix:国际化修改 2022-06-27 10:29:36 +08:00
zyh
eca873d059 Merge branch 'dev-3.4' of git.mesalab.cn:nezha/nezha-fronted into dev-3.4 2022-06-27 10:28:47 +08:00
zyh
e0da2198db feat:新增查询表达式悬浮框 2022-06-27 10:28:29 +08:00
likexuan
39fe482397 NEZ-1980 perf : api keys 列表页面调整 2022-06-27 10:10:49 +08:00
likexuan
02cb511160 Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-06-27 10:00:45 +08:00
likexuan
63d99f0f2a fix:在Group内添加图表后进行拖住,图表能超出以创建的Group 2022-06-27 09:58:28 +08:00
zhangyu
445d1facaa Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-06-27 09:52:53 +08:00
likexuan
fb44c6b61a NEZ-1980 perf : api keys 列表页面调整 2022-06-27 09:46:52 +08:00
zhangyu
5f3169a889 NEZ-1952 fix:在Group内添加图表后进行拖住,图表能超出以创建的Group 2022-06-24 18:29:27 +08:00
zyh
8601913bf4 feat:dashboard支持定义变量页面搭建 2022-06-24 18:18:13 +08:00
zyh
c447e540d4 feat:dashboard支持定义变量页面搭建 2022-06-24 17:54:23 +08:00
zhangyu
0b576243f4 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-06-24 16:35:42 +08:00
zhangyu
f47ceb5ab4 Merge branch 'dev-3.4-report' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4
# Conflicts:
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/table/settings/userTable.vue
2022-06-24 16:34:40 +08:00
zhangyu
4528a5dfec Merge branch 'dev-3.4-crosshair' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4
# Conflicts:
#	nezha-fronted/src/assets/css/common.scss
#	nezha-fronted/src/store/panel.js
2022-06-24 16:28:24 +08:00
zhangyu
d0cb1995bf fix:暂存用户引导页面 2022-06-24 16:24:53 +08:00
zhangyu
fb22f2d9fe fix:修改 apiKey页面 token为key rel-22.05.10 2022-06-24 15:36:37 +08:00
zhangyu
37377e63ed fix:国际化替换 2022-06-23 16:58:18 +08:00
likexuan
e113a6a32b Merge branch 'dev-3.4' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4 2022-06-23 16:55:48 +08:00
likexuan
b73980a9e8 fix : snmpCredentialBox 描述框样式更改 2022-06-23 16:55:40 +08:00
zhangyu
6403b570f5 Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4
# Conflicts:
#	nezha-fronted/src/assets/css/common.scss
2022-06-23 16:51:51 +08:00
zhangyu
8d8654a13a fix:国际化替换 2022-06-23 16:39:20 +08:00
zhangyu
753253f443 NEZ-1974 fix: 新建chart时选择Metrics或Logs后,表达式输入框提示输入限制显示有误 2022-06-23 16:23:39 +08:00
likexuan
acbd5016a9 fix : user 页面提示框位置修改 2022-06-23 16:05:24 +08:00