@nixweb/nixloc-ui 0.0.284 → 0.0.285

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nixweb/nixloc-ui",
-  "version": "0.0.284",
+  "version": "0.0.285",
   "description": "Componentes UI",
   "author": "Fábio Ávila <fabio@nixweb.com.br>",
   "private": false,

package/src/component/report/Report.vue

@@ -9,7 +9,7 @@
                         <div class="div-filter">
                             <div class="side-by-side">
                                 <div class="div-filter">
-                                    <Button _key="btnSearchReport" :disabled="loading || !isRequired" type="primary"
+                                    <Button _key="btnSearchReport" :disabled="loading || !isValid" type="primary"
                                         title="Buscar" classIcon="fas fa-file-search" size="medium" :clicked="getAll" />
                                 </div>
                             </div>
@@ -26,7 +26,7 @@
                     <ProgressBar :text="`Carregando ${liveTotalRecords} registros de ${totalRecords}`"
                         :value="liveTotalRecords" :max="totalRecords" size="medium" />
                 </div>
-                <div v-if="!isRequired">
+                <div v-if="!isValid">
                     <Alert type="info">
                         <span>
                             É necessário informar o filtro <b>{{ fieldsRequired }}</b>, clique no botão <b> <i
@@ -120,8 +120,13 @@ export default {
         liveTotalRecords() {
             return this.data.length;
         },
-        isRequired() {
-            return this.stringFilter.some(item => item.required && item.value !== "");
+        isValid() {
+            var hasRequired = this.filters.some(item => item.required);
+            if (hasRequired) {
+                return this.stringFilter.some(item => item.required == true && item.value !== "");
+            } else {
+                return true;
+            }
         },
         fieldsRequired() {
             let title = "";
@@ -136,53 +141,55 @@ export default {
         ...mapMutations("generic", ["removeLoading"]),
         ...mapActions("generic", ["getApi"]),
         getAll() {
-            this.removeLoading(["btnSearchReport"]);
-            this.loading = true;
-            let params = {
-                url: this.urlGet,
-                obj:
-                {
-                    stringFilter: JSON.stringify(this.stringFilter),
-                    fieldOrder: this.ordering.field,
-                    ordering: this.ordering.ordering,
-                    currentPage: this.currentPage,
-                    totalPerPage: this.totalPerPage,
-                    noPaginated: true
-                }
-            };
+            if (this.isValid) {
+                this.removeLoading(["btnSearchReport"]);
+                this.loading = true;
+                let params = {
+                    url: this.urlGet,
+                    obj:
+                    {
+                        stringFilter: JSON.stringify(this.stringFilter),
+                        fieldOrder: this.ordering.field,
+                        ordering: this.ordering.ordering,
+                        currentPage: this.currentPage,
+                        totalPerPage: this.totalPerPage,
+                        noPaginated: true
+                    }
+                };
 
-            this.getApi(params).then((response) => {
-                let self = this;
-                this.totalization = response.content.totalization;
-                this.totalRecords = response.content.totalRecords;
+                this.getApi(params).then((response) => {
+                    let self = this;
+                    this.totalization = response.content.totalization;
+                    this.totalRecords = response.content.totalRecords;
 
-                if (this.pagination.length == 0) {
-                    this.currentPage = 1;
-                    this.data = [];
-                }
+                    if (this.pagination.length == 0) {
+                        this.currentPage = 1;
+                        this.data = [];
+                    }
 
-                if (this.pagination.length == 0) {
-                    var pagination = response.content.totalRecords / this.totalPerPage;
-                    var arr = Math.ceil(pagination);
-                    for (var i = 1; i <= arr; i++) {
-                        self.pagination.push(i);
+                    if (this.pagination.length == 0) {
+                        var pagination = response.content.totalRecords / this.totalPerPage;
+                        var arr = Math.ceil(pagination);
+                        for (var i = 1; i <= arr; i++) {
+                            self.pagination.push(i);
+                        }
+                    } else {
+                        this.pagination.pop();
                     }
-                } else {
-                    this.pagination.pop();
-                }
 
-                response.content.data.forEach(item => {
-                    self.data.push(item);
-                });
+                    response.content.data.forEach(item => {
+                        self.data.push(item);
+                    });
 
-                this.show = true;
-                setTimeout(function () {
-                    self.loading = false;
+                    this.show = true;
+                    setTimeout(function () {
+                        self.loading = false;
 
-                }, 500);
+                    }, 500);
 
-                this.verifyIfPagination();
-            });
+                    this.verifyIfPagination();
+                });
+            }
         },
         verifyIfPagination() {
             if (this.pagination.length > 0) {

package/src/component/shared/filter-builder/FilterBuilder.vue

@@ -34,7 +34,8 @@
                                         v-model="item.value" />
                                 </div>
                             </div>
-                            <InputText v-if="item.type == 'text'" :title="item.title" v-model="item.value" />
+                            <InputText v-if="item.type == 'text' || item.type == 'patrimony'" :title="item.title"
+                                v-model="item.value" />
                         </b-col>
                         <b-col sm="1">
                             <div class="icon-remove" @click="removeItem(item.field)">