@nixweb/nixloc-ui 1.19.0 → 1.21.0

package/src/component/value-objects/Person.vue

@@ -1,130 +1,130 @@
-<template>
-  <div>
-    <b-row>
-      <b-col xs="12" sm="12" md="12" lg="4" xl="4">
-        <RadioGroup field="typePerson" :formName="formName" v-show="showTypePerson" :options="[
-          { text: 'Física', value: 1 },
-          { text: 'Jurídica', value: 2 },
-        ]" v-model="person.typePerson" :markFormDirty="markFormDirty" />
-      </b-col>
-    </b-row>
-    <div v-if="showDocument">
-      <b-row>
-        <b-col xs="12" sm="12" md="12" lg="4" xl="4">
-          <InputText :title="person.typePerson == 2 ? 'CNPJ' : 'CPF'" field="document" :formName="formName" :mask="person.typePerson == 2 ? ['##.###.###/####-##'] : ['###.###.###-##']
-            " :maxLength="30" :required="required" v-model="person.document" :markFormDirty="markFormDirty">
-            <div class="glyphicon margin-button">
-              <Button v-if="person.typePerson == 2" _key="searchDocumentFederalRecipe" type="success"
-                classIcon="fas fa-search" :disabled="person.document.length < 18" size="small"
-                :clicked="searchDocumentFederalRecipe" />
-            </div>
-          </InputText>
-        </b-col>
-        <b-col xs="12" sm="12" md="12" lg="4" xl="4">
-          <InputText :title="person.typePerson == 2 ? 'Inscrição Estadual' : 'RG'" field="stateInscription"
-            :formName="formName" :maxLength="50" :required="required" v-model="person.stateInscription"
-            :markFormDirty="markFormDirty" />
-        </b-col>
-        <b-col xs="12" sm="12" md="12" lg="4" xl="4">
-          <InputText v-if="person.typePerson == 2" title="Inscrição Municipal" field="municipalInscription"
-            :formName="formName" :maxLength="50" :required="false" v-model="person.municipalInscription"
-            :markFormDirty="markFormDirty" />
-        </b-col>
-      </b-row>
-    </div>
-    <br v-if="person.typePerson == 2 && showDocument" />
-    <b-row>
-      <b-col xs="12" sm="12" md="12" lg="8" xl="8">
-        <InputText :title="person.typePerson == 2 ? 'Razão Social' : 'Nome'" field="companyName" :formName="formName"
-          :required="true" :maxLength="100" v-model="person.companyName" :markFormDirty="markFormDirty" />
-      </b-col>
-      <b-col xs="12" sm="12" md="12" lg="4" xl="4">
-        <InputText :title="person.typePerson == 2 ? 'Fantasia' : 'Apelido'" field="tradeName" :formName="formName"
-          :required="true" :maxLength="100" v-model="person.tradeName" :markFormDirty="markFormDirty" />
-      </b-col>
-    </b-row>
-  </div>
-</template>
-
-<script>
-import Button from "@nixweb/nixloc-ui/src/component/forms/Button";
-import InputText from "@nixweb/nixloc-ui/src/component/forms/InputText";
-import RadioGroup from "@nixweb/nixloc-ui/src/component/forms/RadioGroup";
-import Person from "@nixweb/nixloc-ui/src/component/value-objects/Person.js";
-import axios from "axios";
-
-import { mapMutations } from "vuex";
-
-export default {
-  name: "Person",
-  props: {
-    formName: String,
-    required: {
-      type: Boolean,
-      default: false,
-    },
-    showTypePerson: {
-      type: Boolean,
-      default: true,
-    },
-    showDocument: {
-      type: Boolean,
-      default: true,
-    },
-    markFormDirty: {
-      type: Boolean,
-      default: true,
-    },
-    value: Object,
-  },
-  components: { RadioGroup, InputText, Button },
-  data() {
-    return {
-      person: new Person(),
-    };
-  },
-  mounted() {
-    if (this.value.companyName != undefined) this.person = this.value;
-  },
-  methods: {
-    ...mapMutations("generic", [
-      "addEvent",
-      "addNotifications",
-      "removeLoading",
-    ]),
-    searchDocumentFederalRecipe() {
-      let url = `https://ws.hubdodesenvolvedor.com.br/v2/cnpj/?cnpj=${this.person.document}&token=94473735FzLqpNKajP170569464`;
-      axios.post(url, {}, {}).then((response) => {
-        if (response.data.return == "OK") {
-          this.addEvent({
-            name: "searchDocumentFederalRecipe",
-            data: response.data.result,
-          });
-          this.person.companyName = response.data.result.nome;
-          this.person.tradeName = response.data.result.fantasia;
-          console.log(response.data.result);
-        } else {
-          this.addNotifications([
-            { message: "CNPJ inválido ou não encontrado." },
-          ]);
-        }
-        this.removeLoading(["searchDocumentFederalRecipe"]);
-      });
-    },
-  },
-  watch: {
-    value: {
-      handler() {
-        this.person = this.value;
-      },
-      deep: true,
-    },
-    person: {
-      handler() {
-        this.$emit("input", this.person);
-      },
-      deep: true,
-    },
-  },
-};
-</script>
+<template>
+  <div>
+    <b-row>
+      <b-col xs="12" sm="12" md="12" lg="4" xl="4">
+        <RadioGroup field="typePerson" :formName="formName" v-show="showTypePerson" :options="[
+          { text: 'Física', value: 1 },
+          { text: 'Jurídica', value: 2 },
+        ]" v-model="person.typePerson" :markFormDirty="markFormDirty" />
+      </b-col>
+    </b-row>
+    <div v-if="showDocument">
+      <b-row>
+        <b-col xs="12" sm="12" md="12" lg="4" xl="4">
+          <InputText :title="person.typePerson == 2 ? 'CNPJ' : 'CPF'" field="document" :formName="formName" :mask="person.typePerson == 2 ? ['##.###.###/####-##'] : ['###.###.###-##']
+            " :maxLength="30" :required="required" v-model="person.document" :markFormDirty="markFormDirty">
+            <div class="glyphicon margin-button">
+              <Button v-if="person.typePerson == 2" _key="searchDocumentFederalRecipe" type="success"
+                classIcon="fas fa-search" :disabled="person.document.length < 18" size="small"
+                :clicked="searchDocumentFederalRecipe" />
+            </div>
+          </InputText>
+        </b-col>
+        <b-col xs="12" sm="12" md="12" lg="4" xl="4">
+          <InputText :title="person.typePerson == 2 ? 'Inscrição Estadual' : 'RG'" field="stateInscription"
+            :formName="formName" :maxLength="50" :required="required" v-model="person.stateInscription"
+            :markFormDirty="markFormDirty" />
+        </b-col>
+        <b-col xs="12" sm="12" md="12" lg="4" xl="4">
+          <InputText v-if="person.typePerson == 2" title="Inscrição Municipal" field="municipalInscription"
+            :formName="formName" :maxLength="50" :required="false" v-model="person.municipalInscription"
+            :markFormDirty="markFormDirty" />
+        </b-col>
+      </b-row>
+    </div>
+    <br v-if="person.typePerson == 2 && showDocument" />
+    <b-row>
+      <b-col xs="12" sm="12" md="12" lg="8" xl="8">
+        <InputText :title="person.typePerson == 2 ? 'Razão Social' : 'Nome'" field="companyName" :formName="formName"
+          :required="true" :maxLength="100" v-model="person.companyName" :markFormDirty="markFormDirty" />
+      </b-col>
+      <b-col xs="12" sm="12" md="12" lg="4" xl="4">
+        <InputText :title="person.typePerson == 2 ? 'Fantasia' : 'Apelido'" field="tradeName" :formName="formName"
+          :required="true" :maxLength="100" v-model="person.tradeName" :markFormDirty="markFormDirty" />
+      </b-col>
+    </b-row>
+  </div>
+</template>
+
+<script>
+import Button from "@nixweb/nixloc-ui/src/component/forms/Button";
+import InputText from "@nixweb/nixloc-ui/src/component/forms/InputText";
+import RadioGroup from "@nixweb/nixloc-ui/src/component/forms/RadioGroup";
+import Person from "@nixweb/nixloc-ui/src/component/value-objects/Person.js";
+import axios from "axios";
+
+import { mapMutations } from "vuex";
+
+export default {
+  name: "Person",
+  props: {
+    formName: String,
+    required: {
+      type: Boolean,
+      default: false,
+    },
+    showTypePerson: {
+      type: Boolean,
+      default: true,
+    },
+    showDocument: {
+      type: Boolean,
+      default: true,
+    },
+    markFormDirty: {
+      type: Boolean,
+      default: true,
+    },
+    value: Object,
+  },
+  components: { RadioGroup, InputText, Button },
+  data() {
+    return {
+      person: new Person(),
+    };
+  },
+  mounted() {
+    if (this.value.companyName != undefined) this.person = this.value;
+  },
+  methods: {
+    ...mapMutations("generic", [
+      "addEvent",
+      "addNotifications",
+      "removeLoading",
+    ]),
+    searchDocumentFederalRecipe() {
+      let url = `https://ws.hubdodesenvolvedor.com.br/v2/cnpj/?cnpj=${this.person.document}&token=94473735FzLqpNKajP170569464`;
+      axios.post(url, {}, {}).then((response) => {
+        if (response.data.return == "OK") {
+          this.addEvent({
+            name: "searchDocumentFederalRecipe",
+            data: response.data.result,
+          });
+          this.person.companyName = response.data.result.nome;
+          this.person.tradeName = response.data.result.fantasia;
+          console.log(response.data.result);
+        } else {
+          this.addNotifications([
+            { message: "CNPJ inválido ou não encontrado." },
+          ]);
+        }
+        this.removeLoading(["searchDocumentFederalRecipe"]);
+      });
+    },
+  },
+  watch: {
+    value: {
+      handler() {
+        this.person = this.value;
+      },
+      deep: true,
+    },
+    person: {
+      handler() {
+        this.$emit("input", this.person);
+      },
+      deep: true,
+    },
+  },
+};
+</script>

