uview-plus 3.8.18 → 3.8.37

package/libs/theme/runtime.js

@@ -133,6 +133,37 @@ function getRuntimeU(upU) {
     return null
 }
 
+function normalizeRuntimeRoute(route) {
+    if (typeof route !== 'string') return ''
+    return route.replace(/^\//, '').split('?')[0]
+}
+
+function getCurrentRuntimeRoute() {
+    try {
+        if (typeof getCurrentPages !== 'function') return ''
+        const pages = getCurrentPages()
+        if (!Array.isArray(pages) || pages.length === 0) return ''
+        const page = pages[pages.length - 1] || {}
+        return normalizeRuntimeRoute(page.route || page.path || '')
+    } catch (e) {}
+    return ''
+}
+
+function getRuntimeTabBarRoutes() {
+    const routes = []
+    try {
+        const runtimeConfig = typeof __uniConfig !== 'undefined' ? __uniConfig : null
+        const tabBarList = runtimeConfig?.tabBar?.list
+        if (Array.isArray(tabBarList)) {
+            tabBarList.forEach((item) => {
+                const route = normalizeRuntimeRoute(item?.pagePath || '')
+                if (route) routes.push(route)
+            })
+        }
+    } catch (e) {}
+    return routes
+}
+
 function hasActiveRuntimePage() {
     try {
         if (typeof getCurrentPages === 'function') {
@@ -154,6 +185,25 @@ function trySetNavigationBarColor(options) {
     } catch (e) {}
 }
 
+export function isTabBarPage() {
+    const route = getCurrentRuntimeRoute()
+    if (!route) return false
+    const tabBarRoutes = getRuntimeTabBarRoutes()
+    if (!tabBarRoutes.length) return false
+    return tabBarRoutes.includes(route)
+}
+
+export function trySetTabBarStyle(options) {
+    if (typeof uni === 'undefined' || typeof uni.setTabBarStyle !== 'function') return
+    if (!isTabBarPage()) return
+    try {
+        const result = uni.setTabBarStyle(options)
+        if (result && typeof result.catch === 'function') {
+            result.catch(() => {})
+        }
+    } catch (e) {}
+}
+
 function normalizeThemeMode(theme = 'light') {
     return theme === 'dark' ? 'dark' : 'light'
 }
@@ -349,6 +399,7 @@ export function getThemeTabBarStyle(upU) {
 export function applyNativeThemeUI(upU) {
     if (typeof uni === 'undefined') return
     const runtimeU = getRuntimeU(upU)
+    if (runtimeU?.config?.nativeThemeSync !== true) return
     const isDark = getThemeIsDark(runtimeU)
     const fallbackBg = isDark ? '#1f1f1f' : (runtimeU?.color?.bgColor || '#f3f4f6')
     const pageBg = getThemeVar(
@@ -376,9 +427,7 @@ export function applyNativeThemeUI(upU) {
             backgroundColorBottom: pageBg
         })
     }
-    if (typeof uni.setTabBarStyle === 'function') {
-        uni.setTabBarStyle(getThemeTabBarStyle(runtimeU))
-    }
+    trySetTabBarStyle(getThemeTabBarStyle(runtimeU))
 }
 
 export function applyNativeThemeUIDeferred(upU, delay = 30) {

package/libs/theme/theme.js

@@ -1,6 +1,7 @@
 import config from '../config/config.js'
 import color from '../config/color.js'
 import index from '../function/index.js'
+import { trySetTabBarStyle } from './runtime.js'
 
 const DEFAULT_LIGHT_THEME_COLORS = Object.freeze({
     primary: '#3c9cff',
@@ -512,11 +513,6 @@ function syncThemeToH5(mode) {
     // #ifdef H5
     if (typeof document !== 'undefined' && document.documentElement) {
         document.documentElement.setAttribute('data-up-theme', mode)
-        const bg = color.bgColor || (mode === 'dark' ? '#1f1f1f' : '#f3f4f6')
-        document.documentElement.style.backgroundColor = bg
-        if (document.body) document.body.style.backgroundColor = bg
-        const appRoot = document.getElementById('app')
-        if (appRoot) appRoot.style.backgroundColor = bg
     }
     // #endif
 }
@@ -542,11 +538,14 @@ function trySetNavigationBarColor(options) {
     } catch (e) {}
 }
 
-function applyNativeThemeUI(mode, themeColors) {
+function applyNativeThemeUI(mode, themeColors, themeVars = {}) {
     if (typeof uni === 'undefined') return
+    if (config.nativeThemeSync !== true) return
     const isDark = normalizeThemeMode(mode) === 'dark'
     const pageBg = themeColors?.bgColor || (isDark ? '#1f1f1f' : '#f3f4f6')
-    const navBg = config.color?.['up-navbar-bg-color']
+    const navBg = themeVars?.['--up-navbar-bg-color']
+        || themeVars?.['--u-navbar-bg-color']
+        || config.color?.['up-navbar-bg-color']
         || config.color?.['u-navbar-bg-color']
         || (isDark ? '#1c1c1e' : '#ffffff')
     trySetNavigationBarColor({
@@ -564,14 +563,12 @@ function applyNativeThemeUI(mode, themeColors) {
             backgroundColorBottom: pageBg
         })
     }
-    if (typeof uni.setTabBarStyle === 'function') {
-        uni.setTabBarStyle({
-            color: isDark ? '#8e8e93' : '#909399',
-            selectedColor: isDark ? '#f2f2f7' : '#303133',
-            backgroundColor: isDark ? '#111111' : '#ffffff',
-            borderStyle: isDark ? 'white' : 'black'
-        })
-    }
+    trySetTabBarStyle({
+        color: isDark ? '#8e8e93' : '#909399',
+        selectedColor: isDark ? '#f2f2f7' : '#303133',
+        backgroundColor: isDark ? '#111111' : '#ffffff',
+        borderStyle: isDark ? 'white' : 'black'
+    })
 }
 
 function applyTheme(mode = 'light') {
@@ -615,7 +612,7 @@ function applyTheme(mode = 'light') {
     themeState.vars = { ...themeVars }
     themeState.version = Number(themeState.version || 0) + 1
     syncThemeToH5(themeMode)
-    applyNativeThemeUI(themeMode, themeColors)
+    applyNativeThemeUI(themeMode, themeColors, themeVars)
 
     if (typeof uni !== 'undefined' && uni.$u && uni.$u.theme) {
         uni.$u.theme.mode = themeState.mode

package/package.json

@@ -2,7 +2,7 @@
   "id": "uview-plus",
   "name": "uview-plus",
   "displayName": "零云®uview-plus3.0重磅发布，全面的Vue3鸿蒙跨端移动组件库，组件丰富维护更新稳定。",
-  "version": "3.8.18",
+  "version": "3.8.37",
   "description": "零云®uview-plus已兼容vue3支持多语言，120+全面的组件和便捷的工具会让您信手拈来。近期新增拖动排序、条码、图片裁剪、下拉刷新、虚拟列表、签名、Markdown等。",
   "keywords": [
     "uview",

package/theme.scss

@@ -111,11 +111,6 @@ $up-legacy-light-theme-map: (
 	}
 }
 
-@include up-export-legacy-light-vars(':root');
-@include up-export-legacy-light-vars('page');
-@include up-export-legacy-light-vars('body');
-@include up-export-legacy-light-vars("[data-up-theme='light']");
-
 // scss混入，为了少写几行#ifndef
 @mixin flex($direction: row) {
 	/* #ifndef APP-NVUE */

package/types/comps/calendar.d.ts

@@ -134,6 +134,11 @@ declare interface CalendarProps {
    * @default 3
    */
   monthNum?: string | number
+  /**
+   * 是否显示今天按钮
+   * @default true
+   */
+  showToday?: boolean
   /**
    * 日期选择完成后触发，若`show-confirm`为`true`，则点击确认按钮后触发
    */

package/types/comps/qrcode.d.ts

@@ -17,6 +17,12 @@ declare interface QrcodeProps {
      */
     val: string
 
+    /**
+     * 二维码静区宽度
+     * @default 0
+     */
+    quietZone?: number
+
     /**
      * 背景色
      * @default "#ffffff"

package/types/index.d.ts

@@ -23,6 +23,12 @@ declare module 'uview-plus' {
 		 * @default 'px'
 		 */
 		unit: 'px' | 'rpx';
+		/**
+		 * 是否由运行时主题同步原生导航栏、页面背景、tabBar等全局UI。
+		 * 默认关闭，避免升级后覆盖项目已有 pages.json/theme.json 全局样式。
+		 * @default false
+		 */
+		nativeThemeSync: boolean;
 		/** 
 		 * 只加载一次字体图标
 		 * @default false