From 9251f7ddead402b95129e0d75146da841587d912 Mon Sep 17 00:00:00 2001
From: Uyarn <uyarnchen@gmail.com>
Date: Mon, 17 Jan 2022 00:45:38 +0800
Subject: [PATCH] chore: complete loading watch

---
 examples/loading/demos/delay.vue |  2 +-
 src/loading/loading.tsx          | 32 +++++++++++++++++++-------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/examples/loading/demos/delay.vue b/examples/loading/demos/delay.vue
index 6b3ee6015c..6a2d9c3a8c 100644
--- a/examples/loading/demos/delay.vue
+++ b/examples/loading/demos/delay.vue
@@ -26,7 +26,7 @@ import { defineComponent, ref, onMounted } from 'vue';
 
 export default defineComponent({
   setup() {
-    const loading = ref(true);
+    const loading = ref(false);
     const data = ref('');
     const delay = ref(500);
     const loadingData = (time) => {
diff --git a/src/loading/loading.tsx b/src/loading/loading.tsx
index 17960f5ac1..ffcae9f72f 100644
--- a/src/loading/loading.tsx
+++ b/src/loading/loading.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, watch } from 'vue';
+import { defineComponent, ref, computed, watch, onMounted } from 'vue';
 import GradientIcon from './icon/gradient';
 import { prefix } from '../config';
 import { SIZE_CLASSNAMES } from '../utils/classnames';
@@ -26,6 +26,14 @@ export default defineComponent({
   setup(props, { slots }) {
     const delayShowLoading = ref(false);
 
+    const countDelay = () => {
+      delayShowLoading.value = false;
+      const timer = setTimeout(() => {
+        delayShowLoading.value = true;
+        clearTimeout(timer);
+      }, props.delay);
+    };
+
     // 延时计时是否完成。用于控制延时计时结束前不能显示加载态
     const delayCounted = computed(() => Boolean(!props.delay || (props.delay && delayShowLoading.value)));
 
@@ -41,12 +49,11 @@ export default defineComponent({
       return styles;
     });
 
-    const showText = computed(() => Boolean(props.text || slots.text));
-    const showWrapLoading = computed(() => hasContent.value && props.loading && delayCounted.value);
-    const showNormalLoading = computed(() => hasContent.value && props.loading && delayCounted.value);
-
     const hasContent = computed(() => Boolean(props.default || slots.default || props.content || slots.content));
     const lockFullscreen = computed(() => props.preventScrollThrough && props.fullscreen);
+    const showText = computed(() => Boolean(props.text || slots.text));
+    const showWrapLoading = computed(() => hasContent.value && props.loading && delayCounted.value);
+    const showNormalLoading = computed(() => !hasContent.value && props.loading && delayCounted.value);
 
     const classes = computed(() => {
       const baseClasses = [centerClass, SIZE_CLASSNAMES[props.size], { [inheritColorClass]: props.inheritColor }];
@@ -66,15 +73,9 @@ export default defineComponent({
         normalClasses: baseClasses.concat([name]),
       };
     });
-    const countDelay = () => {
-      delayShowLoading.value = false;
-      const timer = setTimeout(() => {
-        delayShowLoading.value = true;
-        clearTimeout(timer);
-      }, props.delay);
-    };
 
-    watch([props.loading], (value) => {
+    const loadingRef = computed(() => props.loading);
+    watch([loadingRef], (value) => {
       if (value) {
         countDelay();
         lockFullscreen.value && addClass(document.body, lockClass);
@@ -83,6 +84,10 @@ export default defineComponent({
       }
     });
 
+    onMounted(() => {
+      props.delay && countDelay();
+    });
+
     return {
       delayShowLoading,
       styles,
@@ -96,6 +101,7 @@ export default defineComponent({
   },
   render() {
     const { fullScreenClasses, baseClasses, withContentClasses, attachClasses, normalClasses } = this.classes;
+
     const defaultIndicator = <GradientIcon size={this.size} />;
     const indicator = this.loading && renderTNodeJSX(this, 'indicator', defaultIndicator);
     const text = this.showText && <div class={`${prefix}-loading__text`}>{renderTNodeJSX(this, 'text')}</div>;