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
|
5078715039
|
fix： panel 以及下弹窗panel 同步时添加loading
|
2021-11-27 12:07:25 +08:00 |
|
chenjinsong
|
d892f4e645
|
NEZ-1254 feat: chart架构、时序图定义
|
2021-11-26 20:13:54 +08:00 |
|
zhangyu
|
5ced7cb068
|
NEZ-1334 fix：Panel设置时间查询后，刷新单个图表，内容出错
|
2021-11-24 09:38:06 +08:00 |
|
chenjinsong
|
10ccf295b2
|
NEZ-1254 feat: chart重构布局
|
2021-11-19 09:40:21 +08:00 |
|
zhangyu
|
bb04fb852c
|
NEZ-1248 fix： 切换 Panel 后，时间组件未刷新，造成 chart 请求时间为之前时间范围
|
2021-11-16 10:23:35 +08:00 |
|
chenjinsong
|
122a5f9495
|
perf: 样式调整
|
2021-11-15 14:00: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
|
f7ba3bec13
|
NEZ-1205 fix： 英文状态下选择框内的提示语是中文 修改
|
2021-11-09 10:17:12 +08:00 |
|
chenjinsong
|
8f56c0f666
|
NEZ-1194 fix: chart编辑框打不开的问题
|
2021-11-08 18:27:21 +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
|
f6ac483d33
|
NEZ-1137 fix； 导出样式调整
|
2021-11-02 15:47:17 +08:00 |
|
chenjinsong
|
d1efdde2ba
|
NEZ-1072 feat: 主题切换冲突解决
|
2021-11-01 23:05:28 +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
|
6186a61295
|
NEZ-1112 fx: 修复panel loading 缺少样式
|
2021-10-28 15:16:57 +08:00 |
|
@changcode
|
2351baa8f3
|
fix: 列表no data样式展示异常问题
|
2021-10-22 19:39:49 +08:00 |
|
@changcode
|
ad8bef81ec
|
NEZ-1075 feat: state 样式调整
|
2021-10-22 17:47:42 +08:00 |
|
@changcode
|
0e3f7dad19
|
style: panel样式调整
|
2021-10-08 15:08:14 +08:00 |
|
@changcode
|
4f53c91128
|
NEZ-1045 fix: agent 编辑页面增加 protocol 下拉框
|
2021-10-08 13:41:53 +08:00 |
|
zhangyu
|
f38ce444ed
|
NEZ-1035 fix：group chart 编辑页面无法打开的问题
|
2021-10-08 10:17:48 +08:00 |
|
@changcode
|
167d30dc5d
|
fix: 修复 panel 遮罩显示异常问题
|
2021-10-08 10:06:44 +08:00 |
|
@changcode
|
4500e3492f
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
|
2021-10-08 09:45:51 +08:00 |
|
@changcode
|
8123e4cc75
|
fix: panel 页面 select 选择器数据为空时遮罩层为false
|
2021-10-08 09:45:36 +08:00 |
|
zhangyu
|
2499ae479d
|
NEZ-1039 fix： 没有panel时不显示panel添加的问题
|
2021-10-08 09:32:41 +08:00 |
|
zhangyu
|
eddf5e2b85
|
docs： 删除多余空格
|
2021-09-24 17:57:24 +08:00 |
|
zhangyu
|
05f994e00d
|
docs ： 修改panel页面 title的文案
|
2021-09-24 17:38:26 +08:00 |
|
zhangyu
|
cae494a9ec
|
NEZ-1025 fix:panel name超长 限制 最大宽度 (补充显示 chartNum 以及 下拉框内显示 title)
|
2021-09-24 15:07:23 +08:00 |
|
zhangyu
|
a52d3d7004
|
NEZ-1025 fx: panel name超长 限制 最大宽度
|
2021-09-24 14:11:30 +08:00 |
|
zhangyu
|
5d6eff4aef
|
NEZ-1000 fix： panel页面的top按钮没有效果
|
2021-09-15 17:29:34 +08:00 |
|
@changcode
|
ab7e092c70
|
fix: panel 下拉框样式调整，project页面 Endpoint侧滑数据处理错误问题
|
2021-09-08 11:37:41 +08:00 |
|
@changcode
|
780b119c61
|
NEZ-948 fix: asset label 样式调整
|
2021-08-30 10:48:04 +08:00 |
|
@changcode
|
952c563870
|
fix: 修复panel 页面请求数据前 createPanelTitleSec 功能闪出问题
|
2021-08-26 14:38:03 +08:00 |
|
@changcode
|
3ce95f4dc3
|
fix: panel 左侧选择器字体加粗
|
2021-08-26 09:28:09 +08:00 |
|
@changcode
|
faa6a330d1
|
fix: 修复样式，补充国际化，清除console
|
2021-08-25 16:19:44 +08:00 |
|
@changcode
|
c4bbf8698a
|
NEZ-928 fix: panel 页面 左侧选择器样式调整
|
2021-08-25 10:38:46 +08:00 |
|
chenjinsong
|
98e9d60fe0
|
NEZ-858 feat: 新版explore-log
|
2021-08-02 19:51:53 +08:00 |
|
zhangyu
|
63ba940d2a
|
NEZ-843 fix：asset，endpoint chart 导入模板接口错误
|
2021-07-19 17:04:46 +08:00 |
|
zhangyu
|
c5be6b8143
|
fix： 修改 diagram tooltip的时间 未跟panel一致的问题
|
2021-07-16 09:56:48 +08:00 |
|
@changcode
|
0bf5ae0a0d
|
fix: 去除console.log和console.info打印
|
2021-06-21 16:47:37 +08:00 |
|
zhangyu
|
0615351836
|
NEZ-741 fix：修改复制面板中的图表报错的问题
|
2021-06-18 16:57:49 +08:00 |
|
zhangyu
|
d6fd41b9f0
|
NEZ-723 feat：chart编辑时调用请求接口获取最新数据
|
2021-06-03 17:12:45 +08:00 |
|
chenjinsong
|
b31090db5d
|
NEZ-663 fix: 修改部分报错问题
|
2021-05-26 14:15:35 +08:00 |
|
chenjinsong
|
7d61058997
|
perf: endpoint detail chart编辑页不展示panel
|
2021-05-21 15:06:58 +08:00 |
|
chenjinsong
|
7257015870
|
fix: chart菜单宽度增加
|
2021-05-21 14:47:47 +08:00 |
|
zhangyu
|
2c81a8cfa8
|
Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0
# Conflicts:
# nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
|
2021-05-20 14:10:08 +08:00 |
|
zhangyu
|
f805795f1d
|
feat：添加chart 同步按钮 以及 修改时间显示不正确的问题
|
2021-05-20 14:07:58 +08:00 |
|
chenjinsong
|
190e7669b2
|
NEZ-601 feat: 使用temp添加图表
|
2021-05-19 23:17:24 +08:00 |
|
zhangyu
|
fd77ced048
|
feat： 所有表格 添加 loading
|
2021-05-18 19:18:14 +08:00 |
|
chenjinsong
|
656ed5e2d3
|
fix: 修复panel页无法编辑panel的问题
|
2021-05-18 14:01:29 +08:00 |
|