Commit Graph

238 Commits

Author SHA1 Message Date
@changcode
a28bf47bf9 fix: v-has权限调整 2022-01-11 11:00:03 +08:00
zhangyu
9567944859 fix: 删除 console 2021-12-07 17:53:23 +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
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
zhangyu
85a35de8d0 NEZ-1369 fix:chart box 修改图表表达式时,点击任意位置退出,不会弹出提示框 2021-11-29 15:37:08 +08:00
@changcode
81a1af9365 style: 主题样式调整 2021-11-17 16:41:18 +08:00
zhangyu
c19f8436e6 NEZ-1258 fix: Asset查看详情时,多个功能点的搜索记录同步 2021-11-17 13:51:28 +08:00
chenjinsong
f27b6c2606 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/pagination.vue
#	nezha-fronted/src/components/common/searchInput.vue
#	nezha-fronted/src/components/common/table/settings/endpointTable.vue
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
2021-11-15 14:06:42 +08:00
zhangyu
6a4671ac5e NEZ-1229 fix: Chart Option 无法切换 Statistics 属性 2021-11-12 09:42:23 +08:00
zhangyu
713fa0706c NEZ-1228 fix:chart编辑页面 value mappint 切换报错,页面无法点击 2021-11-11 17:25:54 +08:00
chenjinsong
a0dcb8d877 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue
2021-11-11 11:28:19 +08:00
zhangyu
e79a3ac165 NEZ-1205 fix: 开启两个窗口 一个中文一个英文 v-select组件 显示不对的问题 2021-11-08 15:55:51 +08:00
@changcode
3d24cfbcf2 NEZ-1175 fix: 修复点击添加面板内的提示信息会触发 未保存提示 2021-11-05 15:41:25 +08:00
zhangyu
c82f69fccd fix: 修改chartbox 国际化的问题 2021-11-05 11:14:11 +08:00
zhangyu
e635eebe99 fix: 处理 chartBox的报错 2021-11-05 10:31:16 +08:00
zhangyu
897fb7673c fix: 处理国际化的问题 2021-11-04 18:21:20 +08:00
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
d89df0decd NEZ-1138 style: 修复Module页面样式问题 2021-10-29 18:31:52 +08:00
@changcode
47d1863111 style: 优化select公用样式,及类名 2021-10-29 12:02:34 +08:00
zhangyu
af5bfc6d47 Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts:
#	nezha-fronted/src/components/page/dashboard/chartBox.vue
2021-10-28 16:59:05 +08:00
zhangyu
90346ba198 NEZ-1121 fix;鼠标放在图例文字上,文字显示问题 2021-10-28 16:58:09 +08:00
@changcode
9acb8c0b5d fix: 修复el-popover trigger 触发 2021-10-28 16:54:03 +08:00
@changcode
9e82c52436 NEZ-1079 perf: 将各处列表、dashboard等页面中多处下拉框的弹出触发方式统一为点击触发 2021-10-25 17:16:40 +08:00
@changcode
b05240855a style: explore页面,chartBox 下拉 select-panel 选择器样式调整 2021-10-20 09:40:52 +08:00
@changcode
98f8de51c6 NEZ-1037 fix: setup 初始化界面删除 site url 2021-09-29 18:34:39 +08:00
@changcode
1e316e0272 NEZ-1033 feat: group chart 增加 collapse (折叠选项) 2021-09-29 15:06:52 +08:00
zhangyu
cd72fad4b7 fix: 优化 metrics 的数据 不再频繁调用接口 2021-09-28 16:54:07 +08:00
@changcode
9a07b6e454 style: select 样式调整 2021-09-27 10:25:19 +08:00
@changcode
9542e1a63a style: Box 样式调整 2021-09-26 18:14:47 +08:00
@changcode
025ae13877 NEZ-1023 style: 下拉列表 样式调整 2021-09-24 17:07:16 +08:00
zhangyu
89334b6f98 NEZ-1022 fix: logs 日志条数限制修改 2021-09-23 10:51:53 +08:00
@changcode
278044a1bb NEZ-999 fix: 修复chart编辑页面 expression 标题国际化错误 2021-09-15 11:40:33 +08:00
@changcode
430db199b8 style: chartBox,notifyMrthodTab,样式调整 2021-09-13 16:21:13 +08:00
@changcode
868933fa09 fix: chartBox type == URL 无法输入异常,type == Diagram,URL未隐藏 2021-09-13 14:23:32 +08:00
zhangyu
e3b2457979 fix:修改图表复制 接口调用错误的问题 2021-09-13 10:40:29 +08:00
@changcode
34a38a708a style: chartBox,roleBox,exploreItem 页面样式调整 2021-09-10 14:13:10 +08:00
@changcode
55a644c6ac fix: 调整 promlInput 组件 和 chaartBox Legend 样式 2021-09-03 17:23:41 +08:00
zhangyu
5c4d732b90 docs: 补充中英文 2021-09-03 11:39:16 +08:00
zhangyu
fa2920dc9e NEZ-956 feat: chart 增加 logs 图表类型(60%) 2021-09-03 11:10:24 +08:00
zhangyu
48cc2ae1fe NEZ-863 fix:修改panel 页面 搜素后样式错乱的问题 2021-07-23 15:49:18 +08:00
chenjinsong
947ff63127 NEZ-850 perf: topo/diagram样式调整 2021-07-19 18:06:55 +08:00
@changcode
4191c8113f NEZ-835 fix: 新增页面添加标签页关闭提示功能 2021-07-15 11:56:25 +08:00
zhangyu
3e1051c43e fix: 处理参数为空时 传递之前参数的问题 2021-07-09 17:43:03 +08:00
@changcode
8a6da26217 fix: 1. Panel > 编辑图标功能,判断兼容老数据添加默认值
2. 修复 告警等级 Priority select 初始化 color 为 undefined
2021-07-07 14:30:27 +08:00
@changcode
c4c8a7205b fix: 去除打印 2021-07-05 17:02:30 +08:00
zhangyu
42c5ac45d6 NEZ-805 fix :diagram 图表bug 2021-07-05 16:40:19 +08:00
zhangyu
7e4c4a4463 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
# Conflicts:
#	nezha-fronted/src/components/page/dashboard/chartBox.vue
2021-07-05 15:13:51 +08:00
@changcode
d33f6ff598 NEZ-807 fix: 标签关闭 提示功能 2021-07-05 14:43:47 +08:00