From 1c97be13505205094b960fb1fab28a721291fd65 Mon Sep 17 00:00:00 2001
From: handongxun <handongxun@dcloud.io>
Date: Fri, 1 Apr 2022 15:44:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20app=20tabbar=20API=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=20iconfont=20=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                          |  2 +-
 packages/uni-app-plus/src/service/api/ui/tabBar.ts    | 11 +++++++++--
 .../uni-app-plus/src/service/framework/app/tabBar.ts  | 11 +++++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 34b859387..c503ec684 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.16.11",
-    "@dcloudio/types": "^2.5.18",
+    "@dcloudio/types": "^2.5.19",
     "@dcloudio/uni-api": "3.0.0-alpha-3040320220325006",
     "@dcloudio/uni-app": "3.0.0-alpha-3040320220325006",
     "@jest/types": "^27.0.2",
diff --git a/packages/uni-app-plus/src/service/api/ui/tabBar.ts b/packages/uni-app-plus/src/service/api/ui/tabBar.ts
index bc966928d..6410aaab8 100644
--- a/packages/uni-app-plus/src/service/api/ui/tabBar.ts
+++ b/packages/uni-app-plus/src/service/api/ui/tabBar.ts
@@ -47,10 +47,17 @@ export const setTabBarBadge = defineAsyncApi<API_TYPE_SET_TAB_BAR_BADGE>(
 export const setTabBarItem = defineAsyncApi<API_TYPE_SET_TAB_BAR_ITEM>(
   API_SET_TAB_BAR_ITEM,
   (
-    { index, text, iconPath, selectedIconPath, pagePath, visible },
+    { index, text, iconPath, selectedIconPath, pagePath, visible, iconfont },
     { resolve, reject }
   ) => {
-    tabBar.setTabBarItem(index, text, iconPath, selectedIconPath, visible)
+    tabBar.setTabBarItem(
+      index,
+      text,
+      iconPath,
+      selectedIconPath,
+      visible,
+      iconfont
+    )
     const route = pagePath && __uniRoutes.find(({ path }) => path === pagePath)
     if (route) {
       const meta = route.meta
diff --git a/packages/uni-app-plus/src/service/framework/app/tabBar.ts b/packages/uni-app-plus/src/service/framework/app/tabBar.ts
index 69681fe0e..6da6419b5 100644
--- a/packages/uni-app-plus/src/service/framework/app/tabBar.ts
+++ b/packages/uni-app-plus/src/service/framework/app/tabBar.ts
@@ -58,9 +58,13 @@ function setTabBarItem(
   text?: string,
   iconPath?: string,
   selectedIconPath?: string,
-  visible?: boolean
+  visible?: boolean,
+  iconfont?: UniApp.SetTabBarItemIconFontOptions
 ) {
-  type TabBarItem = Record<string, string | number | boolean | undefined>
+  type TabBarItem = Record<
+    string,
+    string | number | boolean | undefined | UniApp.SetTabBarItemIconFontOptions
+  >
   const item: TabBarItem = {
     index,
   }
@@ -73,6 +77,9 @@ function setTabBarItem(
   if (selectedIconPath) {
     item.selectedIconPath = getRealPath(selectedIconPath)
   }
+  if (iconfont !== undefined) {
+    item.iconfont = iconfont
+  }
   if (visible !== undefined) {
     item.visible = config.list[index].visible = visible
     delete item.index
-- 
GitLab