diff --git a/package.json b/package.json index d1e60722..8e40d4d2 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ }, "dependencies": { "@adempiere/grpc-access-client": "^1.1.8", - "@adempiere/grpc-data-client": "^2.1.6", + "@adempiere/grpc-data-client": "^2.2.1", "@adempiere/grpc-dictionary-client": "^1.3.5", "@adempiere/grpc-enrollment-client": "^1.0.7", "autoprefixer": "^9.5.1", diff --git a/src/components/ADempiere/DataTable/index.vue b/src/components/ADempiere/DataTable/index.vue index 5ca1540d..06bc5d97 100644 --- a/src/components/ADempiere/DataTable/index.vue +++ b/src/components/ADempiere/DataTable/index.vue @@ -251,7 +251,7 @@ import IconElement from '@/components/ADempiere/IconElement' import { formatDate } from '@/filters/ADempiere' import MainPanel from '@/components/ADempiere/Panel' import { sortFields } from '@/utils/ADempiere/dictionaryUtils' -import { FIELDS_DECIMALS, FIELDS_QUANTITY, FIELD_READ_ONLY_FORM } from '@/components/ADempiere/Field/references' +import { FIELDS_DECIMALS, FIELDS_QUANTITY, FIELD_READ_ONLY_FORM } from '@/utils/ADempiere/references' import { fieldIsDisplayed } from '@/utils/ADempiere' import evaluator from '@/utils/ADempiere/evaluator' @@ -625,13 +625,13 @@ export default { cell = cell.getTime() } // replace number timestamp value for date - return formatDate(cell, field.referenceType) + return formatDate(cell, field.displayType) } else if (field.componentPath === 'FieldNumber') { if (this.isEmptyValue(row[field.columnName])) { return undefined } return this.formatNumber({ - referenceType: field.referenceType, + displayType: field.displayType, number: row[field.columnName] }) } else if (field.componentPath === 'FieldSelect' && this.isEmptyValue(row['DisplayColumn_' + field.columnName]) && row[field.columnName] === 0) { @@ -969,7 +969,7 @@ export default { return } const field = this.fieldsList.find(field => field.columnName === columnItem.property) - if (!FIELDS_QUANTITY.includes(field.referenceType)) { + if (!FIELDS_QUANTITY.includes(field.displayType)) { sums[index] = '' return } @@ -985,7 +985,7 @@ export default { return prev }, 0) sums[index] = this.formatNumber({ - referenceType: field.referenceType, + displayType: field.displayType, number: total }) } @@ -993,10 +993,10 @@ export default { return sums }, - formatNumber({ referenceType, number }) { + formatNumber({ displayType, number }) { let fixed = 0 // Amount, Costs+Prices, Number - if (FIELDS_DECIMALS.includes(referenceType)) { + if (FIELDS_DECIMALS.includes(displayType)) { fixed = 2 } return new Intl.NumberFormat().format(number.toFixed(fixed)) diff --git a/src/components/ADempiere/DataTable/menu/menuTableMixin.js b/src/components/ADempiere/DataTable/menu/menuTableMixin.js index d87d8632..928d6452 100644 --- a/src/components/ADempiere/DataTable/menu/menuTableMixin.js +++ b/src/components/ADempiere/DataTable/menu/menuTableMixin.js @@ -1,7 +1,7 @@ import { supportedTypes, exportFileFromJson, exportFileZip } from '@/utils/ADempiere/exportUtil' import { showNotification } from '@/utils/ADempiere/notification' import { recursiveTreeSearch } from '@/utils/ADempiere/valueUtils' -import { FIELDS_QUANTITY } from '@/components/ADempiere/Field/references' +import { FIELDS_QUANTITY } from '@/utils/ADempiere/references' export const menuTableMixin = { props: { @@ -119,7 +119,7 @@ export const menuTableMixin = { }, isFieldsQuantity() { const fieldsQuantity = this.getterFieldList.filter(fieldItem => { - return FIELDS_QUANTITY.includes(fieldItem.referenceType) + return FIELDS_QUANTITY.includes(fieldItem.displayType) }).length return !fieldsQuantity }, diff --git a/src/components/ADempiere/Field/FieldDate.vue b/src/components/ADempiere/Field/FieldDate.vue index 9780ae89..02a86f9f 100644 --- a/src/components/ADempiere/Field/FieldDate.vue +++ b/src/components/ADempiere/Field/FieldDate.vue @@ -115,12 +115,14 @@ export default { * Parse the date format to be compatible with element-ui */ formatView() { - let format = this.metadata.VFormat - .replace(/[Y]/gi, 'y') - .replace(/[m]/gi, 'M') - .replace(/[D]/gi, 'd') - - if (format === '') { + let format = '' + if (!this.isEmptyValue(this.metadata.VFormat)) { + format = this.metadata.VFormat + .replace(/[Y]/gi, 'y') + .replace(/[m]/gi, 'M') + .replace(/[D]/gi, 'd') + } + if (this.isEmptyValue(format)) { format = 'yyyy-MM-dd' } if (this.typePicker.replace('range', '') === 'datetime') { diff --git a/src/components/ADempiere/Field/FieldNumber.vue b/src/components/ADempiere/Field/FieldNumber.vue index 93f8f6f8..8e800c13 100644 --- a/src/components/ADempiere/Field/FieldNumber.vue +++ b/src/components/ADempiere/Field/FieldNumber.vue @@ -11,7 +11,7 @@ :disabled="isDisabled" :precision="precision" controls-position="right" - :class="'display-type-' + cssClass" + :class="'display-type-amount'" @change="preHandleChange" @shortkey.native="changeValue" @blur="changeValue" @@ -22,7 +22,7 @@