github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: input-number parse error #3249

pull/3315/head
tanjinzhou 2020-12-04 14:59:23 +08:00
parent ef51ede2ce
commit c5468f2b3b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
components/vc-input-number/src/index.js
View File

@ -148,7 +148,7 @@ export default defineComponent({
// Trigger onChange when max or min change // Trigger onChange when max or min change
// https://github.com/ant-design/ant-design/issues/11574 // https://github.com/ant-design/ant-design/issues/11574
const nextValue = 'value' in props ? value : this.sValue; const nextValue = 'value' in props ? value : this.$data.sValue;
// ref: null < 20 === true // ref: null < 20 === true
// https://github.com/ant-design/ant-design/issues/14277 // https://github.com/ant-design/ant-design/issues/14277
if ( if (
@ -187,14 +187,14 @@ export default defineComponent({
// This caused that if an input didn't init with the selection, // This caused that if an input didn't init with the selection,
// set will cause cursor not correct when first focus. // set will cause cursor not correct when first focus.
// Safari will focus input if set selection. We need skip this. // Safari will focus input if set selection. We need skip this.
if (this.cursorStart !== undefined && this.focused) { if (this.cursorStart !== undefined && this.$data.focused) {
// In most cases, the string after cursor is stable. // In most cases, the string after cursor is stable.
// We can move the cursor before it // We can move the cursor before it
if ( if (
// If not match full str, try to match part of str // If not match full str, try to match part of str
!this.partRestoreByAfter(this.cursorAfter) && !this.partRestoreByAfter(this.cursorAfter) &&
this.sValue !== this.value this.$data.sValue !== this.value
) { ) {
// If not match any of then, let's just keep the position // If not match any of then, let's just keep the position
// TODO: Logic should not reach here, need check if happens // TODO: Logic should not reach here, need check if happens
@ -233,7 +233,7 @@ export default defineComponent({
if (!this.pressingUpOrDown) { if (!this.pressingUpOrDown) {
return; return;
} }
if (this.focusOnUpDown && this.focused) { if (this.focusOnUpDown && this.$data.focused) {
if (document.activeElement !== inputElem) { if (document.activeElement !== inputElem) {
this.focus(); this.focus();
} }
@ -266,7 +266,7 @@ export default defineComponent({
this.__emit('keyup', e, ...args); this.__emit('keyup', e, ...args);
}, },
onChange(e) { onChange(e) {
if (this.focused) { if (this.$data.focused) {
this.inputting = true; this.inputting = true;
} }
this.rawInput = this.parser(this.getValueFromEvent(e)); this.rawInput = this.parser(this.getValueFromEvent(e));
@ -286,7 +286,7 @@ export default defineComponent({
this.setState({ this.setState({
focused: false, focused: false,
}); });
const value = this.getCurrentValidValue(this.inputValue); const value = this.getCurrentValidValue(this.$data.inputValue);
const newValue = this.setValue(value); const newValue = this.setValue(value);
if (this.$attrs.onBlur) { if (this.$attrs.onBlur) {
const originValue = this.inputRef.value; const originValue = this.inputRef.value;
@ -303,7 +303,7 @@ export default defineComponent({
} else if (!this.isNotCompleteNumber(parseFloat(val, 10))) { } else if (!this.isNotCompleteNumber(parseFloat(val, 10))) {
val = this.getValidValue(val); val = this.getValidValue(val);
} else { } else {
val = this.sValue; val = this.$data.sValue;
} }
return this.toNumber(val); return this.toNumber(val);
}, },
@ -363,7 +363,7 @@ export default defineComponent({
// always set input value same as value // always set input value same as value
this.setState( this.setState(
{ {
inputValue: this.toPrecisionAsStep(this.sValue), inputValue: this.toPrecisionAsStep(this.$data.sValue),
}, },
callback, callback,
); );
@ -538,7 +538,7 @@ export default defineComponent({
}, },
toNumber(num) { toNumber(num) {
const { precision, autofocus } = this.$props; const { precision, autofocus } = this.$props;
const { focused = autofocus } = this; const { focused = autofocus } = this.$data;
// num.length > 16 => This is to prevent input of large numbers // num.length > 16 => This is to prevent input of large numbers
const numberIsTooLarge = num && num.length > 16 && focused; const numberIsTooLarge = num && num.length > 16 && focused;
if (this.isNotCompleteNumber(num) || numberIsTooLarge) { if (this.isNotCompleteNumber(num) || numberIsTooLarge) {
@ -579,7 +579,7 @@ export default defineComponent({
return; return;
} }
const { max, min } = this; const { max, min } = this;
const value = this.getCurrentValidValue(this.inputValue) || 0; const value = this.getCurrentValidValue(this.$data.inputValue) || 0;
if (this.isNotCompleteNumber(value)) { if (this.isNotCompleteNumber(value)) {
return; return;
} }
@ -648,11 +648,11 @@ export default defineComponent({
[className]: className, [className]: className,
[prefixCls]: true, [prefixCls]: true,
[`${prefixCls}-disabled`]: disabled, [`${prefixCls}-disabled`]: disabled,
[`${prefixCls}-focused`]: this.focused, [`${prefixCls}-focused`]: this.$data.focused,
}); });
let upDisabledClass = ''; let upDisabledClass = '';
let downDisabledClass = ''; let downDisabledClass = '';
const { sValue } = this; const { sValue } = this.$data;
if (sValue || sValue === 0) { if (sValue || sValue === 0) {
if (!isNaN(sValue)) { if (!isNaN(sValue)) {
const val = Number(sValue); const val = Number(sValue);