uview-ultra 4.5.48 → 4.5.71

package/components/up-root/props.js

@@ -0,0 +1,28 @@
+/*
+ * @Author       : jry
+ * @Description  : uview-ultra up-root component's props mixin file（uni-app Vue3 侧）
+ * @version      : 4.0
+ */
+import { defineMixin } from '../../libs/vue.js'
+import defProps from './root.js'
+let root = defProps['root']
+
+export const propsRoot = defineMixin({
+    props: {
+        // 是否为根节点附加页面底色（--up-page-bg-color）
+        background: {
+            type: Boolean,
+            default: root['background']
+        },
+        // 是否内嵌全局 toast/notify 宿主
+        toastHost: {
+            type: Boolean,
+            default: root['toastHost']
+        },
+        // 自定义根节点样式（与主题变量合并，优先级更高）
+        customStyle: {
+            type: Object,
+            default: () => root['customStyle']
+        }
+    }
+})

package/components/up-root/props.uts

@@ -0,0 +1,28 @@
+/*
+ * @Author       : jry
+ * @Description  : uview-ultra up-root component's props mixin file
+ * @version      : 4.0
+ */
+import { defineMixin } from '../../libs/vue.uts'
+import defProps from './root.uts'
+let root = defProps['root'] as UTSJSONObject
+
+export const propsRoot = defineMixin({
+    props: {
+        // 是否为根节点附加页面底色（--up-page-bg-color）
+        background: {
+            type: Boolean,
+            default: root['background']
+        },
+        // 是否内嵌全局 toast/notify 宿主
+        toastHost: {
+            type: Boolean,
+            default: root['toastHost']
+        },
+        // 自定义根节点样式（与主题变量合并，优先级更高）
+        customStyle: {
+            type: Object,
+            default: () => root['customStyle']
+        }
+    }
+})

package/components/up-root/root.js

@@ -0,0 +1,14 @@
+/*
+ * @Author       : jry
+ * @Description  : up-root 组件默认值（uni-app Vue3 侧，与 root.uts 保持一致）
+ */
+export default {
+    // root组件
+    root: {
+        // 是否为根节点附加页面底色（--up-page-bg-color）
+        background: true,
+        // 是否内嵌全局 toast/notify 宿主
+        toastHost: true,
+        customStyle: {}
+    }
+} as UTSJSONObject

package/components/up-root/root.uts

@@ -0,0 +1,14 @@
+/*
+ * @Author       : jry
+ * @Description  : up-root 组件默认值
+ */
+export default {
+    // root组件
+    root: {
+        // 是否为根节点附加页面底色（--up-page-bg-color）
+        background: true,
+        // 是否内嵌全局 toast/notify 宿主
+        toastHost: true,
+        customStyle: {}
+    }
+} as UTSJSONObject

package/components/up-root/up-root.uvue

@@ -0,0 +1,57 @@
+<template>
+	<view class="up-root" :style="rootStyle">
+		<slot></slot>
+		<up-root-toast-host v-if="toastHost"></up-root-toast-host>
+	</view>
+</template>
+
+<script setup lang="uts">
+	/**
+	 * up-root 页面级根组件（uni-app x 蒸汽模式）。
+	 *
+	 * uni-app x 的 App.uvue 不允许 template，无法像老工程那样在应用根注入
+	 * 主题变量 —— 用 up-root 作为每个页面的根容器：把运行时主题系统的
+	 * CSS 变量表（--up-* / --u-*）绑定到根节点 style，页面与子组件
+	 * （styleIsolation: 'app-and-page'）即可通过 var(--up-*) 消费，
+	 * 切换暗黑时整页自动刷新。
+	 */
+	defineOptions({
+		name: 'up-root',
+		styleIsolation: 'app-and-page'
+	})
+
+	import { computed } from 'vue'
+	import { propsRoot } from './props.uts'
+	import { upThemeVarsStyle, upThemeVar } from '../../libs/theme/theme.uts'
+
+	const props = defineProps(propsRoot)
+
+	const rootStyle = computed((): UTSJSONObject => {
+		const style = {} as UTSJSONObject
+		const vars = upThemeVarsStyle()
+		UTSJSONObject.keys(vars).forEach((key: string) => {
+			const value = vars[key]
+			if (typeof value === 'string') {
+				style[key] = value
+			}
+		})
+		if (props.background) {
+			style['backgroundColor'] = upThemeVar('--up-page-bg-color', '#f3f4f6')
+			style['color'] = upThemeVar('--up-main-color', '#303133')
+		}
+		const customStyle = props.customStyle
+		if (customStyle instanceof UTSJSONObject) {
+			const custom = customStyle as UTSJSONObject
+			UTSJSONObject.keys(custom).forEach((key: string) => {
+				style[key] = custom[key]
+			})
+		}
+		return style
+	})
+</script>
+
+<style>
+	.up-root {
+		flex: 1;
+	}
+</style>

