sard-uniapp 1.18.0 → 1.19.1

package/use/useTimeoutLoading.js

@@ -1,17 +1,18 @@
 import { computed, watch } from 'vue';
 import { ref } from 'vue';
-import { useSetTimeout } from './useSetTimeout';
+import { useTimeout } from './useTimeout';
 export function useTimeoutLoading(loading, options = {}) {
     const { leading = 150, trailing = 20000 } = options;
     const status = ref('idle');
     let startTime = 0;
-    const [waitTrailing, cancelTrailing] = useSetTimeout(() => {
+    let trailingDuration = 0;
+    const { start: waitTrailing, stop: cancelTrailing } = useTimeout(() => {
         status.value = 'idle';
-    });
-    const [waitLeading, cancelLeading] = useSetTimeout(() => {
+    }, () => trailingDuration);
+    const { start: waitLeading, stop: cancelLeading } = useTimeout(() => {
         status.value = 'loading';
         startTime = Date.now();
-    });
+    }, leading);
     watch(loading, () => {
         cancelLeading();
         cancelTrailing();
@@ -19,7 +20,7 @@ export function useTimeoutLoading(loading, options = {}) {
             switch (status.value) {
                 case 'idle':
                     status.value = 'leading';
-                    waitLeading(leading);
+                    waitLeading();
                     break;
                 case 'trailing':
                     status.value = 'loading';
@@ -39,7 +40,8 @@ export function useTimeoutLoading(loading, options = {}) {
                     }
                     else {
                         status.value = 'trailing';
-                        waitTrailing(trailing - duration);
+                        trailingDuration = trailing - duration;
+                        waitTrailing();
                     }
                     break;
                 }

package/use/useSetTimeout.d.ts

@@ -1 +0,0 @@
-export declare function useSetTimeout(callback: (...args: any[]) => any): readonly [(duration: number, ...args: any[]) => void, () => void, () => boolean];

package/use/useSetTimeout.js

@@ -1,24 +0,0 @@
-import { onUnmounted } from 'vue';
-export function useSetTimeout(callback) {
-    let timer;
-    const cancel = () => {
-        if (timer) {
-            clearTimeout(timer);
-            timer = null;
-        }
-    };
-    const doSomethingLater = (duration, ...args) => {
-        cancel();
-        timer = setTimeout(() => {
-            timer = null;
-            callback(...args);
-        }, duration);
-    };
-    const isWaitingToDoSomething = () => {
-        return !!timer;
-    };
-    onUnmounted(() => {
-        cancel();
-    });
-    return [doSomethingLater, cancel, isWaitingToDoSomething];
-}