diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index 166462773..6aa6e72fc 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -473,6 +473,14 @@ textarea { .is-disabled{ color: $--color-text-disabled !important; } -.ql-tooltip { +.ql-snow .ql-tooltip { background: $--background-color-empty; + border: 1px solid $--select-page-focus-color; + box-shadow: 0px 0px 5px $--scrollbar-background-color; + color: $--color-text-primary; + input[type=text]{ + border: 1px solid $--select-page-focus-color; + background: $--background-color-empty; + outline: none; + } } diff --git a/nezha-fronted/src/assets/css/components/chart/chart.scss b/nezha-fronted/src/assets/css/components/chart/chart.scss index 3bd277531..3aac0c05b 100644 --- a/nezha-fronted/src/assets/css/components/chart/chart.scss +++ b/nezha-fronted/src/assets/css/components/chart/chart.scss @@ -3,9 +3,8 @@ } .my-loading-parent--relative { position: relative; - display: inline-block; height: 100%; - width: 100%; + width: auto; } .panel-chart { border: 1px solid $--chart-box-border-color; diff --git a/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss b/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss index d8833a65d..fa9a5445b 100644 --- a/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss +++ b/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss @@ -37,7 +37,7 @@ } .project-title { - background: #eeeeee; + background: $--background-color-base; height: 36px; line-height: 36px; border-radius: 0; diff --git a/nezha-fronted/src/assets/css/components/common/project/topology.scss b/nezha-fronted/src/assets/css/components/common/project/topology.scss index b3197b5c0..757201ff9 100644 --- a/nezha-fronted/src/assets/css/components/common/project/topology.scss +++ b/nezha-fronted/src/assets/css/components/common/project/topology.scss @@ -60,7 +60,7 @@ } } .edit-topologyLine{ - background: rgba(196,196,196,0.4) !important; + //background: rgba(196,196,196,0.4) !important; border-bottom: 1px solid $--explore-border-color-bottom; } .topology-scroll{ @@ -333,10 +333,9 @@ margin-right: 10px; } .project-title { - height: 55px; + height: 36px; padding-bottom: 0; } - .drag-header { cursor: move; background: #1a1a1a; @@ -543,3 +542,12 @@ overflow: hidden; box-sizing: border-box; } +.full.pr10 { + .el-select.el-select--small,.el-input { + background-color: $--background-color-empty; + border: 1px solid $--background-color-empty; + } +} +.el-upload-dragger{ + background-color: $--background-color-empty; +} diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss index 4308be3b6..b68c315c0 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss @@ -38,12 +38,12 @@ } .metrics-input-box{ .input-box .el-textarea .el-textarea__inner { - width: calc(100% + 42px); + width: 100%; } .metric-selector-input-box{ line-height: 32px; .el-input__count{ - right: -38px !important; + right: 18px !important; } } .el-col-24{ @@ -330,4 +330,4 @@ .nz-icon-mimabukejian{ font-size: 18px; } -} \ No newline at end of file +} diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss index 053ac4e9d..b9b3e7815 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss @@ -58,6 +58,7 @@ } .el-cascader-menu { width: 200px; + height: 100%; } .metric-btn:hover, .metric-btn:focus { background-image: linear-gradient(180deg, rgb(247, 248, 250) 0%, rgb(247, 248, 250) 100%); diff --git a/nezha-fronted/src/assets/css/themes/src/table.scss b/nezha-fronted/src/assets/css/themes/src/table.scss index 319c5d135..d64dac5f0 100644 --- a/nezha-fronted/src/assets/css/themes/src/table.scss +++ b/nezha-fronted/src/assets/css/themes/src/table.scss @@ -259,6 +259,7 @@ right: 0; width: 1px; height: 100%; + background: $--border-color-light; } } diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue index f7e408179..480b2fa31 100644 --- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue +++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue @@ -61,7 +61,7 @@
- + @@ -74,7 +74,7 @@
- + @@ -354,7 +354,9 @@ const canvasOptions = { export default { name: 'diagram', data () { + const theme = localStorage.getItem(`nz-user-${localStorage.getItem('nz-user-id')}-theme`) || 'light' return { + theme, title: this.$t('overall.uploadCustomPicture'), objChange: false, // project 变化 用于判断 init是否执行完成 执行完成 才可以执行下次变化 chartDataInfo: {}, @@ -517,10 +519,10 @@ export default { chartData: {}, chartGetData: [], penLineType: [ - { d: 'M5 19 a50,100 0 0,1 40,0', 'stroke-dasharray': '', name: this.$t('project.topology.curve'), id: 'curve' }, - { d: 'M5 8 l20 0 l0 12 l20 0', 'stroke-dasharray': '', name: this.$t('project.topology.polyline'), id: 'polyline' }, - { d: 'M5 14 l40 0', 'stroke-dasharray': '', name: this.$t('project.topology.line'), id: 'line' } - // {d:'M5 20 C0,8 50,0 85,0',"stroke-dasharray":"",name:'mind'}, + { d: 'M5 19 a50,100 0 0,1 40,0', 'stroke-dasharray': '', name: this.$t('project.topology.curve'), id: 'curve' , strokeColor: theme == 'light' ? 'black' : '#BEBEBE'}, + { d: 'M5 8 l20 0 l0 12 l20 0', 'stroke-dasharray': '', name: this.$t('project.topology.polyline'), id: 'polyline' , strokeColor: theme == 'light' ? 'black' : '#BEBEBE'}, + { d: 'M5 14 l40 0', 'stroke-dasharray': '', name: this.$t('project.topology.line'), id: 'line' , strokeColor: theme == 'light' ? 'black' : '#BEBEBE'} + // {d:'M5 20 C0,8 50,0 85,0',"stroke-dasharray":"",name:'mind', strokeColor: theme == 'light' ? 'black' : '#BEBEBE'}, ], lineName: 'curve', cachesIndex: 0, @@ -831,8 +833,10 @@ export default { this.projectAlertShow = true this.saveData = { ...data } this.topologyInfo.name = '' + data.ruleColor = this.theme == 'light' ? '#4e4e4e' : '#BEBEBE' resolve(data) } else { + data.ruleColor = this.theme == 'light' ? '#4e4e4e' : '#BEBEBE' if (data.data) { this.topologyInfo = { fontSize: data.data.fontSize, diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue index 1f43303a2..4c9328ccc 100644 --- a/nezha-fronted/src/components/common/alert/alertLabel.vue +++ b/nezha-fronted/src/components/common/alert/alertLabel.vue @@ -638,7 +638,7 @@
-
{{ $t("overall.login.name") }}
+
{{ $t("profile.username") }}
{{ alertLabelData && alertLabelData.username ? alertLabelData.username : "--" }}
@@ -656,13 +656,13 @@
-
{{ $t("overall.soure") }}
+
{{ $t("profile.source") }}
{{ alertLabelData && alertLabelData.source ? alertLabelData.source : "--" }}
-
{{ $t("config.operationlog.state") }}
+
{{ $t("overall.state") }}
- + - + item.label === data.parent) if (childrenCopy.length > 100) { - childrenCopy = childrenCopy.splice(findChild.children.length, findChild.children.length + 101) + childrenCopy = childrenCopy.splice(findChild.children.length, 100) findChild.children.splice(findChild.children.length - 1, 1) findChild.children.push(...childrenCopy) if (findChild.children.length < children.length - 1) {