shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2645 from brkcvn/master

Browse Source 
Sub category icon is appear on search list
This commit is contained in:
Burak Civan 2022-09-30 10:28:35 +03:00 committed by GitHub
commit 9d65a8d982
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
resources/assets/js/components/AkauntingSearch.vue
View File

@ -82,30 +82,33 @@
<div :id="'search-field-operator-' + _uid" class="absolute top-12 ltr:left-8 rtl:right-8 py-2 bg-white rounded-md border border-gray-200 shadow-xl z-20 list-none dropdown-menu operator" :class="[{'show': visible.operator}]"> <div :id="'search-field-operator-' + _uid" class="absolute top-12 ltr:left-8 rtl:right-8 py-2 bg-white rounded-md border border-gray-200 shadow-xl z-20 list-none dropdown-menu operator" :class="[{'show': visible.operator}]">
<li v-if="equal" ref="" class="w-full flex items-center px-2 h-9 leading-9 whitespace-nowrap"> <li v-if="equal" ref="" class="w-full flex items-center px-2 h-9 leading-9 whitespace-nowrap">
<button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100" @click="onOperatorSelected('=')"> <button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100" @click="onOperatorSelected('=')">
<span class="material-icons text-2xl transform">drag_handle</span> <span class="material-icons text-2xl transform pointer-events-none">drag_handle</span>
<span class="text-gray hidden">{{ operatorIsText }} <span class="text-gray hidden pointer-events-none">{{ operatorIsText }}
</span> </span>
</button> </button>
</li> </li>
<li v-if="not_equal" ref="" class="w-full flex items-center px-2 h-9 leading-9 whitespace-nowrap"> <li v-if="not_equal" ref="" class="w-full flex items-center px-2 h-9 leading-9 whitespace-nowrap">
<button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100" @click="onOperatorSelected('!=')"> <button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100" @click="onOperatorSelected('!=')">
<img :src="not_equal_image" class="w-6 h-6 block m-auto" /> <img :src="not_equal_image" class="w-6 h-6 block m-auto pointer-events-none" />
<span class="text-gray hidden">{{ operatorIsNotText }}</span> <span class="text-gray hidden pointer-events-none">{{ operatorIsNotText }}</span>
</button> </button>
</li> </li>
<li v-if="range" ref="" class="w-full flex items-center px-2 h-9 leading-9 whitespace-nowrap"> <li v-if="range" ref="" class="w-full flex items-center px-2 h-9 leading-9 whitespace-nowrap">
<button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100" @click="onOperatorSelected('><')"> <button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100" @click="onOperatorSelected('><')">
<span class="material-icons text-2xl transform rotate-90">height</span> <span class="material-icons text-2xl transform rotate-90 pointer-events-none">height</span>
<span class="text-gray hidden">{{ operatorIsNotText }}</span> <span class="text-gray hidden pointer-events-none">{{ operatorIsNotText }}</span>
</button> </button>
</li> </li>
</div> </div>
<div :id="'search-field-value-' + _uid" class="absolute top-12 ltr:left-8 rtl:right-8 py-2 bg-white rounded-md border border-gray-200 shadow-xl z-20 list-none dropdown-menu" :class="[{'show': visible.values}]"> <div :id="'search-field-value-' + _uid" class="absolute top-12 ltr:left-8 rtl:right-8 py-2 bg-white rounded-md border border-gray-200 shadow-xl z-20 list-none dropdown-menu" :class="[{'show': visible.values}]">
<li ref="" class="w-full flex items-center px-2 h-9 leading-9 whitespace-nowrap" v-for="(value) in filteredValues" :data-value="value.key"> <li ref="" class="w-full flex items-center px-2 h-9 leading-9 whitespace-nowrap" v-for="(value) in filteredValues" :data-value="value.key">
<button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100" @click="onValueSelected(value.key)">{{ value.value }}</button> <button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100" @click="onValueSelected(value.key)">
<i v-if="value.level != null" class="material-icons align-middle text-lg ltr:mr-2 rtl:ml-2 pointer-events-none">subdirectory_arrow_right</i>
{{ value.value }}
</button>
</li> </li>
<li ref="" class="w-full flex items-center px-2 h-9 leading-9 whitespace-nowrap" v-if="!filteredValues.length"> <li ref="" class="w-full flex items-center px-2 h-9 leading-9 whitespace-nowrap" v-if="!filteredValues.length">
@ -462,7 +465,8 @@ export default {
data.forEach(function (item) { data.forEach(function (item) {
this.values.push({ this.values.push({
key: (item.code) ? item.code : item.id, key: (item.code) ? item.code : item.id,
value: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name value: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name,
level: (item.level) ? item.level : null,
}); });
}, this); }, this);
@ -813,7 +817,6 @@ 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;
} }
@ -821,7 +824,6 @@ export default {
if (nameA > nameB) { if (nameA > nameB) {
return 1; return 1;
} }
// names must be equal // names must be equal
return 0; return 0;
}); });