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,12 +27,13 @@ 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: {
handler(val, preVal) {
if (preVal && typeof preVal !== 'boolean') { if (preVal && typeof preVal !== 'boolean') {
clearTimeout(this.delayTimeout); clearTimeout(this.delayTimeout);
} }
@ -44,6 +45,8 @@ export default defineComponent({
this.sLoading = !!val; this.sLoading = !!val;
} }
}, },
immediate: true,
},
}, },
mounted() { mounted() {
this.fixTwoCNChar(); this.fixTwoCNChar();