Merge pull request #4209 from dataease/pr@dev@refactor_format

refactor(视图): 优化视图格式化,防止出现空值不显示的情况
This commit is contained in:
王嘉豪 2022-12-27 11:45:03 +08:00 committed by GitHub
commit 597f1c0eef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -792,12 +792,14 @@ export default {
this.requestStatus = 'success' this.requestStatus = 'success'
this.httpRequest.status = true this.httpRequest.status = true
} else { } else {
console.error('err2-' + JSON.stringify(response))
this.requestStatus = 'error' this.requestStatus = 'error'
this.message = response.message this.message = response.message
} }
this.isFirstLoad = false this.isFirstLoad = false
return true return true
}).catch(err => { }).catch(err => {
console.error('err-' + err)
this.requestStatus = 'error' this.requestStatus = 'error'
if (err.message && err.message.indexOf('timeout') > -1) { if (err.message && err.message.indexOf('timeout') > -1) {
this.message = this.$t('panel.timeout_refresh') this.message = this.$t('panel.timeout_refresh')
@ -878,10 +880,10 @@ export default {
} }
if (formatterCfg) { if (formatterCfg) {
const v = valueFormatter(value, formatterCfg) const v = valueFormatter(value, formatterCfg)
rowData[key] = v.includes('NaN') ? value : v rowData[key] = v && v.includes('NaN') ? value : v
} else { } else {
const v = valueFormatter(value, formatterItem) const v = valueFormatter(value, formatterItem)
rowData[key] = v.includes('NaN') ? value : v rowData[key] = v && v.includes('NaN') ? value : v
} }
} }
} }