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',
small: 'sm',
},
sLoading: !!this.loading,
sLoading: false,
hasTwoCNChar: false,
};
},
watch: {
loading(val, preVal) {
if (preVal && typeof preVal !== 'boolean') {
clearTimeout(this.delayTimeout);
}
if (val && typeof val !== 'boolean' && val.delay) {
this.delayTimeout = setTimeout(() => {
loading: {
handler(val, preVal) {
if (preVal && typeof preVal !== 'boolean') {
clearTimeout(this.delayTimeout);
}
if (val && typeof val !== 'boolean' && val.delay) {
this.delayTimeout = setTimeout(() => {
this.sLoading = !!val;
}, val.delay);
} else {
this.sLoading = !!val;
}, val.delay);
} else {
this.sLoading = !!val;
}
}
},
immediate: true,
},
},
mounted() {