Fixed missing not-equal icon on search string ( #863gm5vdj )

This commit is contained in:
Cüneyt Şentürk 2023-05-05 18:16:39 +03:00
parent 84a9480267
commit bb678d0165

View File

@ -15,33 +15,34 @@
<span v-if="filter.operator" class="flex items-center bg-purple-lighter text-black border-2 border-body border-l border-r border-t-0 border-b-0 mt-3 px-3 py-4 text-sm cursor-pointer el-tag el-tag--small el-tag-operator" style="margin-left:0; margin-right:0;"> <span v-if="filter.operator" class="flex items-center bg-purple-lighter text-black border-2 border-body border-l border-r border-t-0 border-b-0 mt-3 px-3 py-4 text-sm cursor-pointer el-tag el-tag--small el-tag-operator" style="margin-left:0; margin-right:0;">
<span v-if="filter.operator == '='" class="material-icons text-2xl">drag_handle</span> <span v-if="filter.operator == '='" class="material-icons text-2xl">drag_handle</span>
<span v-else-if="filter.operator == '><'" class="material-icons text-2xl transform rotate-90">height</span> <span v-else-if="filter.operator == '><'" class="material-icons text-2xl transform rotate-90">height</span>
<span v-else class="w-5">
<img :src="not_equal_image" class="w-5 h-5 object-cover block" />
</span>
<img v-else :src="not_equal_image" class="w-5 h-5 object-cover block" /> <i v-if="!filter.value" class="mt-1 ltr:-right-2 rtl:left-0 rtl:right-0 el-tag__close el-icon-close" style="font-size: 16px;" @click="onFilterDelete(index)"></i>
<i v-if="!filter.value" class="mt-1 ltr:-right-2 rtl:left-0 rtl:right-0 el-tag__close el-icon-close " style="font-size: 16px;" @click="onFilterDelete(index)"></i>
</span> </span>
<span v-if="filter.value" class="flex items-center bg-purple-lighter text-black border-0 mt-3 px-3 py-4 text-sm cursor-pointer el-tag el-tag--small el-tag-value"> <span v-if="filter.value" class="flex items-center bg-purple-lighter text-black border-0 mt-3 px-3 py-4 text-sm cursor-pointer el-tag el-tag--small el-tag-value">
{{ filter.value }} {{ filter.value }}
<i class="mt-1 ltr:-right-2 rtl:left-0 rtl:right-0 el-tag__close el-icon-close " style="font-size: 16px;" @click="onFilterDelete(index)"></i> <i class="mt-1 ltr:-right-2 rtl:left-0 rtl:right-0 el-tag__close el-icon-close" style="font-size: 16px;" @click="onFilterDelete(index)"></i>
</span> </span>
</div> </div>
</div> </div>
<div class="relative w-full h-full flex"> <div class="relative w-full h-full flex">
<input <input
v-if="!show_date" v-if="!show_date"
type="text" type="text"
class="w-full h-12 lg:h-auto bg-transparent text-black text-sm border-0 pb-0 focus:outline-none focus:ring-transparent focus:border-purple-100" class="w-full h-12 lg:h-auto bg-transparent text-black text-sm border-0 pb-0 focus:outline-none focus:ring-transparent focus:border-purple-100"
:class="!show_icon ? 'ltr:pr-4 rtl:pl-4' : 'ltr:pr-10 rtl:pl-10'" :class="!show_icon ? 'ltr:pr-4 rtl:pl-4' : 'ltr:pr-10 rtl:pl-10'"
:placeholder="dynamicPlaceholder" :placeholder="dynamicPlaceholder"
:ref="'input-search-field-' + _uid" :ref="'input-search-field-' + _uid"
v-model="search" v-model="search"
@focus="onInputFocus" @focus="onInputFocus"
@input="onInput" @input="onInput"
@blur="onBlur" @blur="onBlur"
@keyup.enter="onInputConfirm" @keyup.enter="onInputConfirm"
/> />
<flat-picker <flat-picker
@ -148,47 +149,57 @@ export default {
default: 'Search or filter results...', default: 'Search or filter results...',
description: 'Input placeholder' description: 'Input placeholder'
}, },
selectPlaceholder: { selectPlaceholder: {
type: String, type: String,
}, },
enterPlaceholder: { enterPlaceholder: {
type: String, type: String,
}, },
searchText: { searchText: {
type: String, type: String,
default: 'Search for this text', default: 'Search for this text',
description: 'Input placeholder' description: 'Input placeholder'
}, },
operatorIsText: { operatorIsText: {
type: String, type: String,
default: 'is', default: 'is',
description: 'Operator is "="' description: 'Operator is "="'
}, },
operatorIsNotText: { operatorIsNotText: {
type: String, type: String,
default: 'is not', default: 'is not',
description: 'Operator is not "!="' description: 'Operator is not "!="'
}, },
noDataText: { noDataText: {
type: String, type: String,
default: 'No Data', default: 'No Data',
description: "Selectbox empty options message" description: "Selectbox empty options message"
}, },
noMatchingDataText: { noMatchingDataText: {
type: String, type: String,
default: 'No Matchign Data', default: 'No Matchign Data',
description: "Selectbox search option not found item message" description: "Selectbox search option not found item message"
}, },
value: { value: {
type: String, type: String,
default: null, default: null,
description: 'Search attribute value' description: 'Search attribute value'
}, },
filters: { filters: {
type: Array, type: Array,
default: () => [], default: () => [],
description: 'List of filters' description: 'List of filters'
}, },
defaultFiltered: { defaultFiltered: {
type: Array, type: Array,
default: () => [], default: () => [],
@ -196,7 +207,6 @@ export default {
}, },
dateConfig: null dateConfig: null
}, },
model: { model: {
@ -850,6 +860,7 @@ export default {
this.values.sort(function (a, b) { this.values.sort(function (a, b) {
var nameA = a.value.toUpperCase(); // ignore upper and lowercase var nameA = a.value.toUpperCase(); // ignore upper and lowercase
var nameB = b.value.toUpperCase(); // ignore upper and lowercase var nameB = b.value.toUpperCase(); // ignore upper and lowercase
if (nameA < nameB) { if (nameA < nameB) {
return -1; return -1;
} }
@ -857,6 +868,7 @@ export default {
if (nameA > nameB) { if (nameA > nameB) {
return 1; return 1;
} }
// names must be equal // names must be equal
return 0; return 0;
}); });
@ -936,7 +948,7 @@ export default {
.searh-field .btn:not(:disabled):not(.disabled):active:focus, .searh-field .btn:not(:disabled):not(.disabled):active:focus,
.searh-field .btn:not(:disabled):not(.disabled).active:focus { .searh-field .btn:not(:disabled):not(.disabled).active:focus {
-webkit-box-shadow: none !important; -webkit-box-shadow: none !important;
box-shadow: none !important; box-shadow: none !important;
} }