package/components/up-root/up-root.vue

@@ -0,0 +1,35 @@
+<template>
+	<view class="up-root" :style="[rootVars, backgroundStyle, customStyle]">
+		<slot></slot>
+		<RootToastHost v-if="toastHost"></RootToastHost>
+	</view>
+</template>
+
+<script setup>
+	/**
+	 * up-root 页面级根组件（uni-app Vue3 侧）。
+	 *
+	 * Vue3 侧的主题变量由 index.js 安装的全局属性 helpers 提供
+	 * （upThemeVars / upThemePageStyle），行为与 .uvue 版对齐。
+	 */
+	defineOptions({
+		name: 'up-root',
+		styleIsolation: 'app-and-page'
+	})
+
+	import { computed, getCurrentInstance } from 'vue'
+	import { propsRoot } from './props.js'
+	import RootToastHost from '../up-root-toast-host/up-root-toast-host.vue'
+
+	const props = defineProps(propsRoot)
+	const { proxy } = getCurrentInstance() || {}
+
+	const rootVars = computed(() => proxy?.upThemeVars || {})
+	const backgroundStyle = computed(() => (props.background ? (proxy?.upThemePageStyle || {}) : {}))
+</script>
+
+<style scoped>
+	.up-root {
+		min-height: 100vh;
+	}
+</style>

package/components/up-root-toast-host/up-root-toast-host.uvue

@@ -0,0 +1,27 @@
+<template>
+	<up-toast ref="toastRef"></up-toast>
+	<up-notify ref="notifyRef"></up-notify>
+</template>
+
+<script setup lang="uts">
+	defineOptions({
+		name: 'up-root-toast-host',
+		styleIsolation: 'app-and-page'
+	})
+
+	import { onBeforeUnmount, onMounted, ref } from 'vue'
+	import { setRootToastRef, setRootNotifyRef } from '../../libs/root/rootState.uts'
+
+	const toastRef = ref<ComponentPublicInstance | null>(null)
+	const notifyRef = ref<ComponentPublicInstance | null>(null)
+
+	onMounted(() => {
+		setRootToastRef(toastRef.value)
+		setRootNotifyRef(notifyRef.value)
+	})
+
+	onBeforeUnmount(() => {
+		setRootToastRef(null)
+		setRootNotifyRef(null)
+	})
+</script>

package/components/up-switch/switch.uts

@@ -15,7 +15,8 @@ export default {
         loading: false,
         disabled: false,
         size: 25,
-        activeColor: '#2979ff',
+        // 与 switch.js 对齐：走主题变量（uvue 端 background 支持 var()，样式隔离 2.0 下变量可继承）
+        activeColor: 'var(--up-switch-active-color, var(--up-primary, #2979ff))',
         inactiveColor: '#ffffff',
         activeValue: true,
         inactiveValue: false,

package/components/up-tag/up-tag.uvue

@@ -275,7 +275,7 @@
 		}
 
 		&--square {
-			border-radius: 3px;
+			border-radius: 8px;
 		}
 
 		&__icon {

package/components/up-tag/up-tag.vue

@@ -183,7 +183,7 @@
 		}
 
 		&--square {
-			border-radius: 3px;
+			border-radius: 8px;
 		}
 
 		&__icon {

package/components/up-transition/up-transition.uvue

@@ -142,6 +142,16 @@ const vueEnter = async (): Promise<void> => {
 	emit('afterEnter')
 	// 赋予组件enter-to类名
 	classes.value = classNames['enter-to']!!.toString()
+	// 动画结束后清理 enter-active / enter-to。
+	// 不清理的话 transition-property 会常驻：进场的 CSS 过渡一旦被页面上任何一次
+	// 重渲染打断，computed transform 就冻结在起点（bottom 弹层 = translateY(100%)，
+	// 整个弹层停在屏幕外），且之后再没有任何样式变化能触发新过渡把它拉回来。
+	// 清掉 active 类后 transition-property 消失，冻结值直接跳到最终态（归位）。
+	setTimeout(() => {
+		if (status.value === 'enter') {
+			classes.value = ''
+		}
+	}, parseInt(props.duration != null ? props.duration.toString() : "0") + 50)
 }
 
 // 动画离场处理

package/components/up-transition/up-transition.vue

@@ -134,6 +134,13 @@ async function vueEnter() {
 		emit('afterEnter')
 		// 赋予组件enter-to类名
 		classes.value = classNames['enter-to']
+		// 动画结束后清理 enter-active / enter-to（避免过渡被打断后 computed transform
+		// 冻结在起点，bottom 弹层停在屏幕外）
+		setTimeout(() => {
+			if (status.value === 'enter') {
+				classes.value = ''
+			}
+		}, parseInt(String(props.duration)) + 50)
 	}
 }
 

