feat(checkboxGroup): add min max prop #491
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
07akioni
reviewed
Jul 14, 2021
src/checkbox/src/CheckboxGroup.tsx
Outdated
Comment on lines
86
to
99
| const minRef = computed(() => { | ||
| if (props.min && props.max) { | ||
| return Math.floor(Math.min(props.min, props.max)) | ||
| } else { | ||
| return props.min ? Math.floor(props.min) : 0 | ||
| } | ||
| }) | ||
| const maxRef = computed(() => { | ||
| if (props.min && props.max) { | ||
| return Math.floor(Math.max(props.min, props.max)) | ||
| } else { | ||
| return props.max ? Math.floor(props.max) : Infinity | ||
| } | ||
| }) |
There was a problem hiding this comment.
我感觉 min max 的 undefined 在 disabled 里面处理就好了，都转成数字反而很麻烦
src/checkbox/src/Checkbox.tsx
Outdated
| disabledUptoNCheckboxGroupPropMin || | ||
| disabledUptoNCheckboxGroupPropMax | ||
| } | ||
| return props.disabled || disabledUptoNCheckboxGroup |
There was a problem hiding this comment.
props.disabled 放在最开始
if (props.disabled) return true
下面的判断走
if (min !== undefined) {
if () return true
}
if (max !== undefined) {
if () return true
}
return xxx
doom-9-zz
force-pushed
the
feat(checkboxGroup)
branch
from
587d57a to
b43d0d8
Compare
07akioni
reviewed
Jul 15, 2021
| !renderedCheckedRef.value) | ||
| ) | ||
| } | ||
| } |
There was a problem hiding this comment.
Suggested change
| } | |
| } | |
| return false |
src/checkbox/src/Checkbox.tsx
Outdated
| if (props.disabled) return true | ||
| if (NCheckboxGroup) { | ||
| if (NCheckboxGroup.disabledRef.value) return true | ||
| if ( |
There was a problem hiding this comment.
Suggested change
| if ( | |
| const { | |
| maxRef: { value: max }, | |
| minRef: { value: min } | |
| } = NCheckboxGroup | |
| if ( |
| NCheckboxGroup.maxRef.value !== undefined && | ||
| NCheckboxGroup.minRef.value !== undefined | ||
| ) { | ||
| return ( |
There was a problem hiding this comment.
Suggested change
| return ( | |
| const { checkedCountRef: { value: checkedCount } } = NCheckboxGroup | |
| return ( |
src/checkbox/src/CheckboxGroup.tsx
Outdated
Comment on lines
86
to
99
| const minRef = computed(() => { | ||
| if (props.min && props.max) { | ||
| return Math.floor(Math.min(props.min, props.max)) | ||
| } else { | ||
| return props.min | ||
| } | ||
| }) | ||
| const maxRef = computed(() => { | ||
| if (props.min && props.max) { | ||
| return Math.floor(Math.max(props.min, props.max)) | ||
| } else { | ||
| return props.max | ||
| } | ||
| }) |
There was a problem hiding this comment.
Suggested change
| const minRef = computed(() => { | |
| if (props.min && props.max) { | |
| return Math.floor(Math.min(props.min, props.max)) | |
| } else { | |
| return props.min | |
| } | |
| }) | |
| const maxRef = computed(() => { | |
| if (props.min && props.max) { | |
| return Math.floor(Math.max(props.min, props.max)) | |
| } else { | |
| return props.max | |
| } | |
| }) | |
| const minRef = toRef(props, 'min') | |
| const maxRef = toRef(props, 'max') |
doom-9-zz
force-pushed
the
feat(checkboxGroup)
branch
from
95758a3 to
8460c28
Compare
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.