feat(List): hide loading when loadingText is set to null (#13440)
This commit is contained in:
@@ -41,7 +41,10 @@ export const listProps = {
|
|||||||
scroller: Object as PropType<Element>,
|
scroller: Object as PropType<Element>,
|
||||||
errorText: String,
|
errorText: String,
|
||||||
direction: makeStringProp<ListDirection>('down'),
|
direction: makeStringProp<ListDirection>('down'),
|
||||||
loadingText: String,
|
loadingText: {
|
||||||
|
type: String as PropType<string | null>,
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
finishedText: String,
|
finishedText: String,
|
||||||
immediateCheck: truthProp,
|
immediateCheck: truthProp,
|
||||||
};
|
};
|
||||||
@@ -139,13 +142,13 @@ export default defineComponent({
|
|||||||
if (loading.value && !props.finished && !props.disabled) {
|
if (loading.value && !props.finished && !props.disabled) {
|
||||||
return (
|
return (
|
||||||
<div class={bem('loading')}>
|
<div class={bem('loading')}>
|
||||||
{slots.loading ? (
|
{slots.loading
|
||||||
slots.loading()
|
? slots.loading()
|
||||||
) : (
|
: props.loadingText != null && (
|
||||||
<Loading class={bem('loading-icon')}>
|
<Loading class={bem('loading-icon')}>
|
||||||
{props.loadingText || t('loading')}
|
{props.loadingText || t('loading')}
|
||||||
</Loading>
|
</Loading>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user