diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index aa6de5bdc..467c890a2 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -980,6 +980,8 @@ const cn = { imgFormat:'上传图片只能是 JPG/png 格式!', imgSize:'上传图片大小不能超过 2MB!', imgMeasure:'上传的图片宽高必须都大于100!', + data:"数据", + style:'样式', }, }, date:{ diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index adb6be501..48cc2ff11 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -986,6 +986,8 @@ const en = { imgFormat:'Upload picture can only be JPG/ PNG format!', imgSize:'Upload image size should not exceed 2MB!', imgMeasure:'The width and height of uploaded pictures must be greater than 100!', + data:"Data", + style:'Style', }, }, date:{ diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index 47822526c..bb0fbd892 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -8,11 +8,11 @@ - + - - @@ -111,7 +111,7 @@ :props="{ expandTrigger: 'hover',emitPath:false }" :show-all-levels="false" filterable - placeholder="" + :placeholder="$t('el.select.placeholder')" popper-class="dc-dropdown" size="mini" v-model="selection.pen.data.unit" @@ -129,7 +129,7 @@ - @@ -253,7 +253,7 @@ - + diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index 49b18dca7..e913606a3 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -116,7 +116,7 @@
-
@@ -976,8 +976,9 @@ //具体内容点击 nodeTools(node,tool){ this.moduleId=node.data.moduleId; - if(tool.id==11){ - + if(tool.id==='total'&&!node.data.expressArr.length){ + this.popDataShowUpdate('',false,node); + return } setTimeout(()=>{ this.popDataShowUpdate(tool.id,false,node)