package/components/up-transition/vue.ani-style.scss

@@ -25,13 +25,18 @@ $up-zoom-scale: scale(0.95);
 	opacity: 0
 }
 
-.up-fade-zoom-enter,
+.up-fade-enter-to {
+	opacity: 1;
+}.up-fade-zoom-enter,
 .up-fade-zoom-leave-to {
 	transform: $up-zoom-scale;
 	opacity: 0;
 }
 
-.up-fade-zoom-enter-active,
+.up-fade-zoom-enter-to {
+	transform: scale(1);
+	opacity: 1;
+}.up-fade-zoom-enter-active,
 .up-fade-zoom-leave-active {
 	transition-property: transform, opacity;
 }
@@ -53,25 +58,37 @@ $up-zoom-scale: scale(0.95);
 	opacity: 0
 }
 
-.up-fade-down-enter,
+.up-fade-up-enter-to {
+	transform: translateY(0);
+	opacity: 1;
+}.up-fade-down-enter,
 .up-fade-down-leave-to {
 	transform: translateY(-100%);
 	opacity: 0
 }
 
-.up-fade-left-enter,
+.up-fade-down-enter-to {
+	transform: translateY(0);
+	opacity: 1;
+}.up-fade-left-enter,
 .up-fade-left-leave-to {
 	transform: translateX(-100%);
 	opacity: 0
 }
 
-.up-fade-right-enter,
+.up-fade-left-enter-to {
+	transform: translateX(0);
+	opacity: 1;
+}.up-fade-right-enter,
 .up-fade-right-leave-to {
 	transform: translateX(100%);
 	opacity: 0
 }
 
-.up-slide-down-enter-active,
+.up-fade-right-enter-to {
+	transform: translateX(0);
+	opacity: 1;
+}.up-slide-down-enter-active,
 .up-slide-down-leave-active,
 .up-slide-left-enter-active,
 .up-slide-left-leave-active,
@@ -87,22 +104,34 @@ $up-zoom-scale: scale(0.95);
 	transform: translateY(100%)
 }
 
-.up-slide-down-enter,
+.up-slide-up-enter-to {
+	transform: translateY(0);
+	opacity: 1;
+}.up-slide-down-enter,
 .up-slide-down-leave-to {
 	transform: translateY(-100%)
 }
 
-.up-slide-left-enter,
+.up-slide-down-enter-to {
+	transform: translateY(0);
+	opacity: 1;
+}.up-slide-left-enter,
 .up-slide-left-leave-to {
 	transform: translateX(-100%)
 }
 
-.up-slide-right-enter,
+.up-slide-left-enter-to {
+	transform: translateX(0);
+	opacity: 1;
+}.up-slide-right-enter,
 .up-slide-right-leave-to {
 	transform: translateX(100%)
 }
 
-.up-zoom-enter-active,
+.up-slide-right-enter-to {
+	transform: translateX(0);
+	opacity: 1;
+}.up-zoom-enter-active,
 .up-zoom-leave-active {
 	transition-property: transform
 }

package/index.uts

@@ -81,9 +81,56 @@ class UPUtils {
 	}
 }
 const uputils = new UPUtils()
