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

Merge branch 'master' of https://github.com/primefaces/primevue

pull/1527/head
Cagatay Civici 2021-09-06 11:59:29 +03:00
parent 3a74243bdb 8f2be06a5b
commit 9ecd219fb2
1 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -425,9 +425,8 @@ export default {
event.preventDefault(); event.preventDefault();
if (selectionStart === selectionEnd) { if (selectionStart === selectionEnd) {
let deleteChar = inputValue.charAt(selectionStart - 1); const deleteChar = inputValue.charAt(selectionStart - 1);
let decimalCharIndex = inputValue.search(this._decimal); const { decimalCharIndex, decimalCharIndexWithoutPrefix } = this.getDecimalCharIndexes(inputValue);
this._decimal.lastIndex = 0;
if (this.isNumeralChar(deleteChar)) { if (this.isNumeralChar(deleteChar)) {
const decimalLength = this.getDecimalLength(inputValue); const decimalLength = this.getDecimalLength(inputValue);
@ -447,10 +446,10 @@ export default {
} }
} }
else if (decimalCharIndex > 0 && selectionStart > decimalCharIndex) { else if (decimalCharIndex > 0 && selectionStart > decimalCharIndex) {
const insertedText = (this.minFractionDigits || 0) < decimalLength ? '' : '0'; const insertedText = this.isDecimalMode() && (this.minFractionDigits || 0) < decimalLength ? '' : '0';
newValueStr = inputValue.slice(0, selectionStart - 1) + insertedText + inputValue.slice(selectionStart); newValueStr = inputValue.slice(0, selectionStart - 1) + insertedText + inputValue.slice(selectionStart);
} }
else if (decimalCharIndex > 0 && decimalCharIndex === 1) { else if (decimalCharIndexWithoutPrefix === 1) {
newValueStr = inputValue.slice(0, selectionStart - 1) + '0' + inputValue.slice(selectionStart); newValueStr = inputValue.slice(0, selectionStart - 1) + '0' + inputValue.slice(selectionStart);
newValueStr = this.parseValue(newValueStr) > 0 ? newValueStr : ''; newValueStr = this.parseValue(newValueStr) > 0 ? newValueStr : '';
} }
@ -475,8 +474,7 @@ export default {
if (selectionStart === selectionEnd) { if (selectionStart === selectionEnd) {
let deleteChar = inputValue.charAt(selectionStart); let deleteChar = inputValue.charAt(selectionStart);
let decimalCharIndex = inputValue.search(this._decimal); const { decimalCharIndex, decimalCharIndexWithoutPrefix } = this.getDecimalCharIndexes(inputValue);
this._decimal.lastIndex = 0;
if (this.isNumeralChar(deleteChar)) { if (this.isNumeralChar(deleteChar)) {
const decimalLength = this.getDecimalLength(inputValue); const decimalLength = this.getDecimalLength(inputValue);
@ -496,10 +494,10 @@ export default {
} }
} }
else if (decimalCharIndex > 0 && selectionStart > decimalCharIndex) { else if (decimalCharIndex > 0 && selectionStart > decimalCharIndex) {
const insertedText = (this.minFractionDigits || 0) < decimalLength ? '' : '0'; const insertedText = this.isDecimalMode() && (this.minFractionDigits || 0) < decimalLength ? '' : '0';
newValueStr = inputValue.slice(0, selectionStart) + insertedText + inputValue.slice(selectionStart + 1); newValueStr = inputValue.slice(0, selectionStart) + insertedText + inputValue.slice(selectionStart + 1);
} }
else if (decimalCharIndex > 0 && decimalCharIndex === 1) { else if (decimalCharIndexWithoutPrefix === 1) {
newValueStr = inputValue.slice(0, selectionStart) + '0' + inputValue.slice(selectionStart + 1); newValueStr = inputValue.slice(0, selectionStart) + '0' + inputValue.slice(selectionStart + 1);
newValueStr = this.parseValue(newValueStr) > 0 ? newValueStr : ''; newValueStr = this.parseValue(newValueStr) > 0 ? newValueStr : '';
} }
@ -560,6 +558,31 @@ export default {
return false; return false;
}, },
isDecimalMode() {
return this.mode === 'decimal';
},
getDecimalCharIndexes(val) {
let decimalCharIndex = val.search(this._decimal);
this._decimal.lastIndex = 0;
const filteredVal = val.replace(this._prefix, '').trim().replace(/\s/g, '').replace(this._currency, '');
const decimalCharIndexWithoutPrefix = filteredVal.search(this._decimal);
this._decimal.lastIndex = 0;
return { decimalCharIndex, decimalCharIndexWithoutPrefix };
},
getCharIndexes(val) {
const decimalCharIndex = val.search(this._decimal);
this._decimal.lastIndex = 0;
const minusCharIndex = val.search(this._minusSign);
this._minusSign.lastIndex = 0;
const suffixCharIndex = val.search(this._suffix);
this._suffix.lastIndex = 0;
const currencyCharIndex = val.search(this._currency);
this._currency.lastIndex = 0;
return { decimalCharIndex, minusCharIndex, suffixCharIndex, currencyCharIndex };
},
insert(event, text, sign = { isDecimalSign: false, isMinusSign: false }) { insert(event, text, sign = { isDecimalSign: false, isMinusSign: false }) {
const minusCharIndexOnText = text.search(this._minusSign); const minusCharIndexOnText = text.search(this._minusSign);
this._minusSign.lastIndex = 0; this._minusSign.lastIndex = 0;
@ -570,10 +593,7 @@ export default {
const selectionStart = this.$refs.input.$el.selectionStart; const selectionStart = this.$refs.input.$el.selectionStart;
const selectionEnd = this.$refs.input.$el.selectionEnd; 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, minusCharIndex, suffixCharIndex, currencyCharIndex } = this.getCharIndexes(inputValue);
this._decimal.lastIndex = 0;
const minusCharIndex = inputValue.search(this._minusSign);
this._minusSign.lastIndex = 0;
let newValueStr; let newValueStr;
if (sign.isMinusSign) { if (sign.isMinusSign) {
@ -605,7 +625,9 @@ export default {
if (decimalCharIndex > 0 && selectionStart > decimalCharIndex) { if (decimalCharIndex > 0 && selectionStart > decimalCharIndex) {
if ((selectionStart + text.length - (decimalCharIndex + 1)) <= maxFractionDigits) { if ((selectionStart + text.length - (decimalCharIndex + 1)) <= maxFractionDigits) {
newValueStr = inputValue.slice(0, selectionStart) + text + inputValue.slice(selectionStart + text.length); const charIndex = currencyCharIndex >= selectionStart ? currencyCharIndex - 1 : (suffixCharIndex >= selectionStart ? suffixCharIndex : inputValue.length);
newValueStr = inputValue.slice(0, selectionStart) + text + inputValue.slice(selectionStart + text.length, charIndex) + inputValue.slice(charIndex);
this.updateValue(event, newValueStr, text, operation); this.updateValue(event, newValueStr, text, operation);
} }
} }
@ -840,7 +862,12 @@ export default {
if (value) { if (value) {
const valueSplit = value.split(this._decimal); const valueSplit = value.split(this._decimal);
return valueSplit.length === 2 ? valueSplit[1].length : 0; if (valueSplit.length === 2) {
return valueSplit[1].replace(this._suffix, '')
.trim()
.replace(/\s/g, '')
.replace(this._currency, '').length;
}
} }
return 0; return 0;