package/src/store/modules/automation.js

@@ -1,31 +1,31 @@
-export default {
-    namespaced: true,
-    state: {
-        rules: [],
-    },
-    getters: {
-        listActivity: (state) => (id) => {
-            var selected = state.rules.find(x => x.id == id);
-            return selected.listActivity
-        },
-    },
-    mutations: {
-        addSelectedRules: (state, obj) => {
-            state.rules.push(obj);
-        },
-        removeRule: (state, id) => {
-            let filter = state.rules.filter(x => x.id != id);
-            state.rules = filter;
-        },
-        addActivity: (state, obj) => {
-            var selected = state.rules.find(x => x.id == obj.id);
-            selected.listActivity.push(obj.activity);
-        },
-        removeActivity: (state, id) => {
-            state.rules.forEach(item => {
-                let filter = item.listActivity.filter(x => x.id != id);
-                item.listActivity = filter;
-            });
-        },
-    },
+export default {
+    namespaced: true,
+    state: {
+        rules: [],
+    },
+    getters: {
+        listActivity: (state) => (id) => {
+            var selected = state.rules.find(x => x.id == id);
+            return selected.listActivity
+        },
+    },
+    mutations: {
+        addSelectedRules: (state, obj) => {
+            state.rules.push(obj);
+        },
+        removeRule: (state, id) => {
+            let filter = state.rules.filter(x => x.id != id);
+            state.rules = filter;
+        },
+        addActivity: (state, obj) => {
+            var selected = state.rules.find(x => x.id == obj.id);
+            selected.listActivity.push(obj.activity);
+        },
+        removeActivity: (state, id) => {
+            state.rules.forEach(item => {
+                let filter = item.listActivity.filter(x => x.id != id);
+                item.listActivity = filter;
+            });
+        },
+    },
 }

package/src/store/modules/generic.js

@@ -255,7 +255,21 @@ export default {
                         const produtoEnd = tbodyHtml.indexOf("</tr>", produtoStart) + "</tr>".length;
 
                         const wrapStart = grupoStart;
-                        const wrapEnd = produtoEnd;
+                        let wrapEnd = produtoEnd;
+
+                        // Keep the group/subgroup total row inside the repeated block when present.
+                        const somaMasterToken = "somaSubGrupo";
+                        const somaMasterIndex = tbodyHtml.indexOf(somaMasterToken, produtoEnd);
+                        if (somaMasterIndex !== -1) {
+                            const totalRowStart = tbodyHtml.lastIndexOf("<tr", somaMasterIndex);
+                            const totalRowEnd = tbodyHtml.indexOf("</tr>", somaMasterIndex) + "</tr>".length;
+
+
+
+                            if (totalRowStart !== -1 && totalRowEnd > wrapEnd) {
+                                wrapEnd = totalRowEnd;
+                            }
+                        }
 
                         let templateContent = tbodyHtml.substring(wrapStart, wrapEnd);
 
@@ -446,10 +460,6 @@ export default {
         cleanTags: (state) => {
             state.tags = []
         },
-        openModal: (state, name) => {
-            state.modal.name = name;
-            state.modal.open = true;
-        },
         addFilterStorage: (state, obj) => {
             const index = state.filterStorage.findIndex(x => x.key === obj.key);
             if (index !== -1) {
@@ -479,7 +489,7 @@ export default {
         updateQueryTags: (state, tags) => {
             state.queryTags = tags;
         },
-        _addFilterStorage: (state, obj) => { // está com _addFilterStorage para não ter duplicidade    
+        _addFilterStorage: (state, obj) => { // está com _addFilterStorage para não ter duplicidade
             // função abaixo é para não deixar duplicidade
             const index = state._filterStorage.findIndex(x => x.routeName === obj.routeName);
             if (index !== -1) {