uview-plus 3.8.55 → 3.8.106

package/components/u-line-progress/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import LineProgressDefaultProps from './lineProgress'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(LineProgressDefaultProps)
 export const props = defineMixin({
     props: {
         // 激活部分的颜色
@@ -9,12 +12,12 @@ export const props = defineMixin({
         },
         inactiveColor: {
             type: String,
-            default: () => defProps.lineProgress.color
+            default: () => defProps.lineProgress.inactiveColor
         },
         // 进度百分比，数值
         percentage: {
             type: [String, Number],
-            default: () => defProps.lineProgress.inactiveColor
+            default: () => defProps.lineProgress.percentage
         },
         // 是否在进度条内部显示百分比的值
         showText: {

package/components/u-link/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import LinkDefaultProps from './link'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(LinkDefaultProps)
 export const props = defineMixin({
     props: {
         // 文字颜色

package/components/u-list/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import ListDefaultProps from './list'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(ListDefaultProps)
 export const props = defineMixin({
     props: {
         // 控制是否出现滚动条，仅nvue有效

package/components/u-list-item/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import ListItemDefaultProps from './listItem'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(ListItemDefaultProps)
 export const props = defineMixin({
     props: {
         // 用于滚动到指定item

package/components/u-loading-icon/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import LoadingIconDefaultProps from './loadingIcon'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(LoadingIconDefaultProps)
 export const props = defineMixin({
     props: {
         // 是否显示组件

package/components/u-loading-page/props.js

@@ -1,6 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import LoadingPageDefaultProps from './loadingPage'
+import { registerComponentProps } from '../../libs/config/props.js'
 
+const defProps = registerComponentProps(LoadingPageDefaultProps)
 export const props = defineMixin({
     props: {
         // 提示内容

package/components/u-loadmore/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import LoadmoreDefaultProps from './loadmore'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(LoadmoreDefaultProps)
 export const props = defineMixin({
     props: {
         // 组件状态，loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态

package/components/u-markdown/u-markdown.vue

@@ -1,14 +1,28 @@
 <template>
   <view class="up-markdown" :class="theme">
-    <up-parse :content="parsedContent" :previewImg="previewImg"></up-parse>
+    <up-parse
+      :content="parsedContent"
+      :previewImg="previewImg"
+      :copyLink="copyLink"
+      :domain="domain"
+      @load="emitLoad"
+      @ready="emitReady"
+      @imgtap="emitImgtap"
+      @linktap="emitLinktap"
+      @play="emitPlay"
+      @error="emitError"
+    ></up-parse>
   </view>
 </template>
 
 <script>
-import { marked } from './marked.esm.js';
+import { marked } from './marked.esm.mjs';
 
 export default {
   name: 'up-markdown',
+  // #ifdef VUE3
+  emits: ['load', 'ready', 'imgtap', 'linktap', 'play', 'error'],
+  // #endif
   props: {
     // markdown内容
     content: {
@@ -20,6 +34,16 @@ export default {
       type: Boolean,
       default: true
     },
+    // 是否允许外部链接被点击时自动打开
+    copyLink: {
+      type: [Boolean, String],
+      default: true
+    },
+    // 主域名，用于 up-parse 处理相对链接
+    domain: {
+      type: String,
+      default: ''
+    },
     // 是否显示代码块行号
     showLineNumber: {
       type: Boolean,
@@ -93,6 +117,24 @@ export default {
     applyTheme(html) {
       // 可以根据theme属性添加不同的样式类
       return html;
+    },
+    emitLoad(event) {
+      this.$emit('load', event)
+    },
+    emitReady(event) {
+      this.$emit('ready', event)
+    },
+    emitImgtap(event) {
+      this.$emit('imgtap', event)
+    },
+    emitLinktap(event) {
+      this.$emit('linktap', event)
+    },
+    emitPlay(event) {
+      this.$emit('play', event)
+    },
+    emitError(event) {
+      this.$emit('error', event)
     }
   }
 };
@@ -297,4 +339,4 @@ export default {
     line-height: 1.6;
   }
 }
-</style>
+</style>

package/components/u-modal/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import ModalDefaultProps from './modal'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(ModalDefaultProps)
 export const props = defineMixin({
     props: {
         // 是否展示modal

package/components/u-navbar/props.js

@@ -1,6 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
-
+import NavbarDefaultProps from './navbar'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(NavbarDefaultProps)
 export const props = defineMixin({
 	props: {
 		// 是否开启顶部安全区适配

package/components/u-navbar/u-navbar.vue

@@ -7,17 +7,18 @@
 				height: addUnit(getPx(height) + getWindowInfo().statusBarHeight,'px'),
 			}"
 		></view>
-		<view :class="[fixed && 'u-navbar--fixed']">
-			<u-status-bar
-				v-if="safeAreaInsetTop"
-				:bgColor="statusBarBgColor ? statusBarBgColor : navbarBgColor"
-			></u-status-bar>
+		<view
+			class="u-navbar__inner"
+			:class="[fixed && 'u-navbar--fixed']"
+			:style="[navbarInnerStyle]"
+		>
+			<u-status-bar v-if="safeAreaInsetTop"></u-status-bar>
 			<view
 				class="u-navbar__content"
 				:class="[border && 'u-border-bottom']"
 				:style="{
 					height: addUnit(height),
-					backgroundColor: navbarBgColor,
+					backgroundColor: 'transparent',
 				}"
 			>
 				<view
@@ -95,8 +96,8 @@
 	 * @property {String}			rightIcon			右边返回图标的名称，只能为uview-plus自带的图标
 	 * @property {String}			title				导航栏标题，如设置为空字符，将会隐藏标题占位区域
 	 * @property {String}			titleColor			文字颜色 （默认 '' ）
-	 * @property {String}			bgColor				导航栏背景设置 （默认 '#ffffff' ）
-	 * @property {String}			statusBarBgColor	状态栏背景颜色 不写同导航栏背景设置
+	 * @property {String}			bgColor				导航栏背景设置，支持颜色、渐变或背景图 （默认 '#ffffff' ）
+	 * @property {String}			statusBarBgColor	状态栏背景颜色，保留兼容；导航栏内部统一使用 bgColor 作为整体背景
 	 * @property {String | Number}	titleWidth			导航栏标题的最大宽度，内容超出会以省略号隐藏 （默认 '400rpx' ）
 	 * @property {String | Number}	height				导航栏高度(不包括状态栏高度在内，内部自动加上)（默认 '44px' ）
 	 * @property {String | Number}	leftIconSize		左侧返回图标的大小（默认 20px ）
@@ -129,6 +130,11 @@
 			},
 			navbarRightColor() {
 				return this.upThemeVar('--up-main-color', this.$u.color.mainColor)
+			},
+			navbarInnerStyle() {
+				const style = {}
+				style.background = this.navbarBgColor
+				return style
 			}
 		},
 		emits: ["leftClick", "rightClick"],
@@ -142,7 +148,7 @@
 				// 如果配置了autoBack，自动返回上一页
 				this.$emit('leftClick')
 				if (config.interceptor.navbarLeftClick != null) {
-					config.interceptor.navbarLeftClick()
+					config.interceptor.navbarLeftClick.call(this, this)
 				} else {
 					if(this.autoBack) {
 						uni.navigateBack()

package/components/u-no-network/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import NoNetworkDefaultProps from './noNetwork'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(NoNetworkDefaultProps)
 export const props = defineMixin({
     props: {
         // 页面文字提示

package/components/u-notice-bar/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import NoticeBarDefaultProps from './noticeBar'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(NoticeBarDefaultProps)
 export const props = defineMixin({
     props: {
         // 显示的内容，数组

package/components/u-notify/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import NotifyDefaultProps from './notify'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(NotifyDefaultProps)
 export const props = defineMixin({
     props: {
         // 到顶部的距离

package/components/u-novel-reader/content-normalizer.js

@@ -0,0 +1,80 @@
+const LINE_BREAK_PATTERN = /\r\n|\r|\n/
+
+function normalizeParagraphs(content) {
+    const values = Array.isArray(content) ? content : [content == null ? '' : content]
+    return values.reduce((paragraphs, value) => {
+        String(value == null ? '' : value)
+            .split(LINE_BREAK_PATTERN)
+            .forEach((text) => paragraphs.push(text))
+        return paragraphs
+    }, [])
+}
+
+export function normalizeContent(content) {
+    const sourceParagraphs = normalizeParagraphs(content)
+    const hasContent = sourceParagraphs.some((text) => text.length > 0)
+    if (!hasContent) {
+        return {
+            paragraphs: [],
+            text: '',
+            length: 0
+        }
+    }
+
+    let offset = 0
+    const paragraphs = sourceParagraphs.map((text, index) => {
+        const startOffset = offset
+        const endOffset = startOffset + text.length
+        offset = endOffset + 1
+        return {
+            index,
+            text,
+            startOffset,
+            endOffset
+        }
+    })
+
+    const text = paragraphs.map((paragraph) => paragraph.text).join('\n')
+    return {
+        paragraphs,
+        text,
+        length: text.length
+    }
+}
+
+export function normalizeProgress(progress, chapter) {
+    const normalizedContent = normalizeContent(chapter && chapter.content)
+    const contentLength = normalizedContent.length
+    const requestedOffset = Number(progress && progress.charOffset)
+    const charOffset = Math.min(
+        contentLength,
+        Math.max(0, Number.isFinite(requestedOffset) ? requestedOffset : 0)
+    )
+    const requestedPageIndex = Number(progress && progress.pageIndex)
+    const chapterIndex = Number(chapter && chapter.index)
+
+    return {
+        chapterId: progress && progress.chapterId != null
+            ? progress.chapterId
+            : chapter && chapter.id != null
+                ? chapter.id
+                : '',
+        chapterIndex: Number.isFinite(chapterIndex)
+            ? chapterIndex
+            : Number(progress && progress.chapterIndex) || 0,
+        pageIndex: Math.max(0, Number.isFinite(requestedPageIndex) ? requestedPageIndex : 0),
+        pageCount: Math.max(0, Number(progress && progress.pageCount) || 0),
+        charOffset,
+        chapterProgress: contentLength
+            ? Math.min(1, Math.max(0, charOffset / contentLength))
+            : 0,
+        totalProgress: Math.min(1, Math.max(0, Number(progress && progress.totalProgress) || 0)),
+        scrollTop: Math.max(0, Number(progress && progress.scrollTop) || 0),
+        updatedAt: Number(progress && progress.updatedAt) || 0
+    }
+}
+
+export default {
+    normalizeContent,
+    normalizeProgress
+}

package/components/u-novel-reader/layout-engine.js

@@ -0,0 +1,225 @@
+import { measureTextWidth } from './measure-adapter'
+
+const CJK_PATTERN = /[\u3400-\u9fff\u3040-\u30ff\uff00-\uffef]/
+
+function createUnit(text, startOffset, endOffset) {
+    return {
+        text,
+        startOffset,
+        endOffset
+    }
+}
+
+function tokenizeText(text) {
+    const units = []
+    let token = ''
+    let tokenStart = 0
+    let offset = 0
+
+    const flushToken = () => {
+        if (token) {
+            units.push(createUnit(token, tokenStart, offset))
+            token = ''
+        }
+    }
+
+    Array.from(String(text)).forEach((character) => {
+        const startOffset = offset
+        offset += character.length
+        if (CJK_PATTERN.test(character) || /\s/.test(character)) {
+            flushToken()
+            units.push(createUnit(character, startOffset, offset))
+            tokenStart = offset
+            return
+        }
+        if (!token) tokenStart = startOffset
+        token += character
+    })
+    flushToken()
+    return units
+}
+
+function splitUnit(unit) {
+    if (unit.text.length <= 1) return [unit]
+    const result = []
+    let offset = unit.startOffset
+    Array.from(unit.text).forEach((character) => {
+        const nextOffset = offset + character.length
+        result.push(createUnit(character, offset, nextOffset))
+        offset = nextOffset
+    })
+    return result
+}
+
+function lineFromUnits(units) {
+    return {
+        text: units.map((unit) => unit.text).join(''),
+        startOffset: units[0].startOffset,
+        endOffset: units[units.length - 1].endOffset
+    }
+}
+
+export function createLayoutKey({
+    chapterId = '',
+    settings = {},
+    width = 0,
+    height = 0
+} = {}) {
+    return JSON.stringify({
+        chapterId,
+        width,
+        height,
+        fontSize: settings.fontSize,
+        lineHeight: settings.lineHeight,
+        paragraphSpacing: settings.paragraphSpacing,
+        contentWidth: settings.contentWidth,
+        fontFamily: settings.fontFamily,
+        fontWeight: settings.fontWeight
+    })
+}
+
+export function wrapText(text, width, measureText = measureTextWidth) {
+    const source = String(text == null ? '' : text)
+    if (!source) {
+        return [{
+            text: '',
+            startOffset: 0,
+            endOffset: 0
+        }]
+    }
+
+    const units = tokenizeText(source).reduce((result, unit) => {
+        const unitWidth = measureText(unit.text)
+        if (unitWidth > width && unit.text.length > 1) {
+            return result.concat(splitUnit(unit))
+        }
+        result.push(unit)
+        return result
+    }, [])
+    const lines = []
+    let currentUnits = []
+
+    units.forEach((unit) => {
+        const candidateUnits = currentUnits.concat(unit)
+        const candidateText = candidateUnits.map((item) => item.text).join('')
+        if (
+            currentUnits.length &&
+            measureText(candidateText) > width
+        ) {
+            lines.push(lineFromUnits(currentUnits))
+            currentUnits = [unit]
+        } else {
+            currentUnits = candidateUnits
+        }
+    })
+
+    if (currentUnits.length) {
+        lines.push(lineFromUnits(currentUnits))
+    }
+    return lines
+}
+
+function getLineHeight(layout) {
+    const fontSize = Number(layout.fontSize) || 18
+    const lineHeight = Number(layout.lineHeight)
+    if (!Number.isFinite(lineHeight)) return fontSize * 1.8
+    return lineHeight <= 4 ? fontSize * lineHeight : lineHeight
+}
+
+function createPage(lines, index) {
+    if (!lines.length) return null
+    return {
+        index,
+        text: lines.map((line) => line.text).join('\n'),
+        lines,
+        startOffset: lines[0].startOffset,
+        endOffset: lines[lines.length - 1].endOffset
+    }
+}
+
+export function paginateParagraphs(paragraphs = [], layout = {}) {
+    const width = Math.max(1, Number(layout.width) || 320)
+    const height = Math.max(1, Number(layout.height) || 500)
+    const lineHeight = Math.max(1, getLineHeight(layout))
+    const paragraphSpacing = Math.max(0, Number(layout.paragraphSpacing) || 0)
+    const measureText = typeof layout.measureText === 'function'
+        ? layout.measureText
+        : (text) => measureTextWidth(text, layout)
+    const pages = []
+    let lines = []
+    let usedHeight = 0
+
+    const flushPage = () => {
+        const page = createPage(lines, pages.length)
+        if (page) pages.push(page)
+        lines = []
+        usedHeight = 0
+    }
+
+    paragraphs.forEach((paragraph, paragraphIndex) => {
+        const normalizedParagraph = typeof paragraph === 'string'
+            ? {
+                text: paragraph,
+                startOffset: 0,
+                endOffset: paragraph.length
+            }
+            : paragraph
+        const paragraphLines = wrapText(
+            normalizedParagraph && normalizedParagraph.text,
+            width,
+            measureText
+        ).map((line) => ({
+            ...line,
+            startOffset: line.startOffset + (normalizedParagraph.startOffset || 0),
+            endOffset: line.endOffset + (normalizedParagraph.startOffset || 0),
+            paragraphIndex
+        }))
+
+        if (paragraphIndex > 0 && lines.length && usedHeight + paragraphSpacing + lineHeight > height) {
+            flushPage()
+        } else if (paragraphIndex > 0 && lines.length) {
+            usedHeight += paragraphSpacing
+        }
+
+        paragraphLines.forEach((line) => {
+            if (lines.length && usedHeight + lineHeight > height) {
+                flushPage()
+            }
+            lines.push(line)
+            usedHeight += lineHeight
+        })
+    })
+    flushPage()
+
+    return {
+        pages,
+        pageCount: pages.length,
+        charOffsetToPage: pages.map((page) => ({
+            pageIndex: page.index,
+            startOffset: page.startOffset,
+            endOffset: page.endOffset
+        }))
+    }
+}
+
+export function resolveAnchor(pages = [], charOffset = 0) {
+    if (!pages.length) {
+        return {
+            pageIndex: 0,
+            localOffset: 0
+        }
+    }
+    const offset = Math.max(0, Number(charOffset) || 0)
+    const page = pages.find((item) => offset <= item.endOffset) || pages[pages.length - 1]
+    return {
+        pageIndex: page.index,
+        localOffset: Math.max(0, Math.min(page.text.length, offset - page.startOffset))
+    }
+}
+
+export default {
+    createLayoutKey,
+    wrapText,
+    paginateParagraphs,
+    resolveAnchor
+}

package/components/u-novel-reader/measure-adapter.js

@@ -0,0 +1,69 @@
+function toNumber(value, fallback) {
+    const number = Number.parseFloat(value)
+    return Number.isFinite(number) ? number : fallback
+}
+
+function getFontSize(style = {}) {
+    return toNumber(style.fontSize, 18)
+}
+
+function getCharacterWidth(character, fontSize) {
+    if (/[\u3400-\u9fff\u3040-\u30ff\uff00-\uffef]/.test(character)) {
+        return fontSize
+    }
+    if (/\s/.test(character)) {
+        return fontSize * 0.28
+    }
+    return fontSize * 0.56
+}
+
+export function normalizeMeasureResult(value) {
+    if (typeof value === 'number') return value
+    if (value && typeof value.width === 'number') return value.width
+    return 0
+}
+
+export function measureTextWidth(text, style = {}, measureText) {
+    if (typeof measureText === 'function') {
+        return normalizeMeasureResult(measureText(String(text), style))
+    }
+    const fontSize = getFontSize(style)
+    return Array.from(String(text)).reduce(
+        (width, character) => width + getCharacterWidth(character, fontSize),
+        0
+    )
+}
+
+export function createMeasureText({ canvasContext, style = {}, measureText } = {}) {
+    if (typeof measureText === 'function') {
+        return (text) => measureTextWidth(text, style, measureText)
+    }
+    if (canvasContext && typeof canvasContext.measureText === 'function') {
+        const fontSize = getFontSize(style)
+        const fontWeight = style.fontWeight || 400
+        const fontFamily = style.fontFamily || 'sans-serif'
+        canvasContext.font = `${fontWeight} ${fontSize}px ${fontFamily}`
+        return (text) => normalizeMeasureResult(canvasContext.measureText(String(text)))
+    }
+    return (text) => measureTextWidth(text, style)
+}
+
+export function measureContainer(selector, vm) {
+    return new Promise((resolve) => {
+        if (typeof uni === 'undefined' || typeof uni.createSelectorQuery !== 'function') {
+            resolve(null)
+            return
+        }
+        const query = vm
+            ? uni.createSelectorQuery().in(vm)
+            : uni.createSelectorQuery()
+        query.select(selector).boundingClientRect((rect) => resolve(rect || null)).exec()
+    })
+}
+
+export default {
+    normalizeMeasureResult,
+    measureTextWidth,
+    createMeasureText,
+    measureContainer
+}