Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: 修复点击icon后超过min-max范围问题(#2606) #2607

Merged
merged 3 commits into from
Oct 24, 2023
Merged

fix: 修复点击icon后超过min-max范围问题(#2606) #2607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fac02ec
fix: 修复点击icon后超过min-max范围问题(#2606)
Formulaaa Oct 21, 2023
2dfe1d7
fix: 修复taro组件input-number，点击icon可能超过min-max范围问题(#2606)
Formulaaa Oct 22, 2023
20a75f0
fix: 在点击icon超出边界值后，重置为边界值
Formulaaa Oct 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/packages/__VUE/inputnumber/index.taro.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export default create({
const emitChange = (value: string | number, event: Event) => {
let output_value: number | string = fixedDecimalPlaces(value);
emit('update:modelValue', output_value, event);
emit('change', output_value, event);
if (Number(props.modelValue) !== Number(output_value)) emit('change', output_value, event);
};
const addAllow = (value = Number(props.modelValue)): boolean => {
return value < Number(props.max) && !props.disabled;
Expand All @@ -112,19 +112,21 @@ export default create({
};
const reduce = (event: Event) => {
emit('reduce', event);
if (reduceAllow()) {
let output_value = Number(props.modelValue) - Number(props.step);
let output_value = Number(props.modelValue) - Number(props.step);
if (reduceAllow() && output_value >= Number(props.min)) {
emitChange(output_value, event);
} else {
emitChange(Number(props.min), event);
emit('overlimit', event, 'reduce');
}
};
const add = (event: Event) => {
emit('add', event);
if (addAllow()) {
let output_value = Number(props.modelValue) + Number(props.step);
let output_value = Number(props.modelValue) + Number(props.step);
if (addAllow() && output_value <= Number(props.max)) {
emitChange(output_value, event);
} else {
emitChange(Number(props.max), event);
emit('overlimit', event, 'add');
}
};
Expand Down
12 changes: 7 additions & 5 deletions src/packages/__VUE/inputnumber/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export default create({
const emitChange = (value: string | number, event: Event) => {
let output_value: number | string = fixedDecimalPlaces(value);
emit('update:modelValue', output_value, event);
emit('change', output_value, event);
if (Number(props.modelValue) !== Number(output_value)) emit('change', output_value, event);
};
const addAllow = (value = Number(props.modelValue)): boolean => {
return value < Number(props.max) && !props.disabled;
Expand All @@ -107,19 +107,21 @@ export default create({
};
const reduce = (event: Event) => {
emit('reduce', event);
if (reduceAllow()) {
let output_value = Number(props.modelValue) - Number(props.step);
let output_value = Number(props.modelValue) - Number(props.step);
if (reduceAllow() && output_value >= Number(props.min)) {
emitChange(output_value, event);
} else {
emitChange(Number(props.min), event);
emit('overlimit', event, 'reduce');
}
};
const add = (event: Event) => {
emit('add', event);
if (addAllow()) {
let output_value = Number(props.modelValue) + Number(props.step);
let output_value = Number(props.modelValue) + Number(props.step);
if (addAllow() && output_value <= Number(props.max)) {
emitChange(output_value, event);
} else {
emitChange(Number(props.max), event);
emit('overlimit', event, 'add');
}
};
Expand Down