@nixweb/nixloc-ui 0.0.159 → 0.0.161

package/package.json

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

package/src/component/forms/ImageUpload.vue

@@ -15,7 +15,7 @@
         <div class="div-preview">
           <img
             :class="classCss"
-            :style="'width:100px;height:100px'"
+            :style="'width:' + width + 'px;height:' + height + 'px'"
             :src="
               'https://espaco.blob.core.windows.net/' +
               container +
@@ -29,7 +29,7 @@
             <div class="div-button">
               <button class="button small primary" @click="show = !show">
                 <span v-if="!loadingAdd">
-                  <span><i class="fas fa-camera"></i> Carregar Foto</span>
+                  <span><i class="fas fa-camera"></i> {{ title }}</span>
                 </span>
               </button>
             </div>
@@ -61,11 +61,12 @@
       @crop-success="cropSuccess"
       langType="pt-br"
       v-model="show"
-      :width="120"
-      :height="100"
+      :width="width"
+      :height="height"
       :noCircle="true"
       img-format="png"
-    />
+    >
+    </my-upload>
   </div>
 </template>
 <script>
@@ -77,12 +78,13 @@ export default {
   name: "ImageUpload",
   components: {
     "my-upload": myUpload,
-    VueCropper,
   },
   props: {
     title: String,
     container: String,
     accepted: String,
+    width: Number,
+    height: Number,
     classCss: String,
     urlPost: String,
     urlRemove: String,
@@ -102,7 +104,7 @@ export default {
   computed: {
     urlImage() {
       if (this.value) return this.value;
-      return "noImage.jpg";
+      return "noImage.png";
     },
   },
   methods: {
@@ -235,6 +237,6 @@ export default {
 }
 
 .div-button {
-  margin-left: 5px;
+  margin-left: 10px;
 }
 </style>

package/src/component/shared/DocumentEditor.vue

@@ -85,7 +85,7 @@ export default {
 }
 
 .document-editor__editable-container .ck-editor__editable {
-  width: 22cm;
+  width: 26cm;
   height: 700px;
   padding: 20px;
   border: 1px hsl(0, 0%, 82.7%) solid;

package/src/component/template/ViewTemplateDocumentView.vue

@@ -24,12 +24,12 @@
                       :clicked="saveDocument"
                     />
                   </div>
-                  <div class="side-by-side">
+                  <div class="side-by-side" v-if="showByRule">
                     <Button
                       v-if="id"
                       _key="saveAs"
                       type="success"
-                      title="Fazer uma cópia"
+                      title="Clonar"
                       classIcon="fas fa-clone"
                       size="small"
                       :clicked="saveAs"
@@ -37,7 +37,7 @@
                   </div>
                 </b-col>
                 <b-col class="text-right" sm="6">
-                  <div class="side-by-side" v-if="id">
+                  <div class="side-by-side" v-if="id && showByRule">
                     <Button
                       key="showModalConfig"
                       type="info"
@@ -46,20 +46,18 @@
                       :clicked="showModalConfig"
                     />
                   </div>
-                  <div class="side-by-side">
+                  <div class="side-by-side" v-if="showByRule">
                     <Button
                       key="showModalLegend"
-                      title="Parâmetros"
                       type="info"
                       classIcon="fas fa-book-reader"
                       size="small"
                       :clicked="showModalLegend"
                     />
                   </div>
-                  <div class="side-by-side">
+                  <div class="side-by-side" v-if="showByRule">
                     <Button
                       key="showModalCode"
-                      title="Código"
                       type="info"
                       classIcon="far fa-code"
                       size="small"
@@ -185,19 +183,16 @@ export default {
     setTimeout(function () {
       self.showDocumentEditor = true;
     }, 1500);
-    window.addEventListener("keydown", (e) => {
-      if (e.key == "Alt") {
-        if (this.modal.open) {
-          this.hideModal();
-        } else {
-          this.showModalLegend();
-        }
-      }
-    });
   },
   computed: {
+    ...mapState("user", ["userLogged"]),
     ...mapState("generic", ["modal", "documentHtml"]),
     ...mapGetters("generic", ["showModal", "event", "documentPreview"]),
+    showByRule() {
+      if (this.userLogged.user == "UserTemp" || this.userLogged.companyId == 3)
+        return true;
+      return false;
+    },
   },
   methods: {
     ...mapMutations("generic", [

package/src/component/template/ViewTemplateImportFile.vue

@@ -311,6 +311,7 @@ export default {
       this.postApi(params).then((response) => {
         if (response.success) {
           this.success = true;
+          this.isValid = false;
           this.removeLoading(["btnImport"]);
         }
         this.removeLoading(["btnValidate"]);

package/src/component/template/ViewTemplateReportPreview.vue

@@ -11,7 +11,7 @@
         <br />
         <div
           class="div-progress"
-          v-if="liveTotalRecords != baseParams.totalRecords"
+          v-if="liveTotalRecords != baseParams.totalRecords && isLoading"
         >
           <ProgressBar
             :text="`Carregando ${liveTotalRecords} registro(s) de ${baseParams.totalRecords}`"
@@ -241,6 +241,7 @@ export default {
       this.resetData();
 
       this.getApiOdata(paramsQuery).then((response) => {
+        this.isLoading = true;
         let totalRecords = response["@odata.count"];
         if (totalRecords == 0) this.noDataReturned = true;
 
@@ -291,7 +292,7 @@ export default {
       this.baseParams.currentPage++;
     },
     resetData() {
-      this.isLoading = true;
+      this.isLoading = false;
       this.content.data = [];
       this.content.totalPages = [];
       this.baseParams.currentPage = 0;
@@ -370,6 +371,8 @@ export default {
       handler(totalPages) {
         this.btnSearchDisabled = false;
         this.btnSaveDisabled = false;
+        this.showBodyReport = false;
+        this.resetData();
       },
       deep: true,
     },

package/src/store/modules/generic.js

@@ -148,7 +148,7 @@ export default {
                             obj.vForSimple = "v-for='endereco in d.locacao.cliente.endereco'";
                             config.push(obj);
                         } else if (isAddressRent) {
-                            obj.vForSimple = "v-for='endereco in d.enderecoLocacao'";
+                            obj.vForSimple = "v-for='endereco in d.saidaRetorno'";
                             config.push(obj);
                         } else {
                             config.push(obj);

package/src/component/forms/Tree.vue

@@ -1,153 +0,0 @@
-<template>
-  <div>
-    <div class="div-btn">
-      <Button
-        _key="btnAddTree"
-        title="Categoria"
-        classIcon="fas fa-plus-circle"
-        type="primary"
-        size="small"
-        :clicked="addNode"
-      />
-    </div>
-    <div v-show="!data.children">
-      <span>Nenhum registro encontrado!</span>
-    </div>
-    <vue-tree-list
-      @click="onClick"
-      @change-name="onChangeName"
-      @delete-node="onDel"
-      @add-node="onAddNode"
-      :model="data"
-      default-tree-node-name="Novo Centro de Custo"
-      default-leaf-node-name="Novo Plano de Conta"
-      v-bind:default-expanded="false"
-    >
-      <template v-slot:leafNameDisplay="slotProps">
-        <span>
-          {{ slotProps.model.name }}
-        </span>
-      </template>
-      <span class="icon" slot="addTreeNodeIcon">📂</span>
-      <span class="icon" slot="addLeafNodeIcon">
-        <i class="icon-tree icon-add fa-solid fa-circle-plus"></i>
-      </span>
-      <span class="icon" slot="editNodeIcon">
-        <i class="icon-tree icon-edit fa-solid fa-pen-to-square"></i>
-      </span>
-      <span class="icon" slot="delNodeIcon">
-        <i class="icon-tree icon-delete fa-solid fa-trash"></i>
-      </span>
-      <span class="icon" slot="leafNodeIcon">
-        <i class="icon-tree fa-solid fa-arrow-right"></i>
-      </span>
-      <span class="icon" slot="treeNodeIcon"> </span>
-    </vue-tree-list>
-  </div>
-</template>
-
-<script>
-import { VueTreeList, Tree, TreeNode } from "vue-tree-list";
-import Button from "@nixweb/nixloc-ui/src/component/forms/Button";
-
-import { mapMutations } from "vuex";
-
-export default {
-  components: {
-    VueTreeList,
-    Button,
-  },
-  data() {
-    return {
-      newTree: {},
-      data: new Tree([]),
-    };
-  },
-  methods: {
-    ...mapMutations("generic", ["removeLoading"]),
-    onDel(node) {
-      // console.log(node);
-      node.remove();
-    },
-    onChangeName(params) {
-      if (params.eventType == "blur") {
-        this.getNewTree();
-      }
-    },
-    onAddNode(params) {
-      // console.log(params);
-    },
-    onClick(params) {
-      // console.log(params);
-    },
-    addNode() {
-      var node = new TreeNode({
-        name: "Novo Centro de Custo",
-        dragDisabled: true,
-        addTreeNodeDisabled: true,
-        addLeafNodeDisabled: false,
-        editNodeDisabled: false,
-        delNodeDisabled: false,
-      });
-      if (!this.data.children) this.data.children = [];
-      this.data.addChildren(node);
-      this.removeLoading(["btnAddTree"]);
-    },
-
-    getNewTree() {
-      var vm = this;
-      function _dfs(oldNode) {
-        var newNode = {};
-
-        for (var k in oldNode) {
-          if (k !== "children" && k !== "parent") {
-            newNode[k] = oldNode[k];
-          }
-        }
-
-        if (oldNode.children && oldNode.children.length > 0) {
-          newNode.children = [];
-          for (var i = 0, len = oldNode.children.length; i < len; i++) {
-            newNode.children.push(_dfs(oldNode.children[i]));
-          }
-        }
-        if (newNode.isLeaf == false && newNode.id == 0) return newNode;
-      }
-
-      vm.newTree = _dfs(vm.data);
-    },
-  },
-};
-</script>
-
-
-<style  scoped>
-.div-btn {
-  color: gray;
-  font-size: 80%;
-  margin-bottom: 20px;
-}
-
-.icon-add {
-  color: #577696 !important;
-}
-
-.icon-edit {
-  color: darkgray !important;
-}
-
-.icon-delete {
-  color: red !important;
-}
-
-.icon-tree {
-  font-size: 15px;
-  margin-right: 10px;
-  cursor: pointer;
-  color: #232324;
-}
-
-.vtl-input {
-  background-color: red !important;
-}
-</style>