uview-plus 3.8.18 → 3.8.32

package/components/u-poster/u-poster.vue

@@ -359,6 +359,14 @@ export default {
             const lineHeight = css.lineHeight ? this.convertRpxToPx(css.lineHeight) : 20;
             const lines = [];
             let currentLine = '';
+            const ellipsis = '...';
+            const appendEllipsis = (line) => {
+                let fitLine = line;
+                while (ctx.measureText(fitLine + ellipsis).width > maxWidth && fitLine.length > 0) {
+                    fitLine = fitLine.substring(0, fitLine.length - 1);
+                }
+                return fitLine + ellipsis;
+            };
             
             for (let i = 0; i < text.length; i++) {
                 const char = text[i];
@@ -367,20 +375,14 @@ export default {
                 
                 if (metrics.width > maxWidth && currentLine !== '') {
                     lines.push(currentLine);
-                    currentLine = char;
                     
                     // 如果已达最大行数，添加省略号并结束
                     if (lines.length === lineClamp) {
-                        if (metrics.width > maxWidth) {
-                            // 添加省略号
-                            let fitLine = currentLine.substring(0, currentLine.length - 1);
-                            while (ctx.measureText(fitLine + '...').width > maxWidth && fitLine.length > 0) {
-                                fitLine = fitLine.substring(0, fitLine.length - 1);
-                            }
-                            lines[lines.length - 1] = fitLine + '...';
-                        }
+                        lines[lines.length - 1] = appendEllipsis(currentLine);
                         break;
                     }
+                    
+                    currentLine = char;
                 } else {
                     currentLine = testLine;
                 }
@@ -626,4 +628,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

package/components/u-qrcode/qrcode.js

@@ -1023,11 +1023,12 @@ let QRCode = {};
     QRCode = function (opt) {
         //设置默认参数
         this.options = {
-            text: '',
-            size: 256,
-            correctLevel: 3,
-            background: '#ffffff',
-            foreground: '#000000',
+            text: '',
+            size: 256,
+            correctLevel: 3,
+            quietZone: 0,
+            background: '#ffffff',
+            foreground: '#000000',
             pdground: '#000000',
             image: '',
             imageSize: 30,
@@ -1103,30 +1104,35 @@ let QRCode = {};
             var ctx = '';
 			ctx = options.ctx;
 
-            var count = qrCodeAlg.getModuleCount();
-            var ratioSize = options.size;
-            var ratioImgSize = options.imageSize;
-            //计算每个点的长宽
-            var tileW = (ratioSize / count).toPrecision(4);
-            var tileH = (ratioSize / count).toPrecision(4);
-            //绘制
-            for (var row = 0; row < count; row++) {
-                for (var col = 0; col < count; col++) {
-                    var w = (Math.ceil((col + 1) * tileW) - Math.floor(col * tileW));
-                    var h = (Math.ceil((row + 1) * tileH) - Math.floor(row * tileH));
-                    var foreground = getForeGround({
-                        row: row,
-                        col: col,
-                        count: count,
-                        options: options
-                    });
-                    if (options.isNvue) {
-                        ctx.setFillStyle(qrCodeAlg.modules[row][col] ? foreground : options.background);
-                    } else {
-                        ctx.fillStyle = qrCodeAlg.modules[row][col] ? foreground : options.background;
-                    }
-                    ctx.fillRect(Math.round(col * tileW), Math.round(row * tileH), w, h);
-                }
+            var count = qrCodeAlg.getModuleCount();
+            var quietZone = Math.max(0, Math.floor(options.quietZone || 0));
+            var renderCount = count + quietZone * 2;
+            var ratioSize = options.size;
+            var ratioImgSize = options.imageSize;
+            //计算每个点的长宽
+            var tileW = (ratioSize / renderCount).toPrecision(4);
+            var tileH = (ratioSize / renderCount).toPrecision(4);
+            //绘制
+            for (var row = 0; row < renderCount; row++) {
+                for (var col = 0; col < renderCount; col++) {
+                    var w = (Math.ceil((col + 1) * tileW) - Math.floor(col * tileW));
+                    var h = (Math.ceil((row + 1) * tileH) - Math.floor(row * tileH));
+                    var qrRow = row - quietZone;
+                    var qrCol = col - quietZone;
+                    var isDark = qrRow >= 0 && qrCol >= 0 && qrRow < count && qrCol < count && qrCodeAlg.modules[qrRow][qrCol];
+                    var foreground = getForeGround({
+                        row: qrRow,
+                        col: qrCol,
+                        count: count,
+                        options: options
+                    });
+                    if (options.isNvue) {
+                        ctx.setFillStyle(isDark ? foreground : options.background);
+                    } else {
+                        ctx.fillStyle = isDark ? foreground : options.background;
+                    }
+                    ctx.fillRect(Math.round(col * tileW), Math.round(row * tileH), w, h);
+                }
             }
             if (options.image) {
                 var x = Number(((ratioSize - ratioImgSize) / 2).toFixed(2));

package/components/u-qrcode/u-qrcode.vue

@@ -101,13 +101,17 @@ export default {
             type: Number,
             default: 40
         },
-        lv: {
-            type: Number,
-            default: 3
-        },
-        onval: {
-            type: Boolean,
-            default: true
+        lv: {
+            type: Number,
+            default: 3
+        },
+        quietZone: {
+            type: Number,
+            default: 0
+        },
+        onval: {
+            type: Boolean,
+            default: true
         },
         loadMake: {
             type: Boolean,
@@ -218,11 +222,12 @@ export default {
 						loadingText: that.loadingText, // loading文字
 						text: that.val, // 生成内容
 						size: that.sizeLocal, // 二维码大小
-						background: that.background, // 背景色
-						foreground: that.foreground, // 前景色
-						pdground: that.pdground, // 定位角点颜色
-						correctLevel: that.lv, // 容错级别
-						image: that.icon, // 二维码图标
+						background: that.background, // 背景色
+						foreground: that.foreground, // 前景色
+						pdground: that.pdground, // 定位角点颜色
+						quietZone: that.quietZone, // 静区宽度
+						correctLevel: that.lv, // 容错级别
+						image: that.icon, // 二维码图标
 						imageSize: that.iconSize,// 二维码图标大小
 						cbResult: function (res) { // 生成二维码的回调
 							that._result(res)

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

@@ -2,7 +2,7 @@
 	<view class="u-toast">
 		<u-overlay
 			:show="isShow"
-			:zIndex="tmpConfig.overlay ? tmpConfig.zIndex : -1"
+			:zIndex="tmpConfig.zIndex"
 			:custom-style="overlayStyle"
 		>
 			<view
@@ -112,6 +112,10 @@
 				}
 				// 将遮罩设置为100%透明度，避免出现灰色背景
 				style.backgroundColor = 'rgba(0, 0, 0, 0)'
+				// overlay=false时不阻止点击穿透
+				if (!this.tmpConfig.overlay) {
+					style.pointerEvents = 'none'
+				}
 				return style
 			},
 			iconStyle() {

package/components/u-tooltip/u-tooltip.vue

@@ -19,6 +19,7 @@
 					:selectable="false"
 					:style="{
 						color: color,
+						fontSize: $u.addUnit(size),
 						backgroundColor: bgColor && showTooltip && tooltipTop !== -10000 ? bgColor : 'transparent'
 					}"
 				>{{ text }}</text>

package/libs/config/config.js

@@ -47,6 +47,8 @@ export default {
     customIcons: {}, // 自定义图标与unicode对应关系
 	// 默认单位，可以通过配置为rpx，那么在用于传入组件大小参数为数值时，就默认为rpx
 	unit: 'px',
+    // 是否由运行时主题同步原生导航栏、页面背景、tabBar等全局UI
+    nativeThemeSync: false,
 	// 拦截器
 	interceptor: {
 		navbarLeftClick: null

package/libs/css/theme-vars-core.scss

@@ -10,6 +10,7 @@ body {
 	--up-hover-bg-color: #e7ebf0;
 	--up-page-bg-color: #f3f4f6;
 	--up-card-bg-color: #ffffff;
+	--up-navbar-bg-color: #ffffff;
 	--up-disabled-color: var(--up-light-disabled-color, #c8c9cc);
 
 	--up-primary: var(--up-light-primary, #3c9cff);
@@ -61,6 +62,7 @@ body {
 		--up-hover-bg-color: #343741;
 		--up-page-bg-color: #1f1f1f;
 		--up-card-bg-color: #1c1c1e;
+		--up-navbar-bg-color: #1c1c1e;
 		--up-disabled-color: #4b5563;
 
 		--up-primary: #3c9cff;
@@ -110,6 +112,7 @@ body {
 	--up-hover-bg-color: #e7ebf0;
 	--up-page-bg-color: #f3f4f6;
 	--up-card-bg-color: #ffffff;
+	--up-navbar-bg-color: #ffffff;
 	--up-disabled-color: var(--up-light-disabled-color, #c8c9cc);
 
 	--up-primary: var(--up-light-primary, #3c9cff);
@@ -158,6 +161,7 @@ body {
 	--up-hover-bg-color: #343741;
 	--up-page-bg-color: #1f1f1f;
 	--up-card-bg-color: #1c1c1e;
+	--up-navbar-bg-color: #1c1c1e;
 	--up-disabled-color: #4b5563;
 
 	--up-primary: #3c9cff;

package/libs/root/index.js

@@ -1,4 +1,5 @@
 import { dirname, relative, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import process from 'node:process'
 import { existsSync, mkdirSync, statSync, writeFileSync } from 'node:fs'
 
@@ -8,13 +9,14 @@ import { transformNvuePage, transformPage } from './page.js'
 import { rebuildUpApp, registerUpApp } from './root.js'
 import { loadPagesJson, normalizePlatformPath, toArray } from './utils.js'
 
+const rootLibPath = normalizePath(dirname(fileURLToPath(import.meta.url)))
+
 export default function UniUpRoot(options = {}) {
   const rootOptions = {
     enabledVirtualHost: false,
     enabledGlobalRef: false,
     rootFileName: 'App.up',
     autoCreateRootFile: true,
-    autoCreateViteConfig: true,
     excludePages: [],
     ...options,
   }
@@ -50,14 +52,10 @@ export default function UniUpRoot(options = {}) {
   const projectInfo = detectProjectRoot()
   const rootPath = normalizePath(projectInfo.rootPath)
   const appUpPath = normalizePath(resolve(rootPath, `${rootFileName}.vue`))
+  const rootToastHostPath = normalizePath(resolve(rootLibPath, 'root-toast-host.vue'))
   const nvueRootPath = normalizePath(resolve(rootPath, 'uni_modules/uview-plus/libs/root/nvue-root.vue'))
   const themeRuntimePath = normalizePath(resolve(rootPath, 'uni_modules/uview-plus/libs/theme/runtime.js'))
   const pagesPath = normalizePath(resolve(rootPath, 'pages.json'))
-  const projectBasePath = normalizePath(
-    projectInfo.projectType === 'cli' ? resolve(rootPath, '..') : rootPath
-  )
-  const viteConfigTsPath = normalizePath(resolve(projectBasePath, 'vite.config.ts'))
-  const viteConfigJsPath = normalizePath(resolve(projectBasePath, 'vite.config.js'))
   const excludedPaths = toArray(rootOptions.excludePages)
     .filter(Boolean)
     .map(path => normalizePath(resolve(rootPath, path)))
@@ -92,27 +90,6 @@ export default function UniUpRoot(options = {}) {
     writeFileSync(appUpPath, defaultRootSfc, 'utf-8')
   }
 
-  const ensureViteConfigFile = () => {
-    if (!rootOptions.autoCreateViteConfig) return
-    if (existsSync(viteConfigTsPath) || existsSync(viteConfigJsPath)) return
-
-    const template = `import { defineConfig } from "vite";
-import uni from "@dcloudio/vite-plugin-uni";
-import UniUpRoot from "./src/uni_modules/uview-plus/libs/root/index.js";
-
-export default defineConfig({
-  plugins: [
-    UniUpRoot({
-      rootFileName: "${rootFileName}",
-    }),
-    uni(),
-  ],
-});
-`
-
-    writeFileSync(viteConfigTsPath, template, 'utf-8')
-  }
-
   const refreshPagesJson = () => {
     if (!existsSync(pagesPath)) return
     const mtimeMs = statSync(pagesPath).mtimeMs
@@ -128,7 +105,6 @@ export default defineConfig({
       hasPlatformPlugin = plugins.some(v => v.name === 'vite-plugin-uni-platform')
     },
     buildStart() {
-      ensureViteConfigFile()
       ensureRootFile()
       refreshPagesJson()
     },
@@ -139,7 +115,7 @@ export default defineConfig({
 
       const filterMain = createFilter(mainFiles)
       if (filterMain(cleanId)) {
-        ms = await registerUpApp(code, rootFileName)
+        ms = await registerUpApp(code, rootFileName, getRelativeImportPath(cleanId, rootToastHostPath))
       }
 
       const filterUpRoot = createFilter(appUpPath)

package/libs/root/root.js

@@ -2,11 +2,15 @@ import { MagicString } from 'vue/compiler-sfc'
 
 import { parseSFC } from './utils.js'
 
-export async function registerUpApp(code, fileName = 'App.up') {
+export async function registerUpApp(
+  code,
+  fileName = 'App.up',
+  rootToastHostPath = './uni_modules/uview-plus/libs/root/root-toast-host.vue'
+) {
   const ms = new MagicString(code)
 
   const importCode = `import GlobalUpRoot from "./${fileName}.vue";
-import UpRootToastHost from "./uni_modules/uview-plus/libs/root/root-toast-host.vue";`
+import UpRootToastHost from "${rootToastHostPath}";`
   const vueUseComponentCode = 'app.component("global-up-root", GlobalUpRoot);\napp.component("ku-root-toast-host", UpRootToastHost);'
 
   ms.prepend(`${importCode}\n`).replace(

package/libs/theme/runtime.js

@@ -349,6 +349,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(

package/libs/theme/theme.js

@@ -512,11 +512,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 +537,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({
@@ -615,7 +613,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.32",
   "description": "零云®uview-plus已兼容vue3支持多语言，120+全面的组件和便捷的工具会让您信手拈来。近期新增拖动排序、条码、图片裁剪、下拉刷新、虚拟列表、签名、Markdown等。",
   "keywords": [
     "uview",

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