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

feat：chart type为table时 增加nullValue的选项

Browse Source
This commit is contained in:
zhangyu
2020-10-26 16:25:00 +08:00
parent 44753abcff
commit b26afb9c0d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nezha-fronted/src/components/charts/chart-list.vue
View File

@@ -229,6 +229,7 @@
}, },
end (event) { end (event) {
//console.info("end event:", event) //console.info("end event:", event)
if(this.dataList.length===1){return}//解决当元素只有一个移动会报错的问题
let item = event.item; let item = event.item;
let oldIndex = event.oldIndex; let oldIndex = event.oldIndex;
let newIndex = event.newIndex; let newIndex = event.newIndex;
@@ -866,7 +867,7 @@
const axiosArr = chartItem.elements.map((ele) => { const axiosArr = chartItem.elements.map((ele) => {
const filterItem = ele; const filterItem = ele;
let query = encodeURIComponent(filterItem.expression); let query = encodeURIComponent(filterItem.expression);
if((chartInfo.type==='line'||chartInfo.type==='bar'||chartInfo.type==='stackArea')&&chartInfo.param){//如果是这三个 默认给connected if((chartInfo.type==='line'||chartInfo.type==='bar'||chartInfo.type==='stackArea'||chartInfo.type==='table')&&chartInfo.param){//如果是这三个 默认给connected
chartInfo.param.nullType=chartInfo.param.nullType||'connected'; chartInfo.param.nullType=chartInfo.param.nullType||'connected';
query+='&nullType='+chartInfo.param.nullType; query+='&nullType='+chartInfo.param.nullType;
} }

7
nezha-fronted/src/components/page/dashboard/chartBox.vue
View File

@@ -151,7 +151,7 @@
<el-input size="small" type="textarea" maxlength="1024" show-word-limit v-model="editChart.param.url"></el-input> <el-input size="small" type="textarea" maxlength="1024" show-word-limit v-model="editChart.param.url"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="editChart.type == 'line' || editChart.type == 'bar' || editChart.type == 'stackArea'" :label='"Null Type"' prop="nullType" class="half-form-item"> <el-form-item v-if="editChart.type == 'line' || editChart.type == 'bar' || editChart.type == 'stackArea' || editChart.type == 'table'" :label='"Null value"' prop="nullType" class="half-form-item">
<el-select class="right-box-row-with-btn" popper-class="chart-box-dropdown-small" v-model="editChart.param.nullType" placeholder="" size="mini" @change="$forceUpdate()"> <el-select class="right-box-row-with-btn" popper-class="chart-box-dropdown-small" v-model="editChart.param.nullType" placeholder="" size="mini" @change="$forceUpdate()">
<el-option v-for="item in nullTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in nullTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
@@ -1249,8 +1249,11 @@
} else { } else {
delete params.param.statistics; delete params.param.statistics;
} }
if(this.editChart.type==='line'||this.editChart.type==='bar'||this.editChart.type==='stackArea'){ if(this.editChart.type==='line'||this.editChart.type==='bar'||this.editChart.type==='stackArea'||this.editChart.type==='table'){
params.param.threshold=this.editChart.param.threshold; params.param.threshold=this.editChart.param.threshold;
if(this.editChart.type==='table'){
delete params.param.threshold;
}
params.param.nullType=this.editChart.param.nullType; params.param.nullType=this.editChart.param.nullType;
params.param.legendValue=this.editChart.param.legendValue; params.param.legendValue=this.editChart.param.legendValue;
} else { } else {