@nixweb/nixloc-ui 0.0.124 → 0.0.127

package/src/component/template/{ListViewWithHandlerData.vue → ListViewWithDataHandler.vue}

@@ -2,14 +2,15 @@
   <div>
     <div :class="{ 'g-div-molded': showMolded }">
       <b-row>
-        <b-col sm="12"
-          ><div>
+        <b-col sm="12">
+          <div>
             <HorizontalFilter v-if="showHorizontalFilter">
               <div slot="content-filter-horizontal">
                 <slot name="content-filter-horizontal"></slot>
               </div>
-            </HorizontalFilter></div
-        ></b-col>
+            </HorizontalFilter>
+          </div>
+        </b-col>
       </b-row>
       <b-row>
         <b-col sm="6">
@@ -19,6 +20,7 @@
           <TableTotalRecords :totalRecords="content.totalRecords" />
         </b-col>
       </b-row>
+      <Loading type="line" :center="false" v-show="isLoading('loadingLine')" />
       <FixedBar posicao="topo" v-show="selected.length > 0">
         <div>
           <Button
@@ -43,23 +45,24 @@
       </Table>
     </div>
     <br />
-    <Pagination key="templateList" :totalRecords="content.totalRecords" />
+    <Pagination _key="templateList" :totalRecords="content.totalRecords" />
   </div>
 </template>
 
 <script>
-import Pagination from "../shared/Pagination.vue";
+import Pagination from "@nixweb/nixloc-ui/src/component/shared/Pagination.vue";
 import Table from "../shared/Table.vue";
 import Button from "../forms/Button.vue";
 import FixedBar from "../layout/FixedBar.vue";
 import TableTotalRecords from "../shared/TableTotalRecords.vue";
 import TableTotalization from "../shared/TableTotalization.vue";
 import HorizontalFilter from "../shared/HorizontalFilter.vue";
