blackteay/vue-element-admin
1
0
Fork 0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-11 21:53:24 +08:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/components/ADempiere/Field/FieldNumber.vue
View File

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

11
src/store/modules/ADempiere/browser.js
View File

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

6
src/store/modules/ADempiere/panel.js
View File

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

12
src/store/modules/ADempiere/process.js
View File

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

1
src/utils/ADempiere/index.js
View File

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