uview-pro 0.6.18 → 0.6.19

package/libs/hooks/useTheme.ts

@@ -1,173 +1,173 @@
-/**
- * 主题管理 composable
- * 提供主题切换、持久化、CSS 变量注入、暗黑模式等功能
- *
- * 使用方式：
- * const { currentTheme, themes, setTheme, getDarkMode, setDarkMode, isInDarkMode, getAvailableThemes, initTheme } = useTheme()
- */
-
-import type { DarkMode, Theme } from '../../types/global';
-import configProvider, { type DefaultThemeConfig } from '../util/config-provider';
-import { defaultThemes } from '../config/theme-tokens';
-
-const THEME_STORAGE_KEY = 'uview-pro-theme';
-const DARK_MODE_STORAGE_KEY = 'uview-pro-dark-mode';
-const themesRef = configProvider.themesRef;
-const currentTheme = configProvider.currentThemeRef;
-const darkModeRef = configProvider.darkModeRef;
-
-/**
- * 保存主题到 Storage
- */
-function saveThemeToStorage(themeName: string) {
-    try {
-        uni.setStorageSync(THEME_STORAGE_KEY, themeName);
-    } catch (e) {
-        console.warn('[useTheme] failed to write storage', e);
-    }
-}
-
-/**
- * 保存暗黑模式设置到 Storage
- */
-function saveDarkModeToStorage(mode: DarkMode) {
-    try {
-        uni.setStorageSync(DARK_MODE_STORAGE_KEY, mode);
-    } catch (e) {
-        console.warn('[useTheme] failed to write storage', e);
-    }
-}
-
-/**
- * 设置主题
- */
-function setTheme(themeName: string) {
-    configProvider.setTheme(themeName);
-    currentTheme.value = configProvider.getCurrentTheme();
-    saveThemeToStorage(themeName);
-}
-
-/**
- * 获取当前主题
- */
-function getCurrentTheme(): Theme | null {
-    return currentTheme.value || configProvider.getCurrentTheme();
-}
-
-/**
- * 获取所有可用主题
- */
-function getAvailableThemes() {
-    return configProvider.getThemes();
-}
-
-/**
- * 初始化主题系统
- * @param themes 可选的主题列表，如果未提供则尝试从 uni.$u.themes 读取
- * @param defaultConfig 可选的默认主题配置，支持字符串（默认主题名）或对象（{ defaultTheme?, defaultDarkMode? }）
- */
-export function initTheme(themes?: Theme[], defaultConfig?: string | DefaultThemeConfig, isForce?: boolean) {
-    // 如果有传入主题列表，使用传入的
-    if (Array.isArray(themes) && themes.length > 0) {
-        configProvider.initTheme(themes, defaultConfig, isForce);
-        return;
-    }
-
-    // // 若已通过插件或其他方式完成初始化，则不再覆盖，最多按需切换默认主题
-    // const existingThemes = configProvider.getThemes();
-    // if (existingThemes.length > 0) {
-    //     if (typeof defaultConfig === 'string') {
-    //         configProvider.setTheme(defaultConfig);
-    //     } else if (defaultConfig && typeof defaultConfig === 'object' && (defaultConfig as any).defaultTheme) {
-    //         configProvider.setTheme(defaultConfig.defaultTheme);
-    //     } else if (!configProvider.getCurrentTheme()) {
-    //         configProvider.setTheme(existingThemes[0].name);
-    //     } else {
-    //         // 触发一次 apply，便于初始化 CSS 变量
-    //         configProvider.setTheme(configProvider.getCurrentTheme()!.name);
-    //     }
-    //     return;
-    // }
-
-    // // 初始化 configProvider（如果运行时提供了内置主题）
-    // try {
-    //     const builtin = (typeof uni !== 'undefined' && (uni as any).$u && (uni as any).$u.themes) || [];
-    //     if (Array.isArray(builtin) && builtin.length > 0) {
-    //         configProvider.initTheme(builtin as Theme[], defaultConfig);
-    //         return;
-    //     }
-    // } catch (e) {
-    //     // ignore
-    // }
-
-    // 回退到内置默认主题
-    configProvider.initTheme(defaultThemes as Theme[], defaultConfig);
-}
-
-/**
- * 初始化暗黑模式
- * @param darkMode 暗黑模式设置
- * @param isForce 是否强制初始化
- */
-function initDarkMode(darkMode?: DarkMode, isForce?: boolean) {
-    configProvider.initDarkMode(darkMode, isForce);
-}
-/**
- * 获取当前暗黑模式设置
- */
-function getDarkMode(): DarkMode {
-    return configProvider.getDarkMode();
-}
-
-/**
- * 设置暗黑模式
- * @param mode 'auto' (跟随系统) | 'light' (强制亮色) | 'dark' (强制暗黑)
- */
-function setDarkMode(mode: DarkMode) {
-    configProvider.setDarkMode(mode);
-    darkModeRef.value = mode;
-    saveDarkModeToStorage(mode);
-}
-
-/**
- * 检查当前是否处于暗黑模式
- */
-function isInDarkMode(): boolean {
-    return configProvider.isInDarkMode();
-}
-
-/**
- * 切换暗黑模式（在当前模式的基础上切换）
- */
-function toggleDarkMode() {
-    const current = getDarkMode();
-    const nextMode = current === 'dark' ? 'light' : 'dark';
-    setDarkMode(nextMode);
-}
-
-/**
- * 使用主题的 composable
- * 返回所有主题相关的响应式引用和方法
- */
-export function useTheme() {
-    return {
-        // 响应式引用
-        currentTheme,
-        themes: themesRef,
-        darkMode: darkModeRef,
-        cssVars: configProvider.cssVarsRef,
-
-        // 主题相关方法
-        initTheme,
-        setTheme,
-        getCurrentTheme,
-        getAvailableThemes,
-
-        // 暗黑模式相关方法
-        initDarkMode,
-        getDarkMode,
-        setDarkMode,
-        isInDarkMode,
-        toggleDarkMode
-    };
-}
+/**
+ * 主题管理 composable
+ * 提供主题切换、持久化、CSS 变量注入、暗黑模式等功能
+ *
+ * 使用方式：
+ * const { currentTheme, themes, setTheme, getDarkMode, setDarkMode, isInDarkMode, getAvailableThemes, initTheme } = useTheme()
+ */
+
+import type { DarkMode, Theme } from '../../types/global';
+import configProvider, { type DefaultThemeConfig } from '../util/config-provider';
+import { defaultThemes } from '../config/theme-tokens';
+
+const THEME_STORAGE_KEY = 'uview-pro-theme';
+const DARK_MODE_STORAGE_KEY = 'uview-pro-dark-mode';
+const themesRef = configProvider.themesRef;
+const currentTheme = configProvider.currentThemeRef;
+const darkModeRef = configProvider.darkModeRef;
+
+/**
+ * 保存主题到 Storage
+ */
+function saveThemeToStorage(themeName: string) {
+    try {
+        uni.setStorageSync(THEME_STORAGE_KEY, themeName);
+    } catch (e) {
+        console.warn('[useTheme] failed to write storage', e);
+    }
+}
+
+/**
+ * 保存暗黑模式设置到 Storage
+ */
+function saveDarkModeToStorage(mode: DarkMode) {
+    try {
+        uni.setStorageSync(DARK_MODE_STORAGE_KEY, mode);
+    } catch (e) {
+        console.warn('[useTheme] failed to write storage', e);
+    }
+}
+
+/**
+ * 设置主题
+ */
+function setTheme(themeName: string) {
+    configProvider.setTheme(themeName);
+    currentTheme.value = configProvider.getCurrentTheme();
+    saveThemeToStorage(themeName);
+}
+
+/**
+ * 获取当前主题
+ */
+function getCurrentTheme(): Theme | null {
+    return currentTheme.value || configProvider.getCurrentTheme();
+}
+
+/**
+ * 获取所有可用主题
+ */
+function getAvailableThemes() {
+    return configProvider.getThemes();
+}
+
+/**
+ * 初始化主题系统
+ * @param themes 可选的主题列表，如果未提供则尝试从 uni.$u.themes 读取
+ * @param defaultConfig 可选的默认主题配置，支持字符串（默认主题名）或对象（{ defaultTheme?, defaultDarkMode? }）
+ */
+export function initTheme(themes?: Theme[], defaultConfig?: string | DefaultThemeConfig, isForce?: boolean) {
+    // 如果有传入主题列表，使用传入的
+    if (Array.isArray(themes) && themes.length > 0) {
+        configProvider.initTheme(themes, defaultConfig, isForce);
+        return;
+    }
+
+    // // 若已通过插件或其他方式完成初始化，则不再覆盖，最多按需切换默认主题
+    // const existingThemes = configProvider.getThemes();
+    // if (existingThemes.length > 0) {
+    //     if (typeof defaultConfig === 'string') {
+    //         configProvider.setTheme(defaultConfig);
+    //     } else if (defaultConfig && typeof defaultConfig === 'object' && (defaultConfig as any).defaultTheme) {
+    //         configProvider.setTheme(defaultConfig.defaultTheme);
+    //     } else if (!configProvider.getCurrentTheme()) {
+    //         configProvider.setTheme(existingThemes[0].name);
+    //     } else {
+    //         // 触发一次 apply，便于初始化 CSS 变量
+    //         configProvider.setTheme(configProvider.getCurrentTheme()!.name);
+    //     }
+    //     return;
+    // }
+
+    // // 初始化 configProvider（如果运行时提供了内置主题）
+    // try {
+    //     const builtin = (typeof uni !== 'undefined' && (uni as any).$u && (uni as any).$u.themes) || [];
+    //     if (Array.isArray(builtin) && builtin.length > 0) {
+    //         configProvider.initTheme(builtin as Theme[], defaultConfig);
+    //         return;
+    //     }
+    // } catch (e) {
+    //     // ignore
+    // }
+
+    // 回退到内置默认主题
+    configProvider.initTheme(defaultThemes as Theme[], defaultConfig);
+}
+
+/**
+ * 初始化暗黑模式
+ * @param darkMode 暗黑模式设置
+ * @param isForce 是否强制初始化
+ */
+function initDarkMode(darkMode?: DarkMode, isForce?: boolean) {
+    configProvider.initDarkMode(darkMode, isForce);
+}
+/**
+ * 获取当前暗黑模式设置
+ */
+function getDarkMode(): DarkMode {
+    return configProvider.getDarkMode();
+}
+
+/**
+ * 设置暗黑模式
+ * @param mode 'auto' (跟随系统) | 'light' (强制亮色) | 'dark' (强制暗黑)
+ */
+function setDarkMode(mode: DarkMode) {
+    configProvider.setDarkMode(mode);
+    darkModeRef.value = mode;
+    saveDarkModeToStorage(mode);
+}
+
+/**
+ * 检查当前是否处于暗黑模式
+ */
+function isInDarkMode(): boolean {
+    return configProvider.isInDarkMode();
+}
+
+/**
+ * 切换暗黑模式（在当前模式的基础上切换）
+ */
+function toggleDarkMode() {
+    const current = getDarkMode();
+    const nextMode = current === 'dark' ? 'light' : 'dark';
+    setDarkMode(nextMode);
+}
+
+/**
+ * 使用主题的 composable
+ * 返回所有主题相关的响应式引用和方法
+ */
+export function useTheme() {
+    return {
+        // 响应式引用
+        currentTheme,
+        themes: themesRef,
+        darkMode: darkModeRef,
+        cssVars: configProvider.cssVarsRef,
+
+        // 主题相关方法
+        initTheme,
+        setTheme,
+        getCurrentTheme,
+        getAvailableThemes,
+
+        // 暗黑模式相关方法
+        initDarkMode,
+        getDarkMode,
+        setDarkMode,
+        isInDarkMode,
+        toggleDarkMode
+    };
+}

