diff --git a/nezha-fronted/package.json b/nezha-fronted/package.json index 81214c7c9..9e32ff771 100644 --- a/nezha-fronted/package.json +++ b/nezha-fronted/package.json @@ -24,7 +24,7 @@ "@topology/sequence-diagram": "^0.3.0", "axios": "^0.19.0", "cytoscape": "^3.15.2", - "echarts": "^5.0.1", + "echarts": "^5.1.2", "element-ui": "^2.15.3", "file-saver": "^2.0.2", "leaflet": "^1.7.1", diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index 30a9333fd..041859def 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -54,63 +54,63 @@ .top-tool-left { display: flex; } - .top-tool-btn-group { - display: flex; - .top-tool-btn:not(:last-of-type):not(:first-of-type) { - border-left: none; - border-radius: 0; - } - .top-tool-btn:first-of-type:not(:last-of-type) { - border-radius: $--button-border-radius 0 0 $--button-border-radius; - } - .top-tool-btn:last-of-type:not(:first-of-type) { - border-radius: 0 $--button-border-radius $--button-border-radius 0; - border-left: none; - } + } + .top-tool-btn-group { + display: flex; + .top-tool-btn:not(:last-of-type):not(:first-of-type) { + border-left: none; + border-radius: 0; } - .top-tool-btn { - height: 32px; - width: 36px; - border: 1px solid $--primary-border-color; - outline: none; - border-radius: $--button-border-radius; - background-color: $--button-gray-background-color; - transition: background-color linear .1s; + .top-tool-btn:first-of-type:not(:last-of-type) { + border-radius: $--button-border-radius 0 0 $--button-border-radius; + } + .top-tool-btn:last-of-type:not(:first-of-type) { + border-radius: 0 $--button-border-radius $--button-border-radius 0; + border-left: none; + } + } + .top-tool-btn { + height: 32px; + width: 36px; + border: 1px solid $--primary-border-color; + outline: none; + border-radius: $--button-border-radius; + background-color: $--button-gray-background-color; + transition: background-color linear .1s; - i { - font-size: 14px; - color: $--button-gray-color; - } + i { + font-size: 14px; + color: $--button-gray-color; } - .top-tool-btn.top-tool-btn--text { - padding: 0 8px; - width: unset; - color: #666; + } + .top-tool-btn.top-tool-btn--text { + padding: 0 8px; + width: unset; + color: #666; + } + .top-tool-btn:hover:not(.nz-btn-disabled) { + background-color: $--button-gray-hover-background-color; + } + .top-tool-btn:focus:not(.nz-btn-disabled), .top-tool-btn.is-focus { + background-color: $--button-gray-hover-background-color; + border: 1px solid #FBCEA4 !important; + i { + color: $--button-gray-active-color; } - .top-tool-btn:hover:not(.nz-btn-disabled) { - background-color: $--button-gray-hover-background-color; - } - .top-tool-btn:focus:not(.nz-btn-disabled), .top-tool-btn.is-focus { - background-color: $--button-gray-hover-background-color; - border: 1px solid #FBCEA4 !important; - i { - color: $--button-gray-active-color; - } - } - .top-tool-btn--delete.top-tool-btn:focus:not(.nz-btn-disabled) { - background-color: $--button-gray-hover-background-color; - border-color: #FFC4B9; + } + .top-tool-btn--delete.top-tool-btn:focus:not(.nz-btn-disabled) { + background-color: $--button-gray-hover-background-color; + border-color: #FFC4B9; - i { - color: #F0745A; - } - } - .top-tool-btn--dropdown { - position: relative; - width: auto; - min-width: 36px; + i { + color: #F0745A; } } + .top-tool-btn--dropdown { + position: relative; + width: auto; + min-width: 36px; + } .top-tools--sub { .top-tool-left { height: 100%; diff --git a/nezha-fronted/src/components/charts/chart.scss b/nezha-fronted/src/components/charts/chart.scss index 25b5da6a8..c297e1979 100644 --- a/nezha-fronted/src/components/charts/chart.scss +++ b/nezha-fronted/src/components/charts/chart.scss @@ -706,7 +706,6 @@ } } .top-tool-btn-group { - margin-left: 10px; display: flex; .top-tool-btn:not(:last-of-type):not(:first-of-type) { border-left: none; diff --git a/nezha-fronted/src/components/common/chartUnit.vue b/nezha-fronted/src/components/common/chartUnit.vue index 5956aefaa..c93e53910 100644 --- a/nezha-fronted/src/components/common/chartUnit.vue +++ b/nezha-fronted/src/components/common/chartUnit.vue @@ -59,7 +59,6 @@ export default { .chart-unit{ width: 100px; - margin: 0 20px 0 0; } .chart-unit.el-cascader .el-input.is-focus .el-input__inner { border-color: #FBCEA4; diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 2a9e98767..bc0e6df99 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -13,6 +13,7 @@ const cn = { oneDay: '1 天', twoDay: '2 天', week: '1 周', + time: '时间', folder: '文件夹', key: '键名', logs: '日志', @@ -65,6 +66,7 @@ const cn = { other: '其他', about: '关于', query: '查询', + logLabels: '日志标签', account: '账号', back: '返回', unavailable: '不可用', @@ -115,6 +117,7 @@ const cn = { }, reset: '重置', submit: '保存', + limit: '限制', noData: '没有数据', tag: '标签', syncChart: '同步图表', @@ -520,6 +523,10 @@ const cn = { down: 'down', prometheus: 'prometheus' } + }, + explore: { + descending: '降序', + wrapLines: '换行' } }, validate: { diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 4b2b18611..1bafb755a 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -19,9 +19,10 @@ const en = { oneDay: '1 day', twoDay: '2 days', week: '1 week', + time: 'Time', folder: 'Folder', key: 'Key', - logs: 'Logging', + logs: 'Logs', state: 'State', projectName: 'Project name', startTime: 'Start time', @@ -70,6 +71,7 @@ const en = { about: 'About', // 关于 detail: 'Detail', // 详情 query: 'Query', // 查询 + logLabels: 'Log labels', account: 'Account', back: 'Back', // 返回 unavailable: 'Unavailable', @@ -119,6 +121,7 @@ const en = { }, reset: 'Reset', submit: 'Save', + limit: 'Limit', noData: 'No data', tag: 'Tag', placeHolder: 'Please enter', @@ -529,6 +532,10 @@ const en = { down: 'down', prometheus: 'prometheus' } + }, + explore: { + descending: 'Descending', + wrapLines: 'Wrap lines' } }, validate: { // 校验规则 diff --git a/nezha-fronted/src/components/common/pickTime.vue b/nezha-fronted/src/components/common/pickTime.vue index 7c39fdaec..7d113738e 100644 --- a/nezha-fronted/src/components/common/pickTime.vue +++ b/nezha-fronted/src/components/common/pickTime.vue @@ -1,9 +1,9 @@