uview-pro 0.4.6 → 0.4.7

package/changelog.md

@@ -1,22 +1,41 @@
-## 0.4.6（2025-12-17）
+## 0.4.7（2025-12-19）
 
-### 📝 Documentation | 文档
+### 🚀 Chore | 构建/工程依赖/工具
 
-- 添加鸿蒙系统预览说明及二维码 ([7f6199a](https://github.com/anyup/uView-Pro/commit/7f6199a30d5477743c20b27a94711b4605787757))
+- 忽略部分文件 ([a8a747f](https://github.com/anyup/uView-Pro/commit/a8a747f97e93ed278a305cd1b2671d2ede5c0fde))
 
 ### ✨ Features | 新功能
 
-- **u-slider:** 增强滑块组件功能与灵活性，支持设置滑块的整体范围起点(start)和终点(end) ([a20c44b](https://github.com/anyup/uView-Pro/commit/a20c44b0270cffde02afd8738a932b2d6bae49f4))
-- **button:** 新增按钮禁用与自定义样式功能演示 ([5f1f482](https://github.com/anyup/uView-Pro/commit/5f1f4823e027dc5ab2e6f49f29fe327c6d4318c6))
+- **u-tabbar:** u-tabbar 组件支持 custom-icon 直接配置图标 custom-prefix ([e577c2d](https://github.com/anyup/uView-Pro/commit/e577c2d083cf46db7124b0df46b2848ef9bdbe80))
 
 ### 🐛 Bug Fixes | Bug 修复
 
-- **button:** 更新禁用状态下按钮样式优先级 ([b3ff20b](https://github.com/anyup/uView-Pro/commit/b3ff20b59818c8bc8204bb2a489eff42ded7e842))
+- **u-icon:** 修复图标组件样式和事件处理问题 ([1cadf27](https://github.com/anyup/uView-Pro/commit/1cadf27f8bd2aec3a11fb1befb9255256a2e3b3a))
+- **u-pagination:** 修复分页切换时传递不正确的当前页码值 ([4befe02](https://github.com/anyup/uView-Pro/commit/4befe02c5cbb4e7db6fbf49f04ca68fac0f69a37))
 
 ### 👥 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.4.6（2025-12-17）
+
+### 📝 Documentation | 文档
+
+- 添加鸿蒙系统预览说明及二维码 ([7f6199a](https://github.com/anyup/uView-Pro/commit/7f6199a30d5477743c20b27a94711b4605787757))
+
+### ✨ Features | 新功能
+
+- **u-slider:** 增强滑块组件功能与灵活性，支持设置滑块的整体范围起点(start)和终点(end) ([a20c44b](https://github.com/anyup/uView-Pro/commit/a20c44b0270cffde02afd8738a932b2d6bae49f4))
+- **button:** 新增按钮禁用与自定义样式功能演示 ([5f1f482](https://github.com/anyup/uView-Pro/commit/5f1f4823e027dc5ab2e6f49f29fe327c6d4318c6))
+
+### 🐛 Bug Fixes | Bug 修复
+
+- **button:** 更新禁用状态下按钮样式优先级 ([b3ff20b](https://github.com/anyup/uView-Pro/commit/b3ff20b59818c8bc8204bb2a489eff42ded7e842))
+
+### 👥 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.4.5（2025-12-10）
 
 ### ✨ Features | 新功能

package/components/u-icon/u-icon.vue

@@ -1,17 +1,22 @@
 <template>
-    <view :style="[customStyle]" class="u-icon" @click="onClick" :class="['u-icon--' + labelPos, customClass]">
-        <image class="u-icon__img" v-if="isImg" :src="name" :mode="imgMode" :style="[imgStyle]" />
+    <view
+        :style="$u.toStyle(customStyle)"
+        class="u-icon"
+        @click="onClick"
+        :class="['u-icon--' + labelPos, customClass]"
+    >
+        <image class="u-icon__img" v-if="isImg" :src="props.name" :mode="imgMode" :style="[imgStyle]" />
         <text
             v-else
             class="u-icon__icon"
             :class="iconClass"
-            :style="[iconStyle]"
+            :style="$u.toStyle(iconStyle)"
             :hover-class="hoverClass"
             @touchstart="onTouchstart"
         >
             <text
                 v-if="showDecimalIcon"
-                :style="[decimalIconStyle]"
+                :style="$u.toStyle(decimalIconStyle)"
                 :class="decimalIconClass"
                 :hover-class="hoverClass"
                 class="u-icon__decimal"
@@ -219,8 +224,8 @@ function onClick(event: any) {
  * 图标触摸时触发
  * @emits touchstart(index)
  */
-function onTouchstart() {
-    emit('touchstart', props.index);
+function onTouchstart(event: any) {
+    emit('touchstart', props.index || event);
 }
 </script>
 

package/components/u-pagination/u-pagination.vue

@@ -65,14 +65,15 @@ const totalPages = computed(() => {
 
 // 切换分页
 function handleChange(type: PaginationDirection) {
-    if (type === 'prev') {
-        current.value -= 1;
-    } else {
-        current.value += 1;
-    }
+    // 先计算新值，确保获取到的是更新后的值
+    const newCurrent = type === 'prev' ? current.value - 1 : current.value + 1;
+
+    // 更新 current 值
+    current.value = newCurrent;
 
     // current为当前页，type值为：next/prev，表示点击的是上一页还是下一页
-    emit('change', { type, current: current.value });
+    // 使用计算后的新值，而不是 current.value，避免异步更新导致的值不同步问题
+    emit('change', { type, current: newCurrent });
 }
 </script>
 

package/components/u-tabbar/u-tabbar.vue

@@ -31,7 +31,7 @@
                         :name="elIconPath(index)"
                         img-mode="scaleToFill"
                         :color="elColor(index)"
-                        :custom-prefix="item.customIcon ? 'custom-icon' : 'uicon'"
+                        :custom-prefix="getCustomPrefix(index)"
                     ></u-icon>
                     <u-badge
                         :count="item.count"
@@ -154,6 +154,34 @@ const elColor = computed<(index: number) => string>(() => {
     };
 });
 
+/**
+ * 计算当前item的custom-prefix
+ * customIcon为boolean时：true为"custom-icon"，false为"uicon"
+ * customIcon为string时：直接使用该值
+ * customIcon为空时：默认"uicon"
+ */
+function getCustomPrefix(index: number): string {
+    const customIcon = props.list[index]?.customIcon;
+
+    // 如果为空（undefined/null），返回默认值
+    if (customIcon === undefined || customIcon === null || customIcon === '') {
+        return 'uicon';
+    }
+
+    // 如果是字符串类型，直接返回
+    if (typeof customIcon === 'string') {
+        return customIcon;
+    }
+
+    // 如果是boolean类型
+    if (typeof customIcon === 'boolean') {
+        return customIcon ? 'custom-icon' : 'uicon';
+    }
+
+    // 默认返回uicon
+    return 'uicon';
+}
+
 /**
  * 点击tabbar item
  */

package/package.json

@@ -2,7 +2,7 @@
     "id": "uview-pro",
     "name": "uview-pro",
     "displayName": "【支持鸿蒙】uView Pro｜基于Vue3+TS的80+精选UI组件库，支持多主题，暗黑模式",
-    "version": "0.4.6",
+    "version": "0.4.7",
     "description": "uView Pro，是全面支持Vue3+TS的uni-app生态框架，80+精选组件，支持安卓，iOS，鸿蒙，各小程序平台，支持多主题，一键暗黑模式",
     "main": "index.ts",
     "module": "index.ts",

package/types/global.d.ts

@@ -401,6 +401,6 @@ export type TabbarItem = {
     selectedIconPath?: string;
     count?: number;
     isDot?: boolean;
-    customIcon?: boolean;
+    customIcon?: boolean | string;
     midButton?: boolean;
 };