uview-ultra 4.5.46

package/components/up-novel-reader/persistence.uts

@@ -0,0 +1,137 @@
+export const STORAGE_VERSION: number = 1
+export const DEFAULT_STORAGE_PREFIX: String = 'uview-ultra:novel-reader:'
+
+function isObject(value: any | null): Boolean {
+    return value != null && typeof value == 'object' && !Array.isArray(value)
+}
+
+function numberValue(value: any | null, fallback: number = 0): number {
+    if (value == null) return fallback
+    const parsed = parseFloat(value.toString())
+    return isNaN(parsed) ? fallback : parsed
+}
+
+function normalizeProgress(value: UTSJSONObject | null): UTSJSONObject | null {
+    if (value == null || !isObject(value)) return null
+    const numericFields = ['chapterIndex', 'pageIndex', 'pageCount', 'charOffset', 'scrollTop']
+    for (const field of numericFields) {
+        if (value[field] != null) {
+            const numericValue = numberValue(value[field], -1)
+            if (numericValue < 0 || isNaN(numericValue)) return null
+        }
+    }
+    for (const field of ['chapterProgress', 'totalProgress']) {
+        if (value[field] != null) {
+            const numericValue = numberValue(value[field], -1)
+            if (numericValue < 0 || numericValue > 1 || isNaN(numericValue)) return null
+        }
+    }
+    const result: UTSJSONObject = UTSJSONObject.assign({}, value)
+    result['pageIndex'] = Math.max(0, numberValue(value['pageIndex']))
+    result['pageCount'] = Math.max(0, numberValue(value['pageCount']))
+    result['charOffset'] = Math.max(0, numberValue(value['charOffset']))
+    result['scrollTop'] = Math.max(0, numberValue(value['scrollTop']))
+    return result
+}
+
+function normalizeSettings(value: any | null): UTSJSONObject {
+    if (!isObject(value)) return {} as UTSJSONObject
+    return UTSJSONObject.assign({}, value as UTSJSONObject)
+}
+
+function normalizeBookmarks(value: any | null): Array<UTSJSONObject> {
+    if (!Array.isArray(value)) return [] as Array<UTSJSONObject>
+    const result: Array<UTSJSONObject> = []
+    const values = value as Array<any>
+    values.forEach((bookmark: any) => {
+        if (!isObject(bookmark)) return
+        const item = bookmark as UTSJSONObject
+        if (
+            item['id'] == null ||
+            item['chapterId'] == null ||
+            numberValue(item['charOffset'], -1) < 0
+        ) return
+        result.push(item)
+    })
+    return result
+}
+
+export function createStorageKey(storageKey: String = '', bookId: any = ''): String {
+    if (storageKey.length > 0) return storageKey
+    if (bookId == null || bookId.toString().length == 0) return ''
+    return `${DEFAULT_STORAGE_PREFIX}${bookId}`
+}
+
+export function normalizePersistedState(value: UTSJSONObject | null): UTSJSONObject | null {
+    if (value == null || value['version'] != STORAGE_VERSION) return null
+    const progress = normalizeProgress(value['progress'] == null ? null : value['progress'] as UTSJSONObject)
+    const readingTime = numberValue(value['readingTime'], -1)
+    const updatedAt = numberValue(value['updatedAt'], -1)
+    if (readingTime < 0 || updatedAt < 0) return null
+    return {
+        version: STORAGE_VERSION,
+        progress,
+        settings: normalizeSettings(value['settings']),
+        bookmarks: normalizeBookmarks(value['bookmarks']),
+        readingTime,
+        updatedAt
+    } as UTSJSONObject
+}
+
+export function readPersistedState(key: String): UTSJSONObject | null {
+    if (key.length == 0) return null
+    try {
+        const rawValue = uni.getStorageSync(key)
+        let parsed: UTSJSONObject | null = null
+        if (rawValue != null && typeof rawValue == 'string') {
+            const rawText = (rawValue as String).trim()
+            // 空串/非法 JSON 直接走 catch 分支，避免 UTS.JSON.parseObject 抛出原生异常
+            if (rawText.length > 0) {
+                parsed = JSON.parseObject<UTSJSONObject>(rawText)
+            }
+        } else if (rawValue != null) {
+            parsed = rawValue as UTSJSONObject
+        }
+        const normalized = normalizePersistedState(parsed)
+        if (parsed != null && normalized == null) {
+            uni.removeStorageSync(key)
+        }
+        return normalized
+    } catch (error) {
+        try {
+            uni.removeStorageSync(key)
+        } catch (removeError) {
+            return null
+        }
+        return null
+    }
+}
+
+export function writePersistedState(key: String, state: UTSJSONObject): Boolean {
+    if (key.length == 0) return false
+    const payload: UTSJSONObject = {
+        version: STORAGE_VERSION,
+        progress: isObject(state['progress']) ? state['progress'] : null,
+        settings: isObject(state['settings']) ? state['settings'] : ({} as UTSJSONObject),
+        bookmarks: Array.isArray(state['bookmarks'])
+            ? state['bookmarks']
+            : ([] as Array<UTSJSONObject>),
+        readingTime: Math.max(0, numberValue(state['readingTime'])),
+        updatedAt: Date.now()
+    } as UTSJSONObject
+    try {
+        uni.setStorageSync(key, payload)
+        return true
+    } catch (error) {
+        return false
+    }
+}
+
+export default {
+    STORAGE_VERSION,
+    DEFAULT_STORAGE_PREFIX,
+    createStorageKey,
+    normalizePersistedState,
+    readPersistedState,
+    writePersistedState
+}