package/libs/hooks/useThrottle.ts

@@ -1,16 +1,16 @@
-export function useThrottle(delay: number = 500) {
-    let previous: number = 0;
-    // 节流函数
-    function throttle(callback: () => void, throttleTime?: number) {
-        throttleTime = throttleTime || delay;
-        let now = Date.now();
-        if (now - previous > throttleTime) {
-            callback();
-            previous = now;
-        }
-    }
-
-    return {
-        throttle
-    };
-}
+export function useThrottle(delay: number = 500) {
+    let previous: number = 0;
+    // 节流函数
+    function throttle(callback: () => void, throttleTime?: number) {
+        throttleTime = throttleTime || delay;
+        let now = Date.now();
+        if (now - previous > throttleTime) {
+            callback();
+            previous = now;
+        }
+    }
+
+    return {
+        throttle
+    };
+}

package/libs/hooks/useToast.ts

@@ -1,115 +1,115 @@
-import {
-    U_TOAST_EVENT_HIDE,
-    U_TOAST_EVENT_SHOW,
-    U_TOAST_GLOBAL_EVENT_HIDE,
-    U_TOAST_GLOBAL_EVENT_SHOW,
-    getEventWithCurrentPage,
-    type ToastPayload
-} from '../../components/u-toast/service';
-import type { ThemeType } from '../../types/global';
-
-export type UseToastShowOptions = ToastPayload;
-
-export type UseToast = {
-    /**
-     * 显示 toast
-     * - show('文本')
-     * - show({ title, type, duration, ... })
-     */
-    show: (titleOrOptions: string | UseToastShowOptions) => void;
-    /** 关闭 toast */
-    close: () => void;
-    /** 成功 */
-    success: (titleOrOptions: string | UseToastShowOptions) => void;
-    /** 错误 */
-    error: (titleOrOptions: string | UseToastShowOptions) => void;
-    /** 警告 */
-    warning: (titleOrOptions: string | UseToastShowOptions) => void;
-    /** 信息 */
-    info: (titleOrOptions: string | UseToastShowOptions) => void;
-    /** 加载中（默认常驻，需 close 关闭） */
-    loading: (titleOrOptions: string | UseToastShowOptions) => void;
-};
-
-export type UseToastOptions = {
-    /** 是否使用全局根部 <u-toast global />，默认 true；为 false 时走页面级 <u-toast /> */
-    global?: boolean;
-    /** 是否使用页面级 <u-toast page /> 或某个页面的 <u-toast page="pageId" /> */
-    page?: boolean | string;
-};
-
-function normalize(titleOrOptions: string | UseToastShowOptions): UseToastShowOptions {
-    if (typeof titleOrOptions === 'string') return { title: titleOrOptions };
-    return titleOrOptions || {};
-}
-
-function getPage(optionsOrGlobal: UseToastOptions | boolean): string {
-    if (typeof optionsOrGlobal === 'boolean') {
-        return '';
-    }
-    if (optionsOrGlobal.page && typeof optionsOrGlobal.page === 'string' && optionsOrGlobal.page !== '') {
-        return optionsOrGlobal.page;
-    }
-    return '';
-}
-
-/**
- * Toast 函数式调用
- * @description 需要页面/应用中至少存在一个 <u-toast global /> 或 <u-toast page /> 实例用于承接事件；不影响原 ref 调用方式。
- *
- * 支持两种调用方式：
- * - 应用级 useToast() / useToast(true) / useToast({ global: true })
- * - 页面级 useToast(false) / useToast({ page: true }) / useToast({ page: 'pageId' }) （pageId 应和页面中 <u-toast page="pageId" /> 的 page 属性一致）
- */
-export function useToast(optionsOrGlobal: UseToastOptions | boolean = true): UseToast {
-    const isGlobal = typeof optionsOrGlobal === 'boolean' ? optionsOrGlobal === true : !!optionsOrGlobal.global;
-    const isPage = typeof optionsOrGlobal === 'boolean' ? optionsOrGlobal === false : !!optionsOrGlobal.page;
-    const showEvent = isGlobal
-        ? U_TOAST_GLOBAL_EVENT_SHOW
-        : isPage
-          ? getEventWithCurrentPage(U_TOAST_EVENT_SHOW, getPage(optionsOrGlobal))
-          : '';
-    const hideEvent = isGlobal
-        ? U_TOAST_GLOBAL_EVENT_HIDE
-        : isPage
-          ? getEventWithCurrentPage(U_TOAST_EVENT_HIDE, getPage(optionsOrGlobal))
-          : '';
-
-    function emitShow(payload: UseToastShowOptions) {
-        if (showEvent) {
-            uni?.$emit && uni.$emit(showEvent, payload);
-        }
-    }
-
-    function emitHide() {
-        if (hideEvent) {
-            uni?.$emit && uni.$emit(hideEvent);
-        }
-    }
-    function show(titleOrOptions: string | UseToastShowOptions) {
-        emitShow(normalize(titleOrOptions));
-    }
-
-    function close() {
-        emitHide();
-    }
-
-    function withType(type: ThemeType, titleOrOptions: string | UseToastShowOptions) {
-        const options = normalize(titleOrOptions);
-        emitShow({ ...options, type });
-    }
-
-    return {
-        show,
-        close,
-        success: (v: any) => withType('success', v),
-        error: (v: any) => withType('error', v),
-        warning: (v: any) => withType('warning', v),
-        info: (v: any) => withType('info', v),
-        loading: (v: any) => {
-            const options = normalize(v);
-            // loading 通常需要常驻，除非用户显式传 duration
-            emitShow({ ...options, loading: true, duration: options.duration ?? 0 });
-        }
-    };
-}
+import {
+    U_TOAST_EVENT_HIDE,
+    U_TOAST_EVENT_SHOW,
+    U_TOAST_GLOBAL_EVENT_HIDE,
+    U_TOAST_GLOBAL_EVENT_SHOW,
+    getEventWithCurrentPage,
+    type ToastPayload
+} from '../../components/u-toast/service';
+import type { ThemeType } from '../../types/global';
+
+export type UseToastShowOptions = ToastPayload;
+
+export type UseToast = {
+    /**
+     * 显示 toast
+     * - show('文本')
+     * - show({ title, type, duration, ... })
+     */
+    show: (titleOrOptions: string | UseToastShowOptions) => void;
+    /** 关闭 toast */
+    close: () => void;
+    /** 成功 */
+    success: (titleOrOptions: string | UseToastShowOptions) => void;
+    /** 错误 */
+    error: (titleOrOptions: string | UseToastShowOptions) => void;
+    /** 警告 */
+    warning: (titleOrOptions: string | UseToastShowOptions) => void;
+    /** 信息 */
+    info: (titleOrOptions: string | UseToastShowOptions) => void;
+    /** 加载中（默认常驻，需 close 关闭） */
+    loading: (titleOrOptions: string | UseToastShowOptions) => void;
+};
+
+export type UseToastOptions = {
+    /** 是否使用全局根部 <u-toast global />，默认 true；为 false 时走页面级 <u-toast /> */
+    global?: boolean;
+    /** 是否使用页面级 <u-toast page /> 或某个页面的 <u-toast page="pageId" /> */
+    page?: boolean | string;
+};
+
+function normalize(titleOrOptions: string | UseToastShowOptions): UseToastShowOptions {
+    if (typeof titleOrOptions === 'string') return { title: titleOrOptions };
+    return titleOrOptions || {};
+}
+
+function getPage(optionsOrGlobal: UseToastOptions | boolean): string {
+    if (typeof optionsOrGlobal === 'boolean') {
+        return '';
+    }
+    if (optionsOrGlobal.page && typeof optionsOrGlobal.page === 'string' && optionsOrGlobal.page !== '') {
+        return optionsOrGlobal.page;
+    }
+    return '';
+}
+
+/**
+ * Toast 函数式调用
+ * @description 需要页面/应用中至少存在一个 <u-toast global /> 或 <u-toast page /> 实例用于承接事件；不影响原 ref 调用方式。
+ *
+ * 支持两种调用方式：
+ * - 应用级 useToast() / useToast(true) / useToast({ global: true })
+ * - 页面级 useToast(false) / useToast({ page: true }) / useToast({ page: 'pageId' }) （pageId 应和页面中 <u-toast page="pageId" /> 的 page 属性一致）
+ */
+export function useToast(optionsOrGlobal: UseToastOptions | boolean = true): UseToast {
+    const isGlobal = typeof optionsOrGlobal === 'boolean' ? optionsOrGlobal === true : !!optionsOrGlobal.global;
+    const isPage = typeof optionsOrGlobal === 'boolean' ? optionsOrGlobal === false : !!optionsOrGlobal.page;
+    const showEvent = isGlobal
+        ? U_TOAST_GLOBAL_EVENT_SHOW
+        : isPage
+          ? getEventWithCurrentPage(U_TOAST_EVENT_SHOW, getPage(optionsOrGlobal))
+          : '';
+    const hideEvent = isGlobal
+        ? U_TOAST_GLOBAL_EVENT_HIDE
+        : isPage
+          ? getEventWithCurrentPage(U_TOAST_EVENT_HIDE, getPage(optionsOrGlobal))
+          : '';
+
+    function emitShow(payload: UseToastShowOptions) {
+        if (showEvent) {
+            uni?.$emit && uni.$emit(showEvent, payload);
+        }
+    }
+
+    function emitHide() {
+        if (hideEvent) {
+            uni?.$emit && uni.$emit(hideEvent);
+        }
+    }
+    function show(titleOrOptions: string | UseToastShowOptions) {
+        emitShow(normalize(titleOrOptions));
+    }
+
+    function close() {
+        emitHide();
+    }
+
+    function withType(type: ThemeType, titleOrOptions: string | UseToastShowOptions) {
+        const options = normalize(titleOrOptions);
+        emitShow({ ...options, type });
+    }
+
+    return {
+        show,
+        close,
+        success: (v: any) => withType('success', v),
+        error: (v: any) => withType('error', v),
+        warning: (v: any) => withType('warning', v),
+        info: (v: any) => withType('info', v),
+        loading: (v: any) => {
+            const options = normalize(v);
+            // loading 通常需要常驻，除非用户显式传 duration
+            emitShow({ ...options, loading: true, duration: options.duration ?? 0 });
+        }
+    };
+}