+
+// 运行时主题系统（蒸汽模式暗黑支持）
+import {
+	initThemeSystem,
+	setTheme,
+	setThemePreference,
+	getThemePreference,
+	getSystemTheme,
+	getThemeVars,
+	upThemeVar,
+	upThemeIsDark,
+	upThemeVarsStyle,
+	getThemePageStyle,
+	getThemeCardStyle,
+	getThemeTabBarStyle,
+	applyNativeThemeUI,
+	upThemeMode,
+	upThemePreference,
+	upThemeVersion,
+	upThemeVars
+} from './libs/theme/theme.uts'
+export {
+	initThemeSystem,
+	setTheme,
+	setThemePreference,
+	getThemePreference,
+	getSystemTheme,
+	getThemeVars,
+	upThemeVar,
+	upThemeIsDark,
+	upThemeVarsStyle,
+	getThemePageStyle,
+	getThemeCardStyle,
+	getThemeTabBarStyle,
+	applyNativeThemeUI
+}
+
+// 全局 root 宿主（up-root + 全局 toast/notify）
+import {
+	rootToast,
+	rootNotify,
+	setRootToastRef,
+	setRootNotifyRef
+} from './libs/root/rootState.uts'
+export { rootToast, rootNotify, setRootToastRef, setRootNotifyRef }
+
 export const install = (app: VueApp): void => {
 	app.config.globalProperties.$u = uputils
     app.config.globalProperties.$up = uputils
+	initThemeSystem()
 }
 
 export default {

package/libs/root/rootState.uts

@@ -0,0 +1,74 @@
+/**
+ * uni-app x（蒸汽模式）全局 root 宿主状态。
+ *
+ * up-root-toast-host.uvue 挂载时把 up-toast / up-notify 的组件实例注册进来，
+ * 业务侧通过 rootToast() / rootNotify() 触发全局提示；没有宿主时降级
+ * uni.showToast。
+ */
+import { ref } from 'vue'
+
+export const rootToastRef = ref<ComponentPublicInstance | null>(null)
+export const rootNotifyRef = ref<ComponentPublicInstance | null>(null)
+
+export function setRootToastRef(instance: ComponentPublicInstance | null): void {
+    rootToastRef.value = instance
+}
+
+export function setRootNotifyRef(instance: ComponentPublicInstance | null): void {
+    rootNotifyRef.value = instance
+}
+
+function normalizeOptions(options: UTSJSONObject | string): UTSJSONObject {
+    if (options instanceof String) {
+        const obj = {} as UTSJSONObject
+        obj['message'] = options.toString()
+        return obj
+    }
+    const source = options as UTSJSONObject
+    const message = source['message']
+    if (message == null) {
+        const title = source['title']
+        if (title != null && typeof title === 'string') {
+            source['message'] = title
+        }
+    }
+    return source
+}
+
+export function rootToast(options: UTSJSONObject | string): void {
+    const toastOptions = normalizeOptions(options)
+    const instance = rootToastRef.value
+    if (instance != null) {
+        instance.$callMethod('show', toastOptions)
+        return
+    }
+    const message = toastOptions['message']
+    if (message == null || typeof message !== 'string') return
+    const durationValue = toastOptions['duration']
+    let duration = 2000
+    if (typeof durationValue === 'number') duration = Math.round(durationValue as number)
+    uni.showToast({
+        title: message as string,
+        icon: 'none',
+        duration
+    })
+}
+
+export function rootNotify(options: UTSJSONObject | string): void {
+    const notifyOptions = normalizeOptions(options)
+    const instance = rootNotifyRef.value
+    if (instance != null) {
+        instance.$callMethod('show', notifyOptions)
+        return
+    }
+    const message = notifyOptions['message']
+    if (message == null || typeof message !== 'string') return
+    const durationValue = notifyOptions['duration']
+    let duration = 3000
+    if (typeof durationValue === 'number') duration = Math.round(durationValue as number)
+    uni.showToast({
+        title: message as string,
+        icon: 'none',
+        duration
+    })
+}

package/libs/theme/theme.js

@@ -95,7 +95,8 @@ export const themeState = {
     vars: {}
 }
 
-const THEME_MODE_STORAGE_KEY = 'u-theme-mode'
+const THEME_MODE_STORAGE_KEY = 'up-theme-mode'
+const LEGACY_THEME_MODE_STORAGE_KEY = 'u-theme-mode'
 const THEME_MODE_SYSTEM = 'system'
 const THEME_MODE_MANUAL = ['light', 'dark']
 const LIGHT_THEME_TOKEN_FIELD_MAP = Object.freeze({
@@ -229,7 +230,16 @@ function getExplicitRuntimeColorValue(token, runtimeColorMap = {}) {
 function readThemePreferenceFromStorage() {
     try {
         if (typeof uni !== 'undefined' && typeof uni.getStorageSync === 'function') {
-            const mode = uni.getStorageSync(THEME_MODE_STORAGE_KEY)
+            let mode = uni.getStorageSync(THEME_MODE_STORAGE_KEY)
+            // 旧 `u-theme-mode` 迁移（fork 时代 key）。
+            if (typeof mode !== 'string' || mode.length === 0) {
+                const legacy = uni.getStorageSync(LEGACY_THEME_MODE_STORAGE_KEY)
+                if (typeof legacy === 'string' && legacy.length > 0) {
+                    mode = legacy
+                    uni.setStorageSync(THEME_MODE_STORAGE_KEY, legacy)
+                    uni.removeStorageSync(LEGACY_THEME_MODE_STORAGE_KEY)
+                }
+            }
             return normalizeThemePreference(mode)
         }
     } catch (e) {}