+import Loading from "../shared/Loading.vue";
 
 import { mapState, mapGetters, mapActions, mapMutations } from "vuex";
 
 export default {
-  name: "ListViewWithHandlerData",
+  name: "ListViewWithDataHandler",
   props: {
     templateList: Object,
     propsParam: Object,
@@ -80,6 +83,7 @@ export default {
     HorizontalFilter,
     TableTotalization,
     TableTotalRecords,
+    Loading,
     FixedBar,
     Button,
     Table,
@@ -93,7 +97,7 @@ export default {
       },
       baseParams: {
         search: undefined,
-        filter: "contem",
+        filter: "contains",
         currentPage: 1,
         totalPerPage: 10,
       },
@@ -111,7 +115,7 @@ export default {
     });
   },
   beforeDestroy() {
-    let search = { content: "", filter: { content: "contem", id: "contem" } };
+    let search = { content: "", filter: { content: "Contém", id: "contains" } };
     this.updateSearch(search);
   },
   computed: {
@@ -124,7 +128,7 @@ export default {
       "totalPerPage",
       "selectStatic",
     ]),
-    ...mapGetters("generic", ["pagination"]),
+    ...mapGetters("generic", ["pagination", "isLoading"]),
     paginationKey: function () {
       return this.pagination("templateList");
     },
@@ -142,12 +146,15 @@ export default {
       let params = { url: this.templateList.urlGetApi, obj: obj };
       this.getApi(params).then((response) => {
         this.content = response.content;
-        this.removeLoading(["panel", "modeloSubView", "search", "clean"]);
+        let self = this;
+        setTimeout(function () {
+          self.removeLoading(["panel", "loadingLine", "btnSearch", "btnClean"]);
+        }, 350);
       });
     },
     removeSelected() {
       let params = {
-        url: this.templateList.urlRemoverTodosApi,
+        url: this.templateList.urlDeleteAllApi,
         selected: this.selected,
       };
       this.deleteAllApi(params).then(() => {
@@ -155,7 +162,7 @@ export default {
         this.addSelected([]);
       });
     },
-    limpaParams() {
+    cleanParams() {
       this.baseParams.currentPage = 1;
     },
   },
@@ -172,19 +179,19 @@ export default {
     },
     executedSearch: function () {
       this.baseParams.search = this.search.content;
-      this.baseParams.filter = this.search.filter.id;
-      this.limpaParams();
+      if (this.search.filter.id) this.baseParams.filter = this.search.filter.id;
+      this.cleanParams();
       this.getAll();
     },
     clearedSearch: function () {
       this.baseParams.search = "";
       this.baseParams.filter = "";
-      this.limpaParams();
+      this.cleanParams();
       this.getAll();
     },
     paginationKey: {
       handler(value) {
-        this.limpaParams();
+        this.cleanParams();
         this.baseParams.currentPage = value.currentPage;
         this.getAll();
       },
@@ -193,19 +200,19 @@ export default {
     selectStatic: {
       handler(value) {
         let fieldTarget = value.fieldTarget;
-        let obj = { key: fieldTarget, valor: value.valor };
+        let obj = { key: fieldTarget, value: value.value };
         this.paramsFilter.push(obj);
 
         var result = {};
         for (var i = 0; i < this.paramsFilter.length; i++) {
           let key = this.paramsFilter[i].key;
-          let valor = this.paramsFilter[i].valor;
+          let value = this.paramsFilter[i].value;
 
-          if (key == "periodo") {
-            result["inicio"] = valor.inicio;
-            result["fim"] = valor.fim;
+          if (key == "period") {
+            result["start"] = value.inicio;
+            result["end"] = value.fim;
           } else {
-            result[key] = valor;
+            result[key] = value;
           }
         }
 

package/src/component/template/{AddEditReport.vue → ReportCreateUpdate.vue}

@@ -1,8 +1,8 @@
 <template>
   <div>
     <b-row>
-      <b-col sm="12"
-        ><InputText
+      <b-col sm="12">
+        <InputText
           title="Nome"
           field="name"
           :formName="formName"
@@ -17,7 +17,7 @@
       <b-col sm="12">
         <div class="text-right">
           <Button
-            key="save"
+            _key="btnSaveReport"
             type="success"
             title="Salvar"
             :disabled="!isFormValid(formName)"
@@ -34,41 +34,44 @@
 <script>
 import InputText from "@nixweb/nixloc-ui/src/component/forms/InputText";
 import Button from "@nixweb/nixloc-ui/src/component/forms/Button";
+
 import Report from "@nixweb/nixloc-ui/src/component/template/model/Report.js";
 
 import { mapGetters, mapState, mapActions, mapMutations } from "vuex";
 
 export default {
-  name: "AddEditReport",
+  name: "ReportCreateUpdate",
   components: { Button, InputText },
   props: {
     module: String,
   },
   data() {
     return {
-      formName: "reportAddEditView",
+      formName: "reportCreateUpdate",
       report: new Report(),
-      urlAdicionar: "/api/v1/shared/report/adicionar",
-      urlModificar: "/api/v1/shared/report/modificar",
+      urlCreate: "/api/v1/shared/report/create",
+      urlUpdate: "/api/v1/shared/report/update",
     };
   },
   computed: {
     ...mapGetters("validation", ["isFormValid"]),
     ...mapGetters("generic", ["event"]),
-    ...mapGetters("report", ["headerTable", "filtroSelecionado"]),
-    ...mapState("report", ["selectedField", "campoOrdenado"]),
+    ...mapState("report", ["selectedFields", "selectedRules"]),
   },
   methods: {
     ...mapActions("generic", ["postApi", "putApi"]),
     ...mapMutations("generic", ["removeLoading", "removeEvent", "hideModal"]),
     ...mapMutations("validation", ["resetValidation"]),
     saveReport() {
-      var personalizado = this.report.id ? "" : "Personalizado";
+      var custom = this.report.id ? "" : "Custom";
       const query = {
-        routeName: `${this.$route.name}${personalizado}`,
-        field: this.selectedField,
-        ordenacao: this.campoOrdenado,
-        filter: this.filtroSelecionado.children,
+        routeName: `${this.$route.name}${custom}`,
+        selectedFields: {
+          orderBy: this.selectedFields.orderBy,
+          selected: this.selectedFields.selected,
+          sort: this.selectedFields.sort,
+        },
+        selectedRules: this.selectedRules,
       };
       let obj = {
         id: this.report.id,
@@ -77,16 +80,23 @@ export default {
         query: JSON.stringify(query),
       };
       if (this.report.id) {
-        let params = { url: this.urlModificar, obj: obj };
+        let params = { url: this.urlUpdate, obj: obj };
         this.putApi(params).then((response) => {
           if (response.success) this.hideModal();
-          this.removeLoading(["save"]);
+          this.removeLoading(["btnSaveReport"]);
         });
       } else {
-        let params = { url: this.urlAdicionar, obj: obj };
+        let params = { url: this.urlCreate, obj: obj };
         this.postApi(params).then((response) => {
-          if (response.success) this.hideModal();
-          this.removeLoading(["save"]);
+          if (response.success) {
+            const query = JSON.parse(response.content.query);
+            this.$router.replace({
+              name: query.routeName,
+              params: { id: response.content.id, name: response.content.name },
+            });
+            this.hideModal();
+          }
+          this.removeLoading(["btnSaveReport"]);
         });
       }
     },
@@ -94,9 +104,10 @@ export default {
   watch: {
     event: {
       handler(event) {
-        if (event.name == "changeReport") {
+        if (event.name == "saveReport") {
           this.report.id = this.$route.params.id;
           if (this.report.id) this.report.name = this.$route.params.name;
+          this.saveReport();
         }
       },
       deep: true,

package/src/component/template/ViewTemplateConfiguration.vue

@@ -1,14 +1,12 @@
 <template>
   <div>
-    <Loading :center="false" v-show="carregando('modeloSubView')" />
-    <div v-show="!carregando('modeloSubView')">
+    <div>
       <slot name="content-buttons"></slot>
       <div v-if="showSearch">
         <Search />
         <br />
       </div>
-
-      <ListViewWithHandlerData
+      <ListViewWithDataHandler
         :templateList="templateList"
         :propsParam="propsParam"
         :showMolded="false"
@@ -24,22 +22,21 @@
         <div slot="content-buttons-table">
           <slot name="content-buttons-table"></slot>
         </div>
-      </ListViewWithHandlerData>
+      </ListViewWithDataHandler>
     </div>
   </div>
 </template>
 
 <script>
 import Search from "../shared/Search.vue";
-import Loading from "../shared/Loading.vue";
 
-import ListViewWithHandlerData from "@nixweb/nixloc-ui/src/component/template/ListViewWithHandlerData.vue";
+import ListViewWithDataHandler from "@nixweb/nixloc-ui/src/component/template/ListViewWithDataHandler.vue";
 
 import { mapGetters, mapMutations } from "vuex";
 
 export default {
   name: "ViewTemplateConfiguration",
-  components: { Search, Loading, ListViewWithHandlerData },
+  components: { Search, ListViewWithDataHandler },
   props: {
     templateList: Object,
     propsParam: Object,
@@ -56,11 +53,8 @@ export default {
       default: true,
     },
   },
-  computed: {
-    ...mapGetters("generic", ["carregando"]),
-  },
   created() {
-    this.addLoading("modeloSubView");
+    this.addLoading("loadingLine");
   },
   methods: {
     ...mapMutations("generic", ["addLoading"]),

package/src/component/template/ViewTemplateDocumentView.vue

@@ -15,7 +15,7 @@
                 <b-col sm="6">
                   <div class="side-by-side">
                     <Button
-                      key="saveDocument"
+                      _key="saveDocument"
                       type="success"
                       title="Salvar"
                       classIcon="fas fa-save"
@@ -27,7 +27,7 @@
                   <div class="side-by-side">
                     <Button
                       v-if="id"
-                      key="saveAs"
+                      _key="saveAs"
                       type="success"
                       title="Fazer uma cópia"
                       classIcon="fas fa-clone"
@@ -73,7 +73,7 @@
             <slot></slot>
           </Modal>
           <Modal title="Parâmetros" :width="1100" v-if="showModal('legenda')">
-            <LegendaParametro v-if="modal.open" :legenda="legenda" />
+            <ParameterLegend v-if="modal.open" :legend="parameterLegend" />
           </Modal>
           <Modal title="Editor de Código" :width="900" v-if="showModal('code')">
             <CodeEditor v-if="modal.open" />
@@ -98,7 +98,10 @@
                 <div>
                   <div class="a4">
                     <div id="printMe">
-                      <DocumentPreview :template="documentoPreview" :d="data" />
+                      <DocumentPreview
+                        :template="documentPreview"
+                        :d="parameterExemple"
+                      />
                     </div>
                   </div>
                 </div>
@@ -116,11 +119,10 @@
 
 <script>
 import Panel from "@nixweb/nixloc-ui/src/component/layout/Panel";
-
 import DocumentEditor from "@nixweb/nixloc-ui/src/component/shared/DocumentEditor.vue";
 import DocumentPreview from "@nixweb/nixloc-ui/src/component/shared/DocumentPreview.vue";
 import CodeEditor from "@nixweb/nixloc-ui/src/component/shared/CodeEditor.vue";
-import LegendaParametro from "@nixweb/nixloc-ui/src/component/shared/LegendaParametro.vue";
+import ParameterLegend from "@nixweb/nixloc-ui/src/component/shared/ParameterLegend.vue";
 import Molded from "@nixweb/nixloc-ui/src/component/layout/Molded";
 import Button from "@nixweb/nixloc-ui/src/component/forms/Button";
 import Modal from "@nixweb/nixloc-ui/src/component/forms/Modal";
@@ -140,7 +142,7 @@ export default {
     DocumentEditor,
     DocumentPreview,
     CodeEditor,
-    LegendaParametro,
+    ParameterLegend,
     Molded,
     Button,
     Modal,
@@ -148,8 +150,8 @@ export default {
   },
   props: {
     panel: Object,
-    data: Object,
-    legenda: Array,
+    parameterExemple: Object,
+    parameterLegend: Array,
   },
   data() {
     return {
@@ -159,36 +161,31 @@ export default {
   },
   computed: {
     ...mapState("generic", ["modal", "documentHtml"]),
-    ...mapGetters("generic", ["showModal", "event", "documentoPreview"]),
+    ...mapGetters("generic", ["showModal", "event", "documentPreview"]),
   },
   methods: {
-    ...mapMutations("generic", [
-      "showModal",
-      "hideModal",
-      "removeLoading",
-      "addEvent",
-    ]),
+    ...mapMutations("generic", ["openModal", "hideModal", "removeLoading", "addEvent"]),
     saveDocument() {
       if (this.id) {
-        this.addEvent({ nome: "saveDocument" });
+        this.addEvent({ name: "saveDocument" });
       } else {
-        this.showModal("saveDocument");
+        this.openModal("saveDocument");
         this.removeLoading(["saveDocument"]);
       }
     },
     saveAs() {
-      this.addEvent({ nome: "saveAs" });
+      this.addEvent({ name: "saveAs" });
     },
     showModalLegend() {
-      this.showModal("legenda");
+      this.openModal("legenda");
       this.removeLoading(["showModalLegend"]);
     },
     showModalCode() {
-      this.showModal("code");
+      this.openModal("code");
       this.removeLoading(["showModalCode"]);
     },
     showModalPreview() {
-      this.showModal("preview");
+      this.openModal("preview");
       this.removeLoading(["showModalPreview"]);
     },
     print() {
@@ -198,8 +195,8 @@ export default {
   watch: {
     event: {
       handler(event) {
-        if (event.nome == "documentoEditorModificado") this.isDisabled = true;
-        if (event.nome == "documentEditorChanged") this.isDisabled = false;
+        if (event.name == "documentEditorModified") this.isDisabled = true;
+        if (event.name == "documentEditorChanged") this.isDisabled = false;
       },
       deep: true,
     },
@@ -223,5 +220,4 @@ export default {
   box-shadow: 0 0 5px hsl(0deg 0% 0% / 10%);
   margin: 0 auto;
 }
-
 </style>