package/components/up-novel-reader/props.js

@@ -0,0 +1,97 @@
+import { defineMixin } from '../../libs/vue.js'
+import defProps from '../../libs/config/props.js'
+
+export const props = defineMixin({
+    props: {
+        chapters: {
+            type: Array,
+            default: () => defProps.novelReader.chapters
+        },
+        currentChapter: {
+            type: Object,
+            default: () => defProps.novelReader.currentChapter
+        },
+        loading: {
+            type: Boolean,
+            default: () => defProps.novelReader.loading
+        },
+        error: {
+            type: Object,
+            default: () => defProps.novelReader.error
+        },
+        bookId: {
+            type: [String, Number],
+            default: () => defProps.novelReader.bookId
+        },
+        storageKey: {
+            type: String,
+            default: () => defProps.novelReader.storageKey
+        },
+        persist: {
+            type: Boolean,
+            default: () => defProps.novelReader.persist
+        },
+        initialProgress: {
+            type: Object,
+            default: () => defProps.novelReader.initialProgress
+        },
+        progress: {
+            type: Object,
+            default: () => defProps.novelReader.progress
+        },
+        initialBookmarks: {
+            type: Array,
+            default: () => defProps.novelReader.initialBookmarks
+        },
+        bookmarks: {
+            type: Array,
+            default: () => defProps.novelReader.bookmarks
+        },
+        defaultSettings: {
+            type: Object,
+            default: () => ({ ...defProps.novelReader.defaultSettings })
+        },
+        settings: {
+            type: Object,
+            default: () => defProps.novelReader.settings
+        },
+        mode: {
+            type: String,
+            default: () => defProps.novelReader.mode
+        },
+        showBack: {
+            type: Boolean,
+            default: () => defProps.novelReader.showBack
+        },
+        autoBack: {
+            type: Boolean,
+            default: () => defProps.novelReader.autoBack
+        },
+        backIcon: {
+            type: String,
+            default: () => defProps.novelReader.backIcon
+        },
+        safeAreaInsetTop: {
+            type: Boolean,
+            default: () => defProps.novelReader.safeAreaInsetTop
+        },
+        safeAreaInsetBottom: {
+            type: Boolean,
+            default: () => defProps.novelReader.safeAreaInsetBottom
+        },
+        preloadThreshold: {
+            type: Number,
+            default: () => defProps.novelReader.preloadThreshold
+        },
+        pageAnimation: {
+            type: Boolean,
+            default: () => defProps.novelReader.pageAnimation
+        },
+        controlsAutoHide: {
+            type: Number,
+            default: () => defProps.novelReader.controlsAutoHide
+        }
+    }
+})
+
+export default props

package/components/up-novel-reader/props.uts

@@ -0,0 +1,97 @@
+import { defineMixin } from '../../libs/vue'
+import defProps from './novelReader'
+
+const currentProps = defProps['novelReader'] as UTSJSONObject
+
+export const propsNovelReader = defineMixin({
+    props: {
+        chapters: {
+            type: Array,
+            default: currentProps['chapters']
+        },
+        currentChapter: {
+            type: UTSJSONObject,
+            default: currentProps['currentChapter']
+        },
+        loading: {
+            type: Boolean,
+            default: currentProps['loading']
+        },
+        error: {
+            type: UTSJSONObject,
+            default: currentProps['error']
+        },
+        bookId: {
+            type: [String, Number],
+            default: currentProps['bookId']
+        },
+        storageKey: {
+            type: String,
+            default: currentProps['storageKey']
+        },
+        persist: {
+            type: Boolean,
+            default: currentProps['persist']
+        },
+        initialProgress: {
+            type: UTSJSONObject,
+            default: currentProps['initialProgress']
+        },
+        progress: {
+            type: UTSJSONObject,
+            default: currentProps['progress']
+        },
+        initialBookmarks: {
+            type: Array,
+            default: currentProps['initialBookmarks']
+        },
+        bookmarks: {
+            type: Array,
+            default: currentProps['bookmarks']
+        },
+        defaultSettings: {
+            type: UTSJSONObject,
+            default: currentProps['defaultSettings']
+        },
+        settings: {
+            type: UTSJSONObject,
+            default: currentProps['settings']
+        },
+        mode: {
+            type: String,
+            default: currentProps['mode']
+        },
+        showBack: {
+            type: Boolean,
+            default: currentProps['showBack']
+        },
+        autoBack: {
+            type: Boolean,
+            default: currentProps['autoBack']
+        },
+        backIcon: {
+            type: String,
+            default: currentProps['backIcon']
+        },
+        safeAreaInsetTop: {
+            type: Boolean,
+            default: currentProps['safeAreaInsetTop']
+        },
+        safeAreaInsetBottom: {
+            type: Boolean,
+            default: currentProps['safeAreaInsetBottom']
+        },
+        preloadThreshold: {
+            type: Number,
+            default: currentProps['preloadThreshold']
+        },
+        pageAnimation: {
+            type: Boolean,
+            default: currentProps['pageAnimation']
+        },
+        controlsAutoHide: {
+            type: Number,
+            default: currentProps['controlsAutoHide']
+        }
+    }
+})

package/components/up-novel-reader/reader-catalog.uvue

@@ -0,0 +1,92 @@
+<template>
+	<view class="up-novel-reader__catalog" :style="catalogStyle">
+		<view class="up-novel-reader__catalog-header">
+			<text class="up-novel-reader__catalog-title">目录</text>
+			<text class="up-novel-reader__catalog-count">{{ chapters.length }} 章</text>
+		</view>
+		<scroll-view v-if="chapters.length > 0" class="up-novel-reader__catalog-scroll" direction="vertical">
+			<view
+				v-for="chapter in chapters"
+				:key="chapterKey(chapter)"
+				class="up-novel-reader__catalog-item"
+				:class="isCurrent(chapter) ? 'is-current' : chapter['isLocked'] == true ? 'is-locked' : ''"
+				@tap="selectChapter(chapter)"
+			>
+				<view class="up-novel-reader__catalog-index">{{ displayIndex(chapter) }}</view>
+				<text class="up-novel-reader__catalog-item-title">{{ chapterTitle(chapter) }}</text>
+				<up-icon v-if="chapter['isLocked'] == true" name="lock" size="15" :color="mutedColor"></up-icon>
+			</view>
+			<view v-if="bookmarks.length > 0" class="up-novel-reader__bookmark-section">
+				<view class="up-novel-reader__bookmark-heading">
+					<text>书签</text>
+					<text>{{ bookmarks.length }}</text>
+				</view>
+				<view v-for="bookmark in bookmarks" :key="bookmarkKey(bookmark)" class="up-novel-reader__bookmark-item" @tap="selectBookmark(bookmark)">
+					<text class="up-novel-reader__bookmark-excerpt">{{ bookmarkExcerpt(bookmark) }}</text>
+					<text class="up-novel-reader__bookmark-progress">{{ bookmarkChapter(bookmark) }} 章</text>
+				</view>
+			</view>
+			<slot></slot>
+		</scroll-view>
+		<view v-else class="up-novel-reader__catalog-empty">暂无目录</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { computed } from 'vue'
+
+defineOptions({ styleIsolation: 'app-and-page', name: 'up-novel-reader-catalog' })
+
+const props = defineProps({
+	chapters: { type: Array, default: () => [] },
+	currentChapter: { type: UTSJSONObject, default: null },
+	bookmarks: { type: Array, default: () => [] },
+	progress: { type: UTSJSONObject, default: () => ({}) },
+	themeTokens: { type: UTSJSONObject, default: () => ({}) }
+})
+const emit = defineEmits(['chapter-select', 'bookmark-select'])
+const chapters = computed((): Array<UTSJSONObject> => props.chapters as Array<UTSJSONObject>)
+const bookmarks = computed((): Array<UTSJSONObject> => props.bookmarks as Array<UTSJSONObject>)
+const theme = computed((): UTSJSONObject => props.themeTokens == null ? ({} as UTSJSONObject) : props.themeTokens as UTSJSONObject)
+const mutedColor = computed((): string => (theme.value['muted'] == null ? '#909399' : theme.value['muted']).toString())
+const catalogStyle = computed((): UTSJSONObject => {
+	return {
+		backgroundColor: (theme.value['background'] == null ? '#f7f8fa' : theme.value['background']).toString(),
+		color: (theme.value['text'] == null ? '#303133' : theme.value['text']).toString()
+	} as UTSJSONObject
+})
+const textValue = (value: any | null, fallback: string): string => value == null ? fallback : value.toString()
+const chapterKey = (chapter: UTSJSONObject): string => textValue(chapter['id'], chapter['index'] == null ? '0' : chapter['index'].toString())
+const bookmarkKey = (bookmark: UTSJSONObject): string => textValue(bookmark['id'], bookmark['charOffset'] == null ? '0' : bookmark['charOffset'].toString())
+const displayIndex = (chapter: UTSJSONObject): string => (parseInt(textValue(chapter['index'], '0')) + 1).toString()
+const chapterTitle = (chapter: UTSJSONObject): string => textValue(chapter['title'], '第' + displayIndex(chapter) + '章')
+const bookmarkExcerpt = (bookmark: UTSJSONObject): string => textValue(bookmark['excerpt'], '书签位置')
+const bookmarkChapter = (bookmark: UTSJSONObject): string => (parseInt(textValue(bookmark['chapterIndex'], '0')) + 1).toString()
+const isCurrent = (chapter: UTSJSONObject): boolean => {
+	return props.currentChapter != null && chapter['id'] == (props.currentChapter as UTSJSONObject)['id']
+}
+const selectChapter = (chapter: UTSJSONObject): void => {
+	if (chapter['isLocked'] == true) return
+	emit('chapter-select', chapter)
+}
+const selectBookmark = (bookmark: UTSJSONObject): void => emit('bookmark-select', bookmark)
+</script>
+
+<style lang="scss" scoped>
+.up-novel-reader__catalog { display: flex; flex-direction: column; width: 82%; max-width: 360px; height: 100%; }
+.up-novel-reader__catalog-header { display: flex; flex-direction: row; align-items: flex-end; justify-content: space-between; padding: 20px 18px 14px; border-bottom: 1px solid var(--up-novel-reader-border, rgba(48, 49, 51, 0.12)); }
+.up-novel-reader__catalog-title { font-size: 20px; font-weight: 600; }
+.up-novel-reader__catalog-count, .up-novel-reader__catalog-index, .up-novel-reader__bookmark-progress { color: var(--up-novel-reader-muted, #909399); font-size: 12px; }
+.up-novel-reader__catalog-scroll { flex: 1; min-height: 0; }
+.up-novel-reader__catalog-item { display: flex; flex-direction: row; align-items: center; min-height: 48px; padding: 0 18px; gap: 10px; }
+.up-novel-reader__catalog-item.is-current { color: var(--up-novel-reader-active, #2979ff); background-color: rgba(41, 121, 255, 0.08); }
+.up-novel-reader__catalog-item.is-locked { opacity: 0.45; }
+.up-novel-reader__catalog-index { width: 24px; }
+.up-novel-reader__catalog-item-title { flex: 1; overflow: hidden; font-size: 14px; text-overflow: ellipsis; white-space: nowrap; }
+.up-novel-reader__catalog-empty { padding: 36px 18px; color: var(--up-novel-reader-muted, #909399); text-align: center; }
+.up-novel-reader__bookmark-section { margin-top: 10px; padding: 16px 18px 24px; border-top: 1px solid var(--up-novel-reader-border, rgba(48, 49, 51, 0.12)); }
+.up-novel-reader__bookmark-heading, .up-novel-reader__bookmark-item { display: flex; flex-direction: row; justify-content: space-between; gap: 10px; }
+.up-novel-reader__bookmark-heading { margin-bottom: 10px; color: var(--up-novel-reader-muted, #909399); font-size: 13px; }
+.up-novel-reader__bookmark-item { padding: 8px 0; }
+.up-novel-reader__bookmark-excerpt { flex: 1; overflow: hidden; font-size: 13px; text-overflow: ellipsis; white-space: nowrap; }
+</style>

package/components/up-novel-reader/reader-catalog.vue

@@ -0,0 +1,202 @@
+<template>
+    <view class="up-novel-reader__catalog" :style="catalogStyle">
+        <view class="up-novel-reader__catalog-header">
+            <text class="up-novel-reader__catalog-title">目录</text>
+            <text class="up-novel-reader__catalog-count">{{ chapters.length }} 章</text>
+        </view>
+        <scroll-view v-if="chapters.length" class="up-novel-reader__catalog-scroll" scroll-y>
+            <view
+                v-for="chapter in chapters"
+                :key="chapter.id || chapter.index"
+                class="up-novel-reader__catalog-item"
+                :class="{
+                    'is-current': isCurrent(chapter),
+                    'is-locked': chapter.isLocked
+                }"
+                @tap="selectChapter(chapter)"
+            >
+                <view class="up-novel-reader__catalog-index">{{ displayIndex(chapter) }}</view>
+                <text class="up-novel-reader__catalog-item-title">
+                    {{ chapter.title || `第${displayIndex(chapter)}章` }}
+                </text>
+                <up-icon v-if="chapter.isLocked" name="lock" size="15" :color="themeTokens.muted"></up-icon>
+            </view>
+            <view v-if="bookmarks.length" class="up-novel-reader__bookmark-section">
+                <view class="up-novel-reader__bookmark-heading">
+                    <text>书签</text>
+                    <text>{{ bookmarks.length }}</text>
+                </view>
+                <view
+                    v-for="bookmark in bookmarks"
+                    :key="bookmark.id"
+                    class="up-novel-reader__bookmark-item"
+                    @tap="selectBookmark(bookmark)"
+                >
+                    <text class="up-novel-reader__bookmark-excerpt">{{ bookmark.excerpt || '书签位置' }}</text>
+                    <text class="up-novel-reader__bookmark-progress">
+                        {{ Number(bookmark.chapterIndex || 0) + 1 }} 章
+                    </text>
+                </view>
+            </view>
+        </scroll-view>
+        <view v-else class="up-novel-reader__catalog-empty">暂无目录</view>
+        <slot></slot>
+    </view>
+</template>
+
+<script>
+export default {
+    name: 'NovelReaderCatalog',
+    props: {
+        chapters: {
+            type: Array,
+            default: () => []
+        },
+        currentChapter: {
+            type: Object,
+            default: null
+        },
+        bookmarks: {
+            type: Array,
+            default: () => []
+        },
+        progress: {
+            type: Object,
+            default: () => ({})
+        },
+        themeTokens: {
+            type: Object,
+            default: () => ({})
+        }
+    },
+    emits: ['chapter-select', 'bookmark-select'],
+    computed: {
+        catalogStyle() {
+            return {
+                backgroundColor: this.themeTokens.background || '#f7f8fa',
+                color: this.themeTokens.text || '#303133'
+            }
+        }
+    },
+    methods: {
+        displayIndex(chapter) {
+            return Number(chapter && chapter.index) + 1
+        },
+        isCurrent(chapter) {
+            return Boolean(
+                chapter &&
+                this.currentChapter &&
+                chapter.id === this.currentChapter.id
+            )
+        },
+        selectChapter(chapter) {
+            if (!chapter || chapter.isLocked) return
+            this.$emit('chapter-select', chapter)
+        },
+        selectBookmark(bookmark) {
+            this.$emit('bookmark-select', bookmark)
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.up-novel-reader__catalog {
+    display: flex;
+    flex-direction: column;
+    width: 82vw;
+    max-width: 360px;
+    height: 100%;
+}
+
+.up-novel-reader__catalog-header {
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+    padding: 20px 18px 14px;
+    border-bottom: 1px solid var(--up-novel-reader-border, rgba(48, 49, 51, 0.12));
+}
+
+.up-novel-reader__catalog-title {
+    font-size: 20px;
+    font-weight: 600;
+}
+
+.up-novel-reader__catalog-count,
+.up-novel-reader__catalog-index,
+.up-novel-reader__bookmark-progress {
+    color: var(--up-novel-reader-muted, #909399);
+    font-size: 12px;
+}
+
+.up-novel-reader__catalog-scroll {
+    flex: 1;
+    min-height: 0;
+}
+
+.up-novel-reader__catalog-item {
+    display: flex;
+    align-items: center;
+    min-height: 48px;
+    padding: 0 18px;
+    gap: 10px;
+}
+
+.up-novel-reader__catalog-item.is-current {
+    color: var(--up-novel-reader-active, #2979ff);
+    background-color: rgba(41, 121, 255, 0.08);
+}
+
+.up-novel-reader__catalog-item.is-locked {
+    opacity: 0.45;
+}
+
+.up-novel-reader__catalog-index {
+    width: 24px;
+}
+
+.up-novel-reader__catalog-item-title {
+    flex: 1;
+    overflow: hidden;
+    font-size: 14px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.up-novel-reader__catalog-empty {
+    padding: 36px 18px;
+    color: var(--up-novel-reader-muted, #909399);
+    text-align: center;
+}
+
+.up-novel-reader__bookmark-section {
+    margin-top: 10px;
+    padding: 16px 18px 24px;
+    border-top: 1px solid var(--up-novel-reader-border, rgba(48, 49, 51, 0.12));
+}
+
+.up-novel-reader__bookmark-heading,
+.up-novel-reader__bookmark-item {
+    display: flex;
+    justify-content: space-between;
+    gap: 10px;
+}
+
+.up-novel-reader__bookmark-heading {
+    margin-bottom: 10px;
+    color: var(--up-novel-reader-muted, #909399);
+    font-size: 13px;
+}
+
+.up-novel-reader__bookmark-item {
+    padding: 8px 0;
+}
+
+.up-novel-reader__bookmark-excerpt {
+    flex: 1;
+    overflow: hidden;
+    font-size: 13px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+</style>