diff --git a/packages/shims-uni-app.d.ts b/packages/shims-uni-app.d.ts index 87457939268d3c556d53c5ace759253e8f6a095e..9297d1cbebea30e522819e9ee4f4dfe20fcd8b46 100644 --- a/packages/shims-uni-app.d.ts +++ b/packages/shims-uni-app.d.ts @@ -92,6 +92,7 @@ declare namespace UniApp { interface PageNavigationBar { type?: 'default' | 'transparent' | 'float' | 'none' + titleSize?: string titleText?: string titleImage?: string titleColor?: '#000' | '#fff' diff --git a/packages/uni-h5/dist/uni-h5.esm.js b/packages/uni-h5/dist/uni-h5.esm.js index 948b1c9fe46f1096848c03f89338e7ab75da221b..aad048f0f2bb57c418e651dc65d7f3d1db5ccb72 100644 --- a/packages/uni-h5/dist/uni-h5.esm.js +++ b/packages/uni-h5/dist/uni-h5.esm.js @@ -1254,9 +1254,11 @@ function normalizePageMeta(pageMeta) { } if (__UNI_FEATURE_NAVIGATIONBAR__) { const {navigationBar} = pageMeta; + const {titleSize, titleColor, backgroundColor} = navigationBar; navigationBar.backButton = pageMeta.isQuit ? false : true; - navigationBar.titleColor = navigationBar.titleColor || "#fff"; - navigationBar.backgroundColor = navigationBar.backgroundColor || "#F7F7F7"; + navigationBar.titleSize = titleSize || "16px"; + navigationBar.titleColor = titleColor || "#fff"; + navigationBar.backgroundColor = backgroundColor || "#F7F7F7"; } if (__UNI_FEATURE_PAGES__ && history.state) { const type = history.state.__type__; @@ -13568,21 +13570,26 @@ function createPageHeadBdTsx(navigationBar, searchInput) { return createPageHeadSearchInputTsx(navigationBar, searchInput); } function createPageHeadTitleTextTsx({ + type, loading, + titleSize, titleText, titleImage }) { return createVNode("div", { class: "uni-page-head-bd" }, [createVNode("div", { - style: "{fontSize:titleSize,opacity:type==='transparent'?0:1}", + style: { + fontSize: titleSize, + opacity: type === "transparent" ? 0 : 1 + }, class: "uni-page-head__title" }, [loading ? createVNode("i", { class: "uni-loading" }, null) : titleImage ? createVNode("img", { src: titleImage, class: "uni-page-head__title_image" - }, null, 8, ["src"]) : titleText])]); + }, null, 8, ["src"]) : titleText], 4)]); } function createPageHeadSearchInputTsx(navigationBar, { text: text2, diff --git a/packages/uni-h5/src/framework/components/page/pageHead.tsx b/packages/uni-h5/src/framework/components/page/pageHead.tsx index bc6a343ef9fe65d0509473c77db04ed5ef100325..3af8f3ad58281b6576c9baaa627d14b3b0f2b0a2 100644 --- a/packages/uni-h5/src/framework/components/page/pageHead.tsx +++ b/packages/uni-h5/src/framework/components/page/pageHead.tsx @@ -147,14 +147,16 @@ function createPageHeadBdTsx( } function createPageHeadTitleTextTsx({ + type, loading, + titleSize, titleText, titleImage, }: UniApp.PageNavigationBar) { return (
{loading ? ( diff --git a/packages/uni-h5/src/framework/setup/provide/page.ts b/packages/uni-h5/src/framework/setup/provide/page.ts index 6f78c810b15f91ad5e05623b564e26c930e56476..a2cccbc24fc0159653e737a7fac099f12c9d5ee5 100644 --- a/packages/uni-h5/src/framework/setup/provide/page.ts +++ b/packages/uni-h5/src/framework/setup/provide/page.ts @@ -104,9 +104,11 @@ function normalizePageMeta(pageMeta: UniApp.PageRouteMeta) { } if (__UNI_FEATURE_NAVIGATIONBAR__) { const { navigationBar } = pageMeta + const { titleSize, titleColor, backgroundColor } = navigationBar navigationBar.backButton = pageMeta.isQuit ? false : true - navigationBar.titleColor = navigationBar.titleColor || '#fff' - navigationBar.backgroundColor = navigationBar.backgroundColor || '#F7F7F7' + navigationBar.titleSize = titleSize || '16px' + navigationBar.titleColor = titleColor || '#fff' + navigationBar.backgroundColor = backgroundColor || '#F7F7F7' } if (__UNI_FEATURE_PAGES__ && history.state) { // 首页执行了redirectTo