@tagplus/components 1.2.2 → 1.2.5

package/package.json

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

package/src/components/Money/Money.vue

@@ -2,7 +2,7 @@
   <el-input
     :id="`${_id}`"
     class="tp-money"
-    :value="value | toCurrency"
+    :value="value | formatM"
     v-bind="$attrs"
     :maxlength="maxlength"
     @input="input"
@@ -30,12 +30,16 @@
 
 <script>
 import Locale from 'tp-ui/mixins/locale'
-import { toCurrency } from 'tp-ui/utils/filters'
-import { unformat } from 'tp-ui/utils/currency'
+import { formatMoney } from 'tp-ui/utils/currency'
 
 export default {
   name: 'TpMoney',
-  filters: { toCurrency },
+  filters: {
+    formatM: (val) => {
+      return formatMoney(val, true)
+    }
+  },
+
   mixins: [Locale],
   props: {
     id: {
@@ -74,11 +78,11 @@ export default {
 
   methods: {
     input (evt) {
-      this.$emit('input', unformat(evt))
+      this.$emit('input', formatMoney(evt, false))
     },
 
     handleChange (evt) {
-      this.$emit('change', unformat(evt))
+      this.$emit('change', formatMoney(evt, false))
     }
   }
 }

package/src/components/Percent/Percent.vue

@@ -2,7 +2,7 @@
   <el-input
     :id="`${_id}`"
     class="tp-percent"
-    :value="value | toCurrency"
+    :value="value | formatM"
     v-bind="$attrs"
     :maxlength="maxlength"
     @input="input"
@@ -26,12 +26,16 @@
 
 <script>
 import Locale from 'tp-ui/mixins/locale'
-import { toCurrency } from 'tp-ui/utils/filters'
+import { formatMoney } from 'tp-ui/utils/filters'
 import { unformat } from 'tp-ui/utils/currency'
 
 export default {
   name: 'TpPercent',
-  filters: { toCurrency },
+  filters: {
+    formatM: (val) => {
+      return formatMoney(val, true)
+    }
+  },
   mixins: [Locale],
   props: {
     id: {
@@ -73,11 +77,11 @@ export default {
 
   methods: {
     input (evt) {
-      this.$emit('input', unformat(evt))
+      this.$emit('input', formatMoney(evt))
     },
 
     handleChange (evt) {
-      this.$emit('change', unformat(evt))
+      this.$emit('change', formatMoney(evt))
     }
   }
 }

package/src/utils/currency.js

@@ -17,10 +17,21 @@ function format (input, opt = defaults) {
 }
 
 function unformat (input, precision = defaults.precision) {
-  const negative = input.indexOf('-') >= 0 ? -1 : 1
+  const negative = ('' + input).indexOf('-') >= 0 ? -1 : 1
   const numbers = onlyNumbers(input)
   const currency = numbersToCurrency(numbers, precision)
-  return parseFloat(currency) * negative
+  return currency * negative
+}
+
+function formatMoney (input, toString = false, precision = defaults.precision) {
+  const negative = ('' + input).indexOf('-') >= 0 ? -1 : 1
+  const numbers = onlyNumbers(input)
+  const currency = numbersToCurrency(numbers, precision)
+  if (toString) {
+    return negative === -1 ? '-' + currency : '' + currency
+  } else {
+    return currency * negative
+  }
 }
 
 function onlyNumbers (input) {
@@ -75,6 +86,7 @@ function event (name) {
 }
 
 export {
+  formatMoney,
   format,
   unformat,
   setCursor,

package/src/utils/filters.js

@@ -17,15 +17,30 @@ import { t } from 'tp-ui/locale'
 /**
  * Transforma valor em String para exibição conforme localidade
  * @param {Number} val
+ * @param {String} locale
  */
-export const toCurrency = (val) => {
+export const toCurrency = (val, locale = false) => {
   if (val === '') {
     return val
   }
-  return (parseInt(val * 100) / 100).toLocaleString(t('locale.prefix'), {
-    minimumFractionDigits: 2,
-    maximumFractionDigits: 2
-  })
+
+  try {
+    if (!locale) {
+      locale = t('locale.prefix')
+    }
+
+    let with2Decimals = val.toString().match(/^-?\d+(?:\.\d{0,2})?/)[0]
+    with2Decimals = Number(with2Decimals).toLocaleString(locale, {
+      minimumFractionDigits: 2,
+      maximumFractionDigits: 2
+    })
+    return with2Decimals
+  } catch (Exception) {
+    return val.toLocaleString(locale, {
+      minimumFractionDigits: 2,
+      maximumFractionDigits: 2
+    })
+  }
 }
 
 /**