fix: search default to OR, enter to submit

This commit is contained in:
puri-ph4tt 2023-12-01 17:31:01 +07:00
parent ed9c552cac
commit 04a9dedfb9
2 changed files with 9 additions and 6 deletions

View file

@ -145,7 +145,12 @@ function clearAdvSearchData() {
/>
</div>
<div class="col-grow">
<q-input dense outlined v-model="item.value" placeholder="เอกสาร"
<q-input
dense
outlined
v-model="item.value"
placeholder="เอกสาร"
@keydown.enter.prevent="searchSubmit()"
><template v-slot:append>
<q-icon
name="close"
@ -184,6 +189,7 @@ function clearAdvSearchData() {
dense
outlined
placeholder="คำสำคัญ:"
@keydown.enter.prevent="searchSubmit()"
v-model="advSearchDataField.keyword"
/>
</div>
@ -192,6 +198,7 @@ function clearAdvSearchData() {
dense
outlined
placeholder="รายละเอียด:"
@keydown.enter.prevent="searchSubmit()"
v-model="advSearchDataField.description"
/>
</div>

View file

@ -36,14 +36,10 @@ async function searchSubmit() {
if (searchData.value.value.trim() !== '') {
submitSearchData.value = { AND: [], OR: [] }
submitSearchData.value.AND.push({
submitSearchData.value.OR.push({
field: searchData.value.field,
value: searchData.value.value,
})
submitSearchData.value.AND.push({
field: 'fileName',
value: searchData.value.value,
})
if (isAdvSearchCall.value && advSearchComp.value) {
const advField = advSearchComp.value.advSearchDataField