chenjinsong
|
fb80fa3de9
|
merge: 合并下拉table的鼠标悬浮提示
|
2021-12-02 21:52:38 +08:00 |
|
@changcode
|
c1d94feea1
|
NEZ-1378 fix: Module内容过长时鼠标悬浮提示，补充国际化
|
2021-12-02 21:51:31 +08:00 |
|
chenjinsong
|
e55dbb116d
|
Merge remote-tracking branch 'origin/dev-3.2' into dev-3.2
|
2021-12-02 21:46:18 +08:00 |
|
chenjinsong
|
49f4320723
|
NEZ-1280 feat: 图表刷新
|
2021-12-02 21:46:07 +08:00 |
|
zhangyu
|
98a55dfa3a
|
fix： 修改数据 为mock数据
|
2021-12-02 18:52:32 +08:00 |
|
zhangyu
|
2410d94d70
|
feat： system-chart-config(30%)
|
2021-12-02 18:33:28 +08:00 |
|
@changcode
|
1dd2c10891
|
NEZ-1378 fix: Module内容过长时鼠标悬浮提示，补充国际化
|
2021-12-02 16:42:37 +08:00 |
|
zhangyu
|
0ce1797524
|
feat： 暂存
|
2021-12-02 15:36:01 +08:00 |
|
zhangyu
|
8cca94f74f
|
feat: 补充chartBox other
|
2021-12-02 14:56:14 +08:00 |
|
zhangyu
|
39a051bbcf
|
Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.2
|
2021-12-02 14:10:01 +08:00 |
|
zhangyu
|
3f010f5da0
|
feat： 修改 log-chart-box 和metrics-chart-box 使用同一个rightbox
|
2021-12-02 14:09:49 +08:00 |
|
@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 |
|