@nixweb/nixloc-ui 0.0.199 → 0.0.201

package/package.json

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

package/src/component/forms/Select.vue

@@ -66,6 +66,7 @@ export default {
     required: Boolean,
     url: String,
     disabled: Boolean,
+    initialFieldTarget: String,
     fieldTarget: String,
     propsParams: Object,
     value: Object,

package/src/component/forms/SelectStatic.vue

@@ -28,6 +28,7 @@ export default {
     title: String,
     formName: String,
     field: String,
+    initialFieldTarget: Object,
     fieldTarget: String,
     required: Boolean,
     initialValue: Object,
@@ -72,6 +73,13 @@ export default {
     if (el) {
       el.tabIndex = 0;
     }
+
+    if (this.initialFieldTarget.id) {
+      let value = this.initialFieldTarget.id;
+      let obj = { tag: `${this.title}: ${value}`, fieldTarget: this.fieldTarget, value: value };
+      this.addFilter(obj);
+    }
+
   },
   computed: {
     ...mapGetters("generic", ["event"]),
@@ -89,7 +97,7 @@ export default {
       this.$emit("input", value);
       let obj = { fieldTarget: this.fieldTarget, value: value.id };
       if (!this.onlyQuery) this.addFilter(obj);
-      if (this.fieldTarget) {
+      if (this.fieldTarget && this.fieldTarget != "totalPerPage") {
         let obj = { tag: `${this.title}: ${value.content}`, fieldTarget: this.fieldTarget, value: value.id };
         this.addFilter(obj);
       }
@@ -124,7 +132,6 @@ export default {
   watch: {
     event: {
       handler(event) {
-
         if (event.name == "tagRemoved") {
           if (this.fieldTarget == event.data) this.cleanSelectStatic();
         }

package/src/component/layout/Menu.vue

@@ -216,6 +216,8 @@ export default {
 .div-title {
   margin-top: -10px;
   font-size: 12.5px;
+  font-weight: 300;
+  color: black;
 }
 
 .title-sub {

package/src/component/layout/Tab.vue

@@ -89,13 +89,13 @@ export default {
 <style>
 .arrow-left {
   position: absolute;
-  margin-top: 28px;
+  margin-top: 40px;
   left: 50%;
 }
 
 .arrow-right {
   position: absolute;
-  margin-top: 28px;
+  margin-top: 40px;
   left: 53%;
 }
 

package/src/component/shared/HorizontalFilter.vue

@@ -19,7 +19,7 @@
             { content: '30', id: 30 },
             { content: '50', id: 50 },
             { content: '100', id: 100 },
-          ]" />
+          ]" v-model="totalPerPage" />
         </b-col>
       </b-row>
     </Collapse>
@@ -31,6 +31,8 @@ import Collapse from "./Collapse.vue";
 import SelectStatic from "../forms/SelectStatic.vue";
 import Select from "../forms/Select";
 
+import { mapMutations } from "vuex";
+
 export default {
   name: "ListViewWithHandlerData",
   components: { Select, SelectStatic, Collapse },
@@ -40,6 +42,21 @@ export default {
       default: true,
     },
   },
+  computed: {
+    totalPerPage: {
+      get() {
+        return this.$store.state.generic.totalPerPage;
+      },
+      set(value) {
+        this.updateTotalPerPage(value);
+      },
+    },
+  },
+  methods: {
+    ...mapMutations("generic", [
+      "updateTotalPerPage",
+    ]),
+  }
 };
 </script>
 

package/src/component/shared/Pagination.vue

@@ -1,12 +1,7 @@
 <template>
   <div>
-    <b-pagination
-      v-model="pagination(_key).currentPage"
-      align="right"
-      :hide-goto-end-buttons="true"
-      :per-page="pagination(_key).totalPerPage"
-      :total-rows="totalRecords"
-    >
+    <b-pagination v-model="pagination(_key).currentPage" align="right" :hide-goto-end-buttons="true"
+      :per-page="totalPerPage.id" :total-rows="totalRecords">
       <template #first-text>
         <i class="fa-regular fa-chevron-left"></i>
       </template>
@@ -14,7 +9,7 @@
         <i class="fa-regular fa-chevron-left"></i>
       </template>
       <template #next-text>
-       <i class="fa-regular fa-chevron-right"></i>
+        <i class="fa-regular fa-chevron-right"></i>
       </template>
       <template #last-text>
         <i class="fa-regular fa-chevron-right"></i>
@@ -24,7 +19,7 @@
 </template>
 
 <script>
-import { mapGetters, mapMutations } from "vuex";
+import { mapGetters, mapMutations, mapState } from "vuex";
 
 export default {
   name: "Pagination",
@@ -41,6 +36,7 @@ export default {
   },
   computed: {
     ...mapGetters("generic", ["pagination"]),
+    ...mapState("generic", ["totalPerPage"]),
   },
   methods: {
     ...mapMutations("generic", ["addPagination"]),
@@ -69,8 +65,7 @@ export default {
   color: #6c757d !important;
   border: 0px solid #dee2e6 !important;
   border-radius: 50px !important;
-   width: 37px !important;
+  width: 37px !important;
   height: 37px !important;
 }
-
 </style>

package/src/component/template/ListViewWithDataHandler.vue

@@ -121,7 +121,7 @@ export default {
   mounted() {
     this.updatePagination({
       key: "templateList",
-      totalPerPage: this.baseParams.totalPerPage,
+      totalPerPage: this.totalPerPage.id,
     });
   },
   beforeDestroy() {
@@ -161,6 +161,8 @@ export default {
       "hideModal"
     ]),
     getAll() {
+      this.baseParams.totalPerPage = this.totalPerPage.id
+
       let obj = {
         ...this.baseParams,
         ...this.dynamicFilter,
@@ -189,7 +191,6 @@ export default {
       }
     },
     selectFilter(value) {
-
       let fieldTarget = value.fieldTarget;
       let obj = { tag: value.tag, key: fieldTarget, value: value.value };
 

package/src/store/modules/generic.js

@@ -19,6 +19,7 @@ export default {
         },
         notifications: [],
         pagination: [],
+        totalPerPage: { "content": "10", "id": 10 },
         selected: [],
         loading: [],
         event: {
@@ -112,6 +113,7 @@ export default {
                         let isMoviment = th.innerText.includes("t.produtoMovimentacao");
                         let isCustumerAddress = th.innerText.includes("t.enderecoCliente");
                         let isAddressRent = th.innerText.includes("t.saidaRetornoLocacao");
+                        let isTeamRent = th.innerText.includes("t.equipeLocacao");
 
 
                         if (isProduct) {
@@ -126,6 +128,9 @@ export default {
                         } else if (isPayment) {
                             obj.vForSimple = "v-for='pagamento in d.pagamentoLocacao'";
                             config.push(obj);
+                        } else if (isTeamRent) {
+                            obj.vForSimple = "v-for='equipe in d.equipeLocacao'";
+                            config.push(obj);
                         } else if (isGrouped) {
                             obj.vForGrouped = "v-for='(itensLocacao, grupo) in produtoAgrupado'";
                             obj.vForSimple = "v-for='produto in itensLocacao'";
@@ -181,6 +186,7 @@ export default {
                     .replaceAll("t.produtoMovimentacao", "")
                     .replaceAll("t.enderecoCliente", "")
                     .replaceAll("t.saidaRetornoLocacao", "")
+                    .replaceAll("t.equipeLocacao", "")
                     .replaceAll("<p>&nbsp!important;</p>", "<p>&nbsp</p>");
             }
 
@@ -237,6 +243,9 @@ export default {
         clearedSearch: (state) => {
             state.clearedSearch = state.clearedSearch = !state.clearedSearch
         },
+        updateTotalPerPage: (state, value) => {
+            state.totalPerPage = value;
+        },
         addSelected: (state, selected) => {
             state.selected = selected;
         },