diff --git a/src/api/ADempiere/data.js b/src/api/ADempiere/data.js index 8e93d5ff..c91565ce 100644 --- a/src/api/ADempiere/data.js +++ b/src/api/ADempiere/data.js @@ -464,7 +464,6 @@ export function requestListWorkflows({ * @param {string} pageSize */ export function requestListRecordChats({ tableName, recordId, pageToken, pageSize }) { - console.log(tableName, recordId, Instance.call(this).requestListRecordChats({ tableName, recordId, pageToken, pageSize })) return Instance.call(this).requestListRecordChats({ tableName, recordId, @@ -479,7 +478,6 @@ export function requestListRecordChats({ tableName, recordId, pageToken, pageSiz * @param {string} pageSize */ export function requestListChatEntries({ uuid, pageToken, pageSize }) { - console.log(uuid, Instance.call(this).requestListChatEntries({ uuid, pageToken, pageSize })) return Instance.call(this).requestListChatEntries({ uuid, pageToken, diff --git a/src/components/ADempiere/Field/FieldText.vue b/src/components/ADempiere/Field/FieldText.vue index f9dbd583..165f74e7 100644 --- a/src/components/ADempiere/Field/FieldText.vue +++ b/src/components/ADempiere/Field/FieldText.vue @@ -42,8 +42,8 @@ export default { }, typeTextBox() { // String, Url, FileName... - var typeInput = 'text' - if (['Memo', 'Text'].includes(this.metadata.referenceType)) { + let typeInput = 'text' + if (this.metadata.referenceType === 'Text') { typeInput = 'textarea' } if (this.metadata.isEncrypted) { @@ -79,7 +79,7 @@ export default { methods: { validateUrl(e) { // Entry pattern, in this case only accepts numbers and letters - var _Pattern = /^(http[s]?:\/\/(www\.)?|ftp:\/\/(www\.)?|www\.){1}([0-9A-Za-z-\.@:%_\+~#=]+)+((\.[a-zA-Z]{1,5})+)(\/(.)*)?(\?(.)*)?/g + const _Pattern = /^(http[s]?:\/\/(www\.)?|ftp:\/\/(www\.)?|www\.){1}([0-9A-Za-z-\.@:%_\+~#=]+)+((\.[a-zA-Z]{1,5})+)(\/(.)*)?(\?(.)*)?/g var rex = RegExp(_Pattern) var value = e.target.value if (rex.test(value) && value.trim() !== '') { diff --git a/src/components/ADempiere/Field/FieldTextLong.vue b/src/components/ADempiere/Field/FieldTextLong.vue index 1a4a6351..0030e1da 100644 --- a/src/components/ADempiere/Field/FieldTextLong.vue +++ b/src/components/ADempiere/Field/FieldTextLong.vue @@ -65,12 +65,6 @@ export default { value = '' } this.value = String(value) - - if (this.isDisabled) { - this.editor.setValue(value) - } else { - this.editor.setValue(oldValue) - } } }, 'metadata.value'(value, oldValue) { @@ -79,21 +73,15 @@ export default { value = '' } this.value = String(value) - - if (this.isDisabled) { - this.editor.setValue(value) - } else { - this.editor.setValue(oldValue) - } } }, value(newValue, oldValue) { - if (newValue !== this.editor.getValue()) { - if (this.isDisabled) { - this.editor.setValue(newValue) - } else { - this.editor.setValue(oldValue) - } + if (this.isDisabled) { + // not changed value + this.value = oldValue + this.editor.setValue(oldValue) + } else { + this.editor.setValue(newValue) } }, language(langValue) { diff --git a/src/components/ADempiere/Field/references.js b/src/components/ADempiere/Field/references.js index 2c0ab2ec..6165b7f9 100644 --- a/src/components/ADempiere/Field/references.js +++ b/src/components/ADempiere/Field/references.js @@ -136,7 +136,7 @@ const REFERENCES = [ }, { id: 34, - type: 'FieldText', + type: 'FieldTextLong', support: true, description: 'Reference List', alias: ['Memo'] diff --git a/src/store/modules/ADempiere/panel.js b/src/store/modules/ADempiere/panel.js index b155fc1b..5b83ea30 100644 --- a/src/store/modules/ADempiere/panel.js +++ b/src/store/modules/ADempiere/panel.js @@ -479,7 +479,7 @@ const panel = { isChangedOldValue = false, withOutColumnNames = [] }) { const panel = getters.getPanel(containerUuid, isAdvancedQuery) - const fieldList = panel.fieldList + const { fieldList } = panel // get field const field = fieldList.find(fieldItem => fieldItem.columnName === columnName) @@ -544,14 +544,16 @@ const panel = { } } - // Change Dependents - dispatch('changeDependentFieldsList', { - parentUuid, - containerUuid, - dependentFieldsList: field.dependentFieldsList, - fieldsList: fieldList, - isSendToServer - }) + if (!isAdvancedQuery) { + // Change Dependents + dispatch('changeDependentFieldsList', { + parentUuid, + containerUuid, + dependentFieldsList: field.dependentFieldsList, + fieldsList: fieldList, + isSendToServer + }) + } // the field has not changed, then the action is broken if (newValue === field.value && isEmptyValue(displayColumn) && !isAdvancedQuery) {