fix：修改 保存时 expressionsValue不保存 以及添加连线的判断条件

nezha-fronted/src/components/common/project/addLine.vue

@@ -361,7 +361,8 @@
             // model.label=this.form.lineName;
             model.name=this.form.lineName;
             model.width = parseInt(model.width) || 4;
-            if(this.form.type==='dynamic'){
+            console.log(this.form.type);
+            if(!this.form.type){
               model.smooth={
                 enabled:false,
               };

nezha-fronted/src/components/common/project/popData/expressionInfo.vue

@@ -1,15 +1,14 @@
 <template>
   <div class="expressionInfo" :style="{top:expressionsInfoPosition.y+'px',left:expressionsInfoPosition.x+'px'}" v-if="expressionsData.length">
     <el-tooltip v-model="show" class="item" effect="light" content="Right Bottom 提示文字" placement="right-start" >
-      <div slot="content">
-        <div v-if="total>10">
-          {{$t('dashboard.panel.moreTitleOther')}}{{$t('dashboard.panel.showAllOther')}}{{total}}
+      <div slot="content" style="padding: 5px;min-width: 150px;max-width: 260px">
+        <div v-if="total>10" class="more-title-other">
+          {{$t('dashboard.panel.moreTitleOther')}}{{$t('dashboard.panel.showAllOther')}} {{ total}}
         </div>
         <div  v-for="(item,index) in expressionsData" class="expressions-box">
-          <span>{{item.name}}</span>
+          <span class="expressions-box-title">{{item.name}}</span>
           <div v-for="item1 in item.value" class="expressions-metric">
-            {{item.legend?item.legend:item.metric}}:
-            {{dataFormat(item.unit,item1.value[0])}}
+            {{item.legend?item.legend:item.metric }} : {{ dataFormat(item.unit,item1.value[1])}}
           </div>
           <div v-if="item.value.length===0">
            NoData
@@ -79,15 +78,21 @@
 </script>
 
 <style scoped>
-.expressionInfo{
+  .expressionInfo{
     position: absolute;
     transform: translateX(20px);
     min-height: 20px;
     max-height: 200px;
     overflow: hidden;
-  padding: 10px;
-}
+  }
+  .more-title-other{
+    margin-bottom: 5px;
+  }
   .expressions-box{
     min-width: 100px;
   }
+  .expressions-box-title{
+    margin-bottom: 5px;
+    display: inline-block;
+  }
 </style>

nezha-fronted/src/components/common/project/topology.vue

@@ -340,7 +340,10 @@
             "source": item.from,
             "target": item.to,
             "smooth": item.smooth,
-            "expressions": item.expressions,
+            "expressions": item.expressions.map((item)=>{
+              delete item.value;
+              return item
+            }),
             "dashes":item.dashes,
           };
           arr1.push(obj)

nezha-fronted/src/components/common/project/visNetwork.vue

@@ -285,10 +285,10 @@
           item.to=item.target;
           item.label='';
           item.title='title';
-          item.expressions.forEach((item,index)=>{
-            this.$get('/prom/api/v1/query?query=' + item.metric).then(res=>{
+          item.expressions.forEach((item1,index)=>{
+            this.$get('/prom/api/v1/query?query=' + item1.metric).then(res=>{
               // item.value=res.data.result[0].value;i
-              item.value=res.data.result;
+              item1.value=res.data.result;
               console.log(res);
             });
           })