@tagplus/components 1.2.14 → 1.2.17

package/package.json

@@ -8,7 +8,7 @@
       "email": "bruno@tagplus.com.br"
     }
   ],
-  "version": "1.2.14",
+  "version": "1.2.17",
   "main": "./dist/tp.common.js",
   "directories": {
     "lib": "src/lib"

package/src/components/Multisuggest/Multisuggest.vue

@@ -450,7 +450,7 @@ export default {
         .join(', ')
     },
 
-    suggestionsList(_newValue, _oldValue){
+    suggestionsList (_newValue, _oldValue) {
       this.setSelectedLabel()
     }
   },
@@ -503,23 +503,23 @@ export default {
     },
 
     setSelectedLabel () {
-    if (Array.isArray(this.value)) {
-      this.value.forEach((item, key) => {
-        this.suggestionsList.forEach(suggestion => {
-          if (suggestion[this.valueKey] === item) {
-            this.selectedLabelsArray.push(suggestion)
-          }
+      if (Array.isArray(this.value)) {
+        this.value.forEach((item, key) => {
+          this.suggestionsList.forEach(suggestion => {
+            if (suggestion[this.valueKey] === item) {
+              this.selectedLabelsArray.push(suggestion)
+            }
+          })
         })
-      })
-    } else if (process.env.DEBUG === 'true') {
-      console.log(`'${this.$options.name}' recebeu valor em formato inválido.`)
-    }
+      } else if (process.env.DEBUG === 'true') {
+        console.log(`'${this.$options.name}' recebeu valor em formato inválido.`)
+      }
 
-    this.selectedLabels = this.selectedLabelsArray
-      .map(item => {
-        return item[this.labelKey]
-      })
-      .join(', ')
+      this.selectedLabels = this.selectedLabelsArray
+        .map(item => {
+          return item[this.labelKey]
+        })
+        .join(', ')
     },
 
     // eslint-disable-next-line no-unused-vars

package/src/mixins/floatFormatter.js

@@ -10,24 +10,30 @@ export default {
     }
   },
 
+  computed: {
+    locale () {
+      return this.t('locale')
+    }
+  },
+
   watch: {
     value: {
       immediate: true,
       handler (newValue, oldValue) {
-        this.formattedValue = formatMoney(newValue, true)
+        this.formattedValue = formatMoney(newValue, true, this.locale)
       }
     }
   },
 
   methods: {
     input (evt) {
-      this.formattedValue = formatMoney(evt, true)
-      const moneyFormatado = formatMoney(evt, false)
+      this.formattedValue = formatMoney(evt, true, this.locale)
+      const moneyFormatado = formatMoney(evt, false, this.locale)
       this.$emit('input', moneyFormatado)
     },
 
     handleChange (evt) {
-      this.$emit('change', formatMoney(evt, false))
+      this.$emit('change', formatMoney(evt, false, this.locale))
     }
   }
 

package/src/utils/currency.js

@@ -1,4 +1,4 @@
-import { messages, t } from 'tp-ui/locale'
+import { messages } from 'tp-ui/locale'
 
 const defaults = messages().locale.number
 
@@ -24,28 +24,55 @@ function unformat (input, precision = defaults.precision) {
   return currency * negative
 }
 
-function formatMoney (input, toString = false, precision = defaults.precision) {
-  const negative = ('' + input).indexOf('-') >= 0 ? -1 : 1
+/**
+ * Formata dinheiro para float sem arredondar ou para string garantindo decimais completos (.00) e respeitando caracter de decimal
+ * @author gteixeira
+ * @param {Float} input Valor
+ * @param {Boolean} toString Se o retorno será float ou string
+ * @param {Object} locale Configuração de localidade para saber número de casas decimais (precision) e caracter de decimal (decimal)
+ * @returns
+ */
+function formatMoney (input, toString = false, locale = defaults) {
+  debugger
+  let inputString = ('' + input)
+  // Impede de digitar . ou , porque o formatador já adiciona
+  if ((inputString.slice(-1).match(/[.,]/))) {
+    inputString = inputString.substring(0, inputString.length - 1)
+  }
+
+  const negative = inputString.indexOf('-') >= 0 ? -1 : 1
+
   if (toString) {
-    input = completeZeros(('' + input), precision)
+    input = completeZeros(inputString, locale)
   }
+
+  const precision = locale.number.precision
   const numbers = onlyNumbers(input, precision)
   const currency = numbersToCurrency(numbers, precision)
   if (toString) {
-    const num = negative === -1 ? '-' + currency : '' + currency
-    return num.replaceAll(',', t('locale.number.decimal')).replaceAll('.', t('locale.number.decimal'))
+    let num = negative === -1 ? '-' + currency : '' + currency
+    if (locale?.number?.decimal) {
+      const decimalChar = locale?.number?.decimal
+      num = num.replaceAll(',', decimalChar).replaceAll('.', decimalChar)
+    }
+
+    return num
   } else {
     return currency * negative
   }
 }
 
-function completeZeros (input, precision = defaults.precision) {
-  const i = input.indexOf('.')
+function completeZeros (input, locale) {
+  const precision = locale?.number?.precision || defaults.precision
+  const decimal = locale?.number?.decimal || defaults.decimal
+  let i = input.lastIndexOf('.')
+  const j = input.lastIndexOf(',')
+  i = i > j ? i : j
   const qntDecimais = i ? input.length - i - 1 : 0
 
   // correção para decimal quebrado
   if (i === -1) {
-    input = input + '.' + '0'.repeat(precision)
+    input = input + decimal + '0'.repeat(precision)
   } else if (i && qntDecimais < precision) {
     input = input + '0'.repeat(precision - qntDecimais)
   }