Commit Graph

75 Commits

Author SHA1 Message Date
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
19519849af style : module rghtbox 样式调整 2021-11-10 10:03:41 +08:00
zhangyu
a1caffa4f4 NEZ-1210 fix: module endpoint 的中文转化问题 2021-11-09 16:14:31 +08:00
zhangyu
f7ba3bec13 NEZ-1205 fix: 英文状态下选择框内的提示语是中文 修改 2021-11-09 10:17:12 +08:00
zhangyu
e79a3ac165 NEZ-1205 fix: 开启两个窗口 一个中文一个英文 v-select组件 显示不对的问题 2021-11-08 15:55:51 +08:00
chenjinsong
a709585a9f Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
#	nezha-fronted/src/components/common/login.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
2021-11-04 14:49:40 +08:00
zhangyu
dc407816ce NEZ-1167 fix:Endpoint 名称校验相关问题 2021-11-04 14:24:42 +08:00
zhangyu
6cb602218e NEZ-1168 fix; Endpoint relabel 配置修改,前端校验错误 2021-11-04 10:08:54 +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
47d1863111 style: 优化select公用样式,及类名 2021-10-29 12:02:34 +08:00
@changcode
945332a931 style: endpointBox 页面select选择器样式调整 2021-10-18 17:51:32 +08:00
@changcode
a2a0565bfe NEZ-1064 fix: module & endpoint protocol字段 http,https 可以相互切换 2021-10-18 17:06:08 +08:00
@changcode
ff57b661f7 NEZ-1047 feat: endpoint metrics 增加 https 选项 2021-10-11 10:18:45 +08:00
@changcode
05131e7989 NEZ-1047 feat: endpoint metrics 增加 https 选项 2021-10-09 15:59:33 +08:00
@changcode
16be95d79f NEZ-1035 fix: group chart 编辑页面无法打开 2021-09-29 17:26:15 +08:00
@changcode
66730b5800 NEZ-1032 fix: Endpoint 新增页面 切换 project,module,asset 重置 metrics,logs配置 2021-09-28 17:42:09 +08:00
@changcode
2e8a2dde5f style: topologyL5,batchaddEndpoint,agent,logtab 下拉选择器样式调整 2021-09-28 10:15:53 +08:00
@changcode
9542e1a63a style: Box 样式调整 2021-09-26 18:14:47 +08:00
@changcode
59d8caa804 style: elementSat 样式调整 2021-09-26 14:50:22 +08:00
@changcode
5879ca0c8a style:下拉选择器样式统一 2021-09-26 11:56:36 +08:00
@changcode
025ae13877 NEZ-1023 style: 下拉列表 样式调整 2021-09-24 17:07:16 +08:00
zhangyu
416a14dccc NEZ-943 feat:module endpoint 编辑页面 metric snmp 类型输入校验修改 2021-08-27 16:15:05 +08:00
zhangyu
8c21e51c89 style: 修改endpointTable的state的展示 2021-08-24 15:11:34 +08:00
zhangyu
8862cbef8f style: module,endpoint rightBox样式调整 2021-08-23 09:37:36 +08:00
zhangyu
4fede61bb2 fix:修改保存 module 时多传参数的问题 2021-08-20 14:33:59 +08:00
zhangyu
e95898eaa5 feat: module endpoint relabel 必填项 跟action的值有关 label符合正则 2021-08-20 13:53:31 +08:00
zhangyu
2113c435a4 NEZ-916 feat: module endpoint 支持relabel 2021-08-19 15:54:38 +08:00
zhangyu
1608b33667 fix:修改asset 为下拉表格的形式 2021-08-17 10:58:24 +08:00
zhangyu
1d7bd5967d fix:修改 auth 输入数字后不能输入英文的问题 2021-08-17 10:49:18 +08:00
zhangyu
9428be3bdb fix:修改 endpoint 批量新增的相关问题 2021-08-17 10:25:53 +08:00
zhangyu
7a421d5cba fix:endpoint module pipline 的json改为key-value , timestamp改为下拉 2021-08-16 16:14:48 +08:00
zhangyu
7879da7e87 feat:登录页面 支持MFA 联调完成 2021-08-13 13:47:12 +08:00
zhangyu
0e7cbe35b8 fix: 修改 module logs 有多条时 endpoint没有默认选中的问题 2021-08-12 15:48:10 +08:00
zhangyu
6269b5f659 fix: 处理 project endpoint列表不显示的问题 2021-08-06 18:30:30 +08:00
zhangyu
81b8962247 fix:修改 endponit module 切换 logs Type 对应值无法输入的问题 2021-08-06 14:57:29 +08:00
zhangyu
6eda2c2e41 feat:更新字体图标库 以及 批量新增endpoint 关不不提示的问题 2021-08-06 10:12:09 +08:00
zhangyu
cea63d4743 fix:保存时 必填项的选项卡的切换的问题 2021-08-05 16:11:46 +08:00
zhangyu
d829cb432e feat: endpoint 批量新增微调 2021-08-05 15:07:45 +08:00
zhangyu
9104317279 feat:联调endpoint的接口 2021-08-05 14:50:29 +08:00
zhangyu
6dd7c9c279 feat: 添加批量新增的页面 2021-08-04 16:55:11 +08:00
zhangyu
78efa5b642 fix:调整module的导入导出 2021-08-03 15:32:22 +08:00
zhangyu
bf65cb5330 feat: 联调module新增接口 处理细节参数的相关问题 2021-08-03 14:12:14 +08:00
zhangyu
2ce11f0894 feat : 报错切换到对应的选项卡 2021-08-03 10:14:37 +08:00
zhangyu
b9829dc0f0 Nez-856 style: 修改表单元素样式未对齐的问题 2021-07-22 14:25:14 +08:00
@changcode
4191c8113f NEZ-835 fix: 新增页面添加标签页关闭提示功能 2021-07-15 11:56:25 +08:00
zhangyu
e3adcd8d67 fix: 修改 endpoint module 编辑新增时 立即点击save params不被保存的问题 2021-07-05 17:14:53 +08:00
@changcode
d33f6ff598 NEZ-807 fix: 标签关闭 提示功能 2021-07-05 14:43:47 +08:00
zhangyu
20215b4906 NEZ-791 fix:批量修改新增的endpoint数据,无法保存的问题 2021-07-02 17:54:10 +08:00
@changcode
c4ac462f7e fix: 侧滑 right-box 重名 2021-06-02 17:16:00 +08:00