Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions src/_internal/select-menu/src/SelectMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ export default defineComponent({
type: Boolean,
default: true
},
showEllipse: {
type: Boolean as PropType<boolean | undefined>,
default: false
},
labelField: {
type: String,
default: 'label'
Expand Down Expand Up @@ -423,6 +427,7 @@ export default defineComponent({
}
useOnResize(selfRef, props.onResize)
return {
showEllipse: props.showEllipse,
mergedTheme: themeRef,
mergedClsPrefix: mergedClsPrefixRef,
rtlEnabled: rtlEnabledRef,
Expand Down Expand Up @@ -543,6 +548,7 @@ export default defineComponent({
/>
) : tmNode.ignored ? null : (
<NSelectOption
showEllipse={this.showEllipse}
clsPrefix={clsPrefix}
key={tmNode.key}
tmNode={tmNode as unknown as TreeNode<SelectOption>}
Expand Down Expand Up @@ -570,6 +576,7 @@ export default defineComponent({
/>
) : (
<NSelectOption
showEllipse={this.showEllipse}
clsPrefix={clsPrefix}
key={tmNode.key}
tmNode={tmNode as unknown as TreeNode<SelectOption>}
Expand Down
14 changes: 13 additions & 1 deletion src/_internal/select-menu/src/SelectOption.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type { RenderLabelImpl, RenderOptionImpl } from './interface'
import { useMemo } from 'vooks'
import { defineComponent, h, inject, Transition } from 'vue'
import { mergeEventHandlers, render } from '../../../_utils'
import { NEllipsis } from '../../../ellipsis'
import { NBaseIcon } from '../../icon'
import { CheckmarkIcon } from '../../icons'
import { internalSelectionMenuInjectionKey } from './interface'
Expand Down Expand Up @@ -39,6 +40,10 @@ export default defineComponent({
tmNode: {
type: Object as PropType<TreeNode<SelectOption>>,
required: true
},
showEllipse: {
type: Boolean as PropType<boolean | undefined>,
default: false
}
},
setup(props) {
Expand Down Expand Up @@ -88,6 +93,7 @@ export default defineComponent({
const { parent } = tmNode
return parent && parent.rawNode.type === 'group'
}),
showEllipse: props.showEllipse,
showCheckmark: showCheckmarkRef,
nodeProps: nodePropsRef,
isPending: isPendingRef,
Expand Down Expand Up @@ -165,7 +171,13 @@ export default defineComponent({
])}
onMousemove={mergeEventHandlers([handleMouseMove, attrs?.onMousemove])}
>
<div class={`${clsPrefix}-base-select-option__content`}>{children}</div>
<div class={`${clsPrefix}-base-select-option__content`}>
{this.showEllipse ? (
<NEllipsis tooltip={{ to: 'body' }}>{children}</NEllipsis>
) : (
children
)}
</div>
</div>
)
return rawNode.render
Expand Down
5 changes: 5 additions & 0 deletions src/cascader/src/Cascader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@ export const cascaderProps = {
type: Boolean as PropType<boolean | undefined>,
default: undefined
},
showEllipse: {
type: Boolean as PropType<boolean | undefined>,
default: false
},
maxTagCount: [String, Number] as PropType<number | 'responsive'>,
ellipsisTagPopoverProps: Object as PropType<PopoverProps>,
menuProps: Object as PropType<HTMLAttributes>,
Expand Down Expand Up @@ -925,6 +929,7 @@ export default defineComponent({
hoverKeyPathRef,
mergedCheckStrategyRef,
showCheckboxRef,
showEllipseRef: toRef(props, 'showEllipse'),
cascadeRef: toRef(props, 'cascade'),
multipleRef: toRef(props, 'multiple'),
keyboardKeyRef,
Expand Down
13 changes: 10 additions & 3 deletions src/cascader/src/CascaderOption.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { computed, defineComponent, h, inject, Transition } from 'vue'
import { NBaseIcon, NBaseLoading } from '../../_internal'
import { CheckmarkIcon, ChevronRightIcon } from '../../_internal/icons'
import { NCheckbox } from '../../checkbox'
import { NEllipsis } from '../../ellipsis'
import { cascaderInjectionKey } from './interface'

export default defineComponent({
Expand Down Expand Up @@ -34,6 +35,7 @@ export default defineComponent({
mergedThemeRef,
labelFieldRef,
showCheckboxRef,
showEllipseRef,
renderPrefixRef,
renderSuffixRef,
updateHoverKey,
Expand Down Expand Up @@ -167,6 +169,7 @@ export default defineComponent({
keyboardPending: keyboardPendingRef,
isLoading: isLoadingRef,
showCheckbox: showCheckboxRef,
showEllipse: showEllipseRef,
isLeaf: isLeafRef,
disabled: disabledRef,
label: labelRef,
Expand Down Expand Up @@ -286,9 +289,13 @@ export default defineComponent({
>
{prefixNode}
<span class={`${mergedClsPrefix}-cascader-option__label`}>
{renderLabel
? renderLabel(this.tmNode.rawNode, this.checked)
: this.label}
{renderLabel ? (
renderLabel(this.tmNode.rawNode, this.checked)
) : this.showEllipse ? (
<NEllipsis>{this.label}</NEllipsis>
) : (
this.label
)}
</span>
{suffixNode}
</div>
Expand Down
3 changes: 3 additions & 0 deletions src/cascader/src/CascaderSelectMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export default defineComponent({
},
setup(props) {
const {
showEllipseRef,
isMountedRef,
mergedValueRef,
mergedClsPrefixRef,
Expand Down Expand Up @@ -171,6 +172,7 @@ export default defineComponent({
enter
}
return {
showEllipse: showEllipseRef,
isMounted: isMountedRef,
mergedTheme: mergedThemeRef,
mergedClsPrefix: mergedClsPrefixRef,
Expand All @@ -197,6 +199,7 @@ export default defineComponent({
clsPrefix={mergedClsPrefix}
class={`${mergedClsPrefix}-cascader-menu`}
autoPending
showEllipse={this.showEllipse}
themeOverrides={
mergedTheme.peerOverrides.InternalSelectMenu
}
Expand Down
1 change: 1 addition & 0 deletions src/cascader/src/interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ export interface CascaderInjection {
optionHeightRef: Ref<string>
labelFieldRef: Ref<string>
showCheckboxRef: Ref<boolean>
showEllipseRef: Ref<boolean>
getColumnStyleRef: Ref<
((detail: { level: number }) => string | CSSProperties) | undefined
>
Expand Down