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 35b354dec..99540d3f5 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -571,3 +571,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/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/bottomBox/tabs/scrapeEndpoint.vue b/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue index dab91248a..c64a6a10f 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue @@ -150,7 +150,7 @@ export default { } else { detailViewRightObj = this.tableData[0] } - this.detailViewRightObj = detailViewRightObj + this.detailViewRightObj = this.$loadsh.cloneDeep(detailViewRightObj) this.inputDateQuery = this.handlerTableData(this.tableData) this.pageObj.total = this.tableData.length if (!this.scrollbarWrap) { diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js index 2561bfc42..e2efde21d 100644 --- a/nezha-fronted/src/components/common/mixin/dataList.js +++ b/nezha-fronted/src/components/common/mixin/dataList.js @@ -134,7 +134,7 @@ export default { } else { detailViewRightObj = this.tableData[0] } - this.detailViewRightObj = detailViewRightObj + this.detailViewRightObj = this.$loadsh.cloneDeep(detailViewRightObj) this.pageObj.total = response.data.total this.pageObj.pages = response.data.pages if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) { diff --git a/nezha-fronted/src/components/common/mixin/detailViewMixin.js b/nezha-fronted/src/components/common/mixin/detailViewMixin.js index df2cc285b..b8d20fa22 100644 --- a/nezha-fronted/src/components/common/mixin/detailViewMixin.js +++ b/nezha-fronted/src/components/common/mixin/detailViewMixin.js @@ -85,7 +85,7 @@ export default { }, 100) }, detailViewRightShow (item) { - this.detailViewRightObj = item + this.detailViewRightObj = this.$loadsh.cloneDeep(item) }, orderDetail (order, orderType) { if (orderType === 'ascending') { 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 @@