diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
index 57580ff57..ff493c21a 100644
--- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
+++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
@@ -374,3 +374,13 @@
.meta-option-box {
color: $--color-text-regular;
}
+.el-range-input{
+ background: $--background-color-empty;
+}
+.ql-toolbar {
+ line-height: 22px;
+ .ql-picker-options{
+ background-color: $--background-color-empty;
+ color: $--color-text-primary;
+ }
+}
diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss
index 77b185d95..4ad432d41 100644
--- a/nezha-fronted/src/assets/css/common/tableCommon.scss
+++ b/nezha-fronted/src/assets/css/common/tableCommon.scss
@@ -568,3 +568,11 @@
overflow: auto;
background-color: $--table-body-background-color;
}
+.el-checkbox.is-disabled{
+ line-height: 1;
+ height: 16px;
+}
+.el-checkbox__input.is-disabled{
+ line-height: 1;
+ height: 16px;
+}
diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss
index e59d2918a..e3ad1e782 100644
--- a/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss
+++ b/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss
@@ -215,16 +215,16 @@
font-weight: 600;
text-transform: Capitalize;
}
- .pipeline-option {
- i {
- color: $--color-text-regular;
- }
- }
}
.el-input-group__append {
background-color: $--border-color-light;
}
}
+.pipeline-option {
+ i {
+ color: $--color-text-regular;
+ }
+}
.sub-label {
padding-right: 15px;
font-size: 14px;
diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index 4e03720ba..d94594694 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -607,10 +607,10 @@
diff --git a/nezha-fronted/src/components/common/alert/nzTooltip.vue b/nezha-fronted/src/components/common/alert/nzTooltip.vue
index b80ee029f..bfa0eaf86 100644
--- a/nezha-fronted/src/components/common/alert/nzTooltip.vue
+++ b/nezha-fronted/src/components/common/alert/nzTooltip.vue
@@ -15,7 +15,8 @@ export default {
// labelLoading:{},
that: {},
detailList: Boolean,
- alertTableDialog: Boolean
+ alertTableDialog: Boolean,
+ isTopoInfo: Boolean
},
data () {
return {
@@ -31,9 +32,10 @@ export default {
const leftOffSetView = this.detailList ? -80 : 10
const leftOffSet = this.detailList ? -80 : 10
const topOffSet = this.detailList ? 60 : 22
+ const topoOffset = this.isTopoInfo ? 155 : 0
if (position.top + this.heightList > clientHeight) {
return {
- left: `${position.left + position.width + leftOffSet}px`,
+ left: `${position.left + position.width + leftOffSet - topoOffset}px`,
top: `${position.top - this.heightList + topOffSet}px`
}
} else if (this.alertTableDialog) {
@@ -47,7 +49,7 @@ export default {
}
} else {
return {
- left: `${position.left + position.width + leftOffSetView}px`,
+ left: `${position.left + position.width + leftOffSetView - topoOffset}px`,
top: `${position.top}px`
}
}
diff --git a/nezha-fronted/src/components/common/project/popData/endpointTable.vue b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
index 7e5b0c0fe..85436511c 100644
--- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
@@ -15,6 +15,7 @@
-
+
@@ -213,6 +213,10 @@ export default {
type: Boolean,
default: true
},
+ isTopoInfo: {
+ type: Boolean,
+ default: false
+ },
endpointTab: Boolean,
loading: Boolean
},