Skip to content

Commit 6f62cef

Browse files
authored
Fix: Sort fields by sequence (adempiere#650)
1 parent 8986eb8 commit 6f62cef

File tree

4 files changed

+25
-27
lines changed

4 files changed

+25
-27
lines changed

src/components/ADempiere/DataTable/Components/BatchEntry.vue

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -35,31 +35,30 @@
3535
size="small"
3636
class="field-component-bacht-entry"
3737
>
38-
<template
38+
<el-col
3939
v-for="(field, key) in fieldsListBatchEntry"
40+
:key="key"
41+
:span="6"
4042
>
41-
<el-col :key="key" :span="6">
42-
<el-form-item
43-
:label="field.name"
44-
:required="field.isMandatory"
45-
style="padding: 0px !important;"
46-
class="label-field-title"
47-
>
48-
<fields-display-definitions
49-
ref="fieldsDisplay"
50-
:field="field"
51-
:update-field="updateField"
52-
:persistence-data="persistenceBachtEntry"
53-
:is-new-record="true"
54-
:field-list="fieldsListBatchEntry"
55-
:is-panel-general="true"
56-
:is-read-only="!isCreateRecord"
57-
:container-manager="containerManager"
58-
:is-value-bacht-entry="attributesBachtEntry[field.column_name]"
59-
/>
60-
</el-form-item>
61-
</el-col>
62-
</template>
43+
<el-form-item
44+
:label="field.name"
45+
style="padding: 0px !important;"
46+
class="label-field-title"
47+
>
48+
<fields-display-definitions
49+
ref="fieldsDisplay"
50+
:field="field"
51+
:update-field="updateField"
52+
:persistence-data="persistenceBachtEntry"
53+
:is-new-record="true"
54+
:field-list="fieldsListBatchEntry"
55+
:is-panel-general="true"
56+
:is-read-only="!isCreateRecord"
57+
:container-manager="containerManager"
58+
:is-value-bacht-entry="attributesBachtEntry[field.column_name]"
59+
/>
60+
</el-form-item>
61+
</el-col>
6362
</el-form>
6463
</el-col>
6564
<el-col :span="24">
@@ -220,7 +219,7 @@ export default defineComponent({
220219
})
221220
})
222221
223-
fieldsListBatchEntry.value = fieldsList.value.filter(fieldAttributes => fieldAttributes.is_quick_entry)
222+
fieldsListBatchEntry.value = fieldsList.value.filter(fieldAttributes => fieldAttributes.is_quick_entry).sort((a, b) => a.sequence - b.sequence)
224223
225224
const defaultValues = computed(() => {
226225
const isSalesTransactionContext = isSalesTransaction({

src/components/ADempiere/FieldsDisplayDefinitionsBachtEntry/FieldNumber.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
:placeholder="fieldMetadata.description"
2525
size="mini"
2626
:precision="precision"
27-
class="field-number"
2827
style="width: 100%;"
2928
:disabled="isReadOnly"
3029
@change="saveFieldValue(fieldMetadata.value, fieldMetadata)"

src/components/ADempiere/FieldsDisplayDefinitionsBachtEntry/FieldSelect.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
:placeholder="fieldMetadata.description"
2929
:remote-method="remoteMethod"
3030
:loading="isLoadingSearch"
31-
style="padding-right: 10px;width: 100%;"
31+
style="width: 100%;"
3232
:disabled="isReadOnly"
3333
@visible-change="showList"
3434
@change="saveFieldValue"

src/components/ADempiere/FieldsDisplayDefinitionsBachtEntry/FieldText.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
:rows="rowsField"
2626
:type="typeTextBox"
2727
:disabled="isReadOnly"
28-
style="padding-right: 10px;width: 100%;"
28+
style="width: 100%;"
2929
@input="saveFieldValue(fieldMetadata.value, fieldMetadata)"
3030
/>
3131
</template>

0 commit comments

Comments
 (0)