uview-pro 0.5.3 → 0.5.4

package/libs/hooks/useToast.ts

@@ -0,0 +1,90 @@
+import {
+    U_TOAST_EVENT_HIDE,
+    U_TOAST_EVENT_SHOW,
+    U_TOAST_GLOBAL_EVENT_HIDE,
+    U_TOAST_GLOBAL_EVENT_SHOW,
+    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;
+};
+
+function normalize(titleOrOptions: string | UseToastShowOptions): UseToastShowOptions {
+    if (typeof titleOrOptions === 'string') return { title: titleOrOptions };
+    return titleOrOptions || {};
+}
+
+/**
+ * Toast 函数式调用
+ * @description 需要页面/应用中至少存在一个 <u-toast /> 实例用于承接事件；不影响原 ref 调用方式。
+ * 支持两种调用方式：useToast() / useToast({ global: false }) / useToast(false)
+ */
+export function useToast(): UseToast;
+export function useToast(options: UseToastOptions): UseToast;
+export function useToast(global: boolean): UseToast;
+export function useToast(optionsOrGlobal: UseToastOptions | boolean = {}): UseToast {
+    const isGlobal =
+        typeof optionsOrGlobal === 'boolean' ? optionsOrGlobal !== false : optionsOrGlobal.global !== false;
+    const showEvent = isGlobal ? U_TOAST_GLOBAL_EVENT_SHOW : U_TOAST_EVENT_SHOW;
+    const hideEvent = isGlobal ? U_TOAST_GLOBAL_EVENT_HIDE : U_TOAST_EVENT_HIDE;
+
+    function emitShow(payload: UseToastShowOptions) {
+        uni?.$emit && uni.$emit(showEvent, payload);
+    }
+
+    function emitHide() {
+        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 ?? 1e9 });
+        }
+    };
+}

package/libs/index.ts

@@ -248,7 +248,7 @@ export function kebabCase(word: string): string {
  * @param {number} value 堵塞时间 单位ms 毫秒
  * @returns {Promise} 返回promise
  */
-export function sleep(value: number = 30) {
+export function sleep(value: number = 30): Promise<boolean> {
     return new Promise(resolve => {
         setTimeout(() => {
             resolve(true);

package/libs/request/index.ts

@@ -223,7 +223,7 @@ export class Request {
             method: 'GET',
             url,
             data,
-            header: options.header,
+            header: options.header || {},
             meta: options.meta
         });
     }
@@ -237,7 +237,7 @@ export class Request {
             url,
             method: 'POST',
             data,
-            header: options.header,
+            header: options.header || {},
             meta: options.meta
         });
     }
@@ -251,7 +251,7 @@ export class Request {
             url,
             method: 'PUT',
             data,
-            header: options.header,
+            header: options.header || {},
             meta: options.meta
         });
     }
@@ -265,7 +265,7 @@ export class Request {
             url,
             method: 'DELETE',
             data,
-            header: options.header,
+            header: options.header || {},
             meta: options.meta
         });
     }

package/package.json

@@ -2,7 +2,7 @@
     "id": "uview-pro",
     "name": "uview-pro",
     "displayName": "【支持鸿蒙】uView Pro｜基于Vue3+TS的高质量UI组件库，支持多主题、暗黑模式、多语言",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "description": "uView Pro是基于Vue3+TS的多平台UI框架，提供80+高质量组件、便捷工具和常用模板，支持多主题、暗黑模式、多语言，支持H5/APP/鸿蒙/小程序多端开发。已在鸿蒙应用商店上架，欢迎体验！",
     "main": "index.ts",
     "module": "index.ts",

package/types/global.d.ts

@@ -1,4 +1,4 @@
-export type ThemeType = 'primary' | 'info' | 'error' | 'warning' | 'success';
+export type ThemeType = 'primary' | 'info' | 'error' | 'warning' | 'success' | 'default';
 
 export type ImgMode = 'aspectFit' | 'aspectFill' | 'widthFix' | 'top' | 'bottom' | 'center' | 'scaleToFill';