diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 949a52caf..1ef024e7a 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -2373,15 +2373,26 @@ li{ } .right-box-form .nz-icon-minus-medium{ padding: 2px 6px; - background: rgba(236,127,102,.1); + background-color: rgba(236,127,102,.1); border-radius: 2px; cursor: pointer; } -.right-box-form .form-row-item .nz-icon-minus-position{ +.nz-icon-copy { + padding: 2px 6px; + color: $global-text-color-active; + background-color: #FDF5E9; + border-radius: 2px; + cursor: pointer; +} +.nz-icon-minus-position{ + display: inline-flex; + flex-direction: column; position: absolute; + right: -40px; top: 50%; - right: -55px; - transform: translate(-50%,-50%); + transform: translateY(-50%); + height: 70px; + justify-content: space-around; } .right-box-form>.el-form-item.half-form-item-other{ display: inline-block; diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index 1b389ba29..0ba81dd9d 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -71,9 +71,14 @@ - +
@@ -1564,6 +1569,17 @@ }); } }, + copyExpression(index) { + this.selection.pen.data.expressArr.push(this.selection.pen.data.expressArr[index]); + this.selection.pen.data.legends.push(this.selection.pen.data.legends[index]); + this.$nextTick(() => { + this.expressions.forEach((ex, index) => { + if (ex) { + this.$refs[`promql-${index}`][0].metricChange(ex); + } + }); + }); + }, valueMappingAdd(){ if(this.selection.pen.data.valueMappingSort==='desc'){ this.selection.pen.data.valueMapping.push({ @@ -1835,8 +1851,12 @@ width: calc(100% - 120px); padding: 20px 20px 20px 0; } - - .form-row-item .nz-icon-minus-position { + .form-row-item .nz-icon-minus-position .nz-icon-minus-medium { + background: rgba(236, 127, 102, 0.1); + padding: 2px 6px; + color: #EC7F66; + } + /*.form-row-item .nz-icon-minus-position { position: absolute; top: 50%; right: -55px; @@ -1849,7 +1869,7 @@ .nz-icon-minus { color: #EC7F66; } - } + }*/ .tooltip-box { padding-left: 10px; diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue index 31e1daeb5..ddd7b1209 100644 --- a/nezha-fronted/src/components/page/dashboard/chartBox.vue +++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue @@ -323,20 +323,25 @@ > -->