gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：处理 project topo 国际化

Browse Source
This commit is contained in:
zhangyu
2021-02-05 15:40:16 +08:00
parent b2c7e52a0e
commit 7f2850c314
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/common/language/cn.js
View File

@@ -980,6 +980,8 @@ const cn = {
imgFormat:'上传图片只能是 JPG/png 格式!',
imgSize:'上传图片大小不能超过 2MB!',
imgMeasure:'上传的图片宽高必须都大于100!',
data:"数据",
style:'样式',
},
},
date:{

2
nezha-fronted/src/components/common/language/en.js
View File

@@ -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:{

12
nezha-fronted/src/components/common/project/L5/CanvasProps.vue
View File

@@ -8,11 +8,11 @@
<!--</button>-->
<!--所有属性-->
<el-tabs v-model="tab" type="card" v-if="selection.pen" @tab-click="tabClick">
<el-tab-pane label="数据" name="1">
<el-tab-pane :label="$t('project.topology.data')" name="1">
<el-form v-model="selection.pen.data" class="pens-data" label-position="top">
<!--module-->
<el-form-item label="Module" prop="moduleId" v-if="!selection.pen.type" class="half-form-item">
<el-select v-model="selection.pen.data.moduleId" placeholder="" popper-class="asset-dropdown" size="small"
<el-select v-model="selection.pen.data.moduleId" :placeholder="$t('el.select.placeholder')" popper-class="asset-dropdown" size="small"
@change="moduleIdChange" :popper-append-to-body="false">
<el-option
v-for="item in modules"
@@ -96,7 +96,7 @@
</el-form-item>
<!--chart aggregation-->
<el-form-item :label="$t('dashboard.panel.chartForm.aggregation')" class="half-form-item" prop="type">
<el-select class="right-box-row-with-btn" placeholder="" popper-class="chart-box-dropdown-small"
<el-select class="right-box-row-with-btn" :placeholder="$t('el.select.placeholder')" popper-class="chart-box-dropdown-small"
size="mini"
v-model="selection.pen.data.aggregation" value-key="chartType">
<el-option :key="item.id" :label="item.name" :value="item.name" v-for="item in aggregationList">
@@ -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 @@
</el-form-item>
<!--chart type-->
<el-form-item :label="$t('dashboard.panel.chartForm.type')" class="half-form-item" prop="type">
<el-select class="right-box-row-with-btn" placeholder="" popper-class="chart-box-dropdown-small"
<el-select class="right-box-row-with-btn" :placeholder="$t('el.select.placeholder')" popper-class="chart-box-dropdown-small"
size="mini"
v-model="selection.pen.data.type" value-key="chartType">
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in chartTypeList">
@@ -253,7 +253,7 @@
</el-form>
</el-tab-pane>
<el-tab-pane label="属性" name="4">
<el-tab-pane :label="$t('project.topology.style')" name="4">
<el-collapse v-model="activeNames">
<!--位置大小-->
<el-collapse-item title="位置和大小" name="3" v-if="selection.pen&&!selection.pen.type">

7
nezha-fronted/src/components/common/project/topologyL5.vue
View File

@@ -116,7 +116,7 @@
<div class="flex middle special-select mb10"
style="width: 75px;height: 28px;display: inline-block;margin: 0 40px 0 20px;background: #fff">
<div class="full pr10">
<el-select v-model="lineName" placeholder="请选择" size="small"
<el-select v-model="lineName" :placeholder="$t('el.select.placeholder')" size="small"
:popper-append-to-body="false"
@change="changeTopologyOpt(lineName,'lineName')">
<div slot="prefix">
@@ -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)