fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/PMCORE-2633 (pull request #7704)

Browse Source 
PMCORE-2633

Approved-by: Rodrigo Quelca <rockoinfo@yahoo.com>
This commit is contained in:
Fabio Guachalla
2021-01-07 13:43:05 +00:00
committed by Julio Cesar Laura Avendaño
parent 2f3cc1abaf aef740212b
commit 132c80df33
1 changed files with 72 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
resources/assets/js/components/search/AdvancedFilter.vue
View File

@@ -10,15 +10,17 @@
:title="addSearchTitle" :title="addSearchTitle"
> >
<template v-slot:target-item> <template v-slot:target-item>
<b-button <div class="p-2">
id="popover-target-1" <b-button
variant="success" id="popover-target-1"
size="sm" variant="success"
href="#" size="sm"
tabindex="0" href="#"
> tabindex="0"
<b-icon icon="plus"></b-icon>{{$t('ID_ADD_FILTER')}} >
</b-button> <b-icon icon="plus"></b-icon>{{$t('ID_ADD_FILTER')}}
</b-button>
</div>
</template> </template>
<template v-slot:body> <template v-slot:body>
<b-form-group> <b-form-group>
@@ -33,12 +35,14 @@
</b-form-group> </b-form-group>
</template> </template>
</SearchPopover> </SearchPopover>
<b-button <div class="p-2">
size="sm" <b-button
@click="cleanAllTags" size="sm"
variant="danger" @click="cleanAllTags"
>{{$t('ID_CLEAN_ALL')}}</b-button variant="danger"
> >{{$t('ID_CLEAN_ALL')}}
</b-button>
</div>
</div> </div>
</b-col> </b-col>
@@ -96,51 +100,57 @@
<b-row> <b-row>
<b-col> <b-col>
<div class="d-flex flex-row"> <div class="d-flex flex-row">
<b-form-tags <div class="tag row">
input-id="tags-pills" <div class="col-11">
v-model="searchTags" <b-form-tags
size="sm" input-id="tags-pills"
> v-model="searchTags"
<template v-slot="{ tags, tagVariant, removeTag }"> size="sm"
<div
class="d-inline-block"
style="font-size: 1rem;"
> >
<b-form-tag <template v-slot="{ tags, tagVariant, removeTag }">
v-for="tag in tags" <div
@remove="customRemove(removeTag, tag)" class="d-inline-block"
:key="tag" style="font-size: 1rem;"
:title="tag" >
:variant="tagVariant" <b-form-tag
@click="onClickTag" v-for="tag in tags"
class="mr-1 badge badge-light" @remove="customRemove(removeTag, tag)"
> :key="tag"
:title="tag"
<div :id="tag"> :variant="tagVariant"
<i class="fas fa-tags"></i> @click="onClickTag"
{{ tagContent(tag) }} class="mr-1 badge badge-light"
>
<div :id="tag" class="p-2">
<i class="fas fa-tags"></i>
{{ tagContent(tag) }}
</div>
<component
v-bind:is="tagComponent(tag)"
v-bind:info="tagInfo(tag)"
v-bind:tag="tag"
v-bind:filter="dataToFilter(tag)"
@updateSearchTag="updateSearchTag"
/>
</b-form-tag>
</div> </div>
<component </template>
v-bind:is="tagComponent(tag)" </b-form-tags>
v-bind:info="tagInfo(tag)" </div>
v-bind:tag="tag" <div class="col-1">
v-bind:filter="dataToFilter(tag)" <b-input-group-append>
@updateSearchTag="updateSearchTag" <b-button
/> pill
</b-form-tag> variant="outline-secondary"
</div> class="pull-right"
</template> @click="onSearch"
</b-form-tags> >
<b-input-group-append> <b-icon icon="search"></b-icon>
<b-button </b-button>
pill </b-input-group-append>
variant="outline-secondary" </div>
class="pull-right" </div>
@click="onSearch"
>
<b-icon icon="search"></b-icon>
</b-button>
</b-input-group-append>
</div> </div>
</b-col> </b-col>
</b-row> </b-row>
@@ -624,4 +634,8 @@ export default {
.bv-example-row-flex-cols .row { .bv-example-row-flex-cols .row {
min-height: 10rem; min-height: 10rem;
} }
.tag {
width: 100%;
}
</style> </style>