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 |
|
@changcode
|
3d24cfbcf2
|
NEZ-1175 fix: 修复点击添加面板内的提示信息会触发 未保存提示
|
2021-11-05 15:41:25 +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 |
|
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
|
950b54381b
|
style: select 选择器样式调整
|
2021-10-29 14:25:59 +08:00 |
|
@changcode
|
47d1863111
|
style: 优化select公用样式，及类名
|
2021-10-29 12:02:34 +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
|
8d0f1cd5ba
|
NEZ-1073 feat: asset 编辑页面 state 下拉框显示 remark 内容
|
2021-10-21 18:37:35 +08:00 |
|
@changcode
|
6838c990c6
|
fix: 修复 select 占位符，未国际化
|
2021-10-13 15:47:56 +08:00 |
|
@changcode
|
441da67ecc
|
NEZ-1042 fix: 补充selsct国际化
|
2021-09-30 10:23:35 +08:00 |
|
@changcode
|
2bf2ca0504
|
style: asset 批量修改样式调整
|
2021-09-27 17:11:08 +08:00 |
|
@changcode
|
4aba56b702
|
fix: 优化 select 选择器
|
2021-09-27 14:46:08 +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
|
5879ca0c8a
|
style:下拉选择器样式统一
|
2021-09-26 11:56:36 +08:00 |
|
@changcode
|
1e80a05033
|
style: 下拉样式调整
|
2021-09-26 09:14:07 +08:00 |
|
@changcode
|
025ae13877
|
NEZ-1023 style: 下拉列表 样式调整
|
2021-09-24 17:07:16 +08:00 |
|
zhangyu
|
23f080f9da
|
fix； 修改 asset 编辑报错的问题
|
2021-09-15 15:17:01 +08:00 |
|
chenjinsong
|
e152ce08ca
|
NEZ-969 fix: 修复location传参问题
|
2021-09-02 18:23:47 +08:00 |
|
@changcode
|
a520ea1e8a
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
|
2021-08-27 09:32:36 +08:00 |
|
@changcode
|
b6a992bfb2
|
fix: 样式调整
|
2021-08-27 09:32:28 +08:00 |
|
zhangyu
|
83e57eec1f
|
fix: 修改 创建 asset Double 精度未控制，时间不选择区间，以及checkBox value值的顺序不对的问题
|
2021-08-26 17:10:32 +08:00 |
|
@changcode
|
7b9db0bd13
|
fix: 解決冲突
|
2021-08-19 17:00:47 +08:00 |
|
@changcode
|
5a8614395e
|
fix asset talon 开关绑定对应值
|
2021-08-18 15:27:53 +08:00 |
|
@changcode
|
d1ca46aed6
|
NEZ-909 fix: asset talon 配置调整
|
2021-08-16 10:48:58 +08:00 |
|
zhangyu
|
9936187060
|
fix： 修改 assetBox location 校验必填的问题
|
2021-08-10 14:26:12 +08:00 |
|
@changcode
|
6f6df771b6
|
NEZ-896 fix: Asset/Asset新增界面部分，添加必填标识
|
2021-08-09 14:21:17 +08:00 |
|
@changcode
|
b64d242458
|
NEZ-875 fix: 修复Asset/Asset页面相关问题
|
2021-08-04 10:32:53 +08:00 |
|
@changcode
|
036c45bfb3
|
NEZ-884 fix: 修复 system reset 功能报错
|
2021-07-30 09:54:02 +08:00 |
|
@changcode
|
79b1b94171
|
NEZ-871 feat: asset支持talon配置，列表增加talon列
|
2021-07-28 14:12:58 +08:00 |
|
zhangyu
|
63ba940d2a
|
NEZ-843 fix：asset，endpoint chart 导入模板接口错误
|
2021-07-19 17:04:46 +08:00 |
|
zhangyu
|
c2cf06b485
|
fix： 修改assetBox vm=1时 位置可以编辑的问题
|
2021-07-15 15:30:23 +08:00 |
|
zhangyu
|
cfccac90e7
|
NEZ-829 feat：aseet添加子集表格
|
2021-07-15 14:38:55 +08:00 |
|
@changcode
|
4191c8113f
|
NEZ-835 fix: 新增页面添加标签页关闭提示功能
|
2021-07-15 11:56:25 +08:00 |
|
zhangyu
|
e75b459eaf
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
|
2021-07-13 10:33:10 +08:00 |
|
zhangyu
|
eb1ff745b9
|
NEZ-816 fix:修改multitext 无法添加多个的问题
|
2021-07-13 10:30:28 +08:00 |
|
@changcode
|
33e5278f8e
|
NEZ-815 fix: 修复asset 编辑页面 label 展示数据不全
|
2021-07-13 10:11:36 +08:00 |
|
@changcode
|
d33f6ff598
|
NEZ-807 fix: 标签关闭 提示功能
|
2021-07-05 14:43:47 +08:00 |
|
zhangyu
|
64bebade30
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
|
2021-06-02 16:55:24 +08:00 |
|
zhangyu
|
9ee8b0f7ba
|
NEX-717 fix：bug修改
|
2021-06-02 16:55:17 +08:00 |
|
chenjinsong
|
6543ac104a
|
fix: 删除无用box
|
2021-06-02 16:41:09 +08:00 |
|
@changcode
|
7ddc9bc67c
|
NEZ-668 style: nezha 系统中输入框字符长度问题
|
2021-05-28 10:43:41 +08:00 |
|
zhangyu
|
a0da6a2cd5
|
fix：修改 asset 新增创建label 后 不能选择值的问题
|
2021-05-26 16:35:10 +08:00 |
|
chenjinsong
|
dbf0e74e7a
|
NEZ-663 fix: 排查部分报错问题
|
2021-05-25 19:47:22 +08:00 |
|
@changcode
|
bb41a56007
|
NEZ-628 perf: 使用向导页面增加权限控制
|
2021-05-17 21:24:06 +08:00 |
|
@changcode
|
1467f15a7c
|
NEZ-613 fix:
1.asset 编辑页面bug ssh port 默认端口：22
2.asset model 搜索分页国际化添加
|
2021-05-17 13:31:25 +08:00 |
|
zhangyu
|
d937dd1666
|
fix：修改 asset chart相关bug
|
2021-05-13 19:02:23 +08:00 |
|