Merge branch 'next' of github.com:vueComponent/ant-design-vue into next

This commit is contained in:
tangjinzhou 2020-11-17 22:51:16 +08:00
commit 00455da385

View File

@ -27,22 +27,25 @@ export default defineComponent({
large: 'lg', large: 'lg',
small: 'sm', small: 'sm',
}, },
sLoading: !!this.loading, sLoading: false,
hasTwoCNChar: false, hasTwoCNChar: false,
}; };
}, },
watch: { watch: {
loading(val, preVal) { loading: {
if (preVal && typeof preVal !== 'boolean') { handler(val, preVal) {
clearTimeout(this.delayTimeout); if (preVal && typeof preVal !== 'boolean') {
} clearTimeout(this.delayTimeout);
if (val && typeof val !== 'boolean' && val.delay) { }
this.delayTimeout = setTimeout(() => { if (val && typeof val !== 'boolean' && val.delay) {
this.delayTimeout = setTimeout(() => {
this.sLoading = !!val;
}, val.delay);
} else {
this.sLoading = !!val; this.sLoading = !!val;
}, val.delay); }
} else { },
this.sLoading = !!val; immediate: true,
}
}, },
}, },
mounted() { mounted() {