1
0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-11 22:08:05 +08:00

fix: Correct rank type numerical fields. (#177)

This commit is contained in:
EdwinBetanc0urt 2019-11-22 14:22:01 -04:00 committed by Yamel Senih
parent 7b0354fa34
commit aa931527f8
5 changed files with 37 additions and 38 deletions

View File

@ -3,7 +3,6 @@
:ref="metadata.columnName" :ref="metadata.columnName"
v-model="value" v-model="value"
type="number" type="number"
:pattern="pattern"
:min="minValue" :min="minValue"
:max="maxValue" :max="maxValue"
:placeholder="metadata.help" :placeholder="metadata.help"
@ -22,23 +21,29 @@ export default {
name: 'FieldNumber', name: 'FieldNumber',
mixins: [fieldMixin], mixins: [fieldMixin],
data() { data() {
// value render
let value = this.metadata.value
if (this.metadata.inTable) {
value = this.valueModel
}
value = this.validateValue(value)
return { return {
pattern: undefined, value: value,
showControls: true showControls: true
} }
}, },
computed: { computed: {
maxValue() { maxValue() {
if (!this.isEmptyValue(this.metadata.valueMax)) { if (this.isEmptyValue(this.metadata.valueMax)) {
return Number(this.metadata.valueMax)
}
return Infinity return Infinity
}
return Number(this.metadata.valueMax)
}, },
minValue() { minValue() {
if (!this.isEmptyValue(this.metadata.valueMin)) { if (this.isEmptyValue(this.metadata.valueMin)) {
return Number(this.metadata.valueMin)
}
return -Infinity return -Infinity
}
return Number(this.metadata.valueMin)
}, },
cssClass() { cssClass() {
return this.metadata.referenceType return this.metadata.referenceType
@ -56,19 +61,21 @@ export default {
// enable to dataTable records // enable to dataTable records
valueModel(value) { valueModel(value) {
if (this.metadata.inTable) { if (this.metadata.inTable) {
if (this.isEmptyValue(value)) { this.value = this.validateValue(value)
value = null
}
this.value = value
} }
}, },
'metadata.value'(value) { 'metadata.value'(value) {
if (!this.metadata.inTable) { if (!this.metadata.inTable) {
if (this.isEmptyValue(value)) { this.value = this.validateValue(value)
value = null
} }
this.value = value
} }
},
methods: {
validateValue(value) {
if (this.isEmptyValue(value) || isNaN(value)) {
return undefined
}
return Number(value)
} }
} }
} }
@ -87,10 +94,4 @@ export default {
text-align: right !important; text-align: right !important;
} }
} }
/* ADempiere Custom */
.el-input-number.is-controls-right .el-input__inner {
padding-left: 15px;
padding-right: 50px;
text-align: -webkit-right;
}
</style> </style>

View File

@ -24,7 +24,6 @@ const browser = {
getBrowserMetadata(browserUuid) getBrowserMetadata(browserUuid)
.then(response => { .then(response => {
const panelType = 'browser' const panelType = 'browser'
var fieldsList = response.getFieldsList()
const query = response.getQuery() const query = response.getQuery()
const whereClause = response.getWhereclause() const whereClause = response.getWhereclause()
const additionalAttributes = { const additionalAttributes = {
@ -35,17 +34,17 @@ const browser = {
} }
// Convert from gRPC // Convert from gRPC
var fieldsRangeList = [] const fieldsRangeList = []
var isMandatoryParams = false var isMandatoryParams = false
fieldsList = fieldsList.map((fieldItem, index) => { var fieldsList = response.getFieldsList().map((fieldItem, index) => {
const someAttributes = { const someAttributes = {
...additionalAttributes, ...additionalAttributes,
fieldListIndex: index fieldListIndex: index
} }
var field = convertField(fieldItem, someAttributes) const field = convertField(fieldItem, someAttributes)
// Add new field if is range number // Add new field if is range number
if (field.isRange && field.componentPath === 'NumberBase') { if (field.isRange && field.componentPath === 'FieldNumber') {
var fieldRange = convertField(fieldItem, someAttributes, true) const fieldRange = convertField(fieldItem, someAttributes, true)
if (!isEmptyValue(fieldRange.value)) { if (!isEmptyValue(fieldRange.value)) {
fieldRange.isShowedFromUser = true fieldRange.isShowedFromUser = true
} }

View File

@ -1175,10 +1175,10 @@ const panel = {
} }
} }
} }
// TODO: Evaluate if is only to fields type Time Date, DateTime // only to fields type Time, Datea and DateTime
if (parameterItem.isRange) { if (parameterItem.isRange && parameterItem.componentPath !== 'FieldNumber') {
parametersRange.push({ parametersRange.push({
columnName: parameterItem.columnName + '_To', columnName: `${parameterItem.columnName}_To`,
value: valueTo value: valueTo
}) })
} }

View File

@ -21,7 +21,7 @@ const process = {
var processUuid = parameters.containerUuid var processUuid = parameters.containerUuid
getProcessMetadata(processUuid) getProcessMetadata(processUuid)
.then(response => { .then(response => {
var panelType = 'process' let panelType = 'process'
if (response.getIsreport()) { if (response.getIsreport()) {
panelType = 'report' panelType = 'report'
} }
@ -34,16 +34,16 @@ const process = {
} }
// Convert from gRPC // Convert from gRPC
var fieldsRangeList = [] const fieldsRangeList = []
var fieldDefinitionList = response.getParametersList().map((fieldItem, index) => { var fieldDefinitionList = response.getParametersList().map((fieldItem, index) => {
var someAttributes = { const someAttributes = {
...additionalAttributes, ...additionalAttributes,
fieldListIndex: index fieldListIndex: index
} }
var field = convertField(fieldItem, someAttributes) const field = convertField(fieldItem, someAttributes)
// Add new field if is range number // Add new field if is range number
if (field.isRange && field.componentPath === 'NumberBase') { if (field.isRange && field.componentPath === 'FieldNumber') {
var fieldRange = convertField(fieldItem, someAttributes, true) const fieldRange = convertField(fieldItem, someAttributes, true)
if (!isEmptyValue(fieldRange.value)) { if (!isEmptyValue(fieldRange.value)) {
fieldRange.isShowedFromUser = true fieldRange.isShowedFromUser = true
} }

View File

@ -235,7 +235,6 @@ export function convertField(fieldGRPC, moreAttributes = {}, typeRange = false)
field.defaultValue = field.defaultValueTo field.defaultValue = field.defaultValueTo
field.parsedDefaultValue = field.parsedDefaultValueTo field.parsedDefaultValue = field.parsedDefaultValueTo
} }
// field.value = field.value === undefined ? null : field.value
// hidden field type button // hidden field type button
const notShowedField = FIELD_NOT_SHOWED.find(itemField => { const notShowedField = FIELD_NOT_SHOWED.find(itemField => {