jinql
/
vue-element-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: Not search records with NULL or NOT NULL operators. (#337)

pull/3759/head
Edwin Betancourt 2020-02-16 00:08:55 -04:00 committed by GitHub
parent df6762578e
commit c13741c5c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/components/ADempiere/Field/fieldContextInfo.vue → src/components/ADempiere/Field/fieldPopovers/fieldContextInfo.vue
View File

6
src/components/ADempiere/Field/fieldOperatorComparison.vue → src/components/ADempiere/Field/fieldPopovers/fieldOperatorComparison.vue
View File

@ -83,9 +83,9 @@ export default {
panelType: this.fieldAttributes.panelType, panelType: this.fieldAttributes.panelType,
columnName: this.fieldAttributes.columnName, columnName: this.fieldAttributes.columnName,
newValue: value === 'NotSend' ? this.value : value, newValue: value === 'NotSend' ? this.value : value,
isAdvancedQuery: this.fieldAttributes.isAdvancedQuery, isAdvancedQuery: true,
isSendToServer: !(value === 'NotSend' || this.fieldAttributes.isAdvancedQuery), isSendToServer: !(value === 'NotSend'),
isSendCallout: !(value === 'NotSend' || this.fieldAttributes.isAdvancedQuery) isSendCallout: false
} }
this.$store.dispatch('notifyFieldChange', { this.$store.dispatch('notifyFieldChange', {

0
src/components/ADempiere/Field/fieldTranslated.vue → src/components/ADempiere/Field/fieldPopovers/fieldTranslated.vue
View File

15
src/components/ADempiere/Field/index.vue
View File

@ -91,9 +91,9 @@
</template> </template>
<script> <script>
import FieldContextInfo from '@/components/ADempiere/Field/fieldContextInfo' import FieldContextInfo from '@/components/ADempiere/Field/fieldPopovers/fieldContextInfo'
import FieldTranslated from '@/components/ADempiere/Field/fieldTranslated' import FieldOperatorComparison from '@/components/ADempiere/Field/fieldPopovers/fieldOperatorComparison'
import FieldOperatorComparison from '@/components/ADempiere/Field/fieldOperatorComparison' import FieldTranslated from '@/components/ADempiere/Field/fieldPopovers/fieldTranslated'
import { FIELD_ONLY } from '@/components/ADempiere/Field/references' import { FIELD_ONLY } from '@/components/ADempiere/Field/references'
import { DEFAULT_SIZE } from '@/components/ADempiere/Field/fieldSize' import { DEFAULT_SIZE } from '@/components/ADempiere/Field/fieldSize'
import { fieldIsDisplayed } from '@/utils/ADempiere' import { fieldIsDisplayed } from '@/utils/ADempiere'
@ -108,8 +108,8 @@ export default {
name: 'FieldDefinition', name: 'FieldDefinition',
components: { components: {
FieldContextInfo, FieldContextInfo,
FieldTranslated, FieldOperatorComparison,
FieldOperatorComparison FieldTranslated
}, },
props: { props: {
parentUuid: { parentUuid: {
@ -300,7 +300,6 @@ export default {
} }
}, },
watch: { watch: {
metadataField(value) { metadataField(value) {
this.field = value this.field = value
} }
@ -354,8 +353,12 @@ export default {
}, },
isReadOnly() { isReadOnly() {
if (this.isAdvancedQuery) { if (this.isAdvancedQuery) {
if (['NULL', 'NOT_NULL'].includes(this.field.operator)) {
return true
}
return false return false
} }
if (!this.field.isActive) { if (!this.field.isActive) {
return true return true
} }