uview-pro 0.5.7 → 0.5.9

package/changelog.md

@@ -1,20 +1,62 @@
-## 0.5.7（2026-02-06）
+## 0.5.9（2026-02-26）
 
 ### 🐛 Bug Fixes | Bug 修复
 
-- **u-tabs:** 修复u-tabs的scroll-view在不同平台会显示滚动条的问题，统一各平台的滚动条隐藏逻辑 ([6ba904b](https://github.com/anyup/uView-Pro/commit/6ba904b85fdc5be69ab8b430878e16fa74674c64))
-- **demo:** 修复演示项目在钉钉小程序调用uni.setTabBarItem报错问题（#125） ([fd4ea39](https://github.com/anyup/uView-Pro/commit/fd4ea3987928039e9dcc3a53dc8bea42fce2b685))
-- **u-input,u-field:** 修复输入框绑定值为undefined和null时的显示异常问题 ([4af659f](https://github.com/anyup/uView-Pro/commit/4af659fb365179e3ed7db26a1d8571c327497f7a))
+- **calendar:** minDate / maxDate 纳入校验年月范围 ([249c04f](https://github.com/anyup/uView-Pro/commit/249c04f11e8610df4964f2d24d5fbe580e9236f8))
 
 ### ✨ Features | 新功能
 
-- **demo-page:** 所有页面支持小程序分享功能 ([a055904](https://github.com/anyup/uView-Pro/commit/a05590443e898ed076d47a04cb8bfc74c2e73da8))
-- **u-card:** u-card添加圆角配置功能并调整默认边框样式 ([e43c939](https://github.com/anyup/uView-Pro/commit/e43c9396a17fe485305e63895a7ea8d6edf1906b))
+- **calendar:** 日历选择演示页面新增最小/最大日期切换功能 ([dc8aeae](https://github.com/anyup/uView-Pro/commit/dc8aeae5072774d3d1be1318e4f7b4567c9b0385))
 
 ### 👥 Contributors
 
-<a href="https://github.com/anyup"><img src="https://github.com/anyup.png?size=40" width="40" height="40" alt="anyup" title="anyup"/></a> 
+<a href="https://github.com/zakicheung"><img src="https://github.com/zakicheung.png?size=40" width="40" height="40" alt="张淇" title="张淇"/></a> <a href="https://github.com/anyup"><img src="https://github.com/anyup.png?size=40" width="40" height="40" alt="anyup" title="anyup"/></a> 
 
+## 0.5.8（2026-02-10）
+
+### 🚀 Chore | 构建/工程依赖/工具
+
+- **deps:** 更新 uni-app 相关依赖包版本到 4.87，修复更新包后运行到 h5 报错问题 ([b00751b](https://github.com/anyup/uView-Pro/commit/b00751b2643bd582f2d1b9472e245d856352d4ed))
+
+### 📝 Documentation | 文档
+
+- 添加npm下载量统计徽章 ([63971ee](https://github.com/anyup/uView-Pro/commit/63971eead3365d5efe29166b2252e58904c0306c))
+
+### 🐛 Bug Fixes | Bug 修复
+
+- **useToast:** 修复使用useToast全局提示会触发多次监听的问题（#130） ([ae56413](https://github.com/anyup/uView-Pro/commit/ae564132604d27c3d92de2f6ece5eaae75980aaa))
+- **useModal:** 修复使用useModal全局弹窗会触发多次监听的问题（#130） ([50da10c](https://github.com/anyup/uView-Pro/commit/50da10c7c19d65885244df5c99634775be088824))
+- **u-upload:** 修复u-upload组件中删除确认弹窗的“取消”和“确认”按钮国际化问题（#128） ([e48ab1d](https://github.com/anyup/uView-Pro/commit/e48ab1d23f50c850b1fd85c9b48860bd1d5105b0))
+
+### ✨ Features | 新功能
+
+- **useToast:** 支持使用useToast页面级弹出时，toast可指定页面ID（#130） ([7d09ffe](https://github.com/anyup/uView-Pro/commit/7d09ffe5f8bbee5a3872dfc716dc7ba013f7e1bc))
+- **useModal:** 支持使用useModal页面级弹出时，modal可指定页面ID（#130） ([63af409](https://github.com/anyup/uView-Pro/commit/63af409370f775bac7ceabe98db8b5225491baa8))
+- **u-button:** 添加按钮文本属性支持 ([72fda47](https://github.com/anyup/uView-Pro/commit/72fda47673f1b099f12dcd88ca20570d20d3d5bc))
+- **router:** 添加路由跳转hooks功能 ([cb5a687](https://github.com/anyup/uView-Pro/commit/cb5a687bd7ec8c863d237f69b5cb486e86016398))
+- **demo:** 添加useModal和useToast示例页面 ([f42ca51](https://github.com/anyup/uView-Pro/commit/f42ca51839b1ebd3f02106da0310f4bbbfbb96cf))
+
+### 👥 Contributors
+
+<a href="https://github.com/anyup"><img src="https://github.com/anyup.png?size=40" width="40" height="40" alt="anyup" title="anyup"/></a> 
+
+## 0.5.7（2026-02-06）
+
+### 🐛 Bug Fixes | Bug 修复
+
+- **u-tabs:** 修复u-tabs的scroll-view在不同平台会显示滚动条的问题，统一各平台的滚动条隐藏逻辑 ([6ba904b](https://github.com/anyup/uView-Pro/commit/6ba904b85fdc5be69ab8b430878e16fa74674c64))
+- **demo:** 修复演示项目在钉钉小程序调用uni.setTabBarItem报错问题（#125） ([fd4ea39](https://github.com/anyup/uView-Pro/commit/fd4ea3987928039e9dcc3a53dc8bea42fce2b685))
+- **u-input,u-field:** 修复输入框绑定值为undefined和null时的显示异常问题 ([4af659f](https://github.com/anyup/uView-Pro/commit/4af659fb365179e3ed7db26a1d8571c327497f7a))
+
+### ✨ Features | 新功能
+
+- **demo-page:** 所有页面支持小程序分享功能 ([a055904](https://github.com/anyup/uView-Pro/commit/a05590443e898ed076d47a04cb8bfc74c2e73da8))
+- **u-card:** u-card添加圆角配置功能并调整默认边框样式 ([e43c939](https://github.com/anyup/uView-Pro/commit/e43c9396a17fe485305e63895a7ea8d6edf1906b))
+
+### 👥 Contributors
+
+<a href="https://github.com/anyup"><img src="https://github.com/anyup.png?size=40" width="40" height="40" alt="anyup" title="anyup"/></a> 
+
 ## 0.5.6（2026-02-04）
 
 ### 🐛 Bug Fixes | Bug 修复

package/components/u-button/types.ts

@@ -9,6 +9,8 @@ import { baseProps } from '../common/props';
 
 export const ButtonProps = {
     ...baseProps,
+    /** 按钮文本 */
+    text: { type: String, default: '' },
     /** 是否细边框 */
     hairLine: { type: Boolean, default: true },
     /** 按钮的预置样式，default，primary，error，warning，success */

package/components/u-button/u-button.vue

@@ -48,7 +48,7 @@
         :hover-class="getHoverClass"
         :loading="loading"
     >
-        <slot></slot>
+        <slot>{{ props.text }}</slot>
         <view
             v-if="ripple"
             class="u-wave-ripple"

package/components/u-calendar/u-calendar.vue

@@ -450,15 +450,25 @@ function getWeekday(yearNum: number, monthNum: number) {
 }
 
 /**
- * 检查年份是否超出范围
+ * 检查年月是否超出范围
  */
-function checkRange(yearNum: number) {
-    let overstep = false;
+function checkRange(yearNum: number, monthNum: number) {
     if (yearNum < Number(props.minYear) || yearNum > Number(props.maxYear)) {
         uni.showToast({ title: t('uCalendar.outOfRange'), icon: 'none' });
-        overstep = true;
+        return true;
     }
-    return overstep;
+
+    const beforeMin =
+        min.value && (yearNum < min.value.year || (yearNum === min.value.year && monthNum < min.value.month));
+    const afterMax =
+        max.value && (yearNum > max.value.year || (yearNum === max.value.year && monthNum > max.value.month));
+
+    if (beforeMin || afterMax) {
+        uni.showToast({ title: t('uCalendar.outOfRange'), icon: 'none' });
+        return true;
+    }
+
+    return false;
 }
 
 /**
@@ -468,16 +478,18 @@ function changeMonthHandler(isAdd: number) {
     if (isAdd) {
         let m = month.value + 1;
         let y = m > 12 ? year.value + 1 : year.value;
-        if (!checkRange(y)) {
-            month.value = m > 12 ? 1 : m;
+        m = m > 12 ? 1 : m;
+        if (!checkRange(y, m)) {
+            month.value = m;
             year.value = y;
             changeData();
         }
     } else {
         let m = month.value - 1;
         let y = m < 1 ? year.value - 1 : year.value;
-        if (!checkRange(y)) {
-            month.value = m < 1 ? 12 : m;
+        m = m < 1 ? 12 : m;
+        if (!checkRange(y, m)) {
+            month.value = m;
             year.value = y;
             changeData();
         }
@@ -485,12 +497,20 @@ function changeMonthHandler(isAdd: number) {
 }
 
 /**
- * 切换年份
+ * 切换年份：若 minDate/maxDate 的月份在当前年超出，则切换到该年的最小/最大有效月
  */
 function changeYearHandler(isAdd: number) {
     let y = isAdd ? year.value + 1 : year.value - 1;
-    if (!checkRange(y)) {
+    let m = month.value;
+    if (min.value && y === min.value.year && m < min.value.month) {
+        m = min.value.month;
+    }
+    if (max.value && y === max.value.year && m > max.value.month) {
+        m = max.value.month;
+    }
+    if (!checkRange(y, m)) {
         year.value = y;
+        month.value = m;
         changeData();
     }
 }

package/components/u-modal/service.ts

@@ -8,15 +8,34 @@
 import type { ModalProps } from './types';
 
 // 普通（页面级）modal 事件
-export const U_MODAL_EVENT_SHOW = 'uview-pro:u-modal:show';
-export const U_MODAL_EVENT_HIDE = 'uview-pro:u-modal:hide';
-export const U_MODAL_EVENT_CLEAR_LOADING = 'uview-pro:u-modal:clear-loading';
+export const U_MODAL_EVENT_SHOW = 'uview-pro:u-modal:show:';
+export const U_MODAL_EVENT_HIDE = 'uview-pro:u-modal:hide:';
+export const U_MODAL_EVENT_CLEAR_LOADING = 'uview-pro:u-modal:clear-loading:';
 
 // 全局（App 根部）modal 事件，供 useModal() 使用
 export const U_MODAL_GLOBAL_EVENT_SHOW = 'uview-pro:u-modal:global:show';
 export const U_MODAL_GLOBAL_EVENT_HIDE = 'uview-pro:u-modal:global:hide';
 export const U_MODAL_GLOBAL_EVENT_CLEAR_LOADING = 'uview-pro:u-modal:global:clear-loading';
 
+// 根据当前页面获取事件名
+export function getEventWithCurrentPage(event: string, page?: string | boolean) {
+    if (page && typeof page === 'string' && page !== '') {
+        return event + page;
+    }
+    return event + getCurrentPage();
+}
+
+// 获取当前页面路由
+function getCurrentPage() {
+    try {
+        const pages = getCurrentPages();
+        const currentPage = pages[pages.length - 1].route as string;
+        return currentPage || '';
+    } catch (error) {
+        return '';
+    }
+}
+
 /**
  * u-modal 函数式调用载荷类型
  * @description 完整覆盖 u-modal 的所有 props（除 modelValue 外）

package/components/u-modal/types.ts

@@ -122,7 +122,7 @@ export const ModalProps = {
     },
     /** 是否作为页面级 modal（通常放在页面中，给 useModal({ page: true }) 使用） */
     page: {
-        type: Boolean,
+        type: [Boolean, String] as PropType<boolean | string>,
         default: false
     }
 };

package/components/u-modal/u-modal.vue

@@ -26,7 +26,7 @@
                         <slot />
                     </view>
                     <view v-else class="u-model__content__message" :style="$u.toStyle(effectiveConfig.contentStyle)">
-                        {{ effectiveConfig.content }}
+                        <text>{{ effectiveConfig.content }}</text>
                     </view>
                 </view>
                 <view
@@ -89,6 +89,7 @@ import {
     U_MODAL_GLOBAL_EVENT_CLEAR_LOADING,
     U_MODAL_GLOBAL_EVENT_HIDE,
     U_MODAL_GLOBAL_EVENT_SHOW,
+    getEventWithCurrentPage,
     type ModalPayload
 } from './service';
 
@@ -128,12 +129,28 @@ const slots = useSlots();
 
 // 确认按钮是否正在加载中
 const loading = ref(false);
-const isGlobal = computed(() => props.global);
-const isPage = computed(() => props.page);
-const showEvent = computed(() => (isGlobal.value ? U_MODAL_GLOBAL_EVENT_SHOW : isPage.value ? U_MODAL_EVENT_SHOW : ''));
-const hideEvent = computed(() => (isGlobal.value ? U_MODAL_GLOBAL_EVENT_HIDE : isPage.value ? U_MODAL_EVENT_HIDE : ''));
+const isGlobal = computed(() => !!props.global);
+const isPage = computed(() => !!props.page);
+const showEvent = computed(() =>
+    isGlobal.value
+        ? U_MODAL_GLOBAL_EVENT_SHOW
+        : isPage.value
+          ? getEventWithCurrentPage(U_MODAL_EVENT_SHOW, props.page)
+          : ''
+);
+const hideEvent = computed(() =>
+    isGlobal.value
+        ? U_MODAL_GLOBAL_EVENT_HIDE
+        : isPage.value
+          ? getEventWithCurrentPage(U_MODAL_EVENT_HIDE, props.page)
+          : ''
+);
 const clearLoadingEvent = computed(() =>
-    isGlobal.value ? U_MODAL_GLOBAL_EVENT_CLEAR_LOADING : isPage.value ? U_MODAL_EVENT_CLEAR_LOADING : ''
+    isGlobal.value
+        ? U_MODAL_GLOBAL_EVENT_CLEAR_LOADING
+        : isPage.value
+          ? getEventWithCurrentPage(U_MODAL_EVENT_CLEAR_LOADING, props.page)
+          : ''
 );
 
 // 存储用户传入的回调函数
@@ -312,7 +329,12 @@ function resetTempConfig() {
     userOnCancel = null;
 }
 
-onMounted(() => {
+// 开始监听事件
+function startListeners() {
+    // 如果为全局 toast，则先移除所有事件监听，再重新监听
+    if (isGlobal.value) {
+        removeAllListeners();
+    }
     if (showEvent.value) {
         uni?.$on && uni.$on(showEvent.value, onServiceShow);
     }
@@ -322,9 +344,10 @@ onMounted(() => {
     if (clearLoadingEvent.value) {
         uni?.$on && uni.$on(clearLoadingEvent.value, clearLoading);
     }
-});
+}
 
-onBeforeUnmount(() => {
+// 停止监听事件
+function stopListeners() {
     if (showEvent.value) {
         uni?.$off && uni.$off(showEvent.value, onServiceShow);
     }
@@ -334,6 +357,27 @@ onBeforeUnmount(() => {
     if (clearLoadingEvent.value) {
         uni?.$off && uni.$off(clearLoadingEvent.value, clearLoading);
     }
+}
+
+// 移除所有事件监听
+function removeAllListeners() {
+    if (showEvent.value) {
+        uni?.$off && uni.$off(showEvent.value);
+    }
+    if (hideEvent.value) {
+        uni?.$off && uni.$off(hideEvent.value);
+    }
+    if (clearLoadingEvent.value) {
+        uni?.$off && uni.$off(clearLoadingEvent.value);
+    }
+}
+
+onMounted(() => {
+    startListeners();
+});
+
+onBeforeUnmount(() => {
+    stopListeners();
 });
 
 defineExpose({

package/components/u-toast/service.ts

@@ -8,13 +8,32 @@
 import type { ToastProps } from './types';
 
 // 普通（页面级）toast 事件
-export const U_TOAST_EVENT_SHOW = 'uview-pro:u-toast:show';
-export const U_TOAST_EVENT_HIDE = 'uview-pro:u-toast:hide';
+export const U_TOAST_EVENT_SHOW = 'uview-pro:u-toast:show:';
+export const U_TOAST_EVENT_HIDE = 'uview-pro:u-toast:hide:';
 
 // 全局（App 根部）toast 事件，供 useToast() 使用
 export const U_TOAST_GLOBAL_EVENT_SHOW = 'uview-pro:u-toast:global:show';
 export const U_TOAST_GLOBAL_EVENT_HIDE = 'uview-pro:u-toast:global:hide';
 
+// 根据当前页面获取事件名
+export function getEventWithCurrentPage(event: string, page?: string | boolean) {
+    if (page && typeof page === 'string' && page !== '') {
+        return event + page;
+    }
+    return event + getCurrentPage();
+}
+
+// 获取当前页面路由
+function getCurrentPage() {
+    try {
+        const pages = getCurrentPages();
+        const currentPage = pages[pages.length - 1].route as string;
+        return currentPage || '';
+    } catch (error) {
+        return '';
+    }
+}
+
 export type ToastPayload = Partial<ToastProps> & {
     /** 文案（兼容 toast.show('xxx')） */
     title?: string;

package/components/u-toast/types.ts

@@ -32,7 +32,7 @@ export const ToastProps = {
     /** 是否作为全局根部 toast（通常放在 App.vue 中，给 useToast() 使用） */
     global: { type: Boolean, default: false },
     /** 是否作为页面级 toast（通常放在页面中，给 useToast({ page: true }) 使用） */
-    page: { type: Boolean, default: false },
+    page: { type: [Boolean, String] as PropType<boolean | string>, default: false },
     /** 是否为loading “常驻” */
     loading: { type: Boolean, default: false }
 };

package/components/u-toast/u-toast.vue

@@ -56,6 +56,7 @@ import {
     U_TOAST_EVENT_SHOW,
     U_TOAST_GLOBAL_EVENT_HIDE,
     U_TOAST_GLOBAL_EVENT_SHOW,
+    getEventWithCurrentPage,
     type ToastPayload
 } from './service';
 
@@ -197,31 +198,68 @@ function onServiceHide() {
 }
 
 // 是否为 App 根部的“全局 toast”
-const isGlobal = computed(() => props.global);
+const isGlobal = computed(() => !!props.global);
 // 是否为页面级 toast
-const isPage = computed(() => props.page);
+const isPage = computed(() => !!props.page);
 
 // 显示事件
-const showEvent = computed(() => (isGlobal.value ? U_TOAST_GLOBAL_EVENT_SHOW : isPage.value ? U_TOAST_EVENT_SHOW : ''));
+const showEvent = computed(() =>
+    isGlobal.value
+        ? U_TOAST_GLOBAL_EVENT_SHOW
+        : isPage.value
+          ? getEventWithCurrentPage(U_TOAST_EVENT_SHOW, props.page)
+          : ''
+);
+
 // 隐藏事件
-const hideEvent = computed(() => (isGlobal.value ? U_TOAST_GLOBAL_EVENT_HIDE : isPage.value ? U_TOAST_EVENT_HIDE : ''));
+const hideEvent = computed(() =>
+    isGlobal.value
+        ? U_TOAST_GLOBAL_EVENT_HIDE
+        : isPage.value
+          ? getEventWithCurrentPage(U_TOAST_EVENT_HIDE, props.page)
+          : ''
+);
 
-onMounted(() => {
+// 开始监听事件
+function startListeners() {
+    // 如果为全局 toast，则先移除所有事件监听，再重新监听
+    if (isGlobal.value) {
+        removeAllListeners();
+    }
     if (showEvent.value) {
         uni?.$on && uni.$on(showEvent.value, onServiceShow);
     }
     if (hideEvent.value) {
         uni?.$on && uni.$on(hideEvent.value, onServiceHide);
     }
-});
+}
 
-onBeforeUnmount(() => {
+// 停止监听事件
+function stopListeners() {
     if (showEvent.value) {
         uni?.$off && uni.$off(showEvent.value, onServiceShow);
     }
     if (hideEvent.value) {
         uni?.$off && uni.$off(hideEvent.value, onServiceHide);
     }
+}
+
+// 移除所有事件监听
+function removeAllListeners() {
+    if (showEvent.value) {
+        uni?.$off && uni.$off(showEvent.value);
+    }
+    if (hideEvent.value) {
+        uni?.$off && uni.$off(hideEvent.value);
+    }
+}
+
+onMounted(() => {
+    startListeners();
+});
+
+onBeforeUnmount(() => {
+    stopListeners();
 });
 
 defineExpose<ToastExpose>({

package/components/u-upload/u-upload.vue

@@ -365,6 +365,8 @@ function deleteItem(index: number) {
     uni.showModal({
         title: t('uUpload.modalTitle'),
         content: t('uUpload.deleteConfirm'),
+        cancelText: t('uUpload.modalCancelText'),
+        confirmText: t('uUpload.modalConfirmText'),
         success: async (res: any) => {
             if (res.confirm) {
                 // 先检查是否有定义before-remove移除前钩子

package/libs/hooks/useModal.ts

@@ -5,6 +5,7 @@ import {
     U_MODAL_GLOBAL_EVENT_SHOW,
     U_MODAL_GLOBAL_EVENT_HIDE,
     U_MODAL_GLOBAL_EVENT_CLEAR_LOADING,
+    getEventWithCurrentPage,
     type ModalPayload
 } from '../../components/u-modal/service';
 
@@ -32,8 +33,8 @@ export type UseModal = {
 export type UseModalOptions = {
     /** 是否使用全局根部 <u-modal global /> */
     global?: boolean;
-    /** 是否使用页面级 <u-modal page /> */
-    page?: boolean;
+    /** 是否使用页面级 <u-modal page /> 或某个页面的 <u-modal page="pageId" /> */
+    page?: boolean | string;
 };
 
 function normalize(contentOrOptions: string | UseModalShowOptions): UseModalShowOptions {
@@ -44,18 +45,43 @@ function normalize(contentOrOptions: string | UseModalShowOptions): UseModalShow
     return contentOrOptions || {};
 }
 
+function getPage(optionsOrGlobal: UseModalOptions | boolean): string {
+    if (typeof optionsOrGlobal === 'boolean') {
+        return '';
+    }
+    if (optionsOrGlobal.page && typeof optionsOrGlobal.page === 'string' && optionsOrGlobal.page !== '') {
+        return optionsOrGlobal.page;
+    }
+    return '';
+}
+
 /**
  * Modal 函数式调用
- * @description 需要页面/应用中至少存在一个 <u-modal global /> 或 <u-modal page /> 实例用于承接事件；不影响原调用方式。
- * 支持两种调用方式：应用级 useModal() / useModal({ global: true }) 页面级 useModal({ page: true }) / useModal(false)
+ * @description 需要页面/应用中至少存在一个 <u-modal global /> 或 <u-modal page /> 实例用于承接事件；不影响原 ref 调用方式。
+ *
+ * 支持两种调用方式：
+ * - 应用级 useModal() / useModal(true) / useModal({ global: true })
+ * - 页面级 useModal(false) / useModal({ page: true }) / useModal({ page: 'pageId' }) （pageId 应和页面中 <u-modal page="pageId" /> 的 page 属性一致）
  */
 export function useModal(optionsOrGlobal: UseModalOptions | boolean = true): UseModal {
-    const isGlobal = typeof optionsOrGlobal === 'boolean' ? optionsOrGlobal !== false : optionsOrGlobal.global === true;
-    const isPage = typeof optionsOrGlobal === 'boolean' ? optionsOrGlobal === false : optionsOrGlobal.page === true;
+    const isGlobal = typeof optionsOrGlobal === 'boolean' ? optionsOrGlobal === true : !!optionsOrGlobal.global;
+    const isPage = typeof optionsOrGlobal === 'boolean' ? optionsOrGlobal === false : !!optionsOrGlobal.page;
 
-    const showEvent = isGlobal ? U_MODAL_GLOBAL_EVENT_SHOW : isPage ? U_MODAL_EVENT_SHOW : '';
-    const hideEvent = isGlobal ? U_MODAL_GLOBAL_EVENT_HIDE : isPage ? U_MODAL_EVENT_HIDE : '';
-    const clearLoadingEvent = isGlobal ? U_MODAL_GLOBAL_EVENT_CLEAR_LOADING : isPage ? U_MODAL_EVENT_CLEAR_LOADING : '';
+    const showEvent = isGlobal
+        ? U_MODAL_GLOBAL_EVENT_SHOW
+        : isPage
+          ? getEventWithCurrentPage(U_MODAL_EVENT_SHOW, getPage(optionsOrGlobal))
+          : '';
+    const hideEvent = isGlobal
+        ? U_MODAL_GLOBAL_EVENT_HIDE
+        : isPage
+          ? getEventWithCurrentPage(U_MODAL_EVENT_HIDE, getPage(optionsOrGlobal))
+          : '';
+    const clearLoadingEvent = isGlobal
+        ? U_MODAL_GLOBAL_EVENT_CLEAR_LOADING
+        : isPage
+          ? getEventWithCurrentPage(U_MODAL_EVENT_CLEAR_LOADING, getPage(optionsOrGlobal))
+          : '';
 
     function emitShow(payload: UseModalShowOptions) {
         if (showEvent) {

package/libs/hooks/useRouter.ts

@@ -0,0 +1,173 @@
+/**
+ * 路由跳转 hooks，基于 route.ts 的 Router 类实现
+ * 提供 Vue Composition API 风格的路由跳转方法
+ */
+
+import { ref } from 'vue';
+
+interface RouterConfig {
+    type?: string;
+    url?: string;
+    delta?: number;
+    params?: Record<string, any>;
+    animationType?: string;
+    animationDuration?: number;
+    intercept?: boolean;
+}
+
+declare const uni: any;
+
+const config: RouterConfig = {
+    type: 'navigateTo',
+    url: '',
+    delta: 1,
+    params: {},
+    animationType: 'pop-in',
+    animationDuration: 300,
+    intercept: false
+};
+
+// 响应式配置，支持动态修改
+const configRef = ref({ ...config });
+
+/**
+ * 判断 url 前面是否有 "/"，如果没有则加上
+ */
+const addRootPath = (url: string): string => {
+    return url[0] === '/' ? url : `/${url}`;
+};
+
+/**
+ * 整合路由参数
+ */
+const mixinParam = (url: string, params: Record<string, any>): string => {
+    url = url && addRootPath(url);
+    let query = '';
+    if (/.*\/.*\?.*=.*/.test(url)) {
+        query = uni.$u.queryParams(params, false);
+        return url + '&' + query;
+    } else {
+        query = uni.$u.queryParams(params);
+        return url + query;
+    }
+};
+
+/**
+ * 执行路由跳转
+ */
+const openPage = (cfg: RouterConfig): void => {
+    const { url = '', type = '', delta = 1, animationDuration = 300 } = cfg;
+    if (type === 'navigateTo' || type === 'to') {
+        uni.navigateTo({ url, animationDuration });
+    }
+    if (type === 'redirectTo' || type === 'redirect') {
+        uni.redirectTo({ url });
+    }
+    if (type === 'switchTab' || type === 'tab') {
+        uni.switchTab({ url });
+    }
+    if (type === 'reLaunch' || type === 'launch') {
+        uni.reLaunch({ url });
+    }
+    if (type === 'navigateBack' || type === 'back') {
+        uni.navigateBack({ delta });
+    }
+};
+
+/**
+ * 路由跳转主方法
+ */
+const route = async (options: string | RouterConfig = {}, params: Record<string, any> = {}): Promise<void> => {
+    let mergeConfig: RouterConfig = {};
+
+    if (typeof options === 'string') {
+        mergeConfig.url = mixinParam(options, params);
+        mergeConfig.type = 'navigateTo';
+    } else {
+        mergeConfig = uni.$u.deepMerge(configRef.value, options);
+        mergeConfig.url = mixinParam(options.url || '', options.params || {});
+    }
+
+    if (params.intercept !== undefined) {
+        configRef.value.intercept = params.intercept;
+    }
+
+    mergeConfig.params = params;
+    mergeConfig = uni.$u.deepMerge(configRef.value, mergeConfig);
+
+    if (uni.$u.routeIntercept && typeof uni.$u.routeIntercept === 'function') {
+        const isNext = await new Promise<boolean>(resolve => {
+            uni.$u.routeIntercept(mergeConfig, resolve);
+        });
+        isNext && openPage(mergeConfig);
+    } else {
+        openPage(mergeConfig);
+    }
+};
+
+/**
+ * 跳转到指定页面
+ */
+const to = (url: string, params?: Record<string, any>): Promise<void> => {
+    return route({ url, type: 'navigateTo' }, params || {});
+};
+
+/**
+ * 关闭当前页面，跳转到指定页面
+ */
+const redirect = (url: string, params?: Record<string, any>): Promise<void> => {
+    return route({ url, type: 'redirectTo' }, params || {});
+};
+
+/**
+ * 跳转到 tabBar 页面
+ */
+const tab = (url: string, params?: Record<string, any>): Promise<void> => {
+    return route({ url, type: 'switchTab' }, params || {});
+};
+
+/**
+ * 关闭所有页面，跳转到指定页面
+ */
+const reLaunch = (url: string, params?: Record<string, any>): Promise<void> => {
+    return route({ url, type: 'reLaunch' }, params || {});
+};
+
+/**
+ * 返回上一页
+ */
+const back = (delta: number = 1): Promise<void> => {
+    return route({ type: 'navigateBack', delta });
+};
+
+/**
+ * 设置默认路由配置
+ */
+const setConfig = (newConfig: Partial<RouterConfig>): void => {
+    configRef.value = uni.$u.deepMerge(configRef.value, newConfig);
+};
+
+/**
+ * 获取当前路由配置
+ */
+const getConfig = (): RouterConfig => {
+    return { ...configRef.value };
+};
+
+export function useRouter() {
+    return {
+        // 核心跳转方法
+        route,
+        // 便捷方法
+        to,
+        redirect,
+        tab,
+        reLaunch,
+        back,
+        // 配置方法
+        setConfig,
+        getConfig
+    };
+}
+
+export default useRouter;

package/libs/hooks/useToast.ts

@@ -3,6 +3,7 @@ import {
     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';
@@ -33,8 +34,8 @@ export type UseToast = {
 export type UseToastOptions = {
     /** 是否使用全局根部 <u-toast global />，默认 true；为 false 时走页面级 <u-toast /> */
     global?: boolean;
-    /** 是否使用页面级 <u-toast page /> */
-    page?: boolean;
+    /** 是否使用页面级 <u-toast page /> 或某个页面的 <u-toast page="pageId" /> */
+    page?: boolean | string;
 };
 
 function normalize(titleOrOptions: string | UseToastShowOptions): UseToastShowOptions {
@@ -42,16 +43,37 @@ function normalize(titleOrOptions: string | UseToastShowOptions): UseToastShowOp
     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({ global: true }) 页面级 useToast({ page: true }) / useToast(false)
+ *
+ * 支持两种调用方式：
+ * - 应用级 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 !== false : optionsOrGlobal.global === true;
-    const isPage = typeof optionsOrGlobal === 'boolean' ? optionsOrGlobal === false : optionsOrGlobal.page === true;
-    const showEvent = isGlobal ? U_TOAST_GLOBAL_EVENT_SHOW : isPage ? U_TOAST_EVENT_SHOW : '';
-    const hideEvent = isGlobal ? U_TOAST_GLOBAL_EVENT_HIDE : isPage ? U_TOAST_EVENT_HIDE : '';
+    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) {

package/locale/lang/en-US.ts

@@ -13,6 +13,8 @@ export default {
         reUpload: 'Re-upload',
         uploadFailed: 'Upload failed, please try again',
         modalTitle: 'Notice',
+        modalCancelText: 'Cancel',
+        modalConfirmText: 'Confirm',
         deleteConfirm: 'Are you sure you want to delete this item?',
         terminatedRemove: 'Removal cancelled',
         removeSuccess: 'Removed successfully',

package/locale/lang/zh-CN.ts

@@ -13,6 +13,8 @@ export default {
         reUpload: '重新上传',
         uploadFailed: '上传失败，请重试',
         modalTitle: '提示',
+        modalCancelText: '取消',
+        modalConfirmText: '确定',
         deleteConfirm: '您确定要删除此项吗？',
         terminatedRemove: '已终止移除',
         removeSuccess: '移除成功',

package/package.json

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

package/readme.md

@@ -9,6 +9,7 @@
 [![stars](https://img.shields.io/github/stars/anyup/uView-Pro?style=flat-square&logo=GitHub)](https://github.com/anyup/uView-Pro)
 [![forks](https://img.shields.io/github/forks/anyup/uView-Pro?style=flat-square&logo=GitHub)](https://github.com/anyup/uView-Pro)
 [![issues](https://img.shields.io/github/issues/anyup/uView-Pro?style=flat-square&logo=GitHub)](https://github.com/anyup/uView-Pro/issues)
+[![downloads](https://img.shields.io/npm/dm/uview-pro?logo=npm&link=https%3A%2F%2Fwww.npmjs.com%2Fpackage%2Fuview-pro&style=flat-square)](https://www.npmjs.com/package/uview-pro)
 [![npm version](https://img.shields.io/npm/v/uview-pro)](https://www.npmjs.com/package/uview-pro)
 [![Website](https://img.shields.io/badge/uView%20Pro-docs-blue?style=flat-square)](https://uviewpro.cn)
 [![node version](https://img.shields.io/badge/node-%3E%3D18-green)](https://nodejs.org/)