@nixweb/nixloc-ui 1.10.0 → 1.12.0

package/@nixweb/nixloc-ui/src/store/modules/validation.js

@@ -1,39 +1,39 @@
-export default {
-    namespaced: true,
-    state: {
-        formDirty: false,
-        validations: [],
-        resetForm: {
-            name: undefined,
-            dateTime: undefined
-        }
-    },
-    getters: {
-        isFormValid: (state) => (formName) => {
-            var hasNotification = state.validations.find(obj => {
-                return obj.formName === formName
-            })
-            if (hasNotification != undefined) return false;
-            return true;
-        }
-    },
-    mutations: {
-        addValidation: (state, obj) => {
-            state.validations.push(obj);
-        },
-        removeValidation: (state, obj) => {
-            let filter = state.validations.filter(v => v.key != obj.key);
-            state.validations = filter;
-        },
-        resetValidation: (state, formName) => {
-            state.resetForm.dateTime = new Date();
-            state.resetForm.name = formName;
-        },
-        updateFormDirty: (state, formDirty) => {
-            state.formDirty = formDirty;
-        },
-        removeFormDirty: (state) => {
-            state.formDirty = false;
-        }
-    },
+export default {
+    namespaced: true,
+    state: {
+        formDirty: false,
+        validations: [],
+        resetForm: {
+            name: undefined,
+            dateTime: undefined
+        }
+    },
+    getters: {
+        isFormValid: (state) => (formName) => {
+            var hasNotification = state.validations.find(obj => {
+                return obj.formName === formName
+            })
+            if (hasNotification != undefined) return false;
+            return true;
+        }
+    },
+    mutations: {
+        addValidation: (state, obj) => {
+            state.validations.push(obj);
+        },
+        removeValidation: (state, obj) => {
+            let filter = state.validations.filter(v => v.key != obj.key);
+            state.validations = filter;
+        },
+        resetValidation: (state, formName) => {
+            state.resetForm.dateTime = new Date();
+            state.resetForm.name = formName;
+        },
+        updateFormDirty: (state, formDirty) => {
+            state.formDirty = formDirty;
+        },
+        removeFormDirty: (state) => {
+            state.formDirty = false;
+        }
+    },
 }

package/@nixweb/nixloc-ui/src/store/store.js

@@ -1,14 +1,14 @@
-import Vue from 'vue';
-import Vuex from 'vuex';
-
-import user from './modules/user'
-import generic from './modules/generic'
-import validation from './modules/validation'
-
-Vue.use(Vuex)
-
-export default new Vuex.Store({
-  modules: {
-    generic, validation, user
-  }
+import Vue from 'vue';
+import Vuex from 'vuex';
+
+import user from './modules/user'
+import generic from './modules/generic'
+import validation from './modules/validation'
+
+Vue.use(Vuex)
+
+export default new Vuex.Store({
+  modules: {
+    generic, validation, user
+  }
 })

package/package.json

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

package/src/component/forms/InputDecimal.vue

@@ -6,15 +6,16 @@
       <Tip :field="field" :formName="formName" />
     </label>
     <div class="inner-addon right-addon">
-      <div class="required glyphicon" v-if="notifications.length > 0 && formDirty">
-        <i class="fas fa-exclamation-triangle"></i>
-      </div>
-      <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>
-
+      <span class="currency-icon" v-if="notifications.length == 0 || !formDirty">
+        <i class="fa-light fa-circle-dollar"></i>
+      </span>
+      <div class="required glyphicon" v-if="notifications.length > 0 && formDirty">
+        <i class="fas fa-exclamation-triangle"></i>
+      </div>
     </div>
     <div v-if="formDirty">
       <div v-for="message in notifications" :key="message">
@@ -150,4 +151,16 @@ export default {
   color: #f0134d;
   font-size: 14px;
 }
+
+.currency-icon {
+  color: #5f5f5f;
+  font-size: 17px;
+  position: absolute;
+  right: 1px;
+  top: 50%;
+  transform: translateY(-50%);
+  background: #F3F4F6;
+  padding: 1px 12px;
+  border-radius: 0 4px 4px 0;
+}
 </style>

package/src/component/training/CourseView.vue

@@ -1,6 +1,7 @@
 <template>
     <div>
-        <div v-if="courseModules.length == 0">
+        <Loading type="line" :center="true" v-if="loading" />
+        <div v-if="!loading && courseModules.length == 0">
             Nenhum curso cadastrado!
         </div>
         <div v-for="(module, moduleIndex) in courseModules" :key="moduleIndex">
@@ -70,25 +71,27 @@
         </Modal>
     </div>
 </template>
-  
+
 <script>
 
 import Molded from "@nixweb/nixloc-ui/src/component/layout/Molded";
 import Modal from "@nixweb/nixloc-ui/src/component/forms/Modal";
+import Loading from "@nixweb/nixloc-ui/src/component/shared/Loading.vue";
 
-import axios from "@/config/axios";
+import axios from "axios";
 
 import { mapGetters, mapMutations } from "vuex";
 
 export default {
     components: {
-        Molded, Modal
+        Molded, Modal, Loading
     },
     data() {
         return {
             urlGet: "",
             environment: "",
             courseModules: [],
+            loading: true,
             moduleSelected: "",
             selectedLesson: {}
         };
@@ -114,17 +117,24 @@ export default {
             this.openModal("play");
         },
         get() {
+            this.loading = true;
             axios.get(this.urlGet, {})
                 .then(response => {
                     if (response.data.success) {
                         this.courseModules = JSON.parse(response.data.content.course);
                     }
                 })
+                .catch(error => {
+                    console.error(error);
+                })
+                .finally(() => {
+                    this.loading = false;
+                });
         },
     },
 };
 </script>
-  
+
 <style scoped>
 .div-title {
     margin-bottom: 10px;
@@ -186,5 +196,4 @@ export default {
     cursor: pointer;
     margin-left: 10px;
 }
-</style>
-  
+</style>

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

@@ -2,8 +2,8 @@
   <div>
     <b-row>
       <b-col xs="12" sm="12" md="12" lg="3" xl="3">
-        <InputText title="CEP" field="zipCode" :formName="formName" :mask="'#####-###'" :maxLength="9"
-          :required="required" :markFormDirty="markFormDirty" v-model="address.zipCode">
+        <InputText title="CEP" field="zipCode" :formName="formName" :disabled="disabled" :mask="'#####-###'"
+          :maxLength="9" :required="required" :markFormDirty="markFormDirty" v-model="address.zipCode">
           <div class="glyphicon margin-button">
             <Button _key="searchZipCode" type="success" classIcon="fas fa-search" size="small"
               :disabled="address.zipCode.length < 9" :clicked="searchZipCode" />
@@ -11,41 +11,45 @@
         </InputText>
       </b-col>
       <b-col xs="12" sm="12" md="12" lg="5" xl="5">
-        <InputText title="Endereço" field="street" :formName="formName" :maxLength="150" :required="required"
-          :markFormDirty="markFormDirty" v-model="address.street" />
+        <InputText title="Endereço" field="street" :formName="formName" :disabled="disabled" :maxLength="150"
+          :required="required" :markFormDirty="markFormDirty" v-model="address.street" />
       </b-col>
       <b-col xs="12" sm="12" md="12" lg="2" xl="2">
-        <InputText title="Número" field="number" :formName="formName" :maxLength="20" :markFormDirty="markFormDirty"
-          v-model="address.number" />
+        <InputText title="Número" field="number" :formName="formName" :disabled="disabled" :maxLength="20"
+          :markFormDirty="markFormDirty" v-model="address.number" />
       </b-col>
       <b-col xs="12" sm="12" md="12" lg="2" xl="2">
-        <InputText title="Complemento" field="complement" :formName="formName" :maxLength="50"
+        <InputText title="Complemento" field="complement" :formName="formName" :disabled="disabled" :maxLength="50"
           :markFormDirty="markFormDirty" v-model="address.complement" />
       </b-col>
       <br />
     </b-row>
     <b-row>
-      <b-col xs="12" sm="12" md="12" lg="5" xl="5">
-        <InputText title="Bairro" field="province" :formName="formName" :maxLength="100" :required="required"
-          :markFormDirty="markFormDirty" v-model="address.province" />
-      </b-col><b-col xs="12" sm="12" md="12" lg="5" xl="5">
-        <InputText title="Cidade" field="city" :formName="formName" :maxLength="100" :required="required"
-          :markFormDirty="markFormDirty" v-model="address.city" />
+      <b-col xs="12" sm="12" md="12" :lg="showCity ? '5' : '12'" :xl="showCity ? '5' : '12'">
+        <InputText title="Bairro" field="province" :formName="formName" :disabled="disabled" :maxLength="100"
+          :required="required" :markFormDirty="markFormDirty" v-model="address.province" />
       </b-col>
-      <b-col xs="12" sm="12" md="12" lg="2" xl="2">
-        <SelectStatic title="UF" :formName="formName" field="uf" fieldTarget="uf" :required="required"
-          :markFormDirty="markFormDirty" v-model="address.state" :data="states" />
-      </b-col></b-row>
+      <b-col xs="12" sm="12" md="12" lg="5" xl="5" v-if="showCity">
+        <InputText title="Cidade" field="city" :formName="formName" :disabled="disabled" :maxLength="100"
+          :required="required" :markFormDirty="markFormDirty" v-model="address.city" />
+      </b-col>
+      <b-col xs="12" sm="12" md="12" lg="2" xl="2" v-if="showState">
+        <SelectStatic title="UF" :formName="formName" field="uf" fieldTarget="uf" :disabled="disabled"
+          :required="required" :markFormDirty="markFormDirty" v-model="address.state" :data="states" />
+      </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 SelectStatic from "@nixweb/nixloc-ui/src/component/forms/SelectStatic";
-
 import Address from "@nixweb/nixloc-ui/src/component/value-objects/Address.js";
 
+import axios from "axios";
+
 import { mapGetters, mapMutations } from "vuex";
 
 export default {
@@ -60,6 +64,18 @@ export default {
       type: Boolean,
       default: false,
     },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    showCity: {
+      type: Boolean,
+      default: true,
+    },
+    showState: {
+      type: Boolean,
+      default: true,
+    },
     value: Object,
   },
   components: { InputText, Button, SelectStatic },
@@ -113,7 +129,7 @@ export default {
     searchZipCode() {
       let zipCode = this.address.zipCode.replace(/\.|\-/g, "");
       let url = `https://viacep.com.br/ws/${zipCode}/json/`;
-      this.$http.get(url).then((response) => {
+      axios.get(url).then((response) => {
         let self = this;
         setTimeout(function () {
           self.loadData(response.data);

package/src/store/modules/generic.js

@@ -885,7 +885,6 @@ export default {
                 headers: new Token().tokenHeaders(),
             })
                 .then((response) => {
-
                     let blob = new Blob([response.data], { type: "application/pdf" }),
                         url = window.URL.createObjectURL(blob);
                     window.open(url);