vertumnus
/
primevue-mirror
mirror of https://github.com/primefaces/primevue.git
1
0
Fork 0
Code Packages Releases Activity

Refactor on InputNumber

pull/548/head
mertsincan 2020-10-09 11:54:28 +03:00
parent 2bb7300979
commit 583aaa1b6d
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/components/inputnumber/InputNumber.vue
View File

@ -198,7 +198,7 @@ export default {
}, },
getGroupingExpression() { getGroupingExpression() {
const formatter = new Intl.NumberFormat(this.locale, {useGrouping: true}); const formatter = new Intl.NumberFormat(this.locale, {useGrouping: true});
this.groupChar = formatter.format(1000000).trim().replace(this._numeral, ''); this.groupChar = formatter.format(1000000).trim().replace(this._numeral, '').charAt(0);
return new RegExp(`[${this.groupChar}]`, 'g'); return new RegExp(`[${this.groupChar}]`, 'g');
}, },
getMinusSignExpression() { getMinusSignExpression() {
@ -218,18 +218,18 @@ export default {
this.prefixChar = this.prefix; this.prefixChar = this.prefix;
} }
else { else {
const formatter = new Intl.NumberFormat(this.props.locale, {style: this.mode, currency: this.currency, currencyDisplay: this.currencyDisplay}); const formatter = new Intl.NumberFormat(this.locale, {style: this.mode, currency: this.currency, currencyDisplay: this.currencyDisplay});
this.prefixChar = formatter.format(1).split('1')[0]; this.prefixChar = formatter.format(1).split('1')[0];
} }
return new RegExp(`${this.escapeRegExp(this.prefixChar||'')}`, 'g'); return new RegExp(`${this.escapeRegExp(this.prefixChar||'')}`, 'g');
}, },
getSuffixExpression() { getSuffixExpression() {
if (this.props.suffix) { if (this.suffix) {
this.suffixChar = this.suffix; this.suffixChar = this.suffix;
} }
else { else {
const formatter = new Intl.NumberFormat(this.props.locale, {style: this.mode, currency: this.currency, currencyDisplay: this.currencyDisplay, const formatter = new Intl.NumberFormat(this.locale, {style: this.mode, currency: this.currency, currencyDisplay: this.currencyDisplay,
minimumFractionDigits: 0, maximumFractionDigits: 0}); minimumFractionDigits: 0, maximumFractionDigits: 0});
this.suffixChar = formatter.format(1).split('1')[1]; this.suffixChar = formatter.format(1).split('1')[1];
} }
@ -262,12 +262,13 @@ export default {
return ''; return '';
}, },
parseValue(text) { parseValue(text) {
let filteredText = text.trim() let filteredText = text
.replace(this._suffix, '')
.replace(this._prefix, '')
.trim()
.replace(/\s/g, '') .replace(/\s/g, '')
.replace(this._currency, '') .replace(this._currency, '')
.replace(this._group, '') .replace(this._group, '')
.replace(this._suffix, '')
.replace(this._prefix, '')
.replace(this._minusSign, '-') .replace(this._minusSign, '-')
.replace(this._decimal, '.') .replace(this._decimal, '.')
.replace(this._numeral, this._index); .replace(this._numeral, this._index);
@ -492,6 +493,9 @@ export default {
} }
} }
}, },
allowMinusSign() {
return this.min === null || this.min < 0;
},
isMinusSign(char) { isMinusSign(char) {
if (this._minusSign.test(char)) { if (this._minusSign.test(char)) {
this._minusSign.lastIndex = 0; this._minusSign.lastIndex = 0;
@ -509,8 +513,14 @@ export default {
return false; return false;
}, },
insert(event, text, sign = { isDecimalSign: false, isMinusSign: false }) { insert(event, text, sign = { isDecimalSign: false, isMinusSign: false }) {
let selectionStart = this.$refs.input.$el.selectionStart; const minusCharIndexOnText = text.search(this._minusSign);
let selectionEnd = this.$refs.input.$el.selectionEnd; this._minusSign.lastIndex = 0;
if (!this.allowMinusSign() && minusCharIndexOnText !== -1) {
return;
}
const selectionStart = this.$refs.input.$el.selectionStart;
const selectionEnd = this.$refs.input.$el.selectionEnd;
let inputValue = this.$refs.input.$el.value.trim(); let inputValue = this.$refs.input.$el.value.trim();
const decimalCharIndex = inputValue.search(this._decimal); const decimalCharIndex = inputValue.search(this._decimal);
this._decimal.lastIndex = 0; this._decimal.lastIndex = 0;
@ -704,7 +714,9 @@ export default {
this.$refs.input.$el.value = newValue; this.$refs.input.$el.value = newValue;
this.$refs.input.$el.setSelectionRange(0, 0); this.$refs.input.$el.setSelectionRange(0, 0);
this.initCursor(); this.initCursor();
this.$refs.input.$el.setSelectionRange(this.$refs.input.$el.selectionStart + 1, this.$refs.input.$el.selectionStart + 1); const prefixLength = (this.prefixChar || '').length;
const selectionEnd = prefixLength + insertedValueStr.length;
this.$refs.input.$el.setSelectionRange(selectionEnd, selectionEnd);
} }
else { else {
let selectionStart = this.$refs.input.$el.selectionStart; let selectionStart = this.$refs.input.$el.selectionStart;