@nixweb/nixloc-ui 0.0.203 → 0.0.205

package/package.json

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

package/src/component/forms/Color.vue

@@ -36,3 +36,15 @@ export default {
   },
 };
 </script>
+<style>
+.vc-chrome-fields .vc-input__input {
+  font-size: 14px !important;
+  color: #333;
+  width: 100%;
+  border-radius: 2px;
+  border: none;
+  box-shadow: inset 0 0 0 1px #dadada;
+  height: 21px;
+  text-align: center;
+}
+</style>

package/src/component/forms/InputDecimal.vue

@@ -12,10 +12,10 @@
       <slot v-else></slot>
       <vue-numeric :style="_style" class="form-control" v-on:keyup.enter.native="pressedEnter"
         :class="{ 'is-invalid': notifications.length > 0 && formDirty }" :placeholder="placeholder" :disabled="disabled"
-        currency="R$" separator="." :minus="allowNegative" v-bind:precision="precision"
-        v-model="valueLocal"></vue-numeric>
-    </div>
+        currency="R$" separator="." :minus="allowNegative" v-bind:precision="precision" v-model="valueLocal">
+      </vue-numeric>
 
+    </div>
     <div v-if="formDirty">
       <div v-for="message in notifications" :key="message">
         <span class="invalid">{{ message }}</span>
@@ -66,6 +66,7 @@ export default {
       formDirty: false,
       _value: 0,
       valueLocal: 20,
+      isPrecision: false
     };
   },
   created() {
@@ -149,8 +150,4 @@ export default {
   color: #f0134d;
   font-size: 14px;
 }
-
-.margin-button {
-  margin-top: -2px;
-}
 </style>

package/src/component/shared/Collapse.vue

@@ -29,29 +29,16 @@
       <b-row>
         <b-col sm="12">
           <div class="text-center">
-            <Button
-              v-if="!showCollapse"
-              :title="buttonShow.title"
-              :classIcon="buttonShow.icon"
-              :type="buttonShow.type"
-              size="small"
-              :clicked="show"
-            />
+            <Button v-if="!showCollapse" :title="buttonShow.title" :classIcon="buttonShow.icon" :type="buttonShow.type"
+              size="small" :clicked="show" />
           </div>
         </b-col>
       </b-row>
       <b-row>
         <b-col>
           <div class="text-center">
-            <Button
-              v-if="showCollapse"
-              key="hideCollapse"
-              :title="buttonHide.title"
-              :classIcon="buttonHide.icon"
-              :type="buttonHide.type"
-              size="small"
-              :clicked="hide"
-            />
+            <Button v-if="showCollapse" key="hideCollapse" :title="buttonHide.title" :classIcon="buttonHide.icon"
+              :type="buttonHide.type" size="small" :clicked="hide" />
           </div>
         </b-col>
       </b-row>

package/src/component/shared/ExportExcel.vue

@@ -1,12 +1,7 @@
 <template>
   <div>
-    <download-excel
-      :fields="column"
-      :data="data"
-      :before-finish="exportFinished"
-      worksheet="Planilha"
-      :name="`${fileName}.xls`"
-    >
+    <download-excel :fields="column" :data="data" :before-finish="exportFinished" worksheet="Planilha"
+      :name="`${fileName}.xls`">
       <i class="fas fa-file-excel"></i>
     </download-excel>
   </div>

package/src/component/shared/Report.vue

@@ -68,8 +68,6 @@ import TotalizationReport from "../shared/TotalizationReport.vue";
 import ExportExcel from "@nixweb/nixloc-ui/src/component/shared/ExportExcel";
 import print from "vue-print-nb";
 
-import { mapState, mapMutations, mapActions } from "vuex";
-
 export default {
   directives: {
     print,

package/src/component/shared/TableItem.vue

@@ -165,4 +165,11 @@ export default {
 .period-rent {
   cursor: pointer;
 }
+
+.limit {
+  max-width: 400px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>

package/src/component/shared/query-builder/AddRule.vue

@@ -6,11 +6,7 @@
           <div class="div-custom">
             <b-row>
               <b-col sm="6">
-                <SelectRule
-                  :options="rules"
-                  class="select"
-                  v-model="selectedRule"
-                />
+                <SelectRule :options="rules" class="select" v-model="selectedRule" />
               </b-col>
               <b-col sm="3">
                 <div class="div-btn">
@@ -21,13 +17,10 @@
             <div class="div-and-or">
               <b-row>
                 <b-col sm="3">
-                  <RadioGroup
-                    :options="[
-                      { text: 'e', value: 'and' },
-                      { text: 'ou', value: 'or' },
-                    ]"
-                    v-model="andOr"
-                  />
+                  <RadioGroup :options="[
+                    { text: 'e', value: 'and' },
+                    { text: 'ou', value: 'or' },
+                  ]" v-model="andOr" />
                 </b-col>
               </b-row>
             </div>

package/src/component/shared/query-builder/ConvertToOdata.js

@@ -13,15 +13,23 @@ export default class ConvertToOdata {
         if (operator === "maior") return `${rule.name} gt ${rule.value}`;
         if (operator === "maior ou igual") return `${rule.name} ge ${rule.value}`;
 
-        if (rule.typeField === "dateTime") return this.convertDateTime(rule.name, rule.value);
+        if (rule.typeField === "dateTime") return this.convertDateTime(rule);
         if (rule.typeField === "select") return this.convertSelect(rule.name, rule.value);
         if (rule.typeField === "checkbox") return this.convertCheckbox(rule.name, rule.title, rule.type, rule.value);
 
     }
-    convertDateTime(name, value) {
-        let start = this.convertDate(value[0]);
-        let end = this.convertDate(value[1]);
-        return `${name} ge ${start} and ${name} le ${end}`;
+    convertDateTime(rule) {
+        let start = this.convertDate(rule.value[0]);
+        let end = this.convertDate(rule.value[1]);
+
+        if (rule.name.includes("&")) {
+            var parts = rule.name.split("&");
+            var first = parts[0];
+            var second = parts[1];
+            return `${first} ge ${start} and ${second} le ${end}`;
+        } else {
+            return `${rule.name} ge ${start} and ${rule.name} le ${end}`;
+        }
     }
     convertSelect(name, value) {
         return `${name} eq '${value.id}'`;
@@ -48,6 +56,9 @@ export default class ConvertToOdata {
         return `${query}`;
     }
     convertDate(data) {
+        // a verificação abaixo valida se tem valor, pois quando não tem está retornando um array com 3 posições em brando
+        if (data.length == 3) return;
+
         let str = data.replace("/", "").replace("/", "");
 
         let date = {

package/src/component/template/ViewTemplateImportFile.vue

@@ -133,7 +133,7 @@ import ViewTemplateConfiguration from "@nixweb/nixloc-ui/src/component/template/
 import TableImport from "@nixweb/nixloc-ui/src/component/shared/TableImport.vue";
 import ListNotifications from "@nixweb/nixloc-ui/src/component/shared/ListNotifications.vue";
 
-import { mapState, mapActions, mapMutations, mapGetters } from "vuex";
+import { mapActions, mapMutations, mapGetters } from "vuex";
 
 export default {
   name: "ViewTemplateImportFileView",

package/src/component/template/ViewTemplateReportList.vue

@@ -44,6 +44,7 @@
                     </b-col>
                     <b-col sm="11" @click="navegateTo(report)">
                       <div class="title-report side-by-side">{{ report.name }}</div>
+                      <div><span class="description-report">{{ report.description }}</span></div>
                     </b-col>
                   </b-row>
                 </Molded>
@@ -207,4 +208,9 @@ export default {
   background: #fafafc !important;
   height: 1px !important;
 }
+
+.description-report {
+  font-size: 13px;
+  color: rgb(110, 110, 110);
+}
 </style>

package/src/component/template/ViewTemplateReportPreview.vue

@@ -259,6 +259,7 @@ export default {
       this.content.data = [];
       this.content.totalPages = [];
       this.baseParams.currentPage = 0;
+      this.baseParams.totalRecords = 0;
       this.noDataReturned = false;
     },
     executeOpenModal(params) {
@@ -344,7 +345,7 @@ export default {
       deep: true,
     },
     oDataFilter: {
-      handler(totalPages) {
+      handler() {
         this.btnSearchDisabled = false;
         this.btnSaveDisabled = false;
         this.showBodyReport = false;
@@ -353,14 +354,14 @@ export default {
       deep: true,
     },
     oDataSelect: {
-      handler(totalPages) {
+      handler() {
         this.btnSearchDisabled = false;
         this.btnSaveDisabled = false;
       },
       deep: true,
     },
     oDataOrderBy: {
-      handler(totalPages) {
+      handler() {
         this.btnSearchDisabled = false;
         this.btnSaveDisabled